[sawfish] for x in am.po ca.po en_CA.po fr.po ko.po nl.po pt_BR.po sl.po vi.po



commit 257f09af1fab052bbd96290155b7ec89e71ea088
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sun Oct 18 15:39:42 2009 +0200

    for x in am.po  ca.po  en_CA.po	fr.po  ko.po  nl.po  pt_BR.po  sl.po	   vi.po
    ar.po  cs.po  en_GB.po	ga.po  lv.po  nn.po  pt.po     sr Latn po  wa.po
    az.po  da.po  es.po	gl.po  mk.po  no.po  ro.po     sr.po	   zh_CN.po
    be.po  de.po  et.po	hu.po  ms.po  oc.po  ru.po     sv.po	   zh_TW.po
    bg.po  dz.po  eu.po	it.po  nb.po  pa.po  rw.po     tr.po
    bs.po  el.po  fi.po	ja.po  ne.po  pl.po  sk.po     uk.po; do ./update.sh .po; done

 po/am.po      |  416 +++--
 po/ar.po      |  419 +++--
 po/az.po      |  446 +++--
 po/be.po      |  445 +++--
 po/bg.po      |  450 +++--
 po/bs.po      |  441 +++--
 po/ca.po      |  444 +++--
 po/cs.po      |  445 +++--
 po/da.po      |  450 +++--
 po/de.po      | 5956 +++++++++++++++++++++++++++++++++++++--------------------
 po/dz.po      |  446 +++--
 po/el.po      |  453 +++--
 po/en_CA.po   |  447 +++--
 po/en_GB.po   |  452 +++--
 po/es.po      |  431 +++--
 po/et.po      |  444 +++--
 po/eu.po      |  418 +++--
 po/fi.po      |  445 +++--
 po/fr.po      |  454 +++--
 po/ga.po      |  409 +++--
 po/gl.po      |  441 +++--
 po/hu.po      |  450 +++--
 po/it.po      |  440 +++--
 po/ja.po      |  450 +++--
 po/ko.po      |  446 +++--
 po/lv.po      |  450 +++--
 po/mk.po      |  435 +++--
 po/ms.po      |  439 +++--
 po/nb.po      |  447 +++--
 po/ne.po      |  451 +++--
 po/nl.po      |  454 +++--
 po/nn.po      |  424 +++--
 po/no.po      |  447 +++--
 po/oc.po      |  406 +++--
 po/pa.po      |  421 +++--
 po/pl.po      |  440 +++--
 po/pt.po      |  463 ++++--
 po/pt_BR.po   |  454 +++--
 po/ro.po      |  445 +++--
 po/ru.po      |  445 +++--
 po/rw.po      |  436 +++--
 po/sk.po      |  445 +++--
 po/sl.po      |  445 +++--
 po/sr.po      |  449 +++--
 po/sr Latn po |  449 +++--
 po/sv.po      |  445 +++--
 po/tr.po      |  444 +++--
 po/uk.po      |  445 +++--
 po/vi.po      |  450 +++--
 po/wa.po      |  431 +++--
 po/zh_CN.po   |  446 +++--
 po/zh_TW.po   |  440 +++--
 52 files changed, 19407 insertions(+), 9077 deletions(-)
---
diff --git a/po/am.po b/po/am.po
index ee7d96f..bb97e6d 100644
--- a/po/am.po
+++ b/po/am.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-01-01 19:37+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales geez org>\n"
 "Language-Team: Amharic <locales geez org>\n"
@@ -195,10 +195,10 @@ msgstr "á??á??á??"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr "á??á??á?? á??á?¨á?¡"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -491,15 +491,15 @@ msgstr "á??á??á??"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -507,14 +507,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -522,8 +522,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -538,7 +538,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -563,8 +563,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -650,8 +650,8 @@ msgstr "á?¦á?³á??á?? á? á?µá?³á??á?µ"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -662,7 +662,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -675,7 +675,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -696,7 +696,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -708,14 +708,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -727,18 +727,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -749,7 +749,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -761,7 +761,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -816,12 +816,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -829,7 +829,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -837,23 +837,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -861,7 +861,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -869,8 +869,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -878,10 +878,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -900,7 +900,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -913,10 +913,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -963,16 +963,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -988,7 +988,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1809,7 +1809,8 @@ msgstr "á??á?µá?®á?µá?? á? á?¥á??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1819,7 +1820,8 @@ msgstr "á??á?µá?®á?µá?? á? á?¥á??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1885,33 +1887,81 @@ msgid "Shrink window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window down"
 msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr ""
@@ -2233,6 +2283,16 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid "Update apps menu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2325,10 +2385,6 @@ msgstr "á??á?µá?®á?µ á? á?³á?­"
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2550,11 +2606,6 @@ msgstr "á??á??á?³"
 msgid "Other"
 msgstr "á??á??"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2748,6 +2799,18 @@ msgstr "á??á?° á??á?? á??á?¥á?ªá?« á?¦á?³á??á?? á??á?­"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "á??á?° á??á?­ á??á?¥á?ªá?« á?¦á?³á??á?? á??á?­"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2773,18 +2836,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "á?¨á??á? á?¨á?? á??á?°á?? á??á?­á?½á?¦ \\w"
 
@@ -2969,6 +3020,59 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "á?¦á?³á??á?? á? á?µá?³á??á?µ"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3169,6 +3273,10 @@ msgid "Display Errors"
 msgstr "á??á?µá?®á?µ á? á?³á?­"
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
 msgid "Restart Sawfish"
 msgstr "á?¥á??á?°á??á?? á? á?µá??á??á?©"
@@ -3228,8 +3336,9 @@ msgid "Display the applications menu."
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "á?¨Sawfish á??á??á?» á??á?½"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3268,7 +3377,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3277,7 +3385,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3286,7 +3393,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3484,7 +3590,8 @@ msgstr "á??á?µá?®á?±á?? á? á?³á?µá?°á??á??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3624,7 +3731,8 @@ msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3644,8 +3752,8 @@ msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3848,9 +3956,7 @@ msgid "Unmark all windows"
 msgstr "á??á?µá?®á?±á?? á? á?³á?µá?°á??á??"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3894,15 +4000,34 @@ msgid "Raise window"
 msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Lower window"
 msgstr "á?¨á??á??á?¥á??á?? á??á?µá?®á?µ"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Raise lower window"
 msgstr "á??á?µá?®á?µ á? á?³á?­"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4026,7 +4151,8 @@ msgstr "á?¨á??á?? á??á?¥á?ªá?« á?¦á?³"
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4036,7 +4162,8 @@ msgstr "á?¨á??á?« á??á?¥á?ªá?« á?¦á?³"
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4045,16 +4172,22 @@ msgid "Move window up"
 msgstr "á?¨á??á??á?¥á??á?? á??á?µá?®á?µ"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
+msgstr "á?¨á??á?? á??á?¥á?ªá?« á?¦á?³"
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Move window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
+msgstr "á?¨á??á?? á??á?¥á?ªá?« á?¦á?³"
 
 #. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
@@ -4090,7 +4223,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4136,6 +4269,11 @@ msgstr ""
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "á??á?µá?®á?±á?? á? á?µá?°á??á??"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4146,7 +4284,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4288,7 +4427,8 @@ msgstr "á??á?° á?³á?½ á??á?¥á?ªá?« á?¦á?³á??á?? á??á?­"
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/ar.po b/po/ar.po
index ab50169..8d92baa 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-11-19 14:58+0100\n"
 "Last-Translator: Djihed Afifi <djihed gmail com>\n"
 "Language-Team: Arabic <doc arabeyes org>\n"
@@ -210,10 +210,10 @@ msgstr "Ù?ا Ù?Ù?جد"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -234,21 +234,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,7 +256,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -264,14 +264,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -292,10 +292,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -318,17 +318,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -336,8 +336,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -368,8 +368,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr "اختÙ?ار اÙ?Ù?Ù?Ù?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,8 +433,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -442,7 +442,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -506,15 +506,15 @@ msgstr "اÙ?Ù?Ù?"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -522,14 +522,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -537,8 +537,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -553,7 +553,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -578,8 +578,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -595,7 +595,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -665,8 +665,8 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -678,7 +678,7 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -692,7 +692,7 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -714,7 +714,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -727,14 +727,14 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -747,18 +747,18 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -770,7 +770,7 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -838,12 +838,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,7 +851,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -859,23 +859,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -883,7 +883,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -891,8 +891,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -900,10 +900,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -922,7 +922,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -935,10 +935,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -985,16 +985,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1010,7 +1010,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1916,7 +1916,8 @@ msgstr "Ù?_Ù?Ù? Ø¥Ù?Ù? Ù?اÙ?ذةÙ? جدÙ?دة"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1926,7 +1927,8 @@ msgstr "إرساء Ù?اÙ?ذة اÙ?برÙ?اÙ?ج"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1995,40 +1997,88 @@ msgid "Shrink window left"
 msgstr "Ù?Ù? اÙ?Ù?سار Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ù?Ù? اÙ?Ù?سار Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أعÙ?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أسÙ?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ù?Ù? اÙ?Ù?سار Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ù?Ù? اÙ?Ù?سار Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أعÙ?Ù?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أسÙ?Ù?"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2399,6 +2449,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "جارÙ? جÙ?ب Ù?عÙ?Ù?Ù?ات اÙ?خط... %3d%%"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ù?ائÙ?Ø© اÙ?Ù?Ù?دÙ?Ù? اÙ?Ù?Ù?بثÙ?Ø©"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2504,10 +2565,6 @@ msgstr "أخطاء اÙ?استÙ?باÙ?:"
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2769,11 +2826,6 @@ msgstr "اÙ?حاÙ?Ø©"
 msgid "Other"
 msgstr "أخرÙ?"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ù?بدÙ? اÙ?Ù?اÙ?ذة"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2995,6 +3047,18 @@ msgstr "تحÙ?Ù? Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? عÙ?Ù? اÙ?Ù?Ù?Ù?Ù?"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?Ù?Ù?Ù?Ù?"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -3022,18 +3086,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "رÙ?ع Ø¢Ù?Ù? Ù?Ù?Ù?اÙ?ذة اÙ?Ù?رÙ?زة"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 #, fuzzy
 msgid "Default font: \\w"
 msgstr "اÙ?خط اÙ?Ø¥Ù?تراضÙ?"
@@ -3236,6 +3288,63 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Ù?Ù?حة Ù?Ù?اتÙ?Ø­ اÙ?برتغاÙ?Ù?Ø© اÙ?برازÙ?Ù?Ù?Ø©"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3462,6 +3571,11 @@ msgstr "أخطاء اÙ?استÙ?باÙ?:"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ù?ائÙ?Ø© اÙ?Ù?Ù?دÙ?Ù? اÙ?Ù?Ù?بثÙ?Ø©"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "أعد تشغÙ?Ù?"
 
@@ -3529,8 +3643,9 @@ msgid "Display the applications menu."
 msgstr "Ù?ائÙ?Ø© جÙ?Ù?Ù? اÙ?رÙ?ئÙ?سÙ?Ù?Ø©"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ù?دÙ?ر اÙ?Ù?Ù?اÙ?Ø° صÙ?Ù?Ø´"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3572,7 +3687,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "رÙ?ع اÙ?Ù?اÙ?ذة اÙ?Ù?ظÙ?Ù?Ø©Ø? Ø£Ù? Ø®Ù?ظÙ?ا Ù?Ù? Ù?ا عدا Ø°Ù?Ù?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3582,7 +3696,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Ø®Ù?ض اÙ?Ù?اÙ?ذة تحت اÙ?Ù?Ù?اÙ?Ø° اÙ?أخرÙ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3592,7 +3705,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "رÙ?ع اÙ?Ù?اÙ?ذة اÙ?Ù?ظÙ?Ù?Ø©Ø? Ø£Ù? Ø®Ù?ظÙ?ا Ù?Ù? Ù?ا عدا Ø°Ù?Ù?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3812,9 +3924,11 @@ msgid "Unmaximize window"
 msgstr "Ø¥Ù?غاء تÙ?بÙ?ر اÙ?Ù?Ù?اÙ?ذة Ù?Ø£Ù?صÙ? حجÙ?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
-msgstr ""
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
+msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? 10"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
@@ -3956,7 +4070,8 @@ msgstr "تحÙ?Ù?Ù? اÙ?Ù?اÙ?ذة عÙ?Ù? جÙ?Ù?ع Ù?ساحات اÙ?عÙ?Ù?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3976,8 +4091,8 @@ msgstr "تحÙ?Ù?Ù? اÙ?Ù?اÙ?ذة عÙ?Ù? جÙ?Ù?ع Ù?ساحات اÙ?عÙ?Ù?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -4197,9 +4312,7 @@ msgid "Unmark all windows"
 msgstr "Ø¥Ù?غاء تÙ?بÙ?ر اÙ?Ù?Ù?اÙ?ذة Ù?Ø£Ù?صÙ? حجÙ?"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4246,15 +4359,34 @@ msgid "Raise window"
 msgstr "Ù?بدÙ? اÙ?Ù?اÙ?ذة"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Lower window"
 msgstr "Ù?بدÙ? اÙ?Ù?اÙ?ذة"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Raise lower window"
 msgstr "رÙ?ع اÙ?Ù?اÙ?ذة اÙ?Ù?ظÙ?Ù?Ø©Ø? Ø£Ù? Ø®Ù?ظÙ?ا Ù?Ù? Ù?ا عدا Ø°Ù?Ù?"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4393,7 +4525,8 @@ msgstr "Ù?Ù?Ù? اÙ?Ù?ساÙ? Ø¥Ù?Ù? اÙ?_Ù?Ù?Ù?Ù?"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? 10"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4404,7 +4537,8 @@ msgstr "Ù?Ù?Ù? اÙ?Ù?ساÙ? Ø¥Ù?Ù? اÙ?_Ù?سار"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? 10"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4414,7 +4548,9 @@ msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أعÙ?Ù?"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? 10"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4424,7 +4560,9 @@ msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ù?ساحة عÙ?Ù? Ù?احدة Ø¥Ù?Ù? اÙ?أسÙ?Ù?"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Ù?Ù?Ù? Ù?اÙ?ذة Ø¥Ù?Ù? Ù?ساحة اÙ?عÙ?Ù? 10"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4461,7 +4599,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4510,6 +4648,11 @@ msgstr "اÙ?اسÙ? Ù?Ø·Ù?Ù?ب"
 msgid "Force the current window to have a unique title."
 msgstr "اÙ?Ù?Ù? اÙ?Ù?ستÙ?د اÙ?حاÙ?Ù? Ø¥Ù?Ù? Ù?اÙ?ذة جدÙ?دة"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ù?بدÙ? اÙ?Ù?اÙ?ذة"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4520,7 +4663,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4669,7 +4813,8 @@ msgstr "إرساÙ? اÙ?عÙ?اصر اÙ?Ù?صطÙ?Ø© Ù? جÙ?ب اÙ?عÙ?اصر اÙ?ج
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/az.po b/po/az.po
index 9642c0c..378fdca 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish.gnome-2.az\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-10-19 20:29+0300\n"
 "Last-Translator: MÉ?tin Æ?mirov <metin karegen com>\n"
 "Language-Team: AzÉ?rbaycan Dili <gnome azÉ?tt com>\n"
@@ -199,10 +199,10 @@ msgstr "heç biri"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -214,8 +214,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -223,21 +223,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -253,14 +253,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -281,10 +281,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -307,17 +307,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -325,8 +325,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -357,8 +357,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr "RÉ?ngi seç"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -395,8 +395,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,7 +431,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -495,15 +495,15 @@ msgstr "hamısı"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -511,14 +511,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -526,8 +526,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -542,7 +542,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -567,8 +567,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -654,8 +654,8 @@ msgstr "baÄ?la-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -667,7 +667,7 @@ msgstr "timsallaÅ?dır-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr "menyu-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -716,14 +716,14 @@ msgstr "menyu-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -736,18 +736,18 @@ msgstr "menyu-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -759,7 +759,7 @@ msgstr "menyu-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgstr "baÄ?la-düymÉ?-açar xÉ?ritÉ?si"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -827,12 +827,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -840,7 +840,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -848,23 +848,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -880,8 +880,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -889,10 +889,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -911,7 +911,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -924,10 +924,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -975,16 +975,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1000,7 +1000,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1833,8 +1833,10 @@ msgid "Move selected window"
 msgstr "Seçili pÉ?ncÉ?rÉ?lÉ?ri daÅ?ı"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Ä°stifadÉ?çinin bir pÉ?ncÉ?rÉ?ni seçmesini gözlÉ?yib, o pÉ?ncÉ?rÉ?ni daÅ?ı ."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1842,8 +1844,10 @@ msgid "Resize selected window"
 msgstr "Seçili pÉ?ncÉ?rÉ?lÉ?ri yüksÉ?lt"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Ä°stifadÉ?çinin bir pÉ?ncÉ?rÉ?ni seçmesini gözlÉ?yib, o pÉ?ncÉ?rÉ?ni yenidÉ?n "
 "böyüklüyünü dÉ?yiÅ?dir ."
@@ -1923,40 +1927,88 @@ msgid "Shrink window left"
 msgstr "PÉ?ncÉ?rÉ?ni sola sürüÅ?dür"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "PÉ?ncÉ?rÉ?ni saÄ?a sürüÅ?dür"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "PÉ?ncÉ?rÉ?ni yuxaı sürüÅ?dür"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "PÉ?ncÉ?rÉ?ni aÅ?aÄ?ı sürüÅ?dür"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "PÉ?ncÉ?rÉ?ni sola yıÄ?ıÅ?dır"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "PÉ?ncÉ?rÉ?ni saÄ?a yıÄ?ıÅ?dır"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "PÉ?ncÉ?rÉ?ni yuxarı yıÄ?camlaÅ?dır"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "PÉ?ncÉ?rÉ?ni aÅ?aÄ?ı yıÄ?camlaÅ?dır"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "PÉ?ncÉ?rÉ?ni bir sÉ?tir böyüt"
@@ -2285,6 +2337,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Proqramlar menüsünü göstÉ?r"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "PÉ?ncÉ?rÉ? É?mÉ?liyyatları üçün sÉ?s effektlÉ?ri istifadÉ? et ."
@@ -2375,10 +2438,6 @@ msgstr "XÉ?taları göstÉ?r"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Bütün baÅ? verÉ?n xÉ?taları ekranda göstÉ?r"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2602,11 +2661,6 @@ msgstr "Hal"
 msgid "Other"
 msgstr "DigÉ?rlÉ?ri"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "PÉ?ncÉ?rÉ?ni yüksÉ?lt"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "MüvÉ?qqÉ?ti Fokus"
@@ -2800,6 +2854,18 @@ msgstr "SaÄ? iÅ? sahÉ?sinÉ? göndÉ?r"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "PÉ?ncÉ?rÉ?ni hazırkı iÅ? sahÉ?sindÉ?n saÄ?ındakı iÅ? sahÉ?sinÉ? göndÉ?r"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Siçan oxunun nÉ? vaxt fokusu dÉ?yiÅ?É?cÉ?yi ."
@@ -2826,18 +2892,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ã?rtüklÉ?r yenilÉ?nincÉ? onları avtomatik olaraq yenidÉ?n yüklÉ?."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Ã?n qurÄ?ulu yazı növü: \\w"
 
@@ -3041,6 +3095,78 @@ msgstr ""
 "( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "timsallaÅ?dır-düymÉ?-açar xÉ?ritÉ?si"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"PÉ?ncÉ?rÉ?lÉ?rin baÄ?lama düymÉ?sinin üstündÉ? hökmlü olan düymÉ? xÉ?ritÉ?si ;\n"
+"( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "baÄ?la-düymÉ?-açar xÉ?ritÉ?si"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"PÉ?ncÉ?rÉ?lÉ?rin baÄ?lama düymÉ?sinin üstündÉ? hökmlü olan düymÉ? xÉ?ritÉ?si ;\n"
+"( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menyu-düymÉ?-açar xÉ?ritÉ?si"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"PÉ?ncÉ?rÉ?lÉ?rin menyu düymÉ?sinin üstündÉ? hökmlü olan düymÉ? xÉ?ritÉ?si ;\n"
+"( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "baÄ?la-düymÉ?-açar xÉ?ritÉ?si"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"PÉ?ncÉ?rÉ?lÉ?rin baÄ?lama düymÉ?sinin üstündÉ? hökmlü olan düymÉ? xÉ?ritÉ?si ;\n"
+"( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "baÄ?la-düymÉ?-açar xÉ?ritÉ?si"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"PÉ?ncÉ?rÉ?lÉ?rin baÄ?lama düymÉ?sinin üstündÉ? hökmlü olan düymÉ? xÉ?ritÉ?si ;\n"
+"( SadÉ?cÉ? olaraq siçan hÉ?rÉ?kÉ?tlÉ?ri analiz edilir .) "
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Ã?n qurÄ?ulu qısa yollar üçün istifadÉ? edilÉ?n düymÉ?(lÉ?r)."
 
@@ -3250,6 +3376,11 @@ msgstr "XÉ?taları göstÉ?r"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Proqramlar menüsünü göstÉ?r"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "YenidÉ?n baÅ?la"
 
@@ -3308,8 +3439,9 @@ msgid "Display the applications menu."
 msgstr "Proqramlar menyunusunu göstÉ?r ."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "\"Sawfish\" quraÅ?dırıcı"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3348,7 +3480,6 @@ msgstr "Kiçik pÉ?ncÉ?rÉ?lÉ?ri, bunlardan üstdÉ? tut : \\w"
 msgid "Raise single window"
 msgstr "TÉ?k pÉ?ncÉ?rÉ?ni yüksÉ?lt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n üstÉ? gÉ?tir."
@@ -3357,7 +3488,6 @@ msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n üstÉ? gÉ?tir."
 msgid "Lower single window"
 msgstr "TÉ?k pÉ?ncÉ?rÉ?ni alçalt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n alta daÅ?ı."
@@ -3366,7 +3496,6 @@ msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n alta daÅ?ı."
 msgid "Raise lower single window"
 msgstr "Alçaq tÉ?k pÉ?ncÉ?rÉ?ni yüksÉ?lt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3565,8 +3694,10 @@ msgid "Unmaximize window"
 msgstr "PÉ?ncÉ?rÉ?ni kiçilt"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "PÉ?ncÉ?rÉ?nin böyüklüyünü É?sas böyüklüyünÉ? çevir."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3700,7 +3831,8 @@ msgstr "PÉ?ncÉ?rÉ?ni tam ekrana böyütmÉ? seçimi"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 "PÉ?ncÉ?rÉ?nin böyüklüyünü artırılmıÅ? ilÉ? normal böyüklük arasında get gÉ?l."
 
@@ -3722,8 +3854,8 @@ msgstr "PÉ?ncÉ?rÉ?ni tam ekrana böyütmÉ? seçimi"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "PÉ?ncÉ?rÉ?nin maksimal vÉ? minimal doldurulması arasında get gÉ?l ."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3945,9 +4077,7 @@ msgstr "PÉ?ncÉ?rÉ?ni kiçilt"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "SÉ?s parçalarını çalacaq olan proqram . Bu tapılmazsa, o vaxt sawfish'in öz "
 "ESD dÉ?stÉ?yi ilÉ? sesler çalınacaqdır."
@@ -3994,13 +4124,39 @@ msgid "Raise window"
 msgstr "PÉ?ncÉ?rÉ?ni yüksÉ?lt"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n üstÉ? gÉ?tir."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "PÉ?ncÉ?rÉ?ni alçalt"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "PÉ?ncÉ?rÉ?ni yapıÅ?ıq olduÄ?u sÉ?viyyÉ?dÉ? É?n alta daÅ?ı."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Alçaq pÉ?ncÉ?rÉ?ni yüksÉ?lt"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"PÉ?ncÉ?rÉ? mümkün olan É?n üst yerdÉ? isÉ?, mümkün olan É?n altdakı yerinÉ? daÅ?ı .\n"
+"Yoxsa onu mümkün olduÄ?u qÉ?dÉ?ri yüksÉ?lt vÉ? bu pÉ?ncÉ?rÉ?yÉ? baÄ?lı olan kiçik "
+"pÉ?ncÉ?rÉ?lÉ?rini dÉ?\n"
+"o pÉ?ncÉ?rÉ? ilÉ? birlikdÉ? yüksÉ?lt/alçalt. "
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4119,8 +4275,10 @@ msgid "Move window right"
 msgstr "PÉ?ncÉ?rÉ?ni saÄ?a daÅ?ı"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "PÉ?ncÉ?rÉ?ni bir saÄ?dakı görünüÅ? nöqtÉ?sinÉ? daÅ?ı, vÉ? o görünüÅ? nöqtÉ?sinÉ? keç."
 
@@ -4129,8 +4287,10 @@ msgid "Move window left"
 msgstr "PÉ?ncÉ?rÉ?ni sola daÅ?ı"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "PÉ?ncÉ?rÉ?ni bir soldakı görünüÅ? nöqtÉ?sinÉ? daÅ?ı, vÉ? o görünüÅ? nöqtÉ?sinÉ? keç."
 
@@ -4139,7 +4299,10 @@ msgid "Move window up"
 msgstr "PÉ?ncÉ?rÉ?ni yuxarı daÅ?ı"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "PÉ?ncÉ?rÉ?ni bir üstdÉ?ki görünüÅ? nöqtÉ?sinÉ? daÅ?ı, vÉ? o görünüÅ? nöqtÉ?sinÉ? keç."
 
@@ -4148,7 +4311,10 @@ msgid "Move window down"
 msgstr "PÉ?ncÉ?rÉ?ni  aÅ?aÄ?ı daÅ?ı"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "PÉ?ncÉ?rÉ?ni bir altdakı görünüÅ? nöqtÉ?sinÉ? daÅ?ı, vÉ? o görünüÅ? nöqtÉ?sinÉ? keç."
 
@@ -4192,7 +4358,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "PÉ?ncÉ?rÉ?lÉ?rin geniÅ?lÉ?dilmÉ?si vÉ? baÄ?lanması sırasında rÉ?dd edilmiÅ?\n"
 "pÉ?ncÉ?rÉ?nin içinÉ? girilmÉ?si."
@@ -4240,6 +4406,11 @@ msgstr "PÉ?ncÉ?rÉ? adlarını eynilÉ?Å?dir"
 msgid "Force the current window to have a unique title."
 msgstr "Hazırkı pÉ?ncÉ?rÉ?ni yeganÉ? olan bir baÅ?lıq sahib olmasına imkan ver."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "PÉ?ncÉ?rÉ?ni yüksÉ?lt"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4252,7 +4423,8 @@ msgstr "MenüyÉ? bütün masa üstlÉ?rinin siyahısı ilÉ? göstÉ?rt ."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "MenüyÉ? bütün masa üstlÉ?rinin siyahısı ilÉ? göstÉ?rt ."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4379,8 +4551,10 @@ msgid "Prepend workspace and send"
 msgstr "Ä°Å? sahÉ?sini önÉ? É?lavÉ? et vÉ? göndÉ?r"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Siyahının baÅ?ında bir masa üstü yarat vÉ? bu pÉ?ncÉ?rÉ?ni oraya daÅ?ı ."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/be.po b/po/be.po
index a1e33c9..cfa934a 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-05 13:02+0200\n"
 "Last-Translator: Vital Khilko <dojlid mova org>\n"
 "Language-Team: Belarusian <i18n mova org>\n"
@@ -199,10 +199,10 @@ msgstr "нÑ?ма"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -214,8 +214,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -223,21 +223,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -253,14 +253,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -281,10 +281,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -307,17 +307,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -325,8 +325,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -357,8 +357,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr "Ð?Ñ?бÑ?Ñ?Ñ?Ñ?е колеÑ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -395,8 +395,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,7 +431,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -495,15 +495,15 @@ msgstr "Ñ?Ñ?е"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -511,14 +511,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -526,8 +526,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -542,7 +542,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -567,8 +567,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -654,8 +654,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -667,7 +667,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -716,14 +716,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -736,18 +736,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -759,7 +759,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -827,12 +827,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -840,7 +840,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -848,23 +848,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -880,8 +880,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -889,10 +889,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -911,7 +911,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -924,10 +924,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -975,16 +975,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1000,7 +1000,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1839,8 +1839,10 @@ msgid "Move selected window"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? акно й пеÑ?аÑ?Ñ?нÑ?Ñ?Ñ? Ñ?го"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "ЧакаÑ?Ñ? покÑ?лÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?к абÑ?Ñ?Ñ? акно, заÑ?Ñ?м Ñ?нÑ?Ñ?Ñ?акÑ?Ñ?Ñ?на пеÑ?аÑ?оÑ?ваÑ?Ñ? гÑ?Ñ?а "
 "акно."
@@ -1850,8 +1852,10 @@ msgid "Resize selected window"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? акно й зÑ?мÑ?нÑ?Ñ?Ñ? Ñ?го памеÑ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "ЧакаÑ?Ñ? покÑ?лÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?к вÑ?бÑ?Ñ?Ñ? акно, заÑ?Ñ?м Ñ?нÑ?Ñ?Ñ?акÑ?Ñ?Ñ?на зÑ?мÑ?нÑ?Ñ?Ñ? памеÑ? "
 "гÑ?Ñ?ага акна."
@@ -1935,40 +1939,88 @@ msgid "Shrink window left"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно Ñ?лева"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно Ñ?пÑ?ава"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно Ñ?гоÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно Ñ?нÑ?з"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ð?еÑ?аÑ?Ñ?нÑ?Ñ?Ñ? акно Ñ?лева да канÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ð?еÑ?аÑ?Ñ?нÑ?Ñ?Ñ? акно Ñ?пÑ?ава да канÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ð?еÑ?аÑ?Ñ?нÑ?Ñ?Ñ? акно Ñ?гоÑ?Ñ? да канÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ð?еÑ?аÑ?Ñ?нÑ?Ñ?Ñ? акно нанÑ?з да канÑ?а"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Ð?авÑ?лÑ?Ñ?Ñ?Ñ?Ñ? памеÑ? акна вÑ?Ñ?Ñ?Ñ?калÑ?на"
@@ -2291,6 +2343,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D Hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? мÑ?нÑ? пÑ?агÑ?амаÑ?"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "УклÑ?Ñ?Ñ?Ñ?Ñ? гÑ?кавÑ?Ñ? Ñ?Ñ?екÑ?Ñ? длÑ? падзеÑ?Ñ?."
@@ -2382,10 +2445,6 @@ msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? паведамленÑ?нÑ? пÑ?а памÑ?лк
 msgid "Display all errors that have occurred to the screen."
 msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? паведамленÑ?нÑ? пÑ?а Ñ?Ñ?е памÑ?лкÑ? на Ñ?кÑ?ане"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2609,11 +2668,6 @@ msgstr "СÑ?ан"
 msgid "Other"
 msgstr "Ð?нÑ?ае"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ð?аднÑ?Ñ?Ñ? акно"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ЧаÑ?овае аÑ?Ñ?авÑ?Ñ?оÑ?ванÑ?не"
@@ -2813,6 +2867,18 @@ msgstr ""
 "Ð?аÑ?лаÑ?Ñ? акно на пÑ?аÑ?оÑ?нÑ?Ñ? пÑ?аÑ?Ñ?оÑ?Ñ? з пÑ?авага бокÑ? ад бÑ?гÑ?Ñ?ай пÑ?аÑ?оÑ?най "
 "пÑ?аÑ?Ñ?оÑ?Ñ?."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "СпоÑ?аб пеÑ?адаÑ?Ñ? заÑ?Ñ?Ñ?оджанÑ?нÑ? Ñ?казалÑ?нÑ?кам."
@@ -2839,18 +2905,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?Ñ?Ñ?амаÑ?Ñ?Ñ?на пеÑ?азагÑ?Ñ?жаÑ?Ñ? Ñ?Ñ?мÑ? калÑ? Ñ?нÑ? абнаÑ?лÑ?Ñ?Ñ?Ñ?а."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Ð?апомнÑ? Ñ?Ñ?Ñ?Ñ?Ñ?: \\w"
 
@@ -3054,6 +3108,78 @@ msgstr ""
 "(Ð?апÑ?Ñ?Ñ?алÑ?нÑ?Ñ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?амбÑ?наÑ?Ñ?Ñ? акÑ?Ñ?Ñ?нÑ?Ñ? калÑ? Ñ?казалÑ?нÑ?к знаÑ?одзÑ?Ñ?Ñ?а на кнопÑ?Ñ? закÑ?Ñ?Ñ?Ñ?Ñ?Ñ? акна. "
+"(Ð?апÑ?Ñ?Ñ?алÑ?нÑ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?амбÑ?наÑ?Ñ?Ñ? акÑ?Ñ?Ñ?нÑ?Ñ? калÑ? Ñ?казалÑ?нÑ?к знаÑ?одзÑ?Ñ?Ñ?а на кнопÑ?Ñ? закÑ?Ñ?Ñ?Ñ?Ñ?Ñ? акна. "
+"(Ð?апÑ?Ñ?Ñ?алÑ?нÑ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?амбÑ?наÑ?Ñ?Ñ? акÑ?Ñ?Ñ?нÑ?Ñ? калÑ? Ñ?казалÑ?нÑ?к знаÑ?одзÑ?Ñ?Ñ?а на кнопÑ?Ñ? мÑ?нÑ? окна. "
+"(Ð?апÑ?Ñ?Ñ?алÑ?нÑ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?амбÑ?наÑ?Ñ?Ñ? акÑ?Ñ?Ñ?нÑ?Ñ? калÑ? Ñ?казалÑ?нÑ?к знаÑ?одзÑ?Ñ?Ñ?а на кнопÑ?Ñ? закÑ?Ñ?Ñ?Ñ?Ñ?Ñ? акна. "
+"(Ð?апÑ?Ñ?Ñ?алÑ?нÑ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?амбÑ?наÑ?Ñ?Ñ? акÑ?Ñ?Ñ?нÑ?Ñ? калÑ? Ñ?казалÑ?нÑ?к знаÑ?одзÑ?Ñ?Ñ?а на кнопÑ?Ñ? закÑ?Ñ?Ñ?Ñ?Ñ?Ñ? акна. "
+"(Ð?апÑ?Ñ?Ñ?алÑ?нÑ? Ñ?олÑ?кÑ? падзеÑ? мÑ?Ñ?Ñ?)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Ð?лÑ?вÑ?Ñ?а-мадÑ?Ñ?Ñ?каÑ?аÑ? длÑ? дапомнÑ?Ñ? Ñ?Ñ?Ñ?кÑ?Ñ? клÑ?вÑ?Ñ?аÑ?."
 
@@ -3263,6 +3389,11 @@ msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? паведамленÑ?нÑ? пÑ?а памÑ?лк
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? мÑ?нÑ? пÑ?агÑ?амаÑ?"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ð?еÑ?азапÑ?Ñ?к"
 
@@ -3321,8 +3452,9 @@ msgid "Display the applications menu."
 msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? мÑ?нÑ? даÑ?Ñ?аÑ?аванÑ?нÑ?Ñ?."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ð?анÑ?Ñ?гÑ?Ñ?аÑ?аÑ? Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3361,7 +3493,6 @@ msgstr "Ð?аÑ?оÑ?ваÑ?Ñ? пÑ?амежкавÑ?Ñ? вокнÑ? Ñ?абÑ?анÑ?мÑ?
 msgid "Raise single window"
 msgstr "Ð?аднÑ?Ñ?Ñ? адно акно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Ð?аднÑ?Ñ?Ñ? акно да найвÑ?Ñ?Ñ?йÑ?ай дапÑ?Ñ?Ñ?алÑ?най пазÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?оÑ?е."
@@ -3370,7 +3501,6 @@ msgstr "Ð?аднÑ?Ñ?Ñ? акно да найвÑ?Ñ?Ñ?йÑ?ай дапÑ?Ñ?Ñ?алÑ?н
 msgid "Lower single window"
 msgstr "Ð?пÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? адно акно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Ð?пÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно да найнÑ?жÑ?йÑ?ай дапÑ?Ñ?Ñ?алÑ?най пазÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?оÑ?е."
@@ -3379,7 +3509,6 @@ msgstr "Ð?пÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно да найнÑ?жÑ?йÑ?ай дапÑ?Ñ?Ñ?ал
 msgid "Raise lower single window"
 msgstr "Ð?аднÑ?Ñ?Ñ?/апÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? адно акно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3577,8 +3706,10 @@ msgid "Unmaximize window"
 msgstr "Ð?аменÑ?Ñ?Ñ?Ñ?Ñ? акно"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Ð?днавÑ?Ñ?Ñ? памеÑ?Ñ? акна да зÑ?Ñ?однага нÑ? найболÑ?Ñ?анага Ñ?Ñ?анÑ?."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3712,7 +3843,8 @@ msgstr "Ð?еÑ?аклÑ?Ñ?Ñ?Ñ?Ñ? найболÑ?Ñ?анÑ?не акна"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Ð?еÑ?аклÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?ан акна мÑ?ж найболÑ?Ñ?анÑ?м Ñ? нÑ? найболÑ?Ñ?анÑ?м."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3733,8 +3865,8 @@ msgstr "Ð?еÑ?аклÑ?Ñ?Ñ?Ñ?Ñ? найболÑ?Ñ?анÑ?не акна"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Ð?еÑ?аклÑ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?ан акна мÑ?ж найболÑ?Ñ?анÑ?м-запоÑ?ненÑ?м Ñ? нÑ? найболÑ?Ñ?анÑ?м."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3954,9 +4086,7 @@ msgstr "Ð?аменÑ?Ñ?Ñ?Ñ?Ñ? акно"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ð?Ñ?агÑ?ама, Ñ?каÑ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваеÑ?Ñ?а длÑ? аднаÑ?ленÑ?нÑ? гÑ?каÑ?. Ð?алÑ? нÑ? Ñ?Ñ?Ñ?алÑ?вана, "
 "вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваеÑ?Ñ?а Ñ?бÑ?даванаÑ? падÑ?Ñ?Ñ?мка длÑ? ESD."
@@ -4001,13 +4131,38 @@ msgid "Raise window"
 msgstr "Ð?аднÑ?Ñ?Ñ? акно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Ð?аднÑ?Ñ?Ñ? акно да найвÑ?Ñ?Ñ?йÑ?ай дапÑ?Ñ?Ñ?алÑ?най пазÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?оÑ?е."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Ð?пÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Ð?пÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно да найнÑ?жÑ?йÑ?ай дапÑ?Ñ?Ñ?алÑ?най пазÑ?Ñ?Ñ?Ñ? Ñ? Ñ?Ñ?оÑ?е."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ð?аднÑ?Ñ?Ñ?/апÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? акно"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ð?алÑ? акно Ñ? найвÑ?Ñ?Ñ?йÑ?ай магÑ?Ñ?май пазÑ?Ñ?Ñ?Ñ?, Ñ?адÑ? апÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?го да найнÑ?жÑ?йÑ?ай "
+"магÑ?Ñ?май пазÑ?Ñ?Ñ?Ñ?. У Ñ?нÑ?Ñ?м вÑ?падкÑ? паднÑ?Ñ?Ñ? Ñ?го Ñ?к мага вÑ?Ñ?Ñ?й. ТакÑ?ама "
+"зÑ?мÑ?нÑ?Ñ?Ñ? Ñ?зÑ?овенÑ? Ñ?Ñ?Ñ?Ñ? Ñ?го пÑ?амежкаавÑ?Ñ? вокнаÑ?."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4128,8 +4283,10 @@ msgid "Move window right"
 msgstr "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ? пÑ?авÑ? бок"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ? воблаÑ?Ñ?Ñ?Ñ? пÑ?аглÑ?дÑ? з пÑ?авага бокÑ? Ñ? пеÑ?аклÑ?Ñ?Ñ?Ñ?Ñ?а на Ñ?го."
 
@@ -4138,8 +4295,10 @@ msgid "Move window left"
 msgstr "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ?лева"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ? воблаÑ?Ñ?Ñ?Ñ? пÑ?аглÑ?дÑ? з левага бокÑ? Ñ? пеÑ?аклÑ?Ñ?Ñ?Ñ?Ñ?а на Ñ?го."
 
@@ -4148,7 +4307,10 @@ msgid "Move window up"
 msgstr "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ?гоÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ? воблаÑ?Ñ?Ñ?Ñ? пÑ?аглÑ?дÑ? з левага бокÑ? Ñ? пеÑ?аклÑ?Ñ?Ñ?Ñ?Ñ?а на Ñ?го."
 
@@ -4157,7 +4319,10 @@ msgid "Move window down"
 msgstr "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно дадолÑ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?анеÑ?Ñ?Ñ?Ñ? акно Ñ? воблаÑ?Ñ?Ñ?Ñ? пÑ?аглÑ?дÑ? з левага бокÑ? Ñ? пеÑ?аклÑ?Ñ?Ñ?Ñ?Ñ?а на Ñ?го."
 
@@ -4199,7 +4364,7 @@ msgstr "ЦÑ? Ñ?Ñ?Ñ?Ñ?каÑ?Ñ?Ñ?а Ñ?гнаÑ?аванÑ?Ñ? вокнÑ? пад Ñ?а
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "ЦÑ? Ñ?Ñ?Ñ?Ñ?каÑ?Ñ?Ñ?а Ñ?гнаÑ?аванÑ?Ñ? вокнÑ? пад Ñ?аÑ? павÑ?лÑ?Ñ?Ñ?нÑ?нÑ? й памÑ?нÑ?Ñ?Ñ?нÑ?нÑ?."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4244,6 +4409,11 @@ msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?нÑ?калÑ?нае Ñ?мÑ? длÑ? акна"
 msgid "Force the current window to have a unique title."
 msgstr "Ð?Ñ?Ñ?мÑ?Ñ?овае вÑ?каÑ?Ñ?Ñ?Ñ?анÑ?не Ñ?нÑ?калÑ?нага загалоÑ?ка бÑ?гÑ?Ñ?Ñ?м акном."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ð?аднÑ?Ñ?Ñ? акно"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4256,7 +4426,8 @@ msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? мÑ?нÑ? Ñ?кое Ñ?Ñ?Ñ?Ñ?млÑ?вае Ñ?Ñ?пÑ?
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Ð?длÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? мÑ?нÑ? Ñ?кое Ñ?Ñ?Ñ?Ñ?млÑ?вае Ñ?Ñ?пÑ?Ñ? Ñ?Ñ?Ñ?Ñ? пÑ?аÑ?оÑ?нÑ?Ñ? пÑ?аÑ?Ñ?оÑ?аÑ?."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4384,8 +4555,10 @@ msgid "Prepend workspace and send"
 msgstr "Ð?адаÑ?Ñ? Ñ? паÑ?аÑ?ак пÑ?аÑ?оÑ?нÑ?Ñ? пÑ?аÑ?Ñ?оÑ?Ñ? й даÑ?лаÑ?Ñ? на Ñ?е акно"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "СÑ?ваÑ?Ñ?Ñ?Ñ? новÑ?Ñ? пÑ?аÑ?оÑ?нÑ?Ñ? пÑ?аÑ?Ñ?оÑ?Ñ? Ñ? паÑ?аÑ?кÑ? Ñ?Ñ?пÑ?Ñ?Ñ? й пеÑ?анеÑ?Ñ?Ñ?Ñ? акно на Ñ?е."
 
diff --git a/po/bg.po b/po/bg.po
index f2501e4..21f8efd 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-09-29 00:15+0200\n"
 "Last-Translator: Sava Chankov <sava fmi uni-sofia bg>\n"
 "Language-Team: Bulgarian <dict linux zonebg com>\n"
@@ -196,10 +196,10 @@ msgstr "без"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -211,8 +211,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -220,21 +220,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,14 +250,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -278,10 +278,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -304,17 +304,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -322,8 +322,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -354,8 +354,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgstr "Ð?збeÑ?и Ñ?вÑ?Ñ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -378,7 +378,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -392,8 +392,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -401,8 +401,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,7 +428,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr "вÑ?иÑ?ки"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -508,14 +508,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -523,8 +523,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -539,7 +539,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -564,8 +564,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -651,8 +651,8 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за заÑ?ва
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -664,7 +664,7 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за миним
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -678,7 +678,7 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за менÑ?"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -713,14 +713,14 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за менÑ?"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -733,18 +733,18 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за менÑ?"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -756,7 +756,7 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за менÑ?"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -769,7 +769,7 @@ msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за заÑ?ва
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -824,12 +824,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -837,7 +837,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -845,23 +845,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -877,8 +877,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -886,10 +886,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -908,7 +908,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -921,10 +921,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -972,16 +972,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -997,7 +997,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1848,8 +1848,10 @@ msgid "Move selected window"
 msgstr "Ð?Ñ?емеÑ?Ñ?ва избÑ?ан пÑ?озоÑ?еÑ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Чака докаÑ?о поÑ?Ñ?ебиÑ?елÑ? избеÑ?е пÑ?озоÑ?еÑ?, Ñ?лед коеÑ?о инÑ?еÑ?акÑ?ивно го пÑ?емеÑ?Ñ?ва"
 
@@ -1858,8 +1860,10 @@ msgid "Resize selected window"
 msgstr "Ð?Ñ?оменÑ? Ñ?азмеÑ?а на избÑ?ан пÑ?озоÑ?еÑ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Чака поÑ?Ñ?ебиÑ?елÑ? да избеÑ?е пÑ?озоÑ?еÑ?, Ñ?лед коеÑ?о инÑ?еÑ?акÑ?ивно пÑ?оменÑ? Ñ?азмеÑ?а "
 "мÑ?."
@@ -1943,40 +1947,88 @@ msgid "Shrink window left"
 msgstr "Ð?лÑ?зга пÑ?озоÑ?еÑ?а влÑ?во"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ð?лÑ?зга пÑ?озоÑ?еÑ?а вдÑ?Ñ?но"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ð?лÑ?зга пÑ?озоÑ?еÑ?а на гоÑ?е"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ð?лÑ?зга пÑ?озоÑ?еÑ?а на долÑ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ð?паковай пÑ?озоÑ?еÑ?а налÑ?во"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ð?пакова пÑ?озоÑ?еÑ?а надÑ?Ñ?но"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ð?пакова пÑ?озоÑ?еÑ?а нагоÑ?е"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ð?пакова пÑ?озоÑ?еÑ?а надолÑ?"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "УвелиÑ?ава Ñ?азмеÑ?а на пÑ?озоÑ?еÑ? добавÑ?йки Ñ?ед"
@@ -2304,6 +2356,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D Ñ?акване"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ð?окажи менÑ?Ñ?о Ñ? пÑ?иложениÑ?"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Ð?клÑ?Ñ?ва звÑ?ков еÑ?екÑ? за Ñ?Ñ?биÑ?иÑ? на пÑ?озоÑ?еÑ?."
@@ -2394,10 +2457,6 @@ msgstr "Ð?оказва гÑ?еÑ?ки"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Ð?оказва вÑ?иÑ?ки гÑ?еÑ?ки коиÑ?о Ñ?е поÑ?вÑ?ваÑ? на екÑ?ана."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2621,11 +2680,6 @@ msgstr "СÑ?Ñ?Ñ?оÑ?ние"
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?ги"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ð?дигни пÑ?озоÑ?еÑ?"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Ð?Ñ?еменно Ñ?виване кÑ?м заглавиеÑ?о"
@@ -2834,6 +2888,18 @@ msgstr "Ð?зпÑ?аÑ?и на Ñ?аб. плоÑ?"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "СÑ?здава нова Ñ?аб. плоÑ? пÑ?еди Ñ?екÑ?Ñ?аÑ?а"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Ð?ога показалеÑ?Ñ?Ñ? на миÑ?каÑ?а влиÑ?е на Ñ?окÑ?Ñ?а."
@@ -2860,18 +2926,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?вÑ?омаÑ?иÑ?но пÑ?езаÑ?еди Ñ?еми когаÑ?о Ñ?а обновени."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "ШÑ?иÑ?Ñ? по подÑ?азбиÑ?ане: \\w"
 
@@ -3087,6 +3141,83 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за минимизаÑ?иÑ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?лавиÑ?на комбинаÑ?иÑ?, Ñ?Ñ?дÑ?Ñ?жаÑ?а обвÑ?Ñ?заноÑ?Ñ?, коÑ?Ñ?о е акÑ?ивна когаÑ?о Ñ?казаÑ?елÑ? "
+"е\n"
+" в бÑ?Ñ?она за заÑ?ваÑ?Ñ?не на пÑ?озоÑ?еÑ?."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за заÑ?ваÑ?Ñ?не"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?лавиÑ?на комбинаÑ?иÑ?, Ñ?Ñ?дÑ?Ñ?жаÑ?а обвÑ?Ñ?заноÑ?Ñ?, коÑ?Ñ?о е акÑ?ивна когаÑ?о Ñ?казаÑ?елÑ? "
+"е\n"
+" в бÑ?Ñ?она за заÑ?ваÑ?Ñ?не на пÑ?озоÑ?еÑ?."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за менÑ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?лавиÑ?на комбинаÑ?иÑ?, Ñ?Ñ?дÑ?Ñ?жаÑ?а обвÑ?Ñ?заноÑ?Ñ?, коÑ?Ñ?о е акÑ?ивна когаÑ?о Ñ?казаÑ?елÑ? "
+"е\n"
+" в бÑ?Ñ?она за менÑ? на пÑ?озоÑ?еÑ?."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за заÑ?ваÑ?Ñ?не"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?лавиÑ?на комбинаÑ?иÑ?, Ñ?Ñ?дÑ?Ñ?жаÑ?а обвÑ?Ñ?заноÑ?Ñ?, коÑ?Ñ?о е акÑ?ивна когаÑ?о Ñ?казаÑ?елÑ? "
+"е\n"
+" в бÑ?Ñ?она за заÑ?ваÑ?Ñ?не на пÑ?озоÑ?еÑ?."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "клавиÑ?на комбинаÑ?иÑ? на бÑ?Ñ?она за заÑ?ваÑ?Ñ?не"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?лавиÑ?на комбинаÑ?иÑ?, Ñ?Ñ?дÑ?Ñ?жаÑ?а обвÑ?Ñ?заноÑ?Ñ?, коÑ?Ñ?о е акÑ?ивна когаÑ?о Ñ?казаÑ?елÑ? "
+"е\n"
+" в бÑ?Ñ?она за заÑ?ваÑ?Ñ?не на пÑ?озоÑ?еÑ?."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Ð?лавиÑ?-модиÑ?икаÑ?оÑ? използван за подÑ?азбиÑ?аÑ? Ñ?е за пÑ?епÑ?аÑ?ка на мениджÑ?Ñ?а на "
@@ -3298,6 +3429,11 @@ msgstr "Ð?оказва гÑ?еÑ?ки"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ð?окажи менÑ?Ñ?о Ñ? пÑ?иложениÑ?"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "РеÑ?Ñ?аÑ?Ñ?иÑ?ай"
 
@@ -3356,8 +3492,9 @@ msgid "Display the applications menu."
 msgstr "Ð?оказва менÑ?Ñ?о Ñ? пÑ?иложениÑ?."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ð?онÑ?игÑ?Ñ?иÑ?ане на Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3398,7 +3535,6 @@ msgstr "Ð?апазва подÑ?инениÑ?е пÑ?озоÑ?Ñ?и над: \\w"
 msgid "Raise single window"
 msgstr "Ð?дигни единиÑ?ен пÑ?озоÑ?еÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Ð?дигни пÑ?озоÑ?еÑ? до най-виÑ?окаÑ?а мÑ? позволена позиÑ?иÑ?."
@@ -3407,7 +3543,6 @@ msgstr "Ð?дигни пÑ?озоÑ?еÑ? до най-виÑ?окаÑ?а мÑ? позв
 msgid "Lower single window"
 msgstr "Снижи единиÑ?ен пÑ?озоÑ?еÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Снижи единиÑ?ен пÑ?озоÑ?еÑ? до неговаÑ?а най-ниÑ?ка позволена позиÑ?иÑ?."
@@ -3416,7 +3551,6 @@ msgstr "Снижи единиÑ?ен пÑ?озоÑ?еÑ? до неговаÑ?а на
 msgid "Raise lower single window"
 msgstr "Ð?здига Ñ?нижен единиÑ?ен пÑ?озоÑ?еÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3618,8 +3752,10 @@ msgid "Unmaximize window"
 msgstr "Ð?емакÑ?имализиÑ?а пÑ?озоÑ?еÑ?а"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Ð?Ñ?зÑ?Ñ?ановÑ?ва Ñ?азмеÑ?а на пÑ?озоÑ?еÑ?а в неговиÑ?Ñ? оÑ?игинал."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3754,7 +3890,8 @@ msgstr "Ð?Ñ?евклÑ?Ñ?ване - макÑ?имизиÑ?ан на Ñ?Ñ?л екÑ?а
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Ð?Ñ?евклÑ?Ñ?ва на макÑ?имализиÑ?ане и ноÑ?мално Ñ?Ñ?Ñ?Ñ?оÑ?ние на пÑ?озоÑ?еÑ?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3775,8 +3912,8 @@ msgstr "Ð?Ñ?евклÑ?Ñ?ване - макÑ?имизиÑ?ан на Ñ?Ñ?л екÑ?а
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Ð?Ñ?евклÑ?Ñ?ва на Ñ?ежимиÑ?е на макÑ?имализаÑ?иÑ?"
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3992,9 +4129,7 @@ msgstr "Ð?емакÑ?имализиÑ?а пÑ?озоÑ?еÑ?а"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ð?Ñ?огÑ?ама за Ñ?лÑ?Ñ?ане на аÑ?дио моÑ?Ñ?Ñ?иÑ?е. Ð?ко не е наглаÑ?ена Ñ?е използва "
 "вгÑ?аденаÑ?а поддÑ?Ñ?жка на ESD."
@@ -4041,13 +4176,38 @@ msgid "Raise window"
 msgstr "Ð?дигни пÑ?озоÑ?еÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Ð?дигни пÑ?озоÑ?еÑ? до най-виÑ?окаÑ?а мÑ? позволена позиÑ?иÑ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Снижи пÑ?озоÑ?еÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Снижи единиÑ?ен пÑ?озоÑ?еÑ? до неговаÑ?а най-ниÑ?ка позволена позиÑ?иÑ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ð?дигни Ñ?нижи пÑ?озоÑ?еÑ?"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ð?ко пÑ?озоÑ?еÑ?Ñ?Ñ? е в най-виÑ?окаÑ?а вÑ?зможна позиÑ?иÑ?, намалÑ?ва го\n"
+"до най-ниÑ?каÑ?а. Ð?наÑ?е го вдига до колкоÑ?о може. СÑ?Ñ?о Ñ?менÑ? нивоÑ?о\n"
+"на вÑ?иÑ?ки подÑ?инени немÑ? пÑ?озоÑ?Ñ?и."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4168,8 +4328,10 @@ msgid "Move window right"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ?еÑ? в дÑ?Ñ?но"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?ва пÑ?озоÑ?еÑ?а в облаÑ?Ñ?Ñ?а за пÑ?еглед оÑ?дÑ?Ñ?но и пÑ?евклÑ?Ñ?ва на неÑ?."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4177,8 +4339,10 @@ msgid "Move window left"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ?еÑ? в лÑ?во"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?ва пÑ?озоÑ?еÑ?а в облаÑ?Ñ?Ñ?а за пÑ?еглед оÑ?лÑ?во и пÑ?евклÑ?Ñ?ва на неÑ?. "
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4186,7 +4350,10 @@ msgid "Move window up"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ?еÑ? нагоÑ?е"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?ва пÑ?озоÑ?еÑ?а в облаÑ?Ñ?Ñ?а за пÑ?еглед оÑ?гоÑ?е и пÑ?евклÑ?Ñ?ва на неÑ?."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4194,7 +4361,10 @@ msgid "Move window down"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ?еÑ? надолÑ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?ва пÑ?озоÑ?еÑ?а в облаÑ?Ñ?Ñ?а за пÑ?еглед оÑ?долÑ? и пÑ?евклÑ?Ñ?ва на неÑ?."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4237,7 +4407,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Ð?али да Ñ?е блÑ?Ñ?ка в игноÑ?иÑ?ани пÑ?озоÑ?Ñ?и пÑ?и Ñ?велиÑ?аване \n"
 "или опаковане."
@@ -4287,6 +4457,11 @@ msgstr "Ð?збеÑ?и Ñ?никално име на пÑ?озоÑ?еÑ?"
 msgid "Force the current window to have a unique title."
 msgstr "Слага Ñ?никално заглавие на Ñ?екÑ?Ñ?иÑ? пÑ?озоÑ?еÑ?."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ð?дигни пÑ?озоÑ?еÑ?"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4299,7 +4474,8 @@ msgstr "Ð?окажи менÑ?Ñ?о Ñ?Ñ?Ñ? Ñ?пиÑ?Ñ?к на вÑ?иÑ?ки Ñ?або
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Ð?окажи менÑ?Ñ?о Ñ?Ñ?Ñ? Ñ?пиÑ?Ñ?к на вÑ?иÑ?ки Ñ?абоÑ?ни плоÑ?и."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4426,8 +4602,10 @@ msgid "Prepend workspace and send"
 msgstr "Ð?обави Ñ?аб. плоÑ? в наÑ?алоÑ?о и изпÑ?аÑ?и"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "СÑ?здава нова Ñ?аб. плоÑ? в наÑ?алоÑ?о на Ñ?пиÑ?Ñ?ка, и пÑ?емеÑ?Ñ?ва пÑ?озоÑ?еÑ?а Ñ?ам."
 
diff --git a/po/bs.po b/po/bs.po
index 21d2671..493aa1b 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-05-26 21:32GMT+1\n"
 "Last-Translator: Samir MariÄ? <samir lugbih org>\n"
 "Language-Team: Bosnian <prijevodi linux org ba>\n"
@@ -199,10 +199,10 @@ msgstr "nijedan"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -214,8 +214,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -223,21 +223,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -253,14 +253,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -281,10 +281,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -307,17 +307,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -325,8 +325,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -357,8 +357,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -371,7 +371,7 @@ msgstr "Izaberite boju"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -381,7 +381,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -395,8 +395,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,7 +431,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -495,15 +495,15 @@ msgstr "sve"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -511,14 +511,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -526,8 +526,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -542,7 +542,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -567,8 +567,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -584,7 +584,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -654,8 +654,8 @@ msgstr "dugme-\"zatvori\"-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -667,7 +667,7 @@ msgstr "dugme-\"umanji\"-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr "Dugme-meni-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -703,7 +703,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -716,14 +716,14 @@ msgstr "Dugme-meni-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -736,18 +736,18 @@ msgstr "Dugme-meni-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -759,7 +759,7 @@ msgstr "Dugme-meni-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgstr "dugme-\"zatvori\"-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -827,12 +827,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -840,7 +840,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -848,23 +848,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -880,8 +880,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -889,10 +889,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -911,7 +911,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -924,10 +924,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -971,16 +971,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1808,8 +1808,10 @@ msgid "Move selected window"
 msgstr "Pomjeri izabrani prozor"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "SaÄ?ekaj da korisnik izabere prozor, a tada ga interaktivno pomiÄ?i."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1817,8 +1819,10 @@ msgid "Resize selected window"
 msgstr "Promijeni veliÄ?inu izabranog prozora"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "SaÄ?ekaj da korisnik izabere prozor, a tada mu interaktivno mijenjaj veliÄ?inu."
 
@@ -1897,40 +1901,88 @@ msgid "Shrink window left"
 msgstr "Klizni prozor ulijevo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Klizni prozor udesno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Klizni prozor prema gore"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Klizni prozor prema dole"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pakuj prozor ulijevo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pakuj prozor udesno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pakuj prozor prema gore"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pakuj prozor prema dole"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Promijeni veliÄ?inu prozora dodaj red"
@@ -2255,6 +2307,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup meni aplikacija"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Sviraj zvuÄ?ne efekte za prozorske dogaÄ?aje."
@@ -2349,10 +2412,6 @@ msgstr "Prikaži greške"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Prikaži na ekranu sve greške koje su se dogodile."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2575,11 +2634,6 @@ msgstr "Stanje"
 msgid "Other"
 msgstr "Drugi"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Podigni prozor"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Hover"
@@ -2788,6 +2842,18 @@ msgstr "Pošalji u radnu površinu"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Dodaje novu radnu površinu prije trenutne radne površine."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kada pokazivaÄ? miÅ¡a utiÄ?e na fokus."
@@ -2815,18 +2881,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatski ponovo uÄ?itaj teme kada su promjenjene."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Default font: \\w"
 
@@ -3033,6 +3087,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "dugme-\"umanji\"-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tipki koja sadrži veze koje su aktivne kada je pokazivaÄ? u \"zatvori\"\n"
+"dugmetu nekog prozora. (Samo su veze miša uzete u obzir u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "dugme-\"zatvori\"-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tipki koja sadrži veze koje su aktivne kada je pokazivaÄ? u \"zatvori\"\n"
+"dugmetu nekog prozora. (Samo su veze miša uzete u obzir u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Dugme-meni-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tipki koja sadrži aktivne veze kada je pokazivaÄ? u meni\n"
+"dugmetu nekog prozora. (Samo su veze miša uzete u obzir u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "dugme-\"zatvori\"-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tipki koja sadrži veze koje su aktivne kada je pokazivaÄ? u \"zatvori\"\n"
+"dugmetu nekog prozora. (Samo su veze miša uzete u obzir u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "dugme-\"zatvori\"-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tipki koja sadrži veze koje su aktivne kada je pokazivaÄ? u \"zatvori\"\n"
+"dugmetu nekog prozora. (Samo su veze miša uzete u obzir u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tipka(e) koja se koristi za default preÄ?ace menadžera prozora."
 
@@ -3250,6 +3376,11 @@ msgstr "Prikaži greške"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup meni aplikacija"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ponovo pokreni"
 
@@ -3308,8 +3439,9 @@ msgid "Display the applications menu."
 msgstr "Pokaži meni s aplikacijama."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish alat za konfiguraciju"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3348,7 +3480,6 @@ msgstr "Zadrži tranzientne prozore složene iznad: \\w"
 msgid "Raise single window"
 msgstr "Podigni jedan prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Podigni prozor na najviše dozvoljeno mjesto u poretku slaganja."
@@ -3357,7 +3488,6 @@ msgstr "Podigni prozor na najviše dozvoljeno mjesto u poretku slaganja."
 msgid "Lower single window"
 msgstr "Spusti jedan prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Spusti prozor na najniže dozvoljeno mjesto u poretku slaganja."
@@ -3366,7 +3496,6 @@ msgstr "Spusti prozor na najniže dozvoljeno mjesto u poretku slaganja."
 msgid "Raise lower single window"
 msgstr "Podigni jedan donji prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3571,8 +3700,10 @@ msgid "Unmaximize window"
 msgstr "De-maksimiziraj prozor"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Vrati veliÄ?inu prozora u originalno, nemaksimizirano stanje."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3714,7 +3845,8 @@ msgstr "Promijeni maksimizaciju prozora"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Mijenja stanje prozora iz maksimiziranog u nemaksimizirano i obratno."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3735,8 +3867,8 @@ msgstr "Promijeni maksimizaciju prozora"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Mijenja stanje prozora izmeÄ?u maksimalno-popunjenog i ne-maksimiziranog."
 
@@ -3955,9 +4087,7 @@ msgstr "De-maksimiziraj prozor"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program koji se koristi za sviranje audio datoteka. Ako nije podešen "
 "koristiÄ?e se ugraÄ?ena podrÅ¡ka za ESD."
@@ -4003,13 +4133,38 @@ msgid "Raise window"
 msgstr "Podigni prozor"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Podigni prozor na najviše dozvoljeno mjesto u poretku slaganja."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Spusti prozor"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Spusti prozor na najniže dozvoljeno mjesto u poretku slaganja."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Podigni spusti prozor"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ako je prozor na najviÅ¡oj moguÄ?oj poziciji spuÅ¡ta ga na najnižu\n"
+"moguÄ?u poziciju. U suprotnom sluÄ?aju podiže prozor koliko je moguÄ?e.\n"
+"TakoÄ?er utiÄ?e i na sve tranzijentne prozore koji pripadaju izabranom prozoru."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4132,7 +4287,8 @@ msgstr "Pomjeri prozor desno"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Pomjeri prozor prema viewport-u na desnoj strani."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4142,7 +4298,8 @@ msgstr "Pomjeri prozor lijevo"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Pomjeri prozor prema viewport-u na lijevoj strani."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4151,7 +4308,9 @@ msgstr "Pomjeri prozor prema gore"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Pomjeri prozor prema viewport-u na lijevoj strani."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4160,7 +4319,9 @@ msgstr "Pomjeri prozor prema dole"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Pomjeri prozor prema viewport-u na lijevoj strani."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4199,7 +4360,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4245,6 +4406,11 @@ msgstr "Daj jedinstveno ime prozoru"
 msgid "Force the current window to have a unique title."
 msgstr "Nametni jedinstveno ime ovom prozoru."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Podigni prozor"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4257,7 +4423,8 @@ msgstr "Prikaži meni koji sadrži listu svih radnih površina."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Prikaži meni koji sadrži listu svih radnih površina."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4384,8 +4551,10 @@ msgid "Prepend workspace and send"
 msgstr "Umetni radnu površinu i pošalji"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Dodaje novu radnu povrÅ¡inu na poÄ?etku liste i pomjera prozor u nju."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/ca.po b/po/ca.po
index 502f803..c99a56e 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-09 04:05+0100\n"
 "Last-Translator: Jordi Mallach <jordi sindominio net>\n"
 "Language-Team: Catalan <gnome softcatala net>\n"
@@ -203,10 +203,10 @@ msgstr "cap"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -218,8 +218,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -227,21 +227,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -257,14 +257,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -285,10 +285,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -311,17 +311,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -329,8 +329,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -361,8 +361,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr "Selecció de colors"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -399,8 +399,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -417,8 +417,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -426,8 +426,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -435,7 +435,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -499,15 +499,15 @@ msgstr "totes"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -515,14 +515,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -530,8 +530,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -546,7 +546,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -571,8 +571,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -658,8 +658,8 @@ msgstr "mapa de tecles del botó de tancar"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -671,7 +671,7 @@ msgstr "mapa de tecles del botó d'iconificar"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -685,7 +685,7 @@ msgstr "mapa de tecles del botó de menú"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -707,7 +707,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -720,14 +720,14 @@ msgstr "mapa de tecles del botó de menú"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -740,18 +740,18 @@ msgstr "mapa de tecles del botó de menú"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -763,7 +763,7 @@ msgstr "mapa de tecles del botó de menú"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -776,7 +776,7 @@ msgstr "mapa de tecles del botó de tancar"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -831,12 +831,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,7 +844,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -852,23 +852,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -884,8 +884,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -893,10 +893,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -915,7 +915,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -928,10 +928,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -979,16 +979,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1004,7 +1004,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1868,8 +1868,10 @@ msgid "Move selected window"
 msgstr "Mou la finestra seleccionada"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Espera fins que l'usuari seleccioni una finestra i després mou-la "
 "interactivament."
@@ -1879,8 +1881,10 @@ msgid "Resize selected window"
 msgstr "Redimensiona la finestra seleccionada"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Espera fins que l'usuari seleccioni una finestra i després redimensiona-la "
 "interactivament."
@@ -1968,40 +1972,88 @@ msgid "Shrink window left"
 msgstr "Mou la finestra a l'esquerra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Mou la finestra a la dreta"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Mou la finestra amunt"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Mou la finestra avall"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Mou la finestra a l'esquerra fins que topi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Mou la finestra a la dreta fins que topi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Mou la finestra amunt fins que topi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Mou la finestra avall fins que topi"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Redimensiona la finestra afegint-hi una fila"
@@ -2346,6 +2398,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Crida la frivolitat tridimensional"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Mostra el menú emergent d'aplicacions"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Reprodueix sons quan es produeixen esdeveniments de finestra."
@@ -2437,10 +2500,6 @@ msgstr "Mostra els errors"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostra a la pantalla tots els errors que s'han produït."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
@@ -2666,11 +2725,6 @@ msgstr "Estat"
 msgid "Other"
 msgstr "Altres"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Eleva la finestra"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Desenrotllament temporal"
@@ -2865,6 +2919,18 @@ msgstr "Envia-la a l'àrea de treball de la dreta"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Envia la finestra a l'àrea de treball a la dreta de l'actual"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Quan afecta el punter del ratolí el focus d'entrada?"
@@ -2891,18 +2957,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Refresca els temes automàticament quan s'actualitzen."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Tipus de lletra predeterminat: \\w"
 
@@ -3108,6 +3162,78 @@ msgstr ""
 "d'enrotllar d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "mapa de tecles del botó d'iconificar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de tecles amb vinculacions actives quan el punter és al botó de\n"
+"tancar d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "mapa de tecles del botó de tancar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de tecles amb vinculacions actives quan el punter és al botó de\n"
+"tancar d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "mapa de tecles del botó de menú"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de tecles amb vinculacions actives quan el punter és al botó de\n"
+"menú d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "mapa de tecles del botó de tancar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de tecles amb vinculacions actives quan el punter és al botó de\n"
+"tancar d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "mapa de tecles del botó de tancar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de tecles amb vinculacions actives quan el punter és al botó de\n"
+"tancar d'una finestra. (Només s'hi avaluen vinculacions de ratolí.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tecles modificadores usades per a les vinculacions predeterminades."
 
@@ -3320,6 +3446,11 @@ msgstr "Mostra els errors"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Mostra el menú emergent d'aplicacions"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Reinicia"
 
@@ -3379,8 +3510,9 @@ msgid "Display the applications menu."
 msgstr "Mostra el menú d'aplicacions."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurador del Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3421,7 +3553,6 @@ msgstr "Conserva les finestres transitòries damunt: \\w"
 msgid "Raise single window"
 msgstr "Eleva la finestra única"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Eleva la finestra a la posició més alta dins la capa."
@@ -3430,7 +3561,6 @@ msgstr "Eleva la finestra a la posició més alta dins la capa."
 msgid "Lower single window"
 msgstr "Abaixa la finestra única"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Abaixa la finestra a la posició més baixa dins la capa."
@@ -3439,7 +3569,6 @@ msgstr "Abaixa la finestra a la posició més baixa dins la capa."
 msgid "Raise lower single window"
 msgstr "Eleva o abaixa la finestra única"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3639,8 +3768,10 @@ msgid "Unmaximize window"
 msgstr "Desmaximitza la finestra"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restaura les dimensions de la finestra al seu estat original, no maximitzat."
 
@@ -3781,7 +3912,8 @@ msgstr "Commutador de maximització de finestra a pantalla sencera"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Commuta l'estat de la finestra entre maximitzat i no maximitzat."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3802,8 +3934,8 @@ msgstr "Commutador de maximització de finestra a pantalla sencera"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Conmuta l'estat de la finestra entre maximitzat i no maximitzat\n"
 "fins que topi."
@@ -4025,9 +4157,7 @@ msgstr "Desmaximitza la finestra"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "El programa que reprodueix mostres d'àudio. Si no s'especifica, s'utilitza "
 "el suport integrat per a l'ESD."
@@ -4072,13 +4202,37 @@ msgid "Raise window"
 msgstr "Eleva la finestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Eleva la finestra a la posició més alta dins la capa."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Abaixa la finestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Abaixa la finestra a la posició més baixa dins la capa."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Eleva o abaixa la finestra"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Commuta si la finestra és a la posició més alta o a la més baixa dins\n"
+"la capa. Igualment amb les finestres transitòries que pugui tenir."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4201,8 +4355,10 @@ msgid "Move window right"
 msgstr "Envia-la a la subàrea de la dreta"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Envia la finestra a la subàrea de la dreta i canvia a aquesta subàrea."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4210,8 +4366,10 @@ msgid "Move window left"
 msgstr "Envia-la a la subàrea de l'esquerra"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Envia la finestra a la subàrea de l'esquerra i canvia a aquesta subàrea."
 
@@ -4220,7 +4378,10 @@ msgid "Move window up"
 msgstr "Envia-la a la subàrea de dalt"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Envia la finestra a la subàrea de dalt i canvia a aquesta subàrea."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4228,7 +4389,10 @@ msgid "Move window down"
 msgstr "Envia-la a la subàrea de baix"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Envia la finestra a la subàrea de l'esquerra i canvia aquesta subàrea."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4269,7 +4433,7 @@ msgstr "Si topar amb finestres ignorades al redimensionar o moure finestres."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Si topar amb finestres ignorades al redimensionar o moure finestres."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4319,6 +4483,11 @@ msgstr "Fes que el nom de la finestra sigui únic"
 msgid "Force the current window to have a unique title."
 msgstr "Fes que la finestra actual tingui un títol únic."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Eleva la finestra"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4331,7 +4500,8 @@ msgstr "Mostra el menú que conté la llista de totes les àrees."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Mostra el menú que conté la llista de totes les àrees."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4461,8 +4631,10 @@ msgid "Prepend workspace and send"
 msgstr "Insereix una àrea al principi i envia-hi la finestra"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Crea una nova àrea de treball al principi de la llista, i envia-hi la "
 "finestra."
diff --git a/po/cs.po b/po/cs.po
index 8986de8..9c37657 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-04-16 17:02+0200\n"
 "Last-Translator: Miloslav Trmac <mitr volny cz>\n"
 "Language-Team: Czech <cs li org>\n"
@@ -201,10 +201,10 @@ msgstr "nic"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -225,21 +225,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,14 +255,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -283,10 +283,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -309,17 +309,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -327,8 +327,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -359,8 +359,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr "Vyberte barvu"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -397,8 +397,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,7 +433,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr "vším"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -513,14 +513,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -528,8 +528,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -544,7 +544,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -569,8 +569,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -586,7 +586,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -656,8 +656,8 @@ msgstr "zkratky zavíracího tlaÄ?ítka"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -669,7 +669,7 @@ msgstr "zkratky minimalizaÄ?ního tlaÄ?ítka"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr "zkratky tlaÄ?ítka menu"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -718,14 +718,14 @@ msgstr "zkratky tlaÄ?ítka menu"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -738,18 +738,18 @@ msgstr "zkratky tlaÄ?ítka menu"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -761,7 +761,7 @@ msgstr "zkratky tlaÄ?ítka menu"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr "zkratky zavíracího tlaÄ?ítka"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -829,12 +829,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,7 +842,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,23 +850,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -882,8 +882,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -891,10 +891,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -913,7 +913,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -926,10 +926,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -977,16 +977,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1837,8 +1837,10 @@ msgid "Move selected window"
 msgstr "PÅ?esunout vybrané okno"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "PoÄ?kat, až uživatel vybere okno, a pak je interaktivnÄ? pÅ?esunout."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1846,8 +1848,10 @@ msgid "Resize selected window"
 msgstr "ZmÄ?nit velikost vybraného okna"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "PoÄ?kat, až uživatel vybere okno, a pak interaktivnÄ? zmÄ?nit jeho velikost."
 
@@ -1926,40 +1930,88 @@ msgid "Shrink window left"
 msgstr "Posunout okno vlevo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Posunout okno vpravo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Posunout okno nahoru"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Posunout okno dolů"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Srazit doleva"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Srazit doprava"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Srazit nahoru"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Srazit dolů"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "ZvÄ?tÅ¡it okno o Å?ádek"
@@ -2281,6 +2333,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Zobraz menu aplikací"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "PÅ?ehrávat zvukové efekty pro události oken."
@@ -2371,10 +2434,6 @@ msgstr "Zobrazit chyby"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Zobrazit všechny vzniklé chyby na obrazovku."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2598,11 +2657,6 @@ msgstr "Stav"
 msgid "Other"
 msgstr "Jiný"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Zvýšit okno"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Automatické rozbalování"
@@ -2795,6 +2849,18 @@ msgstr "Poslat na plochu vpravo"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Poslat okno na pracovní plochu vpravo od aktuální plochy"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kdy kurzor myÅ¡i ovlivÅ?uje aktivitu oken."
@@ -2821,18 +2887,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automaticky naÄ?ítat témata pÅ?i jejich aktualizaci."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Implicitní písmo: \\w"
 
@@ -3038,6 +3092,78 @@ msgstr ""
 "(Použijí se jen zkratky s myší)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "zkratky minimalizaÄ?ního tlaÄ?ítka"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové zkratky aktivní, když je kurzor nad zavíracím tlaÄ?ítkem okna.\n"
+"(Použijí se jen zkratky s myší)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "zkratky zavíracího tlaÄ?ítka"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové zkratky aktivní, když je kurzor nad zavíracím tlaÄ?ítkem okna.\n"
+"(Použijí se jen zkratky s myší)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "zkratky tlaÄ?ítka menu"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové zkratky aktivní, když je kurzor nad tlaÄ?ítkem menu okna.\n"
+"(Použijí se jen zkratky s myší)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "zkratky zavíracího tlaÄ?ítka"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové zkratky aktivní, když je kurzor nad zavíracím tlaÄ?ítkem okna.\n"
+"(Použijí se jen zkratky s myší)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "zkratky zavíracího tlaÄ?ítka"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové zkratky aktivní, když je kurzor nad zavíracím tlaÄ?ítkem okna.\n"
+"(Použijí se jen zkratky s myší)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifikátor(y) používané pro implicitní zkratky."
 
@@ -3247,6 +3373,11 @@ msgstr "Zobrazit chyby"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Zobraz menu aplikací"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Restartovat"
 
@@ -3305,8 +3436,9 @@ msgid "Display the applications menu."
 msgstr "Zobrazit menu aplikací."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Nastavení Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3345,7 +3477,6 @@ msgstr "Udržovat podÅ?ízená okna nad: \\w"
 msgid "Raise single window"
 msgstr "Zvýšit jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Zvýšit okno na svou nejvyšší povolenou pozici v poÅ?adí oken."
@@ -3354,7 +3485,6 @@ msgstr "Zvýšit okno na svou nejvyšší povolenou pozici v poÅ?adí oken."
 msgid "Lower single window"
 msgstr "Snížit jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Snížit okno na svou nejnižší povolenou pozici v poÅ?adí oken."
@@ -3363,7 +3493,6 @@ msgstr "Snížit okno na svou nejnižší povolenou pozici v poÅ?adí oken."
 msgid "Raise lower single window"
 msgstr "Zvýšit-snížit jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3559,8 +3688,10 @@ msgid "Unmaximize window"
 msgstr "Odmaximalizovat okno"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Obnovit rozmÄ?ry okna do původního, nemaximalizovaného stavu."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3694,7 +3825,8 @@ msgstr "PÅ?epnout maximalizaci okna na celou obrazovku"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "PÅ?epnout stav okna mezi maximalizovaným a nemaximalizovaným."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3715,8 +3847,8 @@ msgstr "PÅ?epnout maximalizaci okna na celou obrazovku"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "PÅ?epnout stav okna mezi maximalizovaným-nepÅ?ekrýt a nemaximalizovaným."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3934,9 +4066,7 @@ msgstr "Odmaximalizovat okno"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program pro pÅ?ehrávání zvukových efektů. Když není nastavený, použije se "
 "zabudovaná podpora ESD."
@@ -3981,13 +4111,38 @@ msgid "Raise window"
 msgstr "Zvýšit okno"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Zvýšit okno na svou nejvyšší povolenou pozici v poÅ?adí oken."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Snížit okno"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Snížit okno na svou nejnižší povolenou pozici v poÅ?adí oken."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Zvýšit-snížit okno"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Je-li okno na své nejvyšší možné pozici, snížit jej na svou nejnižší možnou\n"
+"pozici. Jinak je zvýšit co možná nejvýš. Také zmÄ?ní úroveÅ? vÅ¡ech jeho\n"
+"podÅ?ízených oken."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4106,8 +4261,10 @@ msgid "Move window right"
 msgstr "PÅ?esunout okno doprava"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "PÅ?esunout okno do pohledu napravo a pÅ?epnout se do toho pohledu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4115,8 +4272,10 @@ msgid "Move window left"
 msgstr "PÅ?esunout okno doleva"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "PÅ?esunout okno do pohledu nalevo a pÅ?epnout se do toho pohledu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4124,7 +4283,10 @@ msgid "Move window up"
 msgstr "PÅ?esunout okno nahoru"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "PÅ?esunout okno do pohledu nahoÅ?e a pÅ?epnout se do toho pohledu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4132,7 +4294,10 @@ msgid "Move window down"
 msgstr "PÅ?esunout okno dolů"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "PÅ?esunout okno do pohledu dole a pÅ?epnout se do toho pohledu."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4173,7 +4338,7 @@ msgstr "Jestli pÅ?i zvÄ?tÅ¡ování nebo srážení oken narážet do ignorovaný
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Jestli pÅ?i zvÄ?tÅ¡ování nebo srážení oken narážet do ignorovaných oken."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4217,6 +4382,11 @@ msgstr "Vynutit jednoznaÄ?né jméno okna"
 msgid "Force the current window to have a unique title."
 msgstr "Vynutit jednoznaÄ?né jméno aktuálního okna"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Zvýšit okno"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4229,7 +4399,8 @@ msgstr "Zobrazit menu obsahující seznam všech pracovních ploch."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Zobrazit menu obsahující seznam všech pracovních ploch."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4351,8 +4522,10 @@ msgid "Prepend workspace and send"
 msgstr "PÅ?idat plochu na zaÄ?átek a poslat"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "VytvoÅ?it novou pracovní plochu na zaÄ?átku seznamu a poslat tam okno."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/da.po b/po/da.po
index 9ff0463..57a9f59 100644
--- a/po/da.po
+++ b/po/da.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-10 11:39+0100\n"
 "Last-Translator: Ole Laursen <olau hardworking dk>\n"
 "Language-Team: Dansk <dansk klid dk>\n"
@@ -210,10 +210,10 @@ msgstr "ingen"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -234,21 +234,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,7 +256,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -264,14 +264,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -292,10 +292,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -318,17 +318,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -336,8 +336,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -368,8 +368,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr "Vælg farve"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,8 +433,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -442,7 +442,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -506,15 +506,15 @@ msgstr "alle"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -522,14 +522,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -537,8 +537,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -553,7 +553,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -578,8 +578,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -595,7 +595,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -665,8 +665,8 @@ msgstr "lukknap-tastekombinationsliste"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -678,7 +678,7 @@ msgstr "minimérknap-tastekombinationsliste"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -692,7 +692,7 @@ msgstr "menuknap-tastekombinationsliste"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -714,7 +714,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -727,14 +727,14 @@ msgstr "menuknap-tastekombinationsliste"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -747,18 +747,18 @@ msgstr "menuknap-tastekombinationsliste"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -770,7 +770,7 @@ msgstr "menuknap-tastekombinationsliste"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgstr "lukknap-tastekombinationsliste"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -838,12 +838,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,7 +851,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -859,23 +859,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -883,7 +883,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -891,8 +891,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -900,10 +900,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -922,7 +922,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -935,10 +935,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -986,16 +986,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1011,7 +1011,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1855,8 +1855,10 @@ msgid "Move selected window"
 msgstr "Flyt valgte vinduer"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Vent på at der vælges et vindue og flyt det så interaktivt."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1864,8 +1866,10 @@ msgid "Resize selected window"
 msgstr "Forstør/formindsk valgte vinduer"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Vent på at der vælges et vindue og ændr så størrelsen på det interaktivt."
 
@@ -1948,40 +1952,88 @@ msgid "Shrink window left"
 msgstr "Flyt vindue mod venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Flyt vindue mod højre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Flyt vindue opad"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Flyt vindue nedad"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Indpas vindue mod venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Indpas vindue mod højre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Indpas vindue opad"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Indpas vindue nedad"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Tilføj række for vindue"
@@ -2308,6 +2360,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d-hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Vis programmenu"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Afspil lydeffekter ved vindueshændelser"
@@ -2398,10 +2461,6 @@ msgstr "Vis fejl"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Vis alle de fejl der er sket på skærmen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2625,11 +2684,6 @@ msgstr "Tilstand"
 msgid "Other"
 msgstr "Andre"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Hæv vindue"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Smart nedrulning"
@@ -2822,6 +2876,18 @@ msgstr "Send til højre arbejdsområde "
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Send vindue til arbejdsområdet til højre for det aktive"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Hvornår musemarkøren påvirker tastaturfokuset."
@@ -2848,18 +2914,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Genindlæs automatisk temaer hvis de bliver opdateret."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Standard-skrifttype: \\w"
 
@@ -3076,6 +3130,83 @@ msgstr ""
 "brugt)."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "minimérknap-tastekombinationsliste"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastekombinationsliste som indeholder bindinger der gælder når markøren er "
+"over\n"
+"luk-knappen på et vindue (i denne liste bliver kun musebindinger brugt)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "lukknap-tastekombinationsliste"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastekombinationsliste som indeholder bindinger der gælder når markøren er "
+"over\n"
+"luk-knappen på et vindue (i denne liste bliver kun musebindinger brugt)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menuknap-tastekombinationsliste"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastekombinationsliste som indeholder bindinger der gælder når markøren er "
+"over\n"
+"menuknappen på et vindue (i denne liste bliver kun musebindinger brugt)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "lukknap-tastekombinationsliste"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastekombinationsliste som indeholder bindinger der gælder når markøren er "
+"over\n"
+"luk-knappen på et vindue (i denne liste bliver kun musebindinger brugt)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "lukknap-tastekombinationsliste"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastekombinationsliste som indeholder bindinger der gælder når markøren er "
+"over\n"
+"luk-knappen på et vindue (i denne liste bliver kun musebindinger brugt)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modificeringstaster til standardgenveje i vindueshåndteringen."
 
@@ -3285,6 +3416,11 @@ msgstr "Vis fejl"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Vis programmenu"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Genstart"
 
@@ -3343,8 +3479,9 @@ msgid "Display the applications menu."
 msgstr "Vis menuen til at starte programmer fra."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Opsætning af Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3384,7 +3521,6 @@ msgstr "Sørg for at midlertidige vinduer er stablet over: \\w"
 msgid "Raise single window"
 msgstr "Hæv enkelt vindue"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Hæv vinduet til den øverst tilladte position i stabelordenen."
@@ -3393,7 +3529,6 @@ msgstr "Hæv vinduet til den øverst tilladte position i stabelordenen."
 msgid "Lower single window"
 msgstr "Sænk enkelt vindue"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Sænk vinduet til den lavest tilladte position i stablingsordenen."
@@ -3402,7 +3537,6 @@ msgstr "Sænk vinduet til den lavest tilladte position i stablingsordenen."
 msgid "Raise lower single window"
 msgstr "Hæv/sænk enkelt vindue"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3602,8 +3736,10 @@ msgid "Unmaximize window"
 msgstr "Afmaksimér vindue"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Gendan til vinduets oprindelige ikke-maksimerede størrelse."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3733,7 +3869,8 @@ msgstr "Skift mellem maksimeret fuldskærmstilstand"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Skift vinduets tilstand mellem maksimeret og gendannet."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3754,8 +3891,8 @@ msgstr "Skift mellem maksimeret fuldskærmstilstand"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Skift vinduets tilstand mellem maksimalt udfyldt og gendannet."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3975,9 +4112,7 @@ msgstr "Afmaksimér vindue"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program til lydafspilning. Hvis ikke angivet, benyttes indbygget ESD-"
 "understøttelse "
@@ -4024,13 +4159,38 @@ msgid "Raise window"
 msgstr "Hæv vindue"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Hæv vinduet til den øverst tilladte position i stabelordenen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Sænk vindue"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Sænk vinduet til den lavest tilladte position i stablingsordenen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Hæv/sænk vindue"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Hvis vinduet er på dets højeste mulige position, så sænk det til dets\n"
+"lavest mulige position. Ellers hæv det så langt som tilladt. �ndrer\n"
+"også niveauet for alle dets midlertidige vinduer."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4149,8 +4309,10 @@ msgid "Move window right"
 msgstr "Flyt vindue til højre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Flyt vindueet til visningsområdet til højre, og skift til det visningsområde."
 
@@ -4159,8 +4321,10 @@ msgid "Move window left"
 msgstr "Flyt vindue til venstre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Flyt vinduet til visningsområdet til venstre, og skift til det "
 "visningsområde."
@@ -4170,7 +4334,10 @@ msgid "Move window up"
 msgstr "Flyt vindue op"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Flyt vinduet til visningsområdet ovenfor, og skift til det visningsområde."
 
@@ -4179,7 +4346,10 @@ msgid "Move window down"
 msgstr "Flyt vindue op"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Flyt vinduet til visningsområdet til nedenunder, og skift til det "
 "visningsområde."
@@ -4224,7 +4394,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Om der skal stødes mod ignorerede vinduer ved forstørrelse og indpasning af "
 "vinduer."
@@ -4272,6 +4442,11 @@ msgstr "Gør vinduets navn unikt"
 msgid "Force the current window to have a unique title."
 msgstr "Tving det aktive vindue til at have en unik titel."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Hæv vindue"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4284,7 +4459,8 @@ msgstr "Vis menu med alle arbejdsområder."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Vis menu med alle arbejdsområder."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4412,8 +4588,10 @@ msgid "Prepend workspace and send"
 msgstr "Tilføj arbejdsområde til begyndelsen og send vindue"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Opret et nyt arbejdsområde i starten af listen og flyt vinduet derhen."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/de.po b/po/de.po
index a19e866..a8d40c5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -30,7 +30,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-18 11:22+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2009-10-18 00:02+0200\n"
 "Last-Translator: Christian Kirbach <Christian Kirbach googlemail com>\n"
 "Language-Team: German <gnome-de gnome org>\n"
@@ -38,3014 +38,4730 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lisp/sawfish/gtk/widgets/alist.jl:36
-#: ../lisp/sawfish/cfg/widgets/keymap.jl:65
-msgid "Key"
-msgstr "Taste"
-
-#: ../lisp/sawfish/gtk/widgets/alist.jl:37
-msgid "Value"
-msgstr "Wert"
-
-#: ../lisp/sawfish/gtk/widgets/file.jl:32
-#: ../lisp/sawfish/gtk/widgets/font.jl.in:44
-msgid "Browse..."
-msgstr "Auswählen �"
-
-#: ../lisp/sawfish/gtk/widgets/file.jl:42
-msgid "Select file"
-msgstr "Datei wählen"
-
-#: ../lisp/sawfish/gtk/widgets/font.jl.in:54
-msgid "Select font"
-msgstr "Schrift wählen"
-
-#: ../lisp/sawfish/gtk/widgets/list.jl:52
-msgid "Add..."
-msgstr "Hinzufügen �"
-
-#: ../lisp/sawfish/gtk/widgets/list.jl:53
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../lisp/sawfish/gtk/widgets/list.jl:54
-msgid "Edit..."
-msgstr "Bearbeiten â?¦"
+#. ../scripts/sawfish-about.jl
+msgid "and many others..."
+msgstr "und viele andere â?¦"
 
-#: ../lisp/sawfish/gtk/widgets/list.jl:91
-#: ../lisp/sawfish/gtk/widgets/list.jl:92
-msgid "Add:"
-msgstr "Hinzufügen:"
+#. ../scripts/sawfish-about.jl
+msgid "Sawfish manages your windows extensibly."
+msgstr "Sawfish verwaltet Ihre Fenster und ist vielfältig erweiterbar."
 
-#: ../lisp/sawfish/gtk/widgets/list.jl:124
-#: ../lisp/sawfish/gtk/widgets/list.jl:126
-msgid "Edit:"
-msgstr "Bearbeiten:"
+#. ../scripts/sawfish-about.jl
+msgid "Sawfish homepage"
+msgstr "Sawfish-Homepage"
 
-#: ../lisp/sawfish/gtk/widgets/scheme-boolean.jl:31
-#: ../lisp/sawfish/gtk/widgets/scheme-boolean.jl:35
-msgid "Yes"
-msgstr "Ja"
+#. ../themes/Crux/theme.jl
+msgid "Crux Theme"
+msgstr "Thema Crux"
 
-#: ../lisp/sawfish/gtk/widgets/scheme-boolean.jl:35
-msgid "No"
-msgstr "Nein"
+#. ../themes/Crux/theme.jl
+msgid ""
+"Accent color for focused windows (if unset uses the GTK+ selection color)."
+msgstr ""
+"Akzentfarbe für fokussierte Fenster (wenn nicht gesetzt, GTK+-"
+"Markierungsfarbe verwenden)."
+
+#. ../themes/Crux/theme.jl
+msgid "Display the window's icon in its menu button."
+msgstr "Icon des Fensters in seinem Menüknopf anzeigen."
+
+#. ../themes/Crux/theme.jl
+msgid "Display title buttons to mimic: \\w"
+msgstr "Titelknöpfe ahmen folgenden Stil nach: \\w"
+
+#. ../themes/gradient/theme.jl
+msgid "Gradient Theme"
+msgstr "Thema Verlauf"
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/gradient/theme.jl
+msgid "horizontal"
+msgstr "horizontal"
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/gradient/theme.jl
+msgid "vertical"
+msgstr "vertikal"
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/gradient/theme.jl
+msgid "diagonal"
+msgstr "diagonal"
+
+#. ../themes/gradient/theme.jl
+msgid "Direction of gradient in `gradient' frame style."
+msgstr "Richtung des Farbverlaufs beim »Farbverlauf«-Rahmenstil."
+
+#. ../themes/gradient/theme.jl
+msgid "`From' color of inactive frames in `gradient' frame style."
+msgstr "»Ursprungsfarbe« inaktiver Rahmen im »Farbverlauf«-Rahmenstil."
+
+#. ../themes/gradient/theme.jl
+msgid "`To' color of inactive frames in `gradient' frame style."
+msgstr "»Zielfarbe« inaktiver Rahmen im »Farbverlauf«-Rahmenstil."
+
+#. ../themes/gradient/theme.jl
+msgid "`From' color of active frames in `gradient' frame style."
+msgstr "»Ursprungsfarbe« aktiver Rahmen im »Farbverlauf«-Rahmenstil."
+
+#. ../themes/gradient/theme.jl
+msgid "`To' color of active frames in `gradient' frame style."
+msgstr "»Zielfarbe« aktiver Rahmen im »Farbverlauf«-Rahmenstil."
+
+#. ../themes/gradient/theme.jl
+msgid "Use less memory when creating gradients, possibly affecting quality."
+msgstr ""
+"Beim Erstellen von Farbverläufen weniger Speicher verbrauchen (vermutlich "
+"niedrigere Qualität)."
 
-#: ../lisp/sawfish/gtk/widget.jl:377
-#, librep-format
-msgid "No matching item for %S"
-msgstr "Kein auf %S passender Eintrag"
+#. ../themes/mono/theme.jl
+msgid "Mono Theme"
+msgstr "Thema Mono"
 
-#: ../lisp/sawfish/gtk/widget.jl:507
-#, librep-format
-msgid "** unknown widget **  "
-msgstr "** unbekanntes Widget **"
+#. ../themes/mono/theme.jl
+msgid "Color of inactive frames (if unset use GTK+ background color)."
+msgstr ""
+"Farbe der inaktiven Rahmen (wenn nicht gesetzt, GTK+-Hintergrundfarbe "
+"verwenden)."
 
-#: ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl:32
-#: ../lisp/sawfish/cfg/widgets/workspace-geometry.jl:32
-msgid "Workspaces:"
-msgstr "Arbeitsflächen:"
+#. ../themes/mono/theme.jl
+msgid "Color of active frames (if unset use GTK+ selection color)."
+msgstr ""
+"Farbe der aktiven Rahmen (wenn nicht gesetzt, GTK+-Markierungsfarbe "
+"verwenden)."
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/mono/theme.jl
+msgid "left"
+msgstr "links"
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/mono/theme.jl
+msgid "right"
+msgstr "rechts"
+
+#. ../themes/mxflat/theme.jl
+#. ../themes/mono/theme.jl
+msgid "center"
+msgstr "Mitte"
+
+#. ../themes/mono/theme.jl
+msgid "Text is \\w justified in window titles."
+msgstr "Text in Fenstertiteln ist \\w -ausgerichtet"
+
+#. ../themes/mxflat/theme.jl
+msgid "mxflat"
+msgstr ""
 
-#: ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl:33
-#: ../lisp/sawfish/cfg/widgets/workspace-geometry.jl:33
-msgid "Columns:"
-msgstr "Spalten:"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "title"
+msgstr "Zustand"
 
-#: ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl:34
-#: ../lisp/sawfish/cfg/widgets/workspace-geometry.jl:34
-msgid "Rows:"
-msgstr "Zeilen:"
+#. ../themes/mxflat/theme.jl
+msgid "basic"
+msgstr ""
 
-#: ../lisp/sawfish/cfg/apply.jl:84
-#, librep-format
-msgid "While changing %s:"
-msgstr "Beim Ã?ndern von %s:"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "gradient"
+msgstr "Dialoge"
 
-#: ../lisp/sawfish/cfg/apply.jl:106
-msgid "Sawfish Error"
-msgstr "Sawfish-Fehler"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "colors"
+msgstr "Farbe wählen"
 
-#: ../lisp/sawfish/cfg/shell.jl:101 ../lisp/sawfish/cfg/shell.jl:102
-msgid "Sawfish Configurator"
-msgstr "Sawfish-Einstellungen"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "buttons"
+msgstr "nicht"
 
-#: ../lisp/sawfish/cfg/layouts/keymaps.jl:52
-msgid "Context:"
-msgstr "Zusammenhang:"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "positions 1"
+msgstr "Position"
 
-#: ../lisp/sawfish/cfg/widgets/command.jl:51
-#: ../lisp/sawfish/cfg/widgets/keymap.jl:65 ../lisp/sawfish/wm/commands.jl:371
-msgid "Command"
-msgstr "Befehl"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "positions 2"
+msgstr "Position"
 
-#: ../lisp/sawfish/cfg/widgets/command.jl:65
-msgid "Undocumented"
-msgstr "Undokumentiert"
+#. ../themes/mxflat/theme.jl
+msgid "keymaps 1"
+msgstr ""
 
-#: ../lisp/sawfish/cfg/widgets/event.jl:34
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:52
-msgid "Grab..."
-msgstr "Erfassen â?¦"
+#. ../themes/mxflat/theme.jl
+msgid "keymaps 2"
+msgstr ""
 
-#: ../lisp/sawfish/cfg/widgets/keymap.jl:53
-msgid "Edit Binding"
-msgstr "Tastenkombination editieren"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "borders"
+msgstr "Oberer Rahmen"
 
-#: ../lisp/sawfish/cfg/widgets/keymap.jl:84
-msgid "Key:"
-msgstr "Taste:"
+#. ../themes/mxflat/theme.jl
+msgid "extended"
+msgstr ""
 
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:41
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:242
-msgid "Matchers"
-msgstr "Muster"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "normal"
+msgstr "Normal"
 
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:119
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:242
-msgid "Actions"
-msgstr "Aktionen"
+#. ../lisp/sawfish/wm/stacking.jl
+#. ../themes/mxflat/theme.jl
+msgid "all"
+msgstr "alle"
 
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:207
-msgid "not"
-msgstr "nicht"
+#. ../lisp/sawfish/wm/window-anim.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#. ../lisp/sawfish/wm/state/iconify.jl
+#. ../lisp/sawfish/wm/stacking.jl
+#. ../themes/mxflat/theme.jl
+msgid "none"
+msgstr "nichts"
 
-#: ../lisp/sawfish/cfg/widgets/match-window.jl:228
-msgid "Match Window Properties"
-msgstr "Fenstereigenschaften mit Muster vergleichen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"decoration mode\n"
+"\n"
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
+"mode 'all' means that all windows, even transients/dialogs, will get a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
+"sawfish feature that is gone in the latest version."
+msgstr ""
 
-#: ../lisp/sawfish/wm/autoload.jl:195 ../lisp/sawfish/wm/autoload.jl:196
-#: ../lisp/sawfish/wm/commands/viewport-linear.jl:50
-#: ../lisp/sawfish/wm/commands/viewport-linear.jl:62
-msgid "Index:"
-msgstr "Index:"
+#. ../themes/mxflat/theme.jl
+msgid "titlebar height (9 - 1000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/commands.jl:364
-msgid "Command:"
-msgstr "Befehl:"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize title string\n"
+"\n"
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
+"write an email please!)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/audio-events.jl:75
-msgid "Event"
-msgstr "Ereignis"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title string\n"
+"\n"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
+"content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/audio-events.jl:76
-msgid "Audio file"
-msgstr "Klangdatei"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"update title string periodically\n"
+"\n"
+"This is useful if your title string changes without user interaction (eg "
+"because it displays the current time or something like that)."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/error-handler.jl:82
-msgid "No errors."
-msgstr "Keine Fehler."
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title string update interval (1 - 1000000 s)\n"
+"\n"
+"This is useful if your title string changes without user interaction (e.g., "
+"because it displays the current time or something like that)."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/match-window.jl:71
-msgid "Placement"
-msgstr "Platzierung"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title string font\n"
+"\n"
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/match-window.jl:89
-msgid "Focus"
-msgstr "Fokus"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize title position\n"
+"\n"
+"By default the title string is centered horizontally and vertically."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/match-window.jl:95
-msgid "Appearance"
-msgstr "Aussehen"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "real-center"
+msgstr "Mitte"
 
-#: ../lisp/sawfish/wm/ext/match-window.jl:100
-msgid "State"
-msgstr "Zustand"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title string horizontal alignment\n"
+"\n"
+"'real-center' means to take the whole titlebar into account while centering "
+"the string. when selecting 'center' only the distance between the buttons is "
+"taken into account."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/match-window.jl:117
-msgid "Other"
-msgstr "Andere(s)"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title string horizontal align adjustment (-10000 - 10000 pixel)\n"
+"\n"
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/window-history.jl:82
-msgid "Remember _position"
-msgstr "An _Position erinnern"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "top"
+msgstr "Anpassen"
 
-#: ../lisp/sawfish/wm/ext/window-history.jl:83
-msgid "Remember _dimensions"
-msgstr "An _MaÃ?e erinnern"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "bottom"
+msgstr "nicht"
 
-#: ../lisp/sawfish/wm/ext/window-history.jl:84
-msgid "Remember _attributes"
-msgstr "An _Attribute erinnern"
+#. ../themes/mxflat/theme.jl
+msgid "title string vertical alignment"
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/window-history.jl:86
-msgid "_Forget saved state"
-msgstr "Gespeicherten Zustand _vergessen"
+#. ../themes/mxflat/theme.jl
+msgid "title string vertical align adjustment (-10000 - 10000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/ext/window-history.jl:376
-msgid "_History"
-msgstr "C_hronik"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"gradient titlebar background (experimental)\n"
+"\n"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:535
-msgid "Default"
-msgstr "Vorgabe"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"gradient mode\n"
+"\n"
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used."
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:542
-msgid "Normal"
-msgstr "Normal"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"gradient quality (1 best - 20 worst)\n"
+"\n"
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:545
-msgid "Title-only"
-msgstr "Nur Titel"
+#. ../themes/mxflat/theme.jl
+msgid "rainbow"
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:548
-msgid "Border-only"
-msgstr "Nur Rahmen"
+#. ../themes/mxflat/theme.jl
+msgid "jamaica"
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:551
-msgid "Top-border"
-msgstr "Oberer Rahmen"
+#. ../themes/mxflat/theme.jl
+msgid "rgb"
+msgstr ""
 
-#: ../lisp/sawfish/wm/frames.jl:554
-msgid "None"
-msgstr "Nichts"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "custom"
+msgstr "Anpassen"
 
-#. add some GNOME help menus
-#. add some KDE help menus
-#: ../lisp/sawfish/wm/integration/gnome.jl:42
-#: ../lisp/sawfish/wm/integration/kde.jl:42 ../lisp/sawfish/wm/menus.jl:158
-msgid "_Help"
-msgstr "_Hilfe"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"gradient color mode\n"
+"\n"
+"the custom mode will respect the colors set in the list below."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/gnome.jl:45
-msgid "_GNOME Help"
-msgstr "_GNOME-Hilfe"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"\n"
+"\n"
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
+"custom to activate this list."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/gnome.jl:46
-msgid "GNOME Website"
-msgstr "GNOME-Webseite"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "reverse colors"
+msgstr "Farbe wählen"
 
-#: ../lisp/sawfish/wm/integration/gnome.jl:47
-msgid "About GNOME"
-msgstr "Info zu GNOME"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"unfocused/highlighted titlebar colors hue (0 - 360)\n"
+"\n"
+"This value changes the hue of a color, by moving (0 - 360) degress around "
+"the color cycle...180 for example inverts the color"
+msgstr ""
 
-#. add gnome-logout menu item
-#. add kde-logout menu item
-#: ../lisp/sawfish/wm/integration/gnome.jl:50
-#: ../lisp/sawfish/wm/integration/kde.jl:49 ../lisp/sawfish/wm/menus.jl:151
-msgid "Sessi_on"
-msgstr "Sitz_ung"
+#. ../themes/mxflat/theme.jl
+#, c-format
+msgid ""
+"unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
+"color)\n"
+"\n"
+"The saturation of a color is a measurement of the color intensity"
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/gnome.jl:53
-msgid "_Logout from GNOME"
-msgstr "Aus GNOME abme_lden"
+#. ../themes/mxflat/theme.jl
+#, c-format
+msgid ""
+"unfocused/highlighted titlebar colors brightness (0 - 100% of the focused "
+"color)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/gnome.jl:55
-msgid "_Shutdown from GNOME"
-msgstr "Aus GNOME _herunterfahren"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"  focused titlebar color\n"
+"\n"
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
+"depend on these 4 colors."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/kde.jl:45
-msgid "_KDE Help"
-msgstr "_KDE-Hilfe"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"unfocused titlebar color\n"
+"\n"
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
+"depend on these 4 colors."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/kde.jl:46
-msgid "KDE Website"
-msgstr "KDE-Webseite"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"  focused title string color\n"
+"\n"
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
+"depend on these 4 colors."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/kde.jl:53
-msgid "_Logout from KDE"
-msgstr "Aus KDE abme_lden"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"unfocused title string color\n"
+"\n"
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
+"depend on these 4 colors."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/kde.jl:55
-msgid "_Reboot from KDE"
-msgstr "Aus KDE neu sta_rten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize extended title string colors\n"
+"\n"
+"You can customize additional colors of the title string.  If you deactivate "
+"this, these colors will be set to the focused title string color."
+msgstr ""
 
-#: ../lisp/sawfish/wm/integration/kde.jl:57
-msgid "_Shutdown from KDE"
-msgstr "Aus KDE _herunterfahren"
+#. ../themes/mxflat/theme.jl
+msgid "  focused highlighted title string color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:87
-msgid "Mi_nimize"
-msgstr "Mi_nimieren"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused highlighted title string color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:92
-msgid "Unma_ximize"
-msgstr "_Wiederherstellen"
+#. ../themes/mxflat/theme.jl
+msgid "  focused clicked title string color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:93
-msgid "Ma_ximize"
-msgstr "Ma_ximieren"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused clicked title string color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:97
-msgid "_Move"
-msgstr "_Verschieben"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "default-9"
+msgstr "Vorgabe"
 
-#: ../lisp/sawfish/wm/menus.jl:98
-msgid "_Resize"
-msgstr "Grö�e än_dern"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "default-12"
+msgstr "Vorgabe"
 
-#: ../lisp/sawfish/wm/menus.jl:99
-msgid "_Close"
-msgstr "_SchlieÃ?en"
+#. ../themes/mxflat/theme.jl
+msgid "square-6"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:101
-msgid "_Toggle"
-msgstr "_Umschalten"
+#. ../themes/mxflat/theme.jl
+msgid "square-9"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:102
-msgid "In _group"
-msgstr "In _Gruppe"
+#. ../themes/mxflat/theme.jl
+msgid "square-12"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:103
-msgid "_Send window to"
-msgstr "Fenster _schicken auf"
+#. ../themes/mxflat/theme.jl
+msgid "square-15"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:104
-msgid "_Previous workspace"
-msgstr "_Vorherige Arbeitsfläche"
+#. ../themes/mxflat/theme.jl
+msgid "square-18"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:105
-msgid "_Next workspace"
-msgstr "_Nächste Arbeitsfläche"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "ball-9"
+msgstr "alle"
 
-#: ../lisp/sawfish/wm/menus.jl:106
-msgid "C_opy window to"
-msgstr "Fenster k_opieren auf"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "ball-12"
+msgstr "alle"
 
-#: ../lisp/sawfish/wm/menus.jl:107
-msgid "P_revious workspace"
-msgstr "_Vorherige Arbeitsfläche"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"button icon set (experimental)\n"
+"\n"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:108
-msgid "Ne_xt workspace"
-msgstr "_Nächste Arbeitsfläche"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize button size\n"
+"\n"
+"By default the button size follows the size of the titlebar, but by "
+"activating this you can set it to something different."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:109
-msgid "_Grow & Pack"
-msgstr "_Aufweiten und Packen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"buttons size (1 - 1000 pixel)\n"
+"\n"
+"A buttons size that is bigger than your current titlebar height is ignored."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:110
-msgid "Grow left"
-msgstr "Nach links aufweiten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"button vertical alignment\n"
+"\n"
+"If a button is smaller than the titlebar you might want to set its vertical "
+"alignment."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:111
-msgid "Grow right"
-msgstr "Nach rechts aufweiten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"scale button icons (experimental)\n"
+"\n"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:112
-msgid "Grow up"
-msgstr "Nach oben aufweiten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"button icon scale; changes here need a restart of sawfish (0 - 1000 pixel)\n"
+"\n"
+"in case you don't like the default size of 9 pixel you might activate button-"
+"scaling. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:113
-msgid "Grow down"
-msgstr "Nach unten aufweiten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"display window icon on menu button\n"
+"\n"
+"Many people like having the window-icon displayed on the menu-button.  This "
+"icon is defined by the application itself and is also shown in your pager "
+"and task-list."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:115
-msgid "Pack left"
-msgstr "Nach links packen"
+#. ../themes/mxflat/theme.jl
+msgid "menu icon scale (0 - 1000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:116
-msgid "Pack right"
-msgstr "Nach rechts packen"
+#. ../themes/mxflat/theme.jl
+msgid "button distance (0 - 1000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:117
-msgid "Pack up"
-msgstr "Nach oben packen"
+#. ../themes/mxflat/theme.jl
+msgid "buttons left offset (0 - 1000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:118
-msgid "Pack down"
-msgstr "Nach unten packen"
+#. ../themes/mxflat/theme.jl
+msgid "buttons right offset (0 - 1000 pixel)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:119
-msgid "Shrink & _Yank"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
+"\n"
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
+"on left/right side of the titlebar."
 msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:120
-msgid "Shrink left"
-msgstr "Nach links schrumpfen"
+#. ../themes/mxflat/theme.jl
+msgid "title-height"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:121
-msgid "Shrink right"
-msgstr "Nach rechts schrumpfen"
+#. ../themes/mxflat/theme.jl
+msgid "pixel"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:122
-msgid "Shrink up"
-msgstr "Nach oben schrumpfen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"button position model\n"
+"\n"
+"'title-height' means calculate position as multiple of title height. when "
+"selecting 'pixel' you can adjust the button position pixelwise, but keep in "
+"mind that several buttons might slide on top of each other. 'none' means no "
+"buttons at all."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:123
-msgid "Shrink down"
-msgstr "Nach unten schrumpfen"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "menu button position"
+msgstr "An _Position erinnern"
 
-#: ../lisp/sawfish/wm/menus.jl:125
+#. ../themes/mxflat/theme.jl
 #, fuzzy
-msgid "Yank left"
-msgstr "Nach links packen"
+msgid "shade button position"
+msgstr "Einrollknopf-Tastenbewegung"
 
-#: ../lisp/sawfish/wm/menus.jl:126
+#. ../themes/mxflat/theme.jl
 #, fuzzy
-msgid "Yank right"
-msgstr "Nach rechts packen"
+msgid "iconify button position"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:127
+#. ../themes/mxflat/theme.jl
 #, fuzzy
-msgid "Yank up"
-msgstr "Nach oben packen"
+msgid "maximize button position"
+msgstr "Maximierknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:128
+#. ../themes/mxflat/theme.jl
 #, fuzzy
-msgid "Yank down"
-msgstr "Nach unten packen"
+msgid "close button position"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:129
-msgid "Stac_king"
-msgstr "Schich_tung"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "sticky button position"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:130
-msgid "_Raise"
-msgstr "An_heben"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "previous workspace button position"
+msgstr "Vorheriges Fenster auf der Arbeitsfläche"
 
-#: ../lisp/sawfish/wm/menus.jl:131
-msgid "_Lower"
-msgstr "Ab_senken"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "next workspace button position"
+msgstr "Nächstes Fenster auf der Arbeitsfläche"
 
-#: ../lisp/sawfish/wm/menus.jl:133
-msgid "_Upper layer"
-msgstr "_Obere Schicht"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "configure button position"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:134
-msgid "Lo_wer layer"
-msgstr "_Untere Schicht"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "info button position"
+msgstr "Position in Fensterchronik speichern"
 
-#: ../lisp/sawfish/wm/menus.jl:135
-msgid "Frame ty_pe"
-msgstr "Rahmenty_p"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "always-on-top button position"
+msgstr "Position in Fensterchronik speichern"
 
-#: ../lisp/sawfish/wm/menus.jl:136
-msgid "Frame sty_le"
-msgstr "Rahmenst_il"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "lock button position"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:143
-msgid "Sawfish Rootmenu"
-msgstr "Sawfish-Wurzelmenü"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize sticky button keymap\n"
+"\n"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:145
-msgid "_Windows"
-msgstr "_Fenster"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:sticky-button-keymap"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:146
-msgid "Work_spaces"
-msgstr "Arbeit_sflächen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize previous button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: send window to "
+"previous workspace - button2 workspace-list - button3 send window to first "
+"workspace - button6 pack window left"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:148
-msgid "_Programs"
-msgstr "_Programme"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:previous-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:149
-msgid "_Customize"
-msgstr "_Anpassen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize next button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: send window to "
+"next workspace - button2 workspace-list - button3 send window to last "
+"workspace - button6 pack window right"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:152
-msgid "Display Errors"
-msgstr "Fehler anzeigen"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:next-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:153
-msgid "Reload Appsmenu"
-msgstr "Anwendungsmenü neu laden"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"\n"
+"\n"
+"button1: send window to next workspace - button2 workspace-list - button3 "
+"send window to last workspace - button6 pack window right"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:155
-msgid "Restart Sawfish"
-msgstr "Sawfish neu starten"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize configure button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
+"config - button3: toggle custom title string"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:156
-msgid "Quit Sawfish"
-msgstr "Sawfish beenden"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:configure-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:159
-msgid "_FAQ..."
-msgstr "_FAQ â?¦"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"\n"
+"\n"
+"Button1: start sawfish-config - button3: toggle custom title string"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:160
-msgid "_News..."
-msgstr "_Neues â?¦"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize info button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: window list - "
+"button3 window snooper (not included by default)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:161
-msgid "_WWW page..."
-msgstr "_WWW-Seite â?¦"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:info-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:162
-msgid "_Manual..."
-msgstr "_Handbuch â?¦"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"always on top depth (-1000 - 1000)\n"
+"\n"
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:164
-msgid "_About Sawfish..."
-msgstr "_Info zu Sawfish â?¦"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize always-on-top button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:166
-msgid "Kill Window"
-msgstr "Fenster abwürgen"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:always-on-top-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/menus.jl:381
-msgid "S_awfishConfig"
-msgstr "S_awfish-Einstellungen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize look button keymap\n"
+"\n"
+"By default a button will work as it's name suggests. Button1: lock window "
+"position"
+msgstr ""
 
-#: ../lisp/sawfish/wm/menus.jl:388
-msgid "Edit theme..."
-msgstr "Thema bearbeiten â?¦"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "mxflat:lock-button-keymap"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#: ../lisp/sawfish/wm/state/iconify.jl:255
-msgid "_Sticky"
-msgstr "_Klebrig"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize button-colors\n"
+"\n"
+"When you active this you will be able to set custom button colors.  By "
+"default the button colors depend on the titlebar colors."
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/ignored.jl:105
-msgid "_Ignored"
-msgstr "_Ignoriert"
+#. ../themes/mxflat/theme.jl
+msgid "  focused button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/ignored.jl:107
-msgid "_Focusable"
-msgstr "_Fokussierbar"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/ignored.jl:109
-msgid "_Cyclable"
-msgstr "_Durchlaufbar"
+#. ../themes/mxflat/theme.jl
+msgid "  focused highlighted button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/ignored.jl:111
-msgid "In _window list"
-msgstr "I_n Fensterliste"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused highlighted button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/ignored.jl:113
-msgid "In _task list"
-msgstr "In GNOME-_Taskliste"
+#. ../themes/mxflat/theme.jl
+msgid "  focused clicked button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/state/shading.jl:112
-msgid "S_haded"
-msgstr "_Eingerollt"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused clicked button background color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/groups.jl:153
-msgid "New group"
-msgstr "Neue Gruppe"
+#. ../themes/mxflat/theme.jl
+msgid "  focused button foreground color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/keymap.jl:175
-msgid "Press key..."
-msgstr "Taste drücken �"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused button foreground color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/keymap.jl:199
-msgid "[Quote]"
-msgstr "[Quote]"
+#. ../themes/mxflat/theme.jl
+msgid "  focused highlighted button foreground color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/prompt-wm.jl:50
-msgid "Window:"
-msgstr "Fenster:"
+#. ../themes/mxflat/theme.jl
+msgid "  focused clicked button foreground color"
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/prompt-wm.jl:62 ../lisp/sawfish/wm/workspace.jl:982
-#, librep-format
-msgid "Workspace %d"
-msgstr "Arbeitsfläche %d"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"border width (0 - 1000 pixel)\n"
+"\n"
+"set the width border around the window."
+msgstr ""
 
-#: ../lisp/sawfish/wm/util/prompt-wm.jl:76 ../lisp/sawfish/wm/workspace.jl:898
-#: ../lisp/sawfish/wm/workspace.jl:906 ../lisp/sawfish/wm/workspace.jl:914
-msgid "Workspace:"
-msgstr "Arbeitsflächen:"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"border width for maximized windows (0 - 1000 pixel)\n"
+"\n"
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
+"you don't want that, set the border width for maximized windows smaller than "
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/viewport.jl:452 ../lisp/sawfish/wm/viewport.jl:462
-msgid "Column:"
-msgstr "Spalte:"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize border for focused windows (experimental)\n"
+"\n"
+"(NOTE: this works but it is VERY cpu intensive and might slow down your "
+"computer noticably.  So turn it on at your own risk.)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/viewport.jl:453 ../lisp/sawfish/wm/viewport.jl:471
-msgid "Row:"
-msgstr "Zeile"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"border width for focused windows (0 - 1000 pixel)\n"
+"\n"
+"(NOTE: this works but it is VERY cpu intensive and might slow down your "
+"computer noticably.  So turn it on at your own risk.)"
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:137
-msgid "Workspace names"
-msgstr "Namen der Arbeitsflächen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"title-contents border width (0 - 1000 pixel)\n"
+"\n"
+"Sets the widths of the line between titlebar and contents window"
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:154
-msgid "_Insert workspace"
-msgstr "Arbeitsfläche e_infügen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"border offset (-1000 - 1000 pixel)\n"
+"\n"
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
+"small black border around their contents window and this is just ugly when "
+"sawfish draws another border around the window. With a border offset of -1 "
+"the sawfish window border will overlay the gtk2 border exactly."
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:155
-msgid "Select _next workspace"
-msgstr "_Nächste Arbeitsfläche auswählen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"keep window borders and corners at their place when shading a window\n"
+"\n"
+"When shading a window borders and corners will stay where they were and not "
+"merge with the titlebar."
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:156
-msgid "Select _previous workspace"
-msgstr "_Vorherige Arbeitsfläche auswählen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"show window corners\n"
+"\n"
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
+"width but you can adjust them below."
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:157
-msgid "Merge with next"
-msgstr "Mit der nächsten verschmelzen"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"corners length adjustement (-1 - 100 pixel)\n"
+"\n"
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:158
-msgid "Merge with previous"
-msgstr "Mit der vorherigen verschmelzen"
+#. ../themes/mxflat/theme.jl
+msgid "outside"
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:159
-msgid "Move workspace _right"
-msgstr "Arbeitsfläche nach _rechts verschieben"
+#. ../themes/mxflat/theme.jl
+msgid "inside"
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:160
-msgid "Move workspace _left"
-msgstr "Arbeitsfläche nach _links verschieben"
+#. ../themes/mxflat/theme.jl
+msgid "corner direction"
+msgstr ""
 
-#: ../lisp/sawfish/wm/workspace.jl:643
-#, librep-format
-msgid "space %d"
-msgstr "Fläche %d"
+#. ../themes/mxflat/theme.jl
+msgid ""
+"corners width adjustement (0 - 100 pixel)\n"
+"\n"
+"This option makes the window corners broader. with a border width of 1 pixel "
+"it is hard to grab this 1 pixel corner to be able to resize the window in "
+"two directions; thus, make it bigger."
+msgstr ""
 
-#: ../scripts/sawfish-about.jl.in:49
-msgid "and many others..."
-msgstr "und viele andere â?¦"
+#. ../themes/mxflat/theme.jl
+msgid "corners width adjustement for maximized windows (0 - 100 pixel)"
+msgstr ""
 
-#: ../scripts/sawfish-about.jl.in:50
-msgid "Sawfish manages your windows extensibly."
-msgstr "Sawfish verwaltet Ihre Fenster und ist vielfältig erweiterbar."
+#. ../themes/mxflat/theme.jl
+msgid ""
+"fake shadow (experimental)\n"
+"\n"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
+msgstr ""
 
-#: ../scripts/sawfish-about.jl.in:55
-msgid "Sawfish homepage"
-msgstr "Sawfish-Homepage"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "fake shadow only on focused windows"
+msgstr "Bild der Leiste für nicht fokussierte Fenster."
 
-#~ msgid "Crux Theme"
-#~ msgstr "Thema Crux"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "north"
+msgstr "nicht"
 
-#~ msgid ""
-#~ "Accent color for focused windows (if unset uses the GTK+ selection color)."
-#~ msgstr ""
-#~ "Akzentfarbe für fokussierte Fenster (wenn nicht gesetzt, GTK+-"
-#~ "Markierungsfarbe verwenden)."
+#. ../themes/mxflat/theme.jl
+msgid "east"
+msgstr ""
 
-#~ msgid "Display the window's icon in its menu button."
-#~ msgstr "Icon des Fensters in seinem Menüknopf anzeigen."
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "south"
+msgstr "nicht"
 
-#~ msgid "Display title buttons to mimic: \\w"
-#~ msgstr "Titelknöpfe ahmen folgenden Stil nach: \\w"
+#. ../themes/mxflat/theme.jl
+msgid "west"
+msgstr ""
 
-#~ msgid "Gradient Theme"
-#~ msgstr "Thema Verlauf"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "north-east"
+msgstr "nicht"
 
-#~ msgid "horizontal"
-#~ msgstr "horizontal"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "north-west"
+msgstr "nicht"
 
-#~ msgid "vertical"
-#~ msgstr "vertikal"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "south-east"
+msgstr "nicht"
 
-#~ msgid "diagonal"
-#~ msgstr "diagonal"
+#. ../themes/mxflat/theme.jl
+#, fuzzy
+msgid "south-west"
+msgstr "nicht"
 
-#~ msgid "Direction of gradient in `gradient' frame style."
-#~ msgstr "Richtung des Farbverlaufs beim »Farbverlauf«-Rahmenstil."
+#. ../themes/mxflat/theme.jl
+msgid ""
+"fake shadow light source\n"
+"\n"
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
+msgstr ""
 
-#~ msgid "`From' color of inactive frames in `gradient' frame style."
-#~ msgstr "»Ursprungsfarbe« inaktiver Rahmen im »Farbverlauf«-Rahmenstil."
+#. ../themes/mxflat/theme.jl
+msgid ""
+"fake shadow light distance (0 - 100)\n"
+"\n"
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
+"'side' shadows be."
+msgstr ""
 
-#~ msgid "`To' color of inactive frames in `gradient' frame style."
-#~ msgstr "»Zielfarbe« inaktiver Rahmen im »Farbverlauf«-Rahmenstil."
+#. ../themes/mxflat/theme.jl
+msgid "fake shadow width (0 - 100 pixel)"
+msgstr ""
 
-#~ msgid "`From' color of active frames in `gradient' frame style."
-#~ msgstr "»Ursprungsfarbe« aktiver Rahmen im »Farbverlauf«-Rahmenstil."
+#. ../themes/mxflat/theme.jl
+msgid "shadow color"
+msgstr ""
 
-#~ msgid "`To' color of active frames in `gradient' frame style."
-#~ msgstr "»Zielfarbe« aktiver Rahmen im »Farbverlauf«-Rahmenstil."
+#. ../themes/mxflat/theme.jl
+msgid ""
+"customize border colors\n"
+"\n"
+"You can customize your border colors here. If you deactivate this, these "
+"colors will be set to the focused title string color."
+msgstr ""
 
-#~ msgid "Use less memory when creating gradients, possibly affecting quality."
-#~ msgstr ""
-#~ "Beim Erstellen von Farbverläufen weniger Speicher verbrauchen (vermutlich "
-#~ "niedrigere Qualität)."
+#. ../themes/mxflat/theme.jl
+msgid "  focused border color"
+msgstr ""
 
-#~ msgid "Mono Theme"
-#~ msgstr "Thema Mono"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused border color"
+msgstr ""
 
-#~ msgid "Color of inactive frames (if unset use GTK+ background color)."
-#~ msgstr ""
-#~ "Farbe der inaktiven Rahmen (wenn nicht gesetzt, GTK+-Hintergrundfarbe "
-#~ "verwenden)."
+#. ../themes/mxflat/theme.jl
+msgid "  focused highlighted border color"
+msgstr ""
 
-#~ msgid "Color of active frames (if unset use GTK+ selection color)."
-#~ msgstr ""
-#~ "Farbe der aktiven Rahmen (wenn nicht gesetzt, GTK+-Markierungsfarbe "
-#~ "verwenden)."
+#. ../themes/mxflat/theme.jl
+msgid "unfocused highlighted border color"
+msgstr ""
 
-#~ msgid "left"
-#~ msgstr "links"
+#. ../themes/mxflat/theme.jl
+msgid "  focused clicked border color"
+msgstr ""
 
-#~ msgid "right"
-#~ msgstr "rechts"
+#. ../themes/mxflat/theme.jl
+msgid "unfocused clicked border color"
+msgstr ""
 
-#~ msgid "center"
-#~ msgstr "Mitte"
+#. ../themes/simple/theme.jl
+msgid "Simple Theme"
+msgstr "Thema Einfach"
 
-#~ msgid "Text is \\w justified in window titles."
-#~ msgstr "Text in Fenstertiteln ist \\w -ausgerichtet"
+#. ../themes/simple/theme.jl
+msgid "Color of inactive frames in `simple' frame style."
+msgstr "Farbe der inaktiven Rahmen beim »einfachen« Rahmenstil."
 
-#, fuzzy
-#~ msgid "title"
-#~ msgstr "Zustand"
+#. ../themes/simple/theme.jl
+msgid "Color of active frames in `simple' frame style."
+msgstr "Farbe der aktiven Rahmen beim »einfachen« Rahmenstil."
 
-#, fuzzy
-#~ msgid "gradient"
-#~ msgstr "Dialoge"
+#. ../themes/smaker/theme.jl
+msgid "SMaker Theme"
+msgstr "Thema SMaker"
 
-#, fuzzy
-#~ msgid "colors"
-#~ msgstr "Farbe wählen"
+#. ../themes/smaker/theme.jl
+msgid "Use black-on-white button images."
+msgstr "Schwarz-Wei�-Bilder für die Knöpfe verwenden."
 
-#, fuzzy
-#~ msgid "positions 1"
-#~ msgstr "Position"
+#. ../themes/smaker/theme.jl
+msgid "Color to use when drawing text."
+msgstr "Farbe für das Zeichnen von Text."
 
-#, fuzzy
-#~ msgid "positions 2"
-#~ msgstr "Position"
+#. ../themes/smaker/theme.jl
+msgid "Bar image for unfocused windows."
+msgstr "Bild der Leiste für nicht fokussierte Fenster."
 
-#, fuzzy
-#~ msgid "borders"
-#~ msgstr "Oberer Rahmen"
+#. ../themes/smaker/theme.jl
+msgid "Bar image for focused windows."
+msgstr "Bild der Leiste für fokussierte Fenster."
 
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Normal"
+#. ../themes/smaker/theme.jl
+msgid "Bar image for highlighted parts."
+msgstr "Bild der Leiste für hervorgehobene Teile."
 
-#~ msgid "all"
-#~ msgstr "alle"
+#. ../themes/smaker/theme.jl
+msgid "Bar image for clicked parts."
+msgstr "Bild der Leiste für geklickte Teile"
 
-#~ msgid "none"
-#~ msgstr "nichts"
+#. ../themes/smaker/theme.jl
+msgid "Height of title bar."
+msgstr "Höhe der Titelleiste."
 
-#, fuzzy
-#~ msgid "real-center"
-#~ msgstr "Mitte"
+#. ../themes/smaker/theme.jl
+msgid "Width of window border."
+msgstr "Breite des Fensterrahmens."
 
-#, fuzzy
-#~ msgid "top"
-#~ msgstr "Anpassen"
+#. ../themes/smaker/theme.jl
+msgid "Border width of bar images."
+msgstr "Rahmenbreite der Leistenbilder."
 
-#, fuzzy
-#~ msgid "bottom"
-#~ msgstr "nicht"
+#. ../lisp/sawfish/cfg/apply.jl
+#, c-format
+msgid "While changing %s:"
+msgstr "Beim Ã?ndern von %s:"
 
-#, fuzzy
-#~ msgid "custom"
-#~ msgstr "Anpassen"
+#. ../lisp/sawfish/cfg/apply.jl
+msgid "Sawfish Error"
+msgstr "Sawfish-Fehler"
 
-#, fuzzy
-#~ msgid "reverse colors"
-#~ msgstr "Farbe wählen"
+#. ../lisp/sawfish/cfg/layouts/keymaps.jl
+msgid "Context:"
+msgstr "Zusammenhang:"
 
-#, fuzzy
-#~ msgid "default-9"
-#~ msgstr "Vorgabe"
+#. ../lisp/sawfish/cfg/shell.jl
+msgid "Sawfish Configurator"
+msgstr "Sawfish-Einstellungen"
 
-#, fuzzy
-#~ msgid "default-12"
-#~ msgstr "Vorgabe"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+#. ../lisp/sawfish/wm/commands.jl
+#. ../lisp/sawfish/cfg/widgets/keymap.jl
+#. ../lisp/sawfish/cfg/widgets/command.jl
+msgid "Command"
+msgstr "Befehl"
 
-#, fuzzy
-#~ msgid "ball-9"
-#~ msgstr "alle"
+#. ../lisp/sawfish/cfg/widgets/command.jl
+msgid "Undocumented"
+msgstr "Undokumentiert"
 
-#, fuzzy
-#~ msgid "ball-12"
-#~ msgstr "alle"
+#. ../lisp/sawfish/cfg/widgets/match-window.jl
+#. ../lisp/sawfish/cfg/widgets/event.jl
+msgid "Grab..."
+msgstr "Erfassen â?¦"
 
-#, fuzzy
-#~ msgid "menu button position"
-#~ msgstr "An _Position erinnern"
+#. ../lisp/sawfish/cfg/widgets/workspace-geometry.jl
+#. ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
+msgid "Workspaces:"
+msgstr "Arbeitsflächen:"
 
-#, fuzzy
-#~ msgid "shade button position"
-#~ msgstr "Einrollknopf-Tastenbewegung"
+#. ../lisp/sawfish/cfg/widgets/workspace-geometry.jl
+#. ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
+msgid "Columns:"
+msgstr "Spalten:"
 
-#, fuzzy
-#~ msgid "iconify button position"
-#~ msgstr "Minimierknopf-Tastenbelegung"
+#. ../lisp/sawfish/cfg/widgets/workspace-geometry.jl
+#. ../lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
+msgid "Rows:"
+msgstr "Zeilen:"
 
-#, fuzzy
-#~ msgid "maximize button position"
-#~ msgstr "Maximierknopf-Tastenbelegung"
+#. ../lisp/sawfish/cfg/widgets/keymap.jl
+msgid "Edit Binding"
+msgstr "Tastenkombination editieren"
 
-#, fuzzy
-#~ msgid "close button position"
-#~ msgstr "SchlieÃ?knopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/alist.jl
+#. ../lisp/sawfish/cfg/widgets/keymap.jl
+msgid "Key"
+msgstr "Taste"
 
-#, fuzzy
-#~ msgid "sticky button position"
-#~ msgstr "Minimierknopf-Tastenbelegung"
+#. ../lisp/sawfish/cfg/widgets/keymap.jl
+msgid "Key:"
+msgstr "Taste:"
 
-#, fuzzy
-#~ msgid "previous workspace button position"
-#~ msgstr "Vorheriges Fenster auf der Arbeitsfläche"
+#. ../lisp/sawfish/cfg/widgets/match-window.jl
+msgid "Matchers"
+msgstr "Muster"
 
-#, fuzzy
-#~ msgid "next workspace button position"
-#~ msgstr "Nächstes Fenster auf der Arbeitsfläche"
+#. ../lisp/sawfish/cfg/widgets/match-window.jl
+msgid "Actions"
+msgstr "Aktionen"
 
-#, fuzzy
-#~ msgid "configure button position"
-#~ msgstr "Minimierknopf-Tastenbelegung"
+#. ../lisp/sawfish/cfg/widgets/match-window.jl
+msgid "not"
+msgstr "nicht"
 
-#, fuzzy
-#~ msgid "info button position"
-#~ msgstr "Position in Fensterchronik speichern"
+#. ../lisp/sawfish/cfg/widgets/match-window.jl
+msgid "Match Window Properties"
+msgstr "Fenstereigenschaften mit Muster vergleichen"
 
-#, fuzzy
-#~ msgid "always-on-top button position"
-#~ msgstr "Position in Fensterchronik speichern"
+#. ../lisp/sawfish/gtk/widget.jl
+#, c-format
+msgid "No matching item for %S"
+msgstr "Kein auf %S passender Eintrag"
 
-#, fuzzy
-#~ msgid "lock button position"
-#~ msgstr "SchlieÃ?knopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widget.jl
+msgid "** unknown widget **  "
+msgstr "** unbekanntes Widget **"
 
-#, fuzzy
-#~ msgid "mxflat:sticky-button-keymap"
-#~ msgstr "Minimierknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/alist.jl
+msgid "Value"
+msgstr "Wert"
 
-#, fuzzy
-#~ msgid "mxflat:previous-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/font.jl
+#. ../lisp/sawfish/gtk/widgets/file.jl
+msgid "Browse..."
+msgstr "Auswählen �"
 
-#, fuzzy
-#~ msgid "mxflat:next-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/file.jl
+msgid "Select file"
+msgstr "Datei wählen"
 
-#, fuzzy
-#~ msgid "mxflat:configure-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/font.jl
+msgid "Select font"
+msgstr "Schrift wählen"
 
-#, fuzzy
-#~ msgid "mxflat:info-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/list.jl
+msgid "Add..."
+msgstr "Hinzufügen �"
 
-#, fuzzy
-#~ msgid "mxflat:always-on-top-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/list.jl
+msgid "Delete"
+msgstr "Löschen"
 
-#, fuzzy
-#~ msgid "mxflat:lock-button-keymap"
-#~ msgstr "SchlieÃ?knopf-Tastenbelegung"
+#. ../lisp/sawfish/gtk/widgets/list.jl
+msgid "Edit..."
+msgstr "Bearbeiten â?¦"
 
-#, fuzzy
-#~ msgid "fake shadow only on focused windows"
-#~ msgstr "Bild der Leiste für nicht fokussierte Fenster."
+#. ../lisp/sawfish/gtk/widgets/list.jl
+msgid "Add:"
+msgstr "Hinzufügen:"
 
-#, fuzzy
-#~ msgid "north"
-#~ msgstr "nicht"
+#. ../lisp/sawfish/gtk/widgets/list.jl
+msgid "Edit:"
+msgstr "Bearbeiten:"
 
-#, fuzzy
-#~ msgid "south"
-#~ msgstr "nicht"
+#. ../lisp/sawfish/gtk/widgets/scheme-boolean.jl
+msgid "Yes"
+msgstr "Ja"
 
-#, fuzzy
-#~ msgid "north-east"
-#~ msgstr "nicht"
+#. ../lisp/sawfish/gtk/widgets/scheme-boolean.jl
+msgid "No"
+msgstr "Nein"
 
-#, fuzzy
-#~ msgid "north-west"
-#~ msgstr "nicht"
+#. ../lisp/sawfish/wm/animation/outline.jl
+msgid "Animation Outline Coordinates"
+msgstr ""
 
+#. ../lisp/sawfish/wm/animation/outline.jl
 #, fuzzy
-#~ msgid "south-east"
-#~ msgstr "nicht"
+msgid "Animation Steps"
+msgstr "Aktionen"
 
+#. ../lisp/sawfish/wm/animation/outline.jl
 #, fuzzy
-#~ msgid "south-west"
-#~ msgstr "nicht"
-
-#~ msgid "Simple Theme"
-#~ msgstr "Thema Einfach"
-
-#~ msgid "Color of inactive frames in `simple' frame style."
-#~ msgstr "Farbe der inaktiven Rahmen beim »einfachen« Rahmenstil."
-
-#~ msgid "Color of active frames in `simple' frame style."
-#~ msgstr "Farbe der aktiven Rahmen beim »einfachen« Rahmenstil."
-
-#~ msgid "SMaker Theme"
-#~ msgstr "Thema SMaker"
-
-#~ msgid "Use black-on-white button images."
-#~ msgstr "Schwarz-Wei�-Bilder für die Knöpfe verwenden."
-
-#~ msgid "Color to use when drawing text."
-#~ msgstr "Farbe für das Zeichnen von Text."
-
-#~ msgid "Bar image for unfocused windows."
-#~ msgstr "Bild der Leiste für nicht fokussierte Fenster."
-
-#~ msgid "Bar image for focused windows."
-#~ msgstr "Bild der Leiste für fokussierte Fenster."
-
-#~ msgid "Bar image for highlighted parts."
-#~ msgstr "Bild der Leiste für hervorgehobene Teile."
-
-#~ msgid "Bar image for clicked parts."
-#~ msgstr "Bild der Leiste für geklickte Teile"
+msgid "Animation Delay"
+msgstr "Aktionen"
 
-#~ msgid "Height of title bar."
-#~ msgstr "Höhe der Titelleiste."
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Grow, Pack, Shrink & Yank"
+msgstr ""
 
-#~ msgid "Width of window border."
-#~ msgstr "Breite des Fensterrahmens."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Window Cycling"
+msgstr "Durchwechseln durch Fenster"
 
-#~ msgid "Border width of bar images."
-#~ msgstr "Rahmenbreite der Leistenbilder."
+#. ../lisp/sawfish/wm/tabs/tab.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Tabs"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Animation Steps"
-#~ msgstr "Aktionen"
+#. ../lisp/sawfish/wm/ext/audio-events.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Sound"
+msgstr "Klang"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
+#. ../lisp/sawfish/wm/autoload.jl
 #, fuzzy
-#~ msgid "Animation Delay"
-#~ msgstr "Aktionen"
+msgid "Window Rules"
+msgstr "_Fenster"
 
-#~ msgid "Window Cycling"
-#~ msgstr "Durchwechseln durch Fenster"
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Tooltips"
+msgstr "Minihilfen"
 
-#~ msgid "Sound"
-#~ msgstr "Klang"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "History"
+msgstr "Chronik"
 
-#, fuzzy
-#~ msgid "Window Rules"
-#~ msgstr "_Fenster"
+#. ../lisp/sawfish/wm/util/prompt.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Messages"
+msgstr ""
 
-#~ msgid "Tooltips"
-#~ msgstr "Minihilfen"
+#. ../lisp/sawfish/wm/commands/viewport-linear.jl
+#. ../lisp/sawfish/wm/autoload.jl
+msgid "Index:"
+msgstr "Index:"
 
-#~ msgid "History"
-#~ msgstr "Chronik"
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Next workspace window"
+msgstr "Nächstes Fenster auf der Arbeitsfläche"
 
-#~ msgid "Next workspace window"
-#~ msgstr "Nächstes Fenster auf der Arbeitsfläche"
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Select the next window of the current workspace."
+msgstr "Das nächste Fenster der aktuellen Arbeitsfläche auswählen."
 
-#~ msgid "Select the next window of the current workspace."
-#~ msgstr "Das nächste Fenster der aktuellen Arbeitsfläche auswählen."
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Previous workspace window"
+msgstr "Vorheriges Fenster auf der Arbeitsfläche"
 
-#~ msgid "Previous workspace window"
-#~ msgstr "Vorheriges Fenster auf der Arbeitsfläche"
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Focus on the previous window of the current workspace."
+msgstr "Auf das vorherige Fenster der aktuellen Arbeitsfläche fokussieren."
 
-#~ msgid "Focus on the previous window of the current workspace."
-#~ msgstr "Auf das vorherige Fenster der aktuellen Arbeitsfläche fokussieren."
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Next window"
+msgstr "Nächstes Fenster"
 
-#~ msgid "Next window"
-#~ msgstr "Nächstes Fenster"
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Select the next window, cycling through all possible workspaces."
+msgstr ""
+"Das nächste Fenster auswählen, dabei alle möglichen Arbeitsflächen\n"
+"berücksichtigen."
 
-#~ msgid "Select the next window, cycling through all possible workspaces."
-#~ msgstr ""
-#~ "Das nächste Fenster auswählen, dabei alle möglichen Arbeitsflächen\n"
-#~ "berücksichtigen."
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Previous window"
+msgstr "Vorheriges Fenster"
 
-#~ msgid "Previous window"
-#~ msgstr "Vorheriges Fenster"
+#. ../lisp/sawfish/wm/commands/cycle.jl
+msgid "Select the previous window, cycling through all possible workspaces."
+msgstr ""
+"Das vorherige Fenster auswählen, dabei alle möglichen Arbeitsflächen\n"
+"berücksichtigen."
 
-#~ msgid "Select the previous window, cycling through all possible workspaces."
-#~ msgstr ""
-#~ "Das vorherige Fenster auswählen, dabei alle möglichen Arbeitsflächen\n"
-#~ "berücksichtigen."
+#. ../lisp/sawfish/wm/commands/describe.jl
+msgid "Describe symbol"
+msgstr "Symbol beschreiben"
 
-#~ msgid "Describe symbol"
-#~ msgstr "Symbol beschreiben"
+#. ../lisp/sawfish/wm/commands/describe.jl
+msgid "Display the documentation of a specified symbol."
+msgstr "Die Dokumentation eines angegebenen Symbols anzeigen."
 
-#~ msgid "Display the documentation of a specified symbol."
-#~ msgstr "Die Dokumentation eines angegebenen Symbols anzeigen."
+#. ../lisp/sawfish/wm/commands/describe.jl
+msgid "Apropos function"
+msgstr "Funktionen-Apropos"
 
-#~ msgid "Apropos function"
-#~ msgstr "Funktionen-Apropos"
+#. ../lisp/sawfish/wm/commands/describe.jl
+msgid "Apropos variable"
+msgstr "Variablen-Apropos"
 
-#~ msgid "Apropos variable"
-#~ msgstr "Variablen-Apropos"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Iconify group"
+msgstr "Gruppe minimieren"
 
-#~ msgid "Iconify group"
-#~ msgstr "Gruppe minimieren"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Uniconify group"
+msgstr "Gruppe wiederherstellen"
 
-#~ msgid "Uniconify group"
-#~ msgstr "Gruppe wiederherstellen"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Iconify transient group"
+msgstr "Dialoggruppe minimieren"
 
-#~ msgid "Iconify transient group"
-#~ msgstr "Dialoggruppe minimieren"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Uniconify transientgroup"
+msgstr "Dialoggruppe wiederherstellen"
 
-#~ msgid "Uniconify transientgroup"
-#~ msgstr "Dialoggruppe wiederherstellen"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Make group sticky"
+msgstr "Gruppe ankleben"
 
-#~ msgid "Make group sticky"
-#~ msgstr "Gruppe ankleben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Make group unsticky"
+msgstr "Gruppe ablösen"
 
-#~ msgid "Make group unsticky"
-#~ msgstr "Gruppe ablösen"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Toggle group sticky"
+msgstr "Gruppe ankleben ein/aus"
 
-#~ msgid "Toggle group sticky"
-#~ msgstr "Gruppe ankleben ein/aus"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Send group to current workspace"
+msgstr "Gruppe auf aktuelle Arbeitsfläche schicken"
 
-#~ msgid "Send group to current workspace"
-#~ msgstr "Gruppe auf aktuelle Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Send group to next workspace"
+msgstr "Gruppe auf nächste Arbeitsfläche schicken"
 
-#~ msgid "Send group to next workspace"
-#~ msgstr "Gruppe auf nächste Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Send group to previous workspace"
+msgstr "Gruppe auf vorherige Arbeitsfläche schicken"
 
-#~ msgid "Send group to previous workspace"
-#~ msgstr "Gruppe auf vorherige Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Move group to current viewport"
+msgstr "Gruppe in das aktuelle Sichtfeld verschieben"
 
-#~ msgid "Move group to current viewport"
-#~ msgstr "Gruppe in das aktuelle Sichtfeld verschieben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Move group left"
+msgstr "Gruppe nach links verschieben"
 
-#~ msgid "Move group left"
-#~ msgstr "Gruppe nach links verschieben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Move group right"
+msgstr "Gruppe nach rechts verschieben"
 
-#~ msgid "Move group right"
-#~ msgstr "Gruppe nach rechts verschieben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Move group up"
+msgstr "Gruppe nach oben verschieben"
 
-#~ msgid "Move group up"
-#~ msgstr "Gruppe nach oben verschieben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Move group down"
+msgstr "Gruppe nach unten verschieben"
 
-#~ msgid "Move group down"
-#~ msgstr "Gruppe nach unten verschieben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Raise group"
+msgstr "Gruppe anheben"
 
-#~ msgid "Raise group"
-#~ msgstr "Gruppe anheben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Lower group"
+msgstr "Gruppe absenken"
 
-#~ msgid "Lower group"
-#~ msgstr "Gruppe absenken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Raise lower group"
+msgstr "Gruppe anheben/absenken"
 
-#~ msgid "Raise lower group"
-#~ msgstr "Gruppe anheben/absenken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Raise group depth"
+msgstr "Gruppentiefe anheben"
 
-#~ msgid "Raise group depth"
-#~ msgstr "Gruppentiefe anheben"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Lower group depth"
+msgstr "Gruppentiefe absenken"
 
-#~ msgid "Lower group depth"
-#~ msgstr "Gruppentiefe absenken"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Delete group"
+msgstr "Gruppe löschen"
 
-#~ msgid "Delete group"
-#~ msgstr "Gruppe löschen"
+#. ../lisp/sawfish/wm/commands/groups.jl
+msgid "Delete all windows in the group that the current window is a member of."
+msgstr ""
+"Alle Fenster in der Gruppe löschen, zu der das aktuelle Fenster gehört."
 
-#~ msgid ""
-#~ "Delete all windows in the group that the current window is a member of."
-#~ msgstr ""
-#~ "Alle Fenster in der Gruppe löschen, zu der das aktuelle Fenster gehört."
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Whether growing is considered to be maximization."
+msgstr ""
 
-#~ msgid "always"
-#~ msgstr "immer"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "always"
+msgstr "immer"
 
-#~ msgid "maybe"
-#~ msgstr "vielleicht"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "maybe"
+msgstr "vielleicht"
 
-#~ msgid "never"
-#~ msgstr "nie"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "never"
+msgstr "nie"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid "Whether and how to move the pointer."
-#~ msgstr "Das Fenster in das nächste Sichtfeld verschieben."
+msgid "Whether and how to move the pointer."
+msgstr "Das Fenster in das nächste Sichtfeld verschieben."
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid "Whether to bump into fully obscured windows."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem vollständig verdeckten\n"
-#~ "Fenster überschneiden soll."
+msgid "Whether to bump into fully obscured windows."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem vollständig verdeckten\n"
+"Fenster überschneiden soll."
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid "Whether to bump into windows on a different depth."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
-#~ "überschneiden soll."
+msgid "Whether to bump into windows on a different depth."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
+"überschneiden soll."
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid "Whether to bump into ignored windows."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
-#~ "überschneiden soll."
+msgid "Whether to bump into ignored windows."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
+"überschneiden soll."
+
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "The minimum height or width to which a window may be shrunk."
+msgstr ""
 
-#~ msgid "Grow window left"
-#~ msgstr "Fenster nach links aufweiten"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "The minimum amount of window left visible, if yanked over the edge."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Grow window left"
+msgstr "Fenster nach links aufweiten"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Grows window to the left until it `bumps into' another window.\n"
-#~ "See `grow-window-up'."
-#~ msgstr ""
-#~ "Fenster nach links aufweiten, bis es an ein anderes stö�t.\n"
-#~ "Siehe »Fenster aufweiten«."
+msgid ""
+"Grows window to the left until it `bumps into' another window.\n"
+"See `grow-window-up'."
+msgstr ""
+"Fenster nach links aufweiten, bis es an ein anderes stö�t.\n"
+"Siehe »Fenster aufweiten«."
 
-#~ msgid "Grow window right"
-#~ msgstr "Fenster nach rechts aufweiten"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Grow window right"
+msgstr "Fenster nach rechts aufweiten"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Grows window to the right until it `bumps into' another window.\n"
-#~ "See `grow-window-up'."
-#~ msgstr ""
-#~ "Fenster nach rechts aufweiten, bis es an ein anderes stö�t.\n"
-#~ "Siehe »Fenster aufweiten«."
+msgid ""
+"Grows window to the right until it `bumps into' another window.\n"
+"See `grow-window-up'."
+msgstr ""
+"Fenster nach rechts aufweiten, bis es an ein anderes stö�t.\n"
+"Siehe »Fenster aufweiten«."
 
-#~ msgid "Grow window up"
-#~ msgstr "Fenster nach oben aufweiten"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Grow window up"
+msgstr "Fenster nach oben aufweiten"
 
-#~ msgid ""
-#~ "Grows window upwards until it `bumps into' another window.\n"
-#~ "If the top edge was beyond the screen edge, it is brought back in.\n"
-#~ "With a universal prefix arg, maximize upwards instead.\n"
-#~ "With a numeric prefix arg, grow upwards by that many increments specified "
-#~ "by\n"
-#~ "window or pixels instead."
-#~ msgstr ""
-#~ "Vergrö�ert das Fenster nach oben, bis sich dieses mit einem\n"
-#~ "anderen Fenster überschneidet.\n"
-#~ "Falls die Oberkante unterhalb des Bildschirmrands war, wird es\n"
-#~ "zurück nach innen gebracht.\n"
-#~ "Mit einem universellen Präfix-Argument wird es stattdessen\n"
-#~ "maximal nach oben vergrö�ert.\n"
-#~ "Mit einem numerischen Präfix-Argument wird es stattdessen\n"
-#~ "um so viele Pixel nach oben vergrö�ert."
-
-#~ msgid "Grow window down"
-#~ msgstr "Fenster nach unten aufweiten"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid ""
+"Grows window upwards until it `bumps into' another window.\n"
+"If the top edge was beyond the screen edge, it is brought back in.\n"
+"With a universal prefix arg, maximize upwards instead.\n"
+"With a numeric prefix arg, grow upwards by that many increments specified "
+"by\n"
+"window or pixels instead."
+msgstr ""
+"Vergrö�ert das Fenster nach oben, bis sich dieses mit einem\n"
+"anderen Fenster überschneidet.\n"
+"Falls die Oberkante unterhalb des Bildschirmrands war, wird es\n"
+"zurück nach innen gebracht.\n"
+"Mit einem universellen Präfix-Argument wird es stattdessen\n"
+"maximal nach oben vergrö�ert.\n"
+"Mit einem numerischen Präfix-Argument wird es stattdessen\n"
+"um so viele Pixel nach oben vergrö�ert."
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Grow window down"
+msgstr "Fenster nach unten aufweiten"
+
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Grows window downwards until it `bumps into' another window.\n"
-#~ "See `grow-window-up'."
-#~ msgstr ""
-#~ "Fenster nach unten aufweiten, bis es auf ein anderes stö�t.\n"
-#~ "Siehe »Fenster aufweiten«."
+msgid ""
+"Grows window downwards until it `bumps into' another window.\n"
+"See `grow-window-up'."
+msgstr ""
+"Fenster nach unten aufweiten, bis es auf ein anderes stö�t.\n"
+"Siehe »Fenster aufweiten«."
 
-#~ msgid "Pack window left"
-#~ msgstr "Fenster nach links packen"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Pack window left"
+msgstr "Fenster nach links packen"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Moves window to the left until it `bumps into' another window.\n"
-#~ "See `pack-window-up'."
-#~ msgstr ""
-#~ "Fenster nach links verschieben, bis es an ein anderes stö�t.\n"
-#~ "Siehe »Fenster packen«."
+msgid ""
+"Moves window to the left until it `bumps into' another window.\n"
+"See `pack-window-up'."
+msgstr ""
+"Fenster nach links verschieben, bis es an ein anderes stö�t.\n"
+"Siehe »Fenster packen«."
 
-#~ msgid "Pack window right"
-#~ msgstr "Fenster nach rechts packen"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Pack window right"
+msgstr "Fenster nach rechts packen"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Moves window to the right until it `bumps into' another window.\n"
-#~ "See `pack-window-up'."
-#~ msgstr ""
-#~ "Fenster nach rechts verschieben, bis es an ein anderes stö�t.\n"
-#~ "Siehe »Fenster packen«."
+msgid ""
+"Moves window to the right until it `bumps into' another window.\n"
+"See `pack-window-up'."
+msgstr ""
+"Fenster nach rechts verschieben, bis es an ein anderes stö�t.\n"
+"Siehe »Fenster packen«."
 
-#~ msgid "Pack window up"
-#~ msgstr "Fenster nach oben packen"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Pack window up"
+msgstr "Fenster nach oben packen"
 
-#~ msgid ""
-#~ "Moves window upwards until it `bumps into' another window.\n"
-#~ "If the top edge was beyond the screen edge, it is moved back in.\n"
-#~ "With a universal prefix arg, move upwards maximally instead.\n"
-#~ "With a numeric prefix arg, move upwards by that many pixels instead."
-#~ msgstr ""
-#~ "Verschiebt das Fenster nach oben, bis sich dieses mit einem\n"
-#~ "anderen Fenster überschneidet.\n"
-#~ "Falls die Oberkante unterhalb des Bildschirmrands war, wird es\n"
-#~ "zurück nach innen verschoben.\n"
-#~ "Mit einem universellen Präfix-Argument wird es stattdessen\n"
-#~ "maximal nach oben verschoben.\n"
-#~ "Mit einem numerischen Präfix-Argument wird es stattdessen\n"
-#~ "um so viele Pixel nach oben verschoben."
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid ""
+"Moves window upwards until it `bumps into' another window.\n"
+"If the top edge was beyond the screen edge, it is moved back in.\n"
+"With a universal prefix arg, move upwards maximally instead.\n"
+"With a numeric prefix arg, move upwards by that many pixels instead."
+msgstr ""
+"Verschiebt das Fenster nach oben, bis sich dieses mit einem\n"
+"anderen Fenster überschneidet.\n"
+"Falls die Oberkante unterhalb des Bildschirmrands war, wird es\n"
+"zurück nach innen verschoben.\n"
+"Mit einem universellen Präfix-Argument wird es stattdessen\n"
+"maximal nach oben verschoben.\n"
+"Mit einem numerischen Präfix-Argument wird es stattdessen\n"
+"um so viele Pixel nach oben verschoben."
 
-#~ msgid "Pack window down"
-#~ msgstr "Fenster nach unten packen"
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
+msgid "Pack window down"
+msgstr "Fenster nach unten packen"
 
+#. ../lisp/sawfish/wm/commands/grow-pack.jl
 #, fuzzy
-#~ msgid ""
-#~ "Moves window downwards until it `bumps into' another window.\n"
-#~ "See `pack-window-up'."
-#~ msgstr ""
-#~ "Fenster nach unten verschieben, bis es an ein anderes stö�t.\n"
-#~ "Siehe »Fenster packen«."
+msgid ""
+"Moves window downwards until it `bumps into' another window.\n"
+"See `pack-window-up'."
+msgstr ""
+"Fenster nach unten verschieben, bis es an ein anderes stö�t.\n"
+"Siehe »Fenster packen«."
 
-#~ msgid "Help show faq"
-#~ msgstr "Hilfe: FAQ zeigen"
+#. ../lisp/sawfish/wm/commands/help.jl
+msgid "Help show faq"
+msgstr "Hilfe: FAQ zeigen"
 
-#~ msgid "Help show news"
-#~ msgstr "Hilfe: Neuigkeiten zeigen"
+#. ../lisp/sawfish/wm/commands/help.jl
+msgid "Help show news"
+msgstr "Hilfe: Neuigkeiten zeigen"
 
-#~ msgid "Help show programmer manual"
-#~ msgstr "Hilfe: Programmiererhandbuch zeigen"
+#. ../lisp/sawfish/wm/commands/help.jl
+msgid "Help show programmer manual"
+msgstr "Hilfe: Programmiererhandbuch zeigen"
 
-#~ msgid "Help show homepage"
-#~ msgstr "Hilfe: Homepage anzeigen"
+#. ../lisp/sawfish/wm/commands/help.jl
+msgid "Help show homepage"
+msgstr "Hilfe: Homepage anzeigen"
 
-#~ msgid "Help about"
-#~ msgstr "Hilfe: Info"
+#. ../lisp/sawfish/wm/commands/help.jl
+msgid "Help about"
+msgstr "Hilfe: Info"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Number of pixels to move pointer in."
-#~ msgstr ""
-#~ "Anzahl von Pixeln beim Bewegen des Zeigers in »move-cursor-«-Befehlen."
+msgid "Number of pixels to move pointer in."
+msgstr "Anzahl von Pixeln beim Bewegen des Zeigers in »move-cursor-«-Befehlen."
 
-#~ msgid "Move cursor right"
-#~ msgstr "Cursor nach rechts verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor right"
+msgstr "Cursor nach rechts verschieben"
 
-#~ msgid "Move the cursor `move-cursor-increment' pixels to the right."
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach rechts verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor `move-cursor-increment' pixels to the right."
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach rechts verschieben."
 
-#~ msgid "Move cursor left"
-#~ msgstr "Cursor nach links verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor left"
+msgstr "Cursor nach links verschieben"
 
-#~ msgid "Move the cursor `move-cursor-increment' pixels to the left."
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor `move-cursor-increment' pixels to the left."
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
 
-#~ msgid "Move cursor up"
-#~ msgstr "Cursor nach oben verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor up"
+msgstr "Cursor nach oben verschieben"
 
-#~ msgid "Move the cursor `move-cursor-increment' pixels upwards."
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach oben verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor `move-cursor-increment' pixels upwards."
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach oben verschieben."
 
-#~ msgid "Move cursor down"
-#~ msgstr "Cursor nach unten verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor down"
+msgstr "Cursor nach unten verschieben"
 
-#~ msgid "Move the cursor `move-cursor-increment' pixels downwards."
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach unten verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor `move-cursor-increment' pixels downwards."
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach unten verschieben."
 
-#~ msgid "Move cursor right fine"
-#~ msgstr "Cursor fein nach rechts verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor right fine"
+msgstr "Cursor fein nach rechts verschieben"
 
-#~ msgid "Move the cursor 1 pixel to the right."
-#~ msgstr "Den Cursor um ein Pixel nach rechts verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor 1 pixel to the right."
+msgstr "Den Cursor um ein Pixel nach rechts verschieben."
 
-#~ msgid "Move cursor left fine"
-#~ msgstr "Cursor fein nach links verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor left fine"
+msgstr "Cursor fein nach links verschieben"
 
-#~ msgid "Move the cursor 1 pixel to the left."
-#~ msgstr "Den Cursor um ein Pixel nach links verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor 1 pixel to the left."
+msgstr "Den Cursor um ein Pixel nach links verschieben."
 
-#~ msgid "Move cursor up fine"
-#~ msgstr "Cursor fein nach oben verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor up fine"
+msgstr "Cursor fein nach oben verschieben"
 
-#~ msgid "Move the cursor 1 pixel upwards."
-#~ msgstr "Den Cursor um ein Pixel nach oben verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor 1 pixel upwards."
+msgstr "Den Cursor um ein Pixel nach oben verschieben."
 
-#~ msgid "Move cursor down fine"
-#~ msgstr "Cursor fein nach unten verschieben"
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move cursor down fine"
+msgstr "Cursor fein nach unten verschieben"
 
-#~ msgid "Move the cursor 1 pixel downwards."
-#~ msgstr "Den Cursor um ein Pixel nach unten verschieben."
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
+msgid "Move the cursor 1 pixel downwards."
+msgstr "Den Cursor um ein Pixel nach unten verschieben."
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor northwest"
-#~ msgstr "Cursor nach rechts verschieben"
+msgid "Move cursor northwest"
+msgstr "Cursor nach rechts verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move the cursor `move-cursor-increment' pixels northwest"
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
+msgid "Move the cursor `move-cursor-increment' pixels northwest"
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor northeast"
-#~ msgstr "Cursor nach rechts verschieben"
+msgid "Move cursor northeast"
+msgstr "Cursor nach rechts verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move the cursor `move-cursor-increment' pixels northeast"
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
+msgid "Move the cursor `move-cursor-increment' pixels northeast"
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor southwest"
-#~ msgstr "Cursor nach links verschieben"
+msgid "Move cursor southwest"
+msgstr "Cursor nach links verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move the cursor `move-cursor-increment' pixels southwest"
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
+msgid "Move the cursor `move-cursor-increment' pixels southwest"
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor southeast"
-#~ msgstr "Cursor nach links verschieben"
+msgid "Move cursor southeast"
+msgstr "Cursor nach links verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move the cursor `move-cursor-increment' pixels southeast"
-#~ msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
+msgid "Move the cursor `move-cursor-increment' pixels southeast"
+msgstr "Den Cursor um »move-cursor-increment« Pixel nach links verschieben."
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor northwest fine"
-#~ msgstr "Cursor fein nach rechts verschieben"
+msgid "Move cursor northwest fine"
+msgstr "Cursor fein nach rechts verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor northeast fine"
-#~ msgstr "Cursor fein nach rechts verschieben"
+msgid "Move cursor northeast fine"
+msgstr "Cursor fein nach rechts verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor southwest fine"
-#~ msgstr "Cursor fein nach links verschieben"
+msgid "Move cursor southwest fine"
+msgstr "Cursor fein nach links verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor southeast fine"
-#~ msgstr "Cursor fein nach links verschieben"
+msgid "Move cursor southeast fine"
+msgstr "Cursor fein nach links verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move cursor center"
-#~ msgstr "Cursor nach links verschieben"
+msgid "Move cursor center"
+msgstr "Cursor nach links verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-cursor.jl
 #, fuzzy
-#~ msgid "Move the cursor to the center of the screen"
-#~ msgstr "Den Cursor um ein Pixel nach links verschieben."
+msgid "Move the cursor to the center of the screen"
+msgstr "Den Cursor um ein Pixel nach links verschieben."
+
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "opaque"
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "box"
+msgstr ""
 
+#. ../lisp/sawfish/wm/window-anim.jl
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "cross"
+msgstr ""
+
+#. ../lisp/sawfish/wm/window-anim.jl
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "elliptical"
-#~ msgstr "vertikal"
+msgid "elliptical"
+msgstr "vertikal"
 
+#. ../lisp/sawfish/wm/window-anim.jl
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "draft"
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "How windows being moved are animated"
-#~ msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
+msgid "How windows being moved are animated"
+msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "How windows being resized are animated"
-#~ msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
+msgid "How windows being resized are animated"
+msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Raise windows when they are moved or resized."
-#~ msgstr "Fenster anheben, wenn sie fokussiert werden."
+msgid "Raise windows when they are moved or resized."
+msgstr "Fenster anheben, wenn sie fokussiert werden."
+
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Show current position of windows while moving."
+msgstr "Aktuelle Position von Fenstern beim Verschieben zeigen."
 
-#~ msgid "Show current position of windows while moving."
-#~ msgstr "Aktuelle Position von Fenstern beim Verschieben zeigen."
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Show current dimensions of windows while resizing."
+msgstr "Aktuelle Ma�e beim �ndern der Grö�e von Fenstern anzeigen."
 
-#~ msgid "Show current dimensions of windows while resizing."
-#~ msgstr "Aktuelle Ma�e beim �ndern der Grö�e von Fenstern anzeigen."
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "region"
+msgstr ""
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "border"
-#~ msgstr "Oberer Rahmen"
+msgid "border"
+msgstr "Oberer Rahmen"
+
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "grab"
+msgstr ""
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "border-grab"
-#~ msgstr "Kanten-Tastenbelegung"
+msgid "border-grab"
+msgstr "Kanten-Tastenbelegung"
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "How to choose window edges when resizing."
-#~ msgstr "Aktuelle Ma�e beim �ndern der Grö�e von Fenstern anzeigen."
+msgid "How to choose window edges when resizing."
+msgstr "Aktuelle Ma�e beim �ndern der Grö�e von Fenstern anzeigen."
 
-#~ msgid ""
-#~ "Distance in pixels before window edges align with each other.\n"
-#~ "\n"
-#~ "When moving a window, this option lets you align one of its edges with an "
-#~ "edge of another window."
-#~ msgstr ""
-#~ "Abstand in Pixeln bevor sich die Fensterkanten gegenseitig ausrichten.\n"
-#~ "\n"
-#~ "Wenn ein Fenster bewegt wird, lässt die Option eines seiner Kanten mit "
-#~ "einer Kante eines anderen Fensters ausrichten gegenseitig ausrichten."
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid ""
+"Distance in pixels before window edges align with each other.\n"
+"\n"
+"When moving a window, this option lets you align one of its edges with an "
+"edge of another window."
+msgstr ""
+"Abstand in Pixeln bevor sich die Fensterkanten gegenseitig ausrichten.\n"
+"\n"
+"Wenn ein Fenster bewegt wird, lässt die Option eines seiner Kanten mit einer "
+"Kante eines anderen Fensters ausrichten gegenseitig ausrichten."
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Move window center"
-#~ msgstr "Fenster in nächstes verschieben"
+msgid "Move window center"
+msgstr "Fenster in nächstes verschieben"
 
-#~ msgid "Move window interactively"
-#~ msgstr "Fenster interaktiv verschieben"
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Move window interactively"
+msgstr "Fenster interaktiv verschieben"
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Move the window interactively, with mouse or keyboard."
-#~ msgstr "Das Fenster interaktiv mit der Maus verschieben."
+msgid "Move the window interactively, with mouse or keyboard."
+msgstr "Das Fenster interaktiv mit der Maus verschieben."
 
-#~ msgid "Resize window interactively"
-#~ msgstr "Fenstergrö�e interaktiv verändern"
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Resize window interactively"
+msgstr "Fenstergrö�e interaktiv verändern"
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Resize the window interactively, with mouse or keyboard."
-#~ msgstr "Die Fenstergrö�e interaktiv mit der Maus verändern."
+msgid "Resize the window interactively, with mouse or keyboard."
+msgstr "Die Fenstergrö�e interaktiv mit der Maus verändern."
 
-#~ msgid "Move selected window"
-#~ msgstr "Ausgewähltes Fenster bewegen"
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Move selected window"
+msgstr "Ausgewähltes Fenster bewegen"
 
-#~ msgid ""
-#~ "Wait for the user to select a window, then interactively move that window."
-#~ msgstr ""
-#~ "Den Benutzer ein Fenster auswählen lassen, dieses dann interaktiv "
-#~ "verschieben."
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
+msgid ""
+"Wait for the user to select a window, then interactively move\n"
+"that window."
+msgstr ""
+"Den Benutzer ein Fenster auswählen lassen, dieses dann interaktiv "
+"verschieben."
 
-#~ msgid "Resize selected window"
-#~ msgstr "Ausgewähltes Fenster in der Grö�e ändern"
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+msgid "Resize selected window"
+msgstr "Ausgewähltes Fenster in der Grö�e ändern"
 
-#~ msgid ""
-#~ "Wait for the user to select a window, then interactively resize that "
-#~ "window."
-#~ msgstr ""
-#~ "Den Benutzer ein Fenster auswählen lassen, dieses dann interaktiv mit der "
-#~ "Maus in der Grö�e ändern."
+#. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
+msgid ""
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
+msgstr ""
+"Den Benutzer ein Fenster auswählen lassen, dieses dann interaktiv mit der "
+"Maus in der Grö�e ändern."
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Double window size"
-#~ msgstr "Fenster ankleben ein/aus"
+msgid "Double window size"
+msgstr "Fenster ankleben ein/aus"
 
+#. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
-#~ msgid "Halve window size"
-#~ msgstr "Fenster ankleben"
+msgid "Halve window size"
+msgstr "Fenster ankleben"
 
-#~ msgid "Raise and pass through click"
-#~ msgstr "Anheben und Klick durchreichen"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise and pass through click"
+msgstr "Anheben und Klick durchreichen"
 
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
 #, fuzzy
-#~ msgid ""
-#~ "Raise the window that received the current event, then replay any "
-#~ "pointer\n"
-#~ "events that invoked the command."
-#~ msgstr ""
-#~ "Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
-#~ "flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
-#~ "den Befehl aufgerufen haben."
+msgid ""
+"Raise the window that received the current event, then replay any pointer\n"
+"events that invoked the command."
+msgstr ""
+"Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
+"flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
+"den Befehl aufgerufen haben."
 
-#~ msgid "Raise and pass through click if focused"
-#~ msgstr "Anheben und Klick durchreichen wenn fokussiert"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise and pass through click if focused"
+msgstr "Anheben und Klick durchreichen wenn fokussiert"
 
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
 #, fuzzy
-#~ msgid ""
-#~ "Raise the window that received the current event (if it's focused), then\n"
-#~ "replay any pointer events that invoked the command."
-#~ msgstr ""
-#~ "Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
-#~ "flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
-#~ "den Befehl aufgerufen haben."
+msgid ""
+"Raise the window that received the current event (if it's focused), then\n"
+"replay any pointer events that invoked the command."
+msgstr ""
+"Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
+"flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
+"den Befehl aufgerufen haben."
 
-#~ msgid "Raise or pass through click"
-#~ msgstr "Anheben oder Klick durchreichen"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise or pass through click"
+msgstr "Anheben oder Klick durchreichen"
 
-#~ msgid "Raise window and pass through click"
-#~ msgstr "Fenster anheben und Klick durchreichen"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise window and pass through click"
+msgstr "Fenster anheben und Klick durchreichen"
 
-#~ msgid "Raise group and pass through click"
-#~ msgstr "Gruppe anheben und Klick durchreichen"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise group and pass through click"
+msgstr "Gruppe anheben und Klick durchreichen"
 
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
 #, fuzzy
-#~ msgid ""
-#~ "Raise the group of windows that received the current event, then replay\n"
-#~ "any pointer events that invoked the command."
-#~ msgstr ""
-#~ "Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
-#~ "flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
-#~ "den Befehl aufgerufen haben."
+msgid ""
+"Raise the group of windows that received the current event, then replay\n"
+"any pointer events that invoked the command."
+msgstr ""
+"Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
+"flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
+"den Befehl aufgerufen haben."
 
-#~ msgid "Raise transients and pass through click"
-#~ msgstr "Dialoge anheben und Klick durchreichen"
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid "Raise transients and pass through click"
+msgstr "Dialoge anheben und Klick durchreichen"
 
-#~ msgid ""
-#~ "Raise the window that received the current event and any transients it\n"
-#~ "has, then replay any pointer events that invoked the command."
-#~ msgstr ""
-#~ "Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
-#~ "flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
-#~ "den Befehl aufgerufen haben."
+#. ../lisp/sawfish/wm/commands/raise-commands.jl
+msgid ""
+"Raise the window that received the current event and any transients it\n"
+"has, then replay any pointer events that invoked the command."
+msgstr ""
+"Das Fenster, das das aktuelle Ereignis erhalten hat, mit allen seinen\n"
+"flüchtigen Kindern anheben, dann alle Zeigerereignisse abspielen, die\n"
+"den Befehl aufgerufen haben."
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Shrink window left"
-#~ msgstr "Fenster nach links schieben"
+msgid "Shrink window left"
+msgstr "Fenster nach links schieben"
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Shrink window right"
-#~ msgstr "Fenster nach rechts schieben"
+msgid "Shrink window right"
+msgstr "Fenster nach rechts schieben"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Shrink window up"
-#~ msgstr "Fenster nach oben schieben"
+msgid "Shrink window up"
+msgstr "Fenster nach oben schieben"
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Shrink window down"
-#~ msgstr "Fenster nach unten schieben"
+msgid "Shrink window down"
+msgstr "Fenster nach unten schieben"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Yank window left"
-#~ msgstr "Fenster nach links packen"
+msgid "Yank window left"
+msgstr "Fenster nach links packen"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Yank window right"
-#~ msgstr "Fenster nach rechts packen"
+msgid "Yank window right"
+msgstr "Fenster nach rechts packen"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Yank window up"
-#~ msgstr "Fenster nach oben packen"
+msgid "Yank window up"
+msgstr "Fenster nach oben packen"
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
-#~ msgid "Yank window down"
-#~ msgstr "Fenster nach unten packen"
+msgid "Yank window down"
+msgstr "Fenster nach unten packen"
 
-#~ msgid "Size window add row"
-#~ msgstr "Fenster um eine Zeile vergrö�ern"
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
 
-#~ msgid "Increase the size of the current window by one row."
-#~ msgstr "Das aktuelle Fenster um eine Zeile vergrö�ern."
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Size window add row"
+msgstr "Fenster um eine Zeile vergrö�ern"
 
-#~ msgid "Size window subtract row"
-#~ msgstr "Fenster um eine Zeile verkleinern"
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Increase the size of the current window by one row."
+msgstr "Das aktuelle Fenster um eine Zeile vergrö�ern."
 
-#~ msgid "Decrease the size of the current window by one row."
-#~ msgstr "Das aktuelle Fenster um eine Zeile verkleinern."
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Size window subtract row"
+msgstr "Fenster um eine Zeile verkleinern"
 
-#~ msgid "Size window add column"
-#~ msgstr "Fenster um eine Spalte vergrö�ern"
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Decrease the size of the current window by one row."
+msgstr "Das aktuelle Fenster um eine Zeile verkleinern."
 
-#~ msgid "Increase the size of the current window by one column."
-#~ msgstr "Das aktuelle Fenster um eine Spalte vergrö�ern."
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Size window add column"
+msgstr "Fenster um eine Spalte vergrö�ern"
 
-#~ msgid "Size window subtract column"
-#~ msgstr "Fenster um eine Spalte verkleinern"
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Increase the size of the current window by one column."
+msgstr "Das aktuelle Fenster um eine Spalte vergrö�ern."
 
-#~ msgid "Decrease the size of the current window by one column."
-#~ msgstr "Das aktuelle Fenster um eine Spalte verkleinern."
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Size window subtract column"
+msgstr "Fenster um eine Spalte verkleinern"
 
-#~ msgid "Slide window left"
-#~ msgstr "Fenster nach links schieben"
+#. ../lisp/sawfish/wm/commands/size-window.jl
+msgid "Decrease the size of the current window by one column."
+msgstr "Das aktuelle Fenster um eine Spalte verkleinern."
 
-#~ msgid "Move the window `slide-window-increment' pixels to the left."
-#~ msgstr ""
-#~ "Das Fenster um »slide-window-increment« Pixel nach rechts verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide window left"
+msgstr "Fenster nach links schieben"
 
-#~ msgid "Slide window right"
-#~ msgstr "Fenster nach rechts schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window `slide-window-increment' pixels to the left."
+msgstr "Das Fenster um »slide-window-increment« Pixel nach rechts verschieben."
 
-#~ msgid "Move the window `slide-window-increment' pixels to the right."
-#~ msgstr ""
-#~ "Das Fenster um »slide-window-increment« Pixel nach links verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide window right"
+msgstr "Fenster nach rechts schieben"
 
-#~ msgid "Slide window up"
-#~ msgstr "Fenster nach oben schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window `slide-window-increment' pixels to the right."
+msgstr "Das Fenster um »slide-window-increment« Pixel nach links verschieben."
 
-#~ msgid "Move the window `slide-window-increment' pixels upwards."
-#~ msgstr "Das Fenster um »slide-window-increment« Pixel nach oben verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide window up"
+msgstr "Fenster nach oben schieben"
 
-#~ msgid "Slide window down"
-#~ msgstr "Fenster nach unten schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window `slide-window-increment' pixels upwards."
+msgstr "Das Fenster um »slide-window-increment« Pixel nach oben verschieben."
 
-#~ msgid "Move the window `slide-window-increment' pixels downwards."
-#~ msgstr ""
-#~ "Das Fenster um »slide-window-increment« Pixel nach unten verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide window down"
+msgstr "Fenster nach unten schieben"
 
-#~ msgid "Slide group left"
-#~ msgstr "Gruppe nach links schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window `slide-window-increment' pixels downwards."
+msgstr "Das Fenster um »slide-window-increment« Pixel nach unten verschieben."
 
-#~ msgid "Move the window group `slide-window-increment' pixels to the left."
-#~ msgstr ""
-#~ "Die Fenstergruppe um »slide-window-increment« Pixel nach links verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide group left"
+msgstr "Gruppe nach links schieben"
 
-#~ msgid "Slide group right"
-#~ msgstr "Gruppe nach rechts schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window group `slide-window-increment' pixels to the left."
+msgstr ""
+"Die Fenstergruppe um »slide-window-increment« Pixel nach links verschieben."
 
-#~ msgid "Move the window group `slide-window-increment' pixels to the right."
-#~ msgstr ""
-#~ "Die Fenstergruppe um »slide-window-increment« Pixel nach rechts "
-#~ "verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide group right"
+msgstr "Gruppe nach rechts schieben"
 
-#~ msgid "Slide group up"
-#~ msgstr "Gruppe nach oben schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window group `slide-window-increment' pixels to the right."
+msgstr ""
+"Die Fenstergruppe um »slide-window-increment« Pixel nach rechts verschieben."
 
-#~ msgid "Move the window group `slide-window-increment' pixels upwards."
-#~ msgstr ""
-#~ "Die Fenstergruppe um »slide-window-increment« Pixel nach oben verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide group up"
+msgstr "Gruppe nach oben schieben"
 
-#~ msgid "Slide group down"
-#~ msgstr "Gruppe nach unten schieben"
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window group `slide-window-increment' pixels upwards."
+msgstr ""
+"Die Fenstergruppe um »slide-window-increment« Pixel nach oben verschieben."
 
-#~ msgid "Move the window group `slide-window-increment' pixels downwards."
-#~ msgstr ""
-#~ "Die Fenstergruppe um »slide-window-increment« Pixel nach unten verschieben."
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Slide group down"
+msgstr "Gruppe nach unten schieben"
 
+#. ../lisp/sawfish/wm/commands/slide-window.jl
+msgid "Move the window group `slide-window-increment' pixels downwards."
+msgstr ""
+"Die Fenstergruppe um »slide-window-increment« Pixel nach unten verschieben."
+
+#. ../lisp/sawfish/wm/commands/user.jl
 #, fuzzy
-#~ msgid "Default Applications"
-#~ msgstr "Das Anwendungsmenü anzeigen."
+msgid "Default Applications"
+msgstr "Das Anwendungsmenü anzeigen."
 
-#~ msgid "The program launched by the `xterm' command."
-#~ msgstr "Das durch den Befehl »xterm« gestartete Programm."
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "The program launched by the `xterm' command."
+msgstr "Das durch den Befehl »xterm« gestartete Programm."
 
+#. ../lisp/sawfish/wm/commands/user.jl
 #, fuzzy
-#~ msgid "The program launched by the `browser' command."
-#~ msgstr "Das durch den Befehl »xterm« gestartete Programm."
+msgid "The program launched by the `browser' command."
+msgstr "Das durch den Befehl »xterm« gestartete Programm."
+
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "Maximum length of Clipboard Preview"
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "How long to display Clipboard Preview"
+msgstr ""
 
-#~ msgid "Xterm"
-#~ msgstr "XTerm"
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "Xterm"
+msgstr "XTerm"
 
-#~ msgid "Start a new xterm."
-#~ msgstr "Ein neues XTerm starten."
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "Start a new xterm."
+msgstr "Ein neues XTerm starten."
 
+#. ../lisp/sawfish/wm/commands/user.jl
 #, fuzzy
-#~ msgid "Browser"
-#~ msgstr "Auswählen �"
+msgid "Browser"
+msgstr "Auswählen �"
 
+#. ../lisp/sawfish/wm/commands/user.jl
 #, fuzzy
-#~ msgid "Start a new browser instance"
-#~ msgstr "Ein neues XTerm starten."
+msgid "Start a new browser instance"
+msgstr "Ein neues XTerm starten."
 
+#. ../lisp/sawfish/wm/commands/user.jl
 #, fuzzy
-#~ msgid "View clipboard"
-#~ msgstr "Sichtfeld"
+msgid "View clipboard"
+msgstr "Sichtfeld"
+
+#. ../lisp/sawfish/wm/commands/user.jl
+msgid "Show the contents of the clipboard in a message window"
+msgstr ""
 
-#~ msgid "Move viewport next"
-#~ msgstr "Zum nächsten Sichtfeld"
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move viewport next"
+msgstr "Zum nächsten Sichtfeld"
 
-#~ msgid "Move to the next viewport."
-#~ msgstr "Zum nächsten Sichtfeld gehen."
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move to the next viewport."
+msgstr "Zum nächsten Sichtfeld gehen."
 
-#~ msgid "Move viewport previous"
-#~ msgstr "Zum vorherigen Sichtfeld"
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move viewport previous"
+msgstr "Zum vorherigen Sichtfeld"
 
-#~ msgid "Move to the previous viewport."
-#~ msgstr "Zum vorherige Sichtfeld gehen."
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move to the previous viewport."
+msgstr "Zum vorherige Sichtfeld gehen."
 
-#~ msgid "Move window previous"
-#~ msgstr "Fenster in vorheriges verschieben"
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move window previous"
+msgstr "Fenster in vorheriges verschieben"
 
-#~ msgid "Move the window to the previous viewport."
-#~ msgstr "Das Fenster in das vorherige Sichtfeld verschieben."
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move the window to the previous viewport."
+msgstr "Das Fenster in das vorherige Sichtfeld verschieben."
 
-#~ msgid "Move window next"
-#~ msgstr "Fenster in nächstes verschieben"
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
+msgid "Move window next"
+msgstr "Fenster in nächstes verschieben"
 
+#. ../lisp/sawfish/wm/commands/viewport-extras.jl
 #, fuzzy
-#~ msgid "Move the window to the next viewport."
-#~ msgstr "Das Fenster in das vorherige Sichtfeld verschieben."
+msgid "Move the window to the next viewport."
+msgstr "Das Fenster in das vorherige Sichtfeld verschieben."
 
-#~ msgid "Set viewport linear"
-#~ msgstr "Sichtfeld linear angeben"
+#. ../lisp/sawfish/wm/commands/viewport-linear.jl
+msgid "Set viewport linear"
+msgstr "Sichtfeld linear angeben"
 
-#~ msgid "Set window viewport linear"
-#~ msgstr "Fenster-Sichtfläche linear angeben"
+#. ../lisp/sawfish/wm/commands/viewport-linear.jl
+msgid "Set window viewport linear"
+msgstr "Fenster-Sichtfläche linear angeben"
 
-#~ msgid "Display window names and icons while cycling through windows."
-#~ msgstr "Namen und Icons der Fenster beim Blättern anzeigen."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid "Display window names and icons while cycling through windows."
+msgstr "Namen und Icons der Fenster beim Blättern anzeigen."
 
-#~ msgid "Include iconified windows when cycling."
-#~ msgstr "Beim Blättern die minimierten Fenster erwähnen."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid "Include iconified windows when cycling."
+msgstr "Beim Blättern die minimierten Fenster erwähnen."
 
-#~ msgid "Include windows on all workspaces when cycling."
-#~ msgstr "Beim Blättern die Fenster auf allen Arbeitsflächen erwähnen."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid "Include windows on all workspaces when cycling."
+msgstr "Beim Blättern die Fenster auf allen Arbeitsflächen erwähnen."
 
-#~ msgid "Include windows on all viewports when cycling."
-#~ msgstr "Beim Blättern die Fenster in allen Sichtfeldern erwähnen."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid "Include windows on all viewports when cycling."
+msgstr "Beim Blättern die Fenster in allen Sichtfeldern erwähnen."
 
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
 #, fuzzy
-#~ msgid "Raise windows while they're temporarily selected during cycling."
-#~ msgstr "Fenster anheben, wenn sie fokussiert werden."
+msgid "Raise windows while they're temporarily selected during cycling."
+msgstr "Fenster anheben, wenn sie fokussiert werden."
 
-#~ msgid "cycle-keymap"
-#~ msgstr "Durchlauf-Tastenbelegung"
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid "cycle-keymap"
+msgstr "Durchlauf-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active only during window cycling operations."
-#~ msgstr ""
-#~ "Tastenbelegung mit Bindungen, die nur beim Durchlaufen von Fenstern aktiv "
-#~ "sind."
+#. ../lisp/sawfish/wm/commands/x-cycle.jl
+msgid ""
+"Keymap containing bindings active only during window cycling operations."
+msgstr ""
+"Tastenbelegung mit Bindungen, die nur beim Durchlaufen von Fenstern aktiv "
+"sind."
+
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Call command"
+msgstr "Befehl aufrufen"
 
-#~ msgid "Call command"
-#~ msgstr "Befehl aufrufen"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Call the command NAME; optionally with the prefix argument PFX-ARG."
+msgstr "Den Befehl NAME aufrufen; evtl. mit dem Präfixargument PFX-ARG."
 
-#~ msgid "Call the command NAME; optionally with the prefix argument PFX-ARG."
-#~ msgstr "Den Befehl NAME aufrufen; evtl. mit dem Präfixargument PFX-ARG."
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Run shell command"
+msgstr "Shell-Befehl ausführen"
 
-#~ msgid "Run shell command"
-#~ msgstr "Shell-Befehl ausführen"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Execute the given shell command."
+msgstr "Den angegebenen Shell-Befehl ausführen."
 
-#~ msgid "Execute the given shell command."
-#~ msgstr "Den angegebenen Shell-Befehl ausführen."
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Command:"
+msgstr "Befehl:"
 
-#~ msgid "Command sequence"
-#~ msgstr "Befehlssequenz"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Command sequence"
+msgstr "Befehlssequenz"
 
-#~ msgid "Invoke the list of commands, one by one."
-#~ msgstr "Die Liste von Befehlen ausführen, einen nach dem anderen."
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Invoke the list of commands, one by one."
+msgstr "Die Liste von Befehlen ausführen, einen nach dem anderen."
 
-#~ msgid "Quit"
-#~ msgstr "Beenden"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Quit"
+msgstr "Beenden"
 
+#. ../lisp/sawfish/wm/commands.jl
 #, fuzzy
-#~ msgid "Restart"
-#~ msgstr "_Neustart"
+msgid "Restart"
+msgstr "_Neustart"
 
-#~ msgid "Destroy window"
-#~ msgstr "Fenster zerstören"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Destroy window"
+msgstr "Fenster zerstören"
 
-#~ msgid "Kill client"
-#~ msgstr "Client abwürgen"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Kill client"
+msgstr "Client abwürgen"
 
-#~ msgid "No operation"
-#~ msgstr "Kein Vorgang"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "No operation"
+msgstr "Kein Vorgang"
 
-#~ msgid "Call command with output to screen"
-#~ msgstr "Befehl mit Ausgabe auf Bildschirm ausführen"
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Call command with output to screen"
+msgstr "Befehl mit Ausgabe auf Bildschirm ausführen"
 
-#~ msgid ""
-#~ "Prompt for a command, execute it, and print any output to the screen."
-#~ msgstr ""
-#~ "Nach einem Befehl fragen, ihn ausführen, und jede etwaige Ausgabe auf dem "
-#~ "Bildschirm anzeigen."
+#. ../lisp/sawfish/wm/commands.jl
+msgid "Prompt for a command, execute it, and print any output to the screen."
+msgstr ""
+"Nach einem Befehl fragen, ihn ausführen, und jede etwaige Ausgabe auf dem "
+"Bildschirm anzeigen."
+
+#. ../lisp/sawfish/wm/ext/match-window.jl
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Focus"
+msgstr "Fokus"
 
-#~ msgid "Move/Resize"
-#~ msgstr "Verschieben/Grö�e ändern"
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Move/Resize"
+msgstr "Verschieben/Grö�e ändern"
 
-#~ msgid "Workspaces"
-#~ msgstr "Arbeitsflächen"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Appearance"
+msgstr "Aussehen"
 
-#~ msgid "Bindings"
-#~ msgstr "Tastenkombinationen"
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Workspaces"
+msgstr "Arbeitsflächen"
 
+#. ../lisp/sawfish/wm/keymaps.jl
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Bindings"
+msgstr "Tastenkombinationen"
+
+#. ../lisp/sawfish/wm/custom.jl
 #, fuzzy
-#~ msgid "Mini/Maximizing"
-#~ msgstr "Minimieren und Maximieren"
+msgid "Mini/Maximizing"
+msgstr "Minimieren und Maximieren"
 
-#~ msgid "Miscellaneous"
-#~ msgstr "Verschiedenes"
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
 
-#~ msgid "Customize"
-#~ msgstr "Anpassen"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+#. ../lisp/sawfish/wm/custom.jl
+msgid "Placement"
+msgstr "Platzierung"
 
-#~ msgid "3d hack"
-#~ msgstr "3D-Hack"
+#. ../lisp/sawfish/wm/customize.jl
+msgid "Customize"
+msgstr "Anpassen"
 
-#~ msgid "Play sound effects for window events."
-#~ msgstr "Klangeffekte für Fensterereignisse abspielen."
+#. ../lisp/sawfish/wm/customize.jl
+msgid "Invoke the configurator GUI."
+msgstr ""
 
-#~ msgid "Auto-Raise"
-#~ msgstr "Auto-Anheben"
+#. ../lisp/sawfish/wm/ext/3d-hack.jl
+msgid "3d hack"
+msgstr "3D-Hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
 #, fuzzy
-#~ msgid "Raise windows when they are focused."
-#~ msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
+msgid "Update apps menu"
+msgstr "Das Anwendungsmenü anzeigen."
 
-#~ msgid "Delay in milliseconds until focused windows are raised."
-#~ msgstr ""
-#~ "Verzögerung in Millisekunden, bis fokussierte Fenster angehoben werden."
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
 
-#~ msgid "Edge Flipping"
-#~ msgstr "Kantenblättern"
+#. ../lisp/sawfish/wm/ext/audio-events.jl
+msgid "Play sound effects for window events."
+msgstr "Klangeffekte für Fensterereignisse abspielen."
 
-#~ msgid "Select the next desktop when the pointer hits screen edge."
-#~ msgstr ""
-#~ "Nächsten Arbeitsplatz wählen, wenn der Mauszeiger den Bildschirmrand "
-#~ "berührt."
+#. ../lisp/sawfish/wm/ext/audio-events.jl
+msgid "Event"
+msgstr "Ereignis"
+
+#. ../lisp/sawfish/wm/ext/audio-events.jl
+msgid "Audio file"
+msgstr "Klangdatei"
+
+#. ../lisp/sawfish/wm/ext/auto-raise.jl
+msgid "Auto-Raise"
+msgstr "Auto-Anheben"
+
+#. ../lisp/sawfish/wm/ext/auto-raise.jl
+#, fuzzy
+msgid "Raise windows when they are focused."
+msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
+
+#. ../lisp/sawfish/wm/ext/auto-raise.jl
+msgid "Delay in milliseconds until focused windows are raised."
+msgstr ""
+"Verzögerung in Millisekunden, bis fokussierte Fenster angehoben werden."
+
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "Edge Flipping"
+msgstr "Kantenblättern"
+
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "Select the next desktop when the pointer hits screen edge."
+msgstr ""
+"Nächsten Arbeitsplatz wählen, wenn der Mauszeiger den Bildschirmrand berührt."
+
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "viewport"
+msgstr "Sichtfeld"
 
-#~ msgid "viewport"
-#~ msgstr "Sichtfeld"
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "workspace"
+msgstr "Arbeitsfläche"
 
-#~ msgid "workspace"
-#~ msgstr "Arbeitsfläche"
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "Hitting the screen edge selects the next: \\w"
+msgstr "Berühren der Bildschirmkante wählt nächstes: \\w"
 
-#~ msgid "Hitting the screen edge selects the next: \\w"
-#~ msgstr "Berühren der Bildschirmkante wählt nächstes: \\w"
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "Only flip when interactively moving a window."
+msgstr "Nur beim interaktiven Verschieben der Fenster blättern."
 
-#~ msgid "Only flip when interactively moving a window."
-#~ msgstr "Nur beim interaktiven Verschieben der Fenster blättern."
+#. ../lisp/sawfish/wm/ext/edge-flip.jl
+msgid "Milliseconds to delay before edge flipping."
+msgstr ""
 
-#~ msgid "Beep when errors occur."
-#~ msgstr "Warnton, wenn Fehler auftreten."
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "Beep when errors occur."
+msgstr "Warnton, wenn Fehler auftreten."
 
-#~ msgid "nowhere"
-#~ msgstr "nirgendwo"
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "nowhere"
+msgstr "nirgendwo"
 
-#~ msgid "screen"
-#~ msgstr "Bildschirm"
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "screen"
+msgstr "Bildschirm"
 
-#~ msgid "standard-error"
-#~ msgstr "Fehlerstrom (stderr)"
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "standard-error"
+msgstr "Fehlerstrom (stderr)"
 
+#. ../lisp/sawfish/wm/ext/error-handler.jl
 #, fuzzy
-#~ msgid "both"
-#~ msgstr "nicht"
+msgid "both"
+msgstr "nicht"
+
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "Display error messages to: \\w"
+msgstr "Fehlermeldungen anzeigen auf: \\w"
 
-#~ msgid "Display error messages to: \\w"
-#~ msgstr "Fehlermeldungen anzeigen auf: \\w"
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "No errors."
+msgstr "Keine Fehler."
 
-#~ msgid "Display errors"
-#~ msgstr "Fehler anzeigen"
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "Display errors"
+msgstr "Fehler anzeigen"
 
-#~ msgid "Display all errors that have occurred to the screen."
-#~ msgstr "Alle vorgekommenen Fehler auf dem Bildschirm anzeigen."
+#. ../lisp/sawfish/wm/ext/error-handler.jl
+msgid "Display all errors that have occurred to the screen."
+msgstr "Alle vorgekommenen Fehler auf dem Bildschirm anzeigen."
 
+#. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
-#~ msgid "Infinite Desktop"
-#~ msgstr "Fokus auf Desktop"
+msgid "Infinite Desktop"
+msgstr "Fokus auf Desktop"
 
+#. ../lisp/sawfish/wm/ext/infinite-desktop.jl
+msgid "Simulate an infinite desktop (Conflicts edge-flipping)."
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
-#~ msgid "Amount to move the workspace."
-#~ msgstr "Auf nächste Arbeitsfläche schicken"
+msgid "Amount to move the workspace."
+msgstr "Auf nächste Arbeitsfläche schicken"
 
+#. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
-#~ msgid "Amount to move the cursor after moving the workspace."
-#~ msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche verlegen."
+msgid "Amount to move the cursor after moving the workspace."
+msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche verlegen."
+
+#. ../lisp/sawfish/wm/ext/infinite-desktop.jl
+msgid "Stop scrolling at workspace borders (Fixes warp-to-window bugs)."
+msgstr ""
 
-#~ msgid "Name"
-#~ msgstr "Name"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Name"
+msgstr "Name"
 
-#~ msgid "Class"
-#~ msgstr "Klasse"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Class"
+msgstr "Klasse"
 
-#~ msgid "Icon Name"
-#~ msgstr "Symbolname"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Icon Name"
+msgstr "Symbolname"
 
-#~ msgid "Role"
-#~ msgstr "Rolle"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Role"
+msgstr "Rolle"
 
-#~ msgid "Host"
-#~ msgstr "Rechner"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Host"
+msgstr "Rechner"
 
-#~ msgid "Locale"
-#~ msgstr "Locale"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Locale"
+msgstr "Locale"
 
-#~ msgid "Ignore program position"
-#~ msgstr "Programmgegebene Position ignorieren"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Ignore program position"
+msgstr "Programmgegebene Position ignorieren"
 
-#~ msgid "Place mode"
-#~ msgstr "Platzierungsmodus"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Place mode"
+msgstr "Platzierungsmodus"
 
-#~ msgid "Position"
-#~ msgstr "Position"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Position"
+msgstr "Position"
 
-#~ msgid "Dimensions"
-#~ msgstr "MaÃ?e"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Dimensions"
+msgstr "MaÃ?e"
 
-#~ msgid "Workspace"
-#~ msgstr "Arbeitsfläche"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Workspace"
+msgstr "Arbeitsfläche"
 
-#~ msgid "Viewport"
-#~ msgstr "Sichtfeld"
+#. ../lisp/sawfish/wm/viewport.jl
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Viewport"
+msgstr "Sichtfeld"
 
-#~ msgid "Depth"
-#~ msgstr "Tiefe"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Depth"
+msgstr "Tiefe"
 
-#~ msgid "Placement weight"
-#~ msgstr "Platzierungsgewicht"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Placement weight"
+msgstr "Platzierungsgewicht"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Fixed position"
-#~ msgstr "Position"
+msgid "Fixed position"
+msgstr "Position"
 
-#~ msgid "Maximized"
-#~ msgstr "Maximiert"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Maximized"
+msgstr "Maximiert"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "New workspace"
-#~ msgstr "Nächste Arbeitsfläche"
+msgid "New workspace"
+msgstr "Nächste Arbeitsfläche"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "New viewport"
-#~ msgstr "Sichtfeld"
+msgid "New viewport"
+msgstr "Sichtfeld"
 
-#~ msgid "Raise on focus"
-#~ msgstr "Beim Fokussieren anheben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Raise on focus"
+msgstr "Beim Fokussieren anheben"
 
-#~ msgid "Focus when mapped"
-#~ msgstr "Beim Anzeigen anheben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Focus when mapped"
+msgstr "Beim Anzeigen anheben"
 
-#~ msgid "Never focus"
-#~ msgstr "Nie fokussieren"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Never focus"
+msgstr "Nie fokussieren"
 
-#~ msgid "Focus click through"
-#~ msgstr "Fokus-Klick weitergeben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Focus click through"
+msgstr "Fokus-Klick weitergeben"
 
-#~ msgid "Focus mode"
-#~ msgstr "Fokusmodus"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Focus mode"
+msgstr "Fokusmodus"
 
-#~ msgid "Frame type"
-#~ msgstr "Rahmentyp"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Frame type"
+msgstr "Rahmentyp"
 
-#~ msgid "Frame style"
-#~ msgstr "Rahmenstil"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Frame style"
+msgstr "Rahmenstil"
 
-#~ msgid "Avoid"
-#~ msgstr "Vermeiden"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Avoid"
+msgstr "Vermeiden"
 
-#~ msgid "Ignored"
-#~ msgstr "Ignoriert"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Ignored"
+msgstr "Ignoriert"
 
-#~ msgid "Iconified"
-#~ msgstr "Minimiert"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Iconified"
+msgstr "Minimiert"
 
-#~ msgid "Shaded"
-#~ msgstr "Eingerollt"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Shaded"
+msgstr "Eingerollt"
 
-#~ msgid "Sticky"
-#~ msgstr "Klebrig"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Sticky"
+msgstr "Klebrig"
 
-#~ msgid "Sticky viewport"
-#~ msgstr "Klebriges Sichtfeld"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Sticky viewport"
+msgstr "Klebriges Sichtfeld"
 
-#~ msgid "Group"
-#~ msgstr "Gruppe"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Group"
+msgstr "Gruppe"
 
-#~ msgid "Ungrouped"
-#~ msgstr "Nicht gruppiert"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Ungrouped"
+msgstr "Nicht gruppiert"
 
-#~ msgid "Cycle skip"
-#~ msgstr "Beim Durchlaufen überspringen"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Cycle skip"
+msgstr "Beim Durchlaufen überspringen"
 
-#~ msgid "Window list skip"
-#~ msgstr "In Fensterliste überspringen"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Window list skip"
+msgstr "In Fensterliste überspringen"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Task list skip"
-#~ msgstr "In Fensterliste überspringen"
+msgid "Task list skip"
+msgstr "In Fensterliste überspringen"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Never iconify"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Never maximize"
-#~ msgstr "_Wiederherstellen"
+msgid "Never maximize"
+msgstr "_Wiederherstellen"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Fullscreen"
-#~ msgstr "Bildschirm"
+msgid "Fullscreen"
+msgstr "Bildschirm"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Fullscreen xinerama"
-#~ msgstr "Bildschirm"
+msgid "Fullscreen xinerama"
+msgstr "Bildschirm"
 
-#~ msgid "Unique name"
-#~ msgstr "Eindeutiger Name"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Unique name"
+msgstr "Eindeutiger Name"
 
-#~ msgid "Auto gravity"
-#~ msgstr "Automatische Schwerkraft"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Auto gravity"
+msgstr "Automatische Schwerkraft"
 
-#~ msgid "Shade hover"
-#~ msgstr "Aufgerollte anheben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Shade hover"
+msgstr "Aufgerollte anheben"
 
-#~ msgid "Transients above"
-#~ msgstr "Dialoge darüber"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Transients above"
+msgstr "Dialoge darüber"
 
-#~ msgid "Ignore stacking requests"
-#~ msgstr "Schichtungsanfragen ignorieren"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Ignore stacking requests"
+msgstr "Schichtungsanfragen ignorieren"
 
+#. ../lisp/sawfish/wm/ext/match-window.jl
 #, fuzzy
-#~ msgid "Window name"
-#~ msgstr "Fenster:"
+msgid "Window name"
+msgstr "Fenster:"
 
-#, fuzzy
-#~ msgid "Rename window"
-#~ msgstr "Fenster anheben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "State"
+msgstr "Zustand"
 
-#~ msgid "Shade Hover"
-#~ msgstr "Aufgerollte anheben"
+#. ../lisp/sawfish/wm/ext/match-window.jl
+msgid "Other"
+msgstr "Andere(s)"
 
-#~ msgid ""
-#~ "Enable shade-hover mode.\n"
-#~ "\n"
-#~ "(Temporarily unshades windows while the mouse pointer is over them.)"
-#~ msgstr ""
-#~ "Ausrollen bei Berührung aktivieren.\n"
-#~ "\n"
-#~ "(Fenster zeitweise ausrollen, wenn der Zeiger über ihnen steht.)"
+#. ../lisp/sawfish/wm/ext/shade-hover.jl
+msgid "Shade Hover"
+msgstr "Aufgerollte anheben"
 
-#~ msgid "Delay in milliseconds before unshading windows."
-#~ msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
+#. ../lisp/sawfish/wm/ext/shade-hover.jl
+msgid ""
+"Enable shade-hover mode.\n"
+"\n"
+"(Temporarily unshades windows while the mouse pointer is over them.)"
+msgstr ""
+"Ausrollen bei Berührung aktivieren.\n"
+"\n"
+"(Fenster zeitweise ausrollen, wenn der Zeiger über ihnen steht.)"
 
-#~ msgid "Raise windows when they are unshaded."
-#~ msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
+#. ../lisp/sawfish/wm/ext/shade-hover.jl
+msgid "Delay in milliseconds before unshading windows."
+msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
 
-#~ msgid "Display tooltips for window frames."
-#~ msgstr "Minihilfen für Fensterrahmen anzeigen."
+#. ../lisp/sawfish/wm/ext/shade-hover.jl
+msgid "Raise windows when they are unshaded."
+msgstr "Fenster in den Vordergrund bringen, wenn sie ausgerollt werden."
 
-#~ msgid "Show full documentation in tooltips."
-#~ msgstr "Ausführliche Dokumentation in den Minihilfen zeigen."
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+msgid "Display tooltips for window frames."
+msgstr "Minihilfen für Fensterrahmen anzeigen."
 
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+msgid "Show full documentation in tooltips."
+msgstr "Ausführliche Dokumentation in den Minihilfen zeigen."
+
+#. ../lisp/sawfish/wm/ext/tooltips.jl
 #, fuzzy
-#~ msgid "Number of milliseconds before displaying tooltips."
-#~ msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
+msgid "Number of milliseconds before displaying tooltips."
+msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
 
+#. ../lisp/sawfish/wm/ext/tooltips.jl
 #, fuzzy
-#~ msgid "Number of milliseconds before removing tooltips."
-#~ msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
+msgid "Number of milliseconds before removing tooltips."
+msgstr "Verzögerung in Millisekunden, bevor Fenster ausgerollt werden."
 
-#~ msgid "Automatically remember window positions."
-#~ msgstr "An Fensterpositionen automatisch erinnern."
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+msgid "Font used to display tooltips, or nil for default."
+msgstr ""
 
-#~ msgid "Automatically remember window sizes."
-#~ msgstr "An Fenstergrö�en automatisch erinnern."
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+msgid "Color used for the tooltips background"
+msgstr ""
 
-#~ msgid "Automatically remember other window attributes."
-#~ msgstr "An andere Fensterattribute automatisch erinnern."
+#. ../lisp/sawfish/wm/ext/tooltips.jl
+msgid "Color used for the tooltips foreground"
+msgstr ""
 
-#~ msgid "Don't automatically remember details of transient windows."
-#~ msgstr "Nicht automatisch an Details flüchtiger Fenster erinnern."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember _position"
+msgstr "An _Position erinnern"
+
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember _dimensions"
+msgstr "An _MaÃ?e erinnern"
 
-#~ msgid "Window history save position"
-#~ msgstr "Position in Fensterchronik speichern"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember _attributes"
+msgstr "An _Attribute erinnern"
 
-#~ msgid "Remember the current position of the focused window."
-#~ msgstr "An die aktuelle Position des fokussierten Fensters erinnern."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "_Forget saved state"
+msgstr "Gespeicherten Zustand _vergessen"
 
-#~ msgid "Window history save dimensions"
-#~ msgstr "MaÃ?e in Fensterchronik speichern"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Automatically remember window positions."
+msgstr "An Fensterpositionen automatisch erinnern."
 
-#~ msgid "Remember the current dimensions of the focused window."
-#~ msgstr "An die aktuellen MaÃ?e des fokussierten Fensters erinnern."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Automatically remember window sizes."
+msgstr "An Fenstergrö�en automatisch erinnern."
 
-#~ msgid "Window history save attributes"
-#~ msgstr "Attribute in Fensterchronik speichern"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Automatically remember other window attributes."
+msgstr "An andere Fensterattribute automatisch erinnern."
 
-#~ msgid "Remember the current attributes of the focused window."
-#~ msgstr "An die aktuellen Attribute des fokussierten Fensters erinnern."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Don't automatically remember details of transient windows."
+msgstr "Nicht automatisch an Details flüchtiger Fenster erinnern."
 
-#~ msgid "Window history forget"
-#~ msgstr "Fensterchronik vergessen"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Window history save position"
+msgstr "Position in Fensterchronik speichern"
 
-#~ msgid "Forget any persistent state associated with the current window."
-#~ msgstr ""
-#~ "Jegliche dauerhaften Statusinformationen über das aktuelle Fenster "
-#~ "vergessen."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember the current position of the focused window."
+msgstr "An die aktuelle Position des fokussierten Fensters erinnern."
 
-#~ msgid "Window history clear"
-#~ msgstr "Fensterchronik löschen"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Window history save dimensions"
+msgstr "MaÃ?e in Fensterchronik speichern"
 
-#~ msgid "Forget all saved window history."
-#~ msgstr "Jegliche gespeicherte Fensterchronik vergessen."
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember the current dimensions of the focused window."
+msgstr "An die aktuellen MaÃ?e des fokussierten Fensters erinnern."
 
-#~ msgid "Workspace down"
-#~ msgstr "Arbeitsfläche unten"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Window history save attributes"
+msgstr "Attribute in Fensterchronik speichern"
 
-#~ msgid "View the workspace below the current workspace"
-#~ msgstr "Die Arbeitsfläche unterhalb der aktuellen anzeigen"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Remember the current attributes of the focused window."
+msgstr "An die aktuellen Attribute des fokussierten Fensters erinnern."
 
-#~ msgid "Workspace up"
-#~ msgstr "Arbeitsfläche oben"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Window history forget"
+msgstr "Fensterchronik vergessen"
 
-#~ msgid "View the workspace above the current workspace"
-#~ msgstr "Die Arbeitsfläche oberhalb der aktuellen anzeigen"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Forget any persistent state associated with the current window."
+msgstr ""
+"Jegliche dauerhaften Statusinformationen über das aktuelle Fenster vergessen."
 
-#~ msgid "Workspace left"
-#~ msgstr "Arbeitsfläche links"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Window history clear"
+msgstr "Fensterchronik löschen"
 
-#~ msgid "View the workspace to the left of the current workspace"
-#~ msgstr "Die Arbeitsfläche links von der aktuellen anzeigen"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "Forget all saved window history."
+msgstr "Jegliche gespeicherte Fensterchronik vergessen."
 
-#~ msgid "Workspace right"
-#~ msgstr "Arbeitsfläche rechts"
+#. ../lisp/sawfish/wm/ext/window-history.jl
+msgid "_History"
+msgstr "C_hronik"
 
-#~ msgid "View the workspace to the right of the current workspace"
-#~ msgstr "Die Arbeitsfläche rechts von der aktuellen anzeigen"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Workspace down"
+msgstr "Arbeitsfläche unten"
 
-#~ msgid "Send to workspace down"
-#~ msgstr "Auf untere Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "View the workspace below the current workspace"
+msgstr "Die Arbeitsfläche unterhalb der aktuellen anzeigen"
 
-#~ msgid "Send window to the workspace below the current workspace"
-#~ msgstr "Fenster auf die Arbeitsfläche unterhalb der aktuellen schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Workspace up"
+msgstr "Arbeitsfläche oben"
 
-#~ msgid "Send to workspace up"
-#~ msgstr "Auf obere Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "View the workspace above the current workspace"
+msgstr "Die Arbeitsfläche oberhalb der aktuellen anzeigen"
 
-#~ msgid "Send window to the workspace above the current workspace"
-#~ msgstr "Fenster auf die Arbeitsfläche oberhalb der aktuellen schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Workspace left"
+msgstr "Arbeitsfläche links"
 
-#~ msgid "Send to workspace left"
-#~ msgstr "Auf linke Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "View the workspace to the left of the current workspace"
+msgstr "Die Arbeitsfläche links von der aktuellen anzeigen"
 
-#~ msgid "Send window to the workspace left of the current workspace"
-#~ msgstr "Fenster auf die Arbeitsfläche links von der aktuellen schicken"
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Workspace right"
+msgstr "Arbeitsfläche rechts"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "View the workspace to the right of the current workspace"
+msgstr "Die Arbeitsfläche rechts von der aktuellen anzeigen"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send to workspace down"
+msgstr "Auf untere Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send window to the workspace below the current workspace"
+msgstr "Fenster auf die Arbeitsfläche unterhalb der aktuellen schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send to workspace up"
+msgstr "Auf obere Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send window to the workspace above the current workspace"
+msgstr "Fenster auf die Arbeitsfläche oberhalb der aktuellen schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send to workspace left"
+msgstr "Auf linke Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send window to the workspace left of the current workspace"
+msgstr "Fenster auf die Arbeitsfläche links von der aktuellen schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send to workspace right"
+msgstr "Auf rechte Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/ext/workspace-grid.jl
+msgid "Send window to the workspace right of the current workspace"
+msgstr "Fenster auf die Arbeitsfläche rechts von der aktuellen schicken"
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
 
-#~ msgid "Send to workspace right"
-#~ msgstr "Auf rechte Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
 
-#~ msgid "Send window to the workspace right of the current workspace"
-#~ msgstr "Fenster auf die Arbeitsfläche rechts von der aktuellen schicken"
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
 
-#~ msgid "When does the mouse pointer affect the input focus."
-#~ msgstr "Ereignisse zur Beeinflussung des Fokus durch den Mauszeiger"
+#. ../lisp/sawfish/wm/focus.jl
+msgid "When does the mouse pointer affect the input focus."
+msgstr "Ereignisse zur Beeinflussung des Fokus durch den Mauszeiger"
 
-#~ msgid "Click-to-focus mode passes the click through to the application."
-#~ msgstr "»click-to-focus«-Modus reicht den Klick an die Anwendung weiter."
+#. ../lisp/sawfish/wm/focus.jl
+msgid "Click-to-focus mode passes the click through to the application."
+msgstr "»click-to-focus«-Modus reicht den Klick an die Anwendung weiter."
 
+#. ../lisp/sawfish/wm/focus.jl
 #, fuzzy
-#~ msgid "Whether focusing a window doesn't change it's position in the stack."
-#~ msgstr ""
-#~ "Das Fenster auf seine niedrigste erlaubte Stellung in der Schichtung\n"
-#~ "absenken."
+msgid "Whether focusing a window doesn't change it's position in the stack."
+msgstr ""
+"Das Fenster auf seine niedrigste erlaubte Stellung in der Schichtung\n"
+"absenken."
 
-#~ msgid "Default frame style:"
-#~ msgstr "Vorgegebener Rahmenstil:"
+#. ../lisp/sawfish/wm/focus.jl
+msgid "When true, pointer in/out events don't cause focus changes."
+msgstr ""
 
-#~ msgid "Automatically reload themes when they are updated."
-#~ msgstr "Themen automatisch neu laden, wenn sie erneuert werden."
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Default frame style:"
+msgstr "Vorgegebener Rahmenstil:"
 
-#~ msgid "Default font: \\w"
-#~ msgstr "Standardschriftart: \\w"
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Automatically reload themes when they are updated."
+msgstr "Themen automatisch neu laden, wenn sie erneuert werden."
 
-#~ msgid "Edit frame style"
-#~ msgstr "Rahmenstil bearbeiten"
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Default font: \\w"
+msgstr "Standardschriftart: \\w"
 
-#~ msgid "global-keymap"
-#~ msgstr "Global-Tastenbelegung"
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Edit frame style"
+msgstr "Rahmenstil bearbeiten"
 
-#~ msgid "Keymap containing bindings active anywhere."
-#~ msgstr "Tastenbelegung mit Tastenkombinationen, die überall aktiv sind."
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Default"
+msgstr "Vorgabe"
 
-#~ msgid "window-keymap"
-#~ msgstr "Fenster-Tastenbelegung"
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Normal"
+msgstr "Normal"
 
-#~ msgid "Keymap containing bindings active when a client window is focused."
-#~ msgstr ""
-#~ "Tastenbelegung mit Bindungen, die aktiv sind, wenn ein Clientfenster\n"
-#~ "fokussiert ist."
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Title-only"
+msgstr "Nur Titel"
+
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Border-only"
+msgstr "Nur Rahmen"
+
+#. ../lisp/sawfish/wm/frames.jl
+msgid "Top-border"
+msgstr "Oberer Rahmen"
+
+#. ../lisp/sawfish/wm/frames.jl
+msgid "None"
+msgstr "Nichts"
 
-#~ msgid "root-window-keymap"
-#~ msgstr "Hintergrundfenster-Tastenbelegung"
+#. ../lisp/sawfish/wm/menus.jl
+#. ../lisp/sawfish/wm/integration/kde.jl
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "_Help"
+msgstr "_Hilfe"
+
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "_GNOME Help"
+msgstr "_GNOME-Hilfe"
+
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "GNOME Website"
+msgstr "GNOME-Webseite"
+
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "About GNOME"
+msgstr "Info zu GNOME"
+
+#. ../lisp/sawfish/wm/menus.jl
+#. ../lisp/sawfish/wm/integration/kde.jl
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "Sessi_on"
+msgstr "Sitz_ung"
+
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "_Logout from GNOME"
+msgstr "Aus GNOME abme_lden"
+
+#. ../lisp/sawfish/wm/integration/gnome.jl
+msgid "_Shutdown from GNOME"
+msgstr "Aus GNOME _herunterfahren"
+
+#. ../lisp/sawfish/wm/integration/kde.jl
+msgid "_KDE Help"
+msgstr "_KDE-Hilfe"
 
+#. ../lisp/sawfish/wm/integration/kde.jl
+msgid "KDE Website"
+msgstr "KDE-Webseite"
+
+#. ../lisp/sawfish/wm/integration/kde.jl
+msgid "_Logout from KDE"
+msgstr "Aus KDE abme_lden"
+
+#. ../lisp/sawfish/wm/integration/kde.jl
+msgid "_Reboot from KDE"
+msgstr "Aus KDE neu sta_rten"
+
+#. ../lisp/sawfish/wm/integration/kde.jl
+msgid "_Shutdown from KDE"
+msgstr "Aus KDE _herunterfahren"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "global-keymap"
+msgstr "Global-Tastenbelegung"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "Keymap containing bindings active anywhere."
+msgstr "Tastenbelegung mit Tastenkombinationen, die überall aktiv sind."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "window-keymap"
+msgstr "Fenster-Tastenbelegung"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "Keymap containing bindings active when a client window is focused."
+msgstr ""
+"Tastenbelegung mit Bindungen, die aktiv sind, wenn ein Clientfenster\n"
+"fokussiert ist."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "root-window-keymap"
+msgstr "Hintergrundfenster-Tastenbelegung"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the root window\n"
-#~ "(or when no window is focused)."
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger\n"
-#~ "über dem Hintergrundfenster ist (oder kein Fenster fokussiert ist)."
+msgid ""
+"Keymap containing bindings active when the pointer is in the root window\n"
+"(or when no window is focused)."
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger\n"
+"über dem Hintergrundfenster ist (oder kein Fenster fokussiert ist)."
 
-#~ msgid "title-keymap"
-#~ msgstr "Titel-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "title-keymap"
+msgstr "Titel-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the title of\n"
-#~ "a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der\n"
-#~ "Zeiger in der Titelleiste eines Fensters ist. (Nur Mauskombinationen\n"
-#~ "werden hier ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the title of\n"
+"a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der\n"
+"Zeiger in der Titelleiste eines Fensters ist. (Nur Mauskombinationen\n"
+"werden hier ausgewertet.)"
 
-#~ msgid "border-keymap"
-#~ msgstr "Kanten-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "border-keymap"
+msgstr "Kanten-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the border of\n"
-#~ "a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger "
-#~ "im\n"
-#~ "Rand eines Fensters ist. (Nur Mauskombinationen werden hier ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the border of\n"
+"a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"Rand eines Fensters ist. (Nur Mauskombinationen werden hier ausgewertet.)"
 
-#~ msgid "close-button-keymap"
-#~ msgstr "SchlieÃ?knopf-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "close-button-keymap"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the close "
-#~ "button\n"
-#~ "of a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger "
-#~ "im\n"
-#~ "SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
-#~ "ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "iconify-button-keymap"
-#~ msgstr "Minimierknopf-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "iconify-button-keymap"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the iconify\n"
-#~ "button of a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger "
-#~ "im\n"
-#~ "Minimierungsknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
-#~ "ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the iconify\n"
+"button of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"Minimierungsknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "maximize-button-keymap"
-#~ msgstr "Maximierknopf-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "maximize-button-keymap"
+msgstr "Maximierknopf-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the maximize\n"
-#~ "button of a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger "
-#~ "im\n"
-#~ "Maximierungsknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
-#~ "ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the maximize\n"
+"button of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"Maximierungsknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "menu-button-keymap"
-#~ msgstr "Menüknopf-Tastenbelegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "menu-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the menu button\n"
-#~ "of a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger "
-#~ "im\n"
-#~ "Menüknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
-#~ "ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the menu button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"Menüknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "shade-button-keymap"
-#~ msgstr "Einrollknopf-Tastenbewegung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "shade-button-keymap"
+msgstr "Einrollknopf-Tastenbewegung"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when the pointer is in the shade "
-#~ "button\n"
-#~ "of a window. (Only mouse-bindings are evaluated in this map.)"
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der\n"
-#~ "Zeiger im Aufrollen-Knopf eines Fensters ist. (Nur Mauskombinationen\n"
-#~ "werden hier ausgewertet.)"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the shade button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der\n"
+"Zeiger im Aufrollen-Knopf eines Fensters ist. (Nur Mauskombinationen\n"
+"werden hier ausgewertet.)"
 
-#~ msgid "Modifier key(s) used for default shortcuts."
-#~ msgstr "Modifikatortaste(n) für Vorgabe-Tastenkombinationen."
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Minimierknopf-Tastenbelegung"
 
-#~ msgid "Popup window menu"
-#~ msgstr "Fenstermenü anzeigen"
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "Display the menu listing all window operations."
-#~ msgstr "Das Menü mit sämtlichen Fensteraktionen anzeigen."
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#~ msgid "Popup root menu"
-#~ msgstr "Hintergrundmenü anzeigen"
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "Display the main menu."
-#~ msgstr "Das Hauptmenü anzeigen."
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Menüknopf-Tastenbelegung"
 
-#~ msgid "Display the applications menu."
-#~ msgstr "Das Anwendungsmenü anzeigen."
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"Menüknopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "S_awfish-UI"
-#~ msgstr "S_awfish-UI"
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
+#. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
-#~ msgid "Distance between successive placements in `stagger' placement mode."
-#~ msgstr ""
-#~ "Abstand zwischen aufeinanderfolgenden Neuerscheinungen im "
-#~ "Platzierungsmodus »staffeln«."
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "Method of placing windows: \\w"
-#~ msgstr "Platzierungsmethode für Fenster: \\w"
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "SchlieÃ?knopf-Tastenbelegung"
 
-#~ msgid "Method of placing dialog windows: \\w"
-#~ msgstr "Platzierungsmethode für Dialogfenster: \\w"
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn der Zeiger im\n"
+"SchlieÃ?en-Knopf eines Fensters ist. (Nur Mauskombinationen werden hier\n"
+"ausgewertet.)"
 
-#~ msgid "Stacking"
-#~ msgstr "Schichtung"
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "Modifier key(s) used for default shortcuts."
+msgstr "Modifikatortaste(n) für Vorgabe-Tastenkombinationen."
 
-#~ msgid "parents"
-#~ msgstr "Eltern"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Mi_nimize"
+msgstr "Mi_nimieren"
 
-#~ msgid "Keep transient windows stacked above: \\w"
-#~ msgstr "Vergängliche Fenster gestapelt halten über: \\w"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Unma_ximize"
+msgstr "_Wiederherstellen"
 
-#~ msgid "Raise single window"
-#~ msgstr "Einzelnes Fenster anheben"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Ma_ximize"
+msgstr "Ma_ximieren"
 
-#~ msgid ""
-#~ "Raise the window to its highest allowed position in the stacking order."
-#~ msgstr ""
-#~ "Das Fenster auf seine höchste erlaubte Stellung in der Schichtung\n"
-#~ "anheben."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Move"
+msgstr "_Verschieben"
 
-#~ msgid "Lower single window"
-#~ msgstr "Einzelnes Fenster absenken"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Resize"
+msgstr "Grö�e än_dern"
 
-#~ msgid ""
-#~ "Lower the window to its lowest allowed position in the stacking order."
-#~ msgstr ""
-#~ "Das Fenster auf seine niedrigste erlaubte Stellung in der Schichtung\n"
-#~ "absenken."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Close"
+msgstr "_SchlieÃ?en"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Toggle"
+msgstr "_Umschalten"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "In _group"
+msgstr "In _Gruppe"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Send window to"
+msgstr "Fenster _schicken auf"
 
-#~ msgid "Raise lower single window"
-#~ msgstr "Einzelnes Fenster anheben/absenken"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Previous workspace"
+msgstr "_Vorherige Arbeitsfläche"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Next workspace"
+msgstr "_Nächste Arbeitsfläche"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "C_opy window to"
+msgstr "Fenster k_opieren auf"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "P_revious workspace"
+msgstr "_Vorherige Arbeitsfläche"
 
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Ne_xt workspace"
+msgstr "_Nächste Arbeitsfläche"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Grow & Pack"
+msgstr "_Aufweiten und Packen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Grow left"
+msgstr "Nach links aufweiten"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Grow right"
+msgstr "Nach rechts aufweiten"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Grow up"
+msgstr "Nach oben aufweiten"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Grow down"
+msgstr "Nach unten aufweiten"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Pack left"
+msgstr "Nach links packen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Pack right"
+msgstr "Nach rechts packen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Pack up"
+msgstr "Nach oben packen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Pack down"
+msgstr "Nach unten packen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Shrink & _Yank"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Shrink left"
+msgstr "Nach links schrumpfen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Shrink right"
+msgstr "Nach rechts schrumpfen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Shrink up"
+msgstr "Nach oben schrumpfen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Shrink down"
+msgstr "Nach unten schrumpfen"
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
-#~ msgid ""
-#~ "If the window is at its highest possible position, then lower it to its\n"
-#~ "lowest possible position. Otherwise raise it as far as allowed."
-#~ msgstr ""
-#~ "Falls das Fenster auf seiner höchsten möglichen Stellung ist, es auf\n"
-#~ "die niedrigstmögliche absenken. Es andernfalls so weit wie erlaubt\n"
-#~ "anheben. Auch die Ebene aller dazugehörigen Dialoge mit ändern."
+msgid "Yank left"
+msgstr "Nach links packen"
 
-#~ msgid "Raise window depth"
-#~ msgstr "Fenstertiefe anheben"
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Yank right"
+msgstr "Nach rechts packen"
 
-#~ msgid "Put the window in the stacking level above its current level."
-#~ msgstr "Das Fenster in die Stapelebene über seiner derzeitigen anheben."
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Yank up"
+msgstr "Nach oben packen"
 
-#~ msgid "Lower window depth"
-#~ msgstr "Fenstertiefe absenken"
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Yank down"
+msgstr "Nach unten packen"
 
-#~ msgid "Put the window in the stacking level beneath its current level."
-#~ msgstr "Das Fenster in die Stapelebene unter seiner derzeitigen absenken."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Stac_king"
+msgstr "Schich_tung"
 
-#~ msgid "transients"
-#~ msgstr "Dialoge"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Raise"
+msgstr "An_heben"
 
-#~ msgid "group"
-#~ msgstr "Gruppe"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Lower"
+msgstr "Ab_senken"
 
-#~ msgid "Minimizing a window also removes its: \\w"
-#~ msgstr "Minimieren eines Fensters entfernt auch: \\w"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Upper layer"
+msgstr "_Obere Schicht"
 
-#~ msgid "Unminimizing a window also restores its: \\w"
-#~ msgstr "Wiederherstellen eines Fensters bringt auch: \\w"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Lo_wer layer"
+msgstr "_Untere Schicht"
 
-#~ msgid "Iconify window"
-#~ msgstr "Fenster minimieren"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Frame ty_pe"
+msgstr "Rahmenty_p"
 
-#~ msgid "Minimize the window."
-#~ msgstr "Das Fenster minimieren."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Frame sty_le"
+msgstr "Rahmenst_il"
 
-#~ msgid "Uniconify window"
-#~ msgstr "Fenster wiederherstellen"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Sawfish Rootmenu"
+msgstr "Sawfish-Wurzelmenü"
 
-#~ msgid "Restore the window from its minimized state."
-#~ msgstr "Das Fenster aus dem minimierten Zustand zurückrufen."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Windows"
+msgstr "_Fenster"
 
-#~ msgid "Toggle window iconified"
-#~ msgstr "Minimierung des Fensters umschalten"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Work_spaces"
+msgstr "Arbeit_sflächen"
 
-#~ msgid "Toggle the iconification of window W."
-#~ msgstr "Die Minimierung des Fensters W umschalten."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Programs"
+msgstr "_Programme"
 
-#~ msgid "Iconify workspace windows"
-#~ msgstr "Fenster der Arbeitsfläche minimieren"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Customize"
+msgstr "_Anpassen"
 
-#~ msgid "Minimize all windows on the current workspace."
-#~ msgstr "Alle Fenster auf der aktuellen Arbeitsfläche minimieren."
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Display Errors"
+msgstr "Fehler anzeigen"
 
-#~ msgid "Make window sticky"
-#~ msgstr "Fenster ankleben"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr "Anwendungsmenü neu laden"
 
-#~ msgid "Make window unsticky"
-#~ msgstr "Fenster ablösen"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Restart Sawfish"
+msgstr "Sawfish neu starten"
 
-#~ msgid "Toggle window sticky"
-#~ msgstr "Fenster ankleben ein/aus"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Quit Sawfish"
+msgstr "Sawfish beenden"
 
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_FAQ..."
+msgstr "_FAQ â?¦"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_News..."
+msgstr "_Neues â?¦"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_WWW page..."
+msgstr "_WWW-Seite â?¦"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_Manual..."
+msgstr "_Handbuch â?¦"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "_About Sawfish..."
+msgstr "_Info zu Sawfish â?¦"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Kill Window"
+msgstr "Fenster abwürgen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Popup window menu"
+msgstr "Fenstermenü anzeigen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Display the menu listing all window operations."
+msgstr "Das Menü mit sämtlichen Fensteraktionen anzeigen."
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Popup root menu"
+msgstr "Hintergrundmenü anzeigen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Display the main menu."
+msgstr "Das Hauptmenü anzeigen."
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the `stickiness' of the window--whether or not it is a member of\n"
-#~ "all workspaces."
-#~ msgstr ""
-#~ "Die »Klebrigkeit« des Fensters ein-/ausschalten -- ganz gleich, ob es\n"
-#~ "zu allen Arbeitsflächen gehört oder nicht."
+msgid "Popup apps menu"
+msgstr "Hintergrundmenü anzeigen"
 
-#~ msgid "Make window ignored"
-#~ msgstr "Fenster ignorieren lassen"
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Display the applications menu."
+msgstr "Das Anwendungsmenü anzeigen."
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "S_awfishConfig"
+msgstr "S_awfish-Einstellungen"
+
+#. ../lisp/sawfish/wm/menus.jl
+msgid "Edit theme..."
+msgstr "Thema bearbeiten â?¦"
+
+#. ../lisp/sawfish/wm/placement/stagger.jl
+#, fuzzy
+msgid "Distance between successive placements in `stagger' placement mode."
+msgstr ""
+"Abstand zwischen aufeinanderfolgenden Neuerscheinungen im Platzierungsmodus "
+"»staffeln«."
+
+#. ../lisp/sawfish/wm/placement.jl
+msgid "Method of placing windows: \\w"
+msgstr "Platzierungsmethode für Fenster: \\w"
+
+#. ../lisp/sawfish/wm/placement.jl
+msgid "Method of placing dialog windows: \\w"
+msgstr "Platzierungsmethode für Dialogfenster: \\w"
+
+#. ../lisp/sawfish/wm/placement.jl
+msgid "Ignore program-specified window placements."
+msgstr ""
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Stacking"
+msgstr "Schichtung"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "parents"
+msgstr "Eltern"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Keep transient windows stacked above: \\w"
+msgstr "Vergängliche Fenster gestapelt halten über: \\w"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Raise single window"
+msgstr "Einzelnes Fenster anheben"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Raise the window to its highest allowed position in the stacking order."
+msgstr ""
+"Das Fenster auf seine höchste erlaubte Stellung in der Schichtung\n"
+"anheben."
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Lower single window"
+msgstr "Einzelnes Fenster absenken"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Lower the window to its lowest allowed position in the stacking order."
+msgstr ""
+"Das Fenster auf seine niedrigste erlaubte Stellung in der Schichtung\n"
+"absenken."
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Raise lower single window"
+msgstr "Einzelnes Fenster anheben/absenken"
 
-#~ msgid "Ignore the window."
-#~ msgstr "Das Fenster ignorieren."
+#. ../lisp/sawfish/wm/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it to its\n"
+"lowest possible position. Otherwise raise it as far as allowed."
+msgstr ""
+"Falls das Fenster auf seiner höchsten möglichen Stellung ist, es auf\n"
+"die niedrigstmögliche absenken. Es andernfalls so weit wie erlaubt\n"
+"anheben. Auch die Ebene aller dazugehörigen Dialoge mit ändern."
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Raise window depth"
+msgstr "Fenstertiefe anheben"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Put the window in the stacking level above its current level."
+msgstr "Das Fenster in die Stapelebene über seiner derzeitigen anheben."
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Lower window depth"
+msgstr "Fenstertiefe absenken"
+
+#. ../lisp/sawfish/wm/stacking.jl
+msgid "Put the window in the stacking level beneath its current level."
+msgstr "Das Fenster in die Stapelebene unter seiner derzeitigen absenken."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "transients"
+msgstr "Dialoge"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "group"
+msgstr "Gruppe"
+
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Minimizing a window also removes its: \\w"
+msgstr "Minimieren eines Fensters entfernt auch: \\w"
+
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Unminimizing a window also restores its: \\w"
+msgstr "Wiederherstellen eines Fensters bringt auch: \\w"
+
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Iconify window"
+msgstr "Fenster minimieren"
 
-#~ msgid "Make window not ignored"
-#~ msgstr "Fenster nicht ignorieren lassen"
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Minimize the window."
+msgstr "Das Fenster minimieren."
 
-#~ msgid "Unignore the window."
-#~ msgstr "Aufhören, das Fenster zu ignorieren."
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Uniconify window"
+msgstr "Fenster wiederherstellen"
 
-#~ msgid "Toggle window ignored"
-#~ msgstr "Ignorieren des Fensters umschalten"
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Restore the window from its minimized state."
+msgstr "Das Fenster aus dem minimierten Zustand zurückrufen."
 
-#~ msgid "Toggle whether a window is ignored or not."
-#~ msgstr "Ignorieren eines Fensters ein-/ausschalten."
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Toggle window iconified"
+msgstr "Minimierung des Fensters umschalten"
 
-#~ msgid "Toggle window never focus"
-#~ msgstr "Fenster nie fokussieren ein/aus"
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Toggle the iconification of window W."
+msgstr "Die Minimierung des Fensters W umschalten."
 
-#~ msgid "Toggle whether a window is focusable or not."
-#~ msgstr "Fokussierbarkeit eines Fensters ein-/ausschalten."
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Iconify workspace windows"
+msgstr "Fenster der Arbeitsfläche minimieren"
 
-#~ msgid "Toggle window cycle skip"
-#~ msgstr "Fenster beim Durchlaufen überspringen ein/aus"
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Minimize all windows on the current workspace."
+msgstr "Alle Fenster auf der aktuellen Arbeitsfläche minimieren."
 
-#~ msgid "Toggle whether a window is ignored while window cycling."
-#~ msgstr "Ignorieren eines Fensters beim Durchwechseln ein-/ausschalten."
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Make window sticky"
+msgstr "Fenster ankleben"
 
-#~ msgid "Toggle window list skip"
-#~ msgstr "Ã?berspringen in Fensterliste umschalten"
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Make window unsticky"
+msgstr "Fenster ablösen"
 
-#~ msgid "Toggle whether a window will be include in the window list."
-#~ msgstr "EinschlieÃ?en eines Fensters in die Fensterliste ein-/ausschalten."
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "Toggle window sticky"
+msgstr "Fenster ankleben ein/aus"
 
+#. ../lisp/sawfish/wm/state/iconify.jl
 #, fuzzy
-#~ msgid "Toggle task list skip"
-#~ msgstr "Ã?berspringen in Fensterliste umschalten"
+msgid ""
+"Toggle the `stickiness' of the window--whether or not it is a member of\n"
+"all workspaces."
+msgstr ""
+"Die »Klebrigkeit« des Fensters ein-/ausschalten -- ganz gleich, ob es\n"
+"zu allen Arbeitsflächen gehört oder nicht."
+
+#. ../lisp/sawfish/wm/state/iconify.jl
+msgid "_Sticky"
+msgstr "_Klebrig"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Make window ignored"
+msgstr "Fenster ignorieren lassen"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Ignore the window."
+msgstr "Das Fenster ignorieren."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Make window not ignored"
+msgstr "Fenster nicht ignorieren lassen"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Unignore the window."
+msgstr "Aufhören, das Fenster zu ignorieren."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle window ignored"
+msgstr "Ignorieren des Fensters umschalten"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle whether a window is ignored or not."
+msgstr "Ignorieren eines Fensters ein-/ausschalten."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle window never focus"
+msgstr "Fenster nie fokussieren ein/aus"
 
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle whether a window is focusable or not."
+msgstr "Fokussierbarkeit eines Fensters ein-/ausschalten."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle window cycle skip"
+msgstr "Fenster beim Durchlaufen überspringen ein/aus"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle whether a window is ignored while window cycling."
+msgstr "Ignorieren eines Fensters beim Durchwechseln ein-/ausschalten."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle window list skip"
+msgstr "Ã?berspringen in Fensterliste umschalten"
+
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "Toggle whether a window will be include in the window list."
+msgstr "EinschlieÃ?en eines Fensters in die Fensterliste ein-/ausschalten."
+
+#. ../lisp/sawfish/wm/state/ignored.jl
 #, fuzzy
-#~ msgid "Toggle whether a window will be included in the task-list."
-#~ msgstr "EinschlieÃ?en eines Fensters in die Fensterliste ein-/ausschalten."
+msgid "Toggle task list skip"
+msgstr "Ã?berspringen in Fensterliste umschalten"
 
-#~ msgid "Lock position and size while windows are maximized."
-#~ msgstr "Position und Grö�e festschreiben, während Fenster maximiert sind."
+#. ../lisp/sawfish/wm/state/ignored.jl
+#, fuzzy
+msgid "Toggle whether a window will be included in the task-list."
+msgstr "EinschlieÃ?en eines Fensters in die Fensterliste ein-/ausschalten."
 
-#~ msgid "Maximize window"
-#~ msgstr "Fenster maximieren"
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "_Ignored"
+msgstr "_Ignoriert"
 
-#~ msgid "Maximize the dimensions of the window."
-#~ msgstr "Die MaÃ?e des Fensters maximieren."
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "_Focusable"
+msgstr "_Fokussierbar"
 
-#~ msgid "Unmaximize window"
-#~ msgstr "Fenster wiederherstellen"
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "_Cyclable"
+msgstr "_Durchlaufbar"
 
-#~ msgid ""
-#~ "Restore the dimensions of the window to its original, unmaximized, state."
-#~ msgstr ""
-#~ "Die Ma�e des Fensters auf ihren ursprünglichen, nicht maximierten Zustand "
-#~ "zurücksetzen."
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "In _window list"
+msgstr "I_n Fensterliste"
 
-#~ msgid "Maximize window vertically"
-#~ msgstr "Fenster vertikal maximieren"
+#. ../lisp/sawfish/wm/state/ignored.jl
+msgid "In _task list"
+msgstr "In GNOME-_Taskliste"
 
-#~ msgid "Maximize the vertical dimension of the window."
-#~ msgstr "Die Höhe des Fensters maximieren."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Lock position and size while windows are maximized."
+msgstr "Position und Grö�e festschreiben, während Fenster maximiert sind."
 
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Fenster horizontal maximieren"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window"
+msgstr "Fenster maximieren"
 
-#~ msgid "Maximize the horizontal dimension of the window."
-#~ msgstr "Die Breite des Fensters maximieren."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the dimensions of the window."
+msgstr "Die MaÃ?e des Fensters maximieren."
+
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Unmaximize window"
+msgstr "Fenster wiederherstellen"
+
+#. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
+msgid ""
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
+msgstr ""
+"Die Ma�e des Fensters auf ihren ursprünglichen, nicht maximierten Zustand "
+"zurücksetzen."
 
-#~ msgid "Maximize window toggle"
-#~ msgstr "Maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window vertically"
+msgstr "Fenster vertikal maximieren"
 
-#~ msgid "Toggle the state of the window between maximized and unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the vertical dimension of the window."
+msgstr "Die Höhe des Fensters maximieren."
 
-#~ msgid "Maximize window horizontally toggle"
-#~ msgstr "Fenster in der Breite maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window horizontally"
+msgstr "Fenster horizontal maximieren"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the horizontal dimension of the window."
+msgstr "Die Breite des Fensters maximieren."
+
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window toggle"
+msgstr "Maximieren ein/aus"
+
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Toggle the state of the window between maximized and unmaximized."
+msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
+
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window horizontally toggle"
+msgstr "Fenster in der Breite maximieren ein/aus"
+
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between horizontally maximized and\n"
-#~ "unmaximized."
-#~ msgstr ""
-#~ "Das Fenster in der Breite zwischen maximiert und unmaximiert\n"
-#~ "umschalten."
+msgid ""
+"Toggle the state of the window between horizontally maximized and\n"
+"unmaximized."
+msgstr ""
+"Das Fenster in der Breite zwischen maximiert und unmaximiert\n"
+"umschalten."
 
-#~ msgid "Maximize window vertically toggle"
-#~ msgstr "Fenster in der Höhe maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window vertically toggle"
+msgstr "Fenster in der Höhe maximieren ein/aus"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between vertically maximized and\n"
-#~ "unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
+msgid ""
+"Toggle the state of the window between vertically maximized and\n"
+"unmaximized."
+msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
 
-#~ msgid "Maximize fill window"
-#~ msgstr "Fenster schonend maximieren"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window"
+msgstr "Fenster schonend maximieren"
 
-#~ msgid "Maximize the window without obscuring any other windows."
-#~ msgstr "Das Fenster maximieren, ohne andere zu verdecken."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the window without obscuring any other windows."
+msgstr "Das Fenster maximieren, ohne andere zu verdecken."
 
-#~ msgid "Maximize fill window vertically"
-#~ msgstr "Fenster vertikal schonend maximieren"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window vertically"
+msgstr "Fenster vertikal schonend maximieren"
 
-#~ msgid "Maximize the window vertically without obscuring any other windows."
-#~ msgstr "Das Fenster in der Höhe maximieren, ohne andere zu verdecken."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the window vertically without obscuring any other windows."
+msgstr "Das Fenster in der Höhe maximieren, ohne andere zu verdecken."
 
-#~ msgid "Maximize fill window horizontally"
-#~ msgstr "Fenster horizontal schonend maximieren"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window horizontally"
+msgstr "Fenster horizontal schonend maximieren"
 
-#~ msgid ""
-#~ "Maximize the window horizontally without obscuring any other windows."
-#~ msgstr "Das Fenster in der Breite maximieren, ohne andere zu verdecken."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize the window horizontally without obscuring any other windows."
+msgstr "Das Fenster in der Breite maximieren, ohne andere zu verdecken."
 
-#~ msgid "Maximize fill window toggle"
-#~ msgstr "Fenster schonend maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window toggle"
+msgstr "Fenster schonend maximieren ein/aus"
 
-#~ msgid ""
-#~ "Toggle the state of the window between maximized-filled and unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid ""
+"Toggle the state of the window between maximized-filled and unmaximized."
+msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
 
-#~ msgid "Maximize fill window horizontally toggle"
-#~ msgstr "Fenster in der Breite schonend maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window horizontally toggle"
+msgstr "Fenster in der Breite schonend maximieren ein/aus"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between horizontally maximized-filled and\n"
-#~ "unmaximized."
-#~ msgstr ""
-#~ "Das Fenster in der Breite zwischen maximiert/gefüllt und unmaximiert\n"
-#~ "umschalten."
+msgid ""
+"Toggle the state of the window between horizontally maximized-filled and\n"
+"unmaximized."
+msgstr ""
+"Das Fenster in der Breite zwischen maximiert/gefüllt und unmaximiert\n"
+"umschalten."
 
-#~ msgid "Maximize fill window vertically toggle"
-#~ msgstr "Fenster in der Höhe schonend maximierend ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize fill window vertically toggle"
+msgstr "Fenster in der Höhe schonend maximierend ein/aus"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between vertically maximized-filled and\n"
-#~ "unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
+msgid ""
+"Toggle the state of the window between vertically maximized-filled and\n"
+"unmaximized."
+msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Maximize unframe"
-#~ msgstr "Fenster maximieren"
+msgid "Maximize unframe"
+msgstr "Fenster maximieren"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Maximize reframe"
-#~ msgstr "Maximiert"
+msgid "Maximize reframe"
+msgstr "Maximiert"
 
-#~ msgid "Maximize window fullscreen"
-#~ msgstr "Fenster auf Vollbild maximieren"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window fullscreen"
+msgstr "Fenster auf Vollbild maximieren"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Fullscreen maximize the window."
-#~ msgstr "Das Fenster minimieren."
+msgid "Fullscreen maximize the window."
+msgstr "Das Fenster minimieren."
 
-#~ msgid "Maximize window fullscreen toggle"
-#~ msgstr "Fenster auf Vollbild maximieren ein/aus"
+#. ../lisp/sawfish/wm/state/maximize.jl
+msgid "Maximize window fullscreen toggle"
+msgstr "Fenster auf Vollbild maximieren ein/aus"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between fullscreen maximized and "
-#~ "unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
+msgid ""
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
+msgstr "Das Fenster zwischen maximiert und unmaximiert umschalten."
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Maximize window fullxinerama"
-#~ msgstr "Fenster auf Vollbild maximieren"
+msgid "Maximize window fullxinerama"
+msgstr "Fenster auf Vollbild maximieren"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Fullscreen maximize the window across all Xinerama screens."
-#~ msgstr "Das Fenster minimieren."
+msgid "Fullscreen maximize the window across all Xinerama screens."
+msgstr "Das Fenster minimieren."
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid "Maximize window fullxinerama toggle"
-#~ msgstr "Fenster auf Vollbild maximieren ein/aus"
+msgid "Maximize window fullxinerama toggle"
+msgstr "Fenster auf Vollbild maximieren ein/aus"
 
+#. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
-#~ msgid ""
-#~ "Toggle the state of the window between fullscreen maximized across all "
-#~ "Xinerama and unmaximized."
-#~ msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
+msgid ""
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
+msgstr "Das Fenster zwischen maximiert/gefüllt und unmaximiert umschalten."
 
-#~ msgid "Shade window"
-#~ msgstr "Fenster einrollen"
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid "Shade window"
+msgstr "Fenster einrollen"
 
-#~ msgid "Display only the title bar of the window."
-#~ msgstr "Nur die Titelleiste des Fensters anzeigen."
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid "Display only the title bar of the window."
+msgstr "Nur die Titelleiste des Fensters anzeigen."
 
-#~ msgid "Unshade window"
-#~ msgstr "Fenster ausrollen"
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid "Unshade window"
+msgstr "Fenster ausrollen"
 
+#. ../lisp/sawfish/wm/state/shading.jl
 #, fuzzy
-#~ msgid ""
-#~ "If the window is shaded (see `shade-window'), restore it to it's usual\n"
-#~ "state."
-#~ msgstr ""
-#~ "Falls das Fenster aufgerollt ist (siehe »shade-window«), es in seinen\n"
-#~ "Normalzustand zurückführen."
+msgid ""
+"If the window is shaded (see `shade-window'), restore it to it's usual\n"
+"state."
+msgstr ""
+"Falls das Fenster aufgerollt ist (siehe »shade-window«), es in seinen\n"
+"Normalzustand zurückführen."
 
-#~ msgid "Toggle window shaded"
-#~ msgstr "Fenster ein-/ausrollen"
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid "Toggle window shaded"
+msgstr "Fenster ein-/ausrollen"
 
-#~ msgid ""
-#~ "Toggle the shaded (only the title bar is displayed) state of the window."
-#~ msgstr ""
-#~ "Den aufgerollten Zustand des Fensters (nur die Titelleiste wird "
-#~ "angezeigt) ein-/ausschalten."
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid ""
+"Toggle the shaded (only the title bar is displayed) state of the window."
+msgstr ""
+"Den aufgerollten Zustand des Fensters (nur die Titelleiste wird angezeigt) "
+"ein-/ausschalten."
 
-#~ msgid "Focus on application windows when they first appear."
-#~ msgstr ""
-#~ "Auf Anwendungsfenster fokussieren, wenn sie zum ersten Mal angezeigt "
-#~ "werden."
+#. ../lisp/sawfish/wm/state/shading.jl
+msgid "S_haded"
+msgstr "_Eingerollt"
 
-#~ msgid "Raise window and transients"
-#~ msgstr "Fenster und Dialoge anheben"
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid "Focus on application windows when they first appear."
+msgstr ""
+"Auf Anwendungsfenster fokussieren, wenn sie zum ersten Mal angezeigt werden."
 
-#~ msgid ""
-#~ "Raise the current window to its highest allowed position in the stacking\n"
-#~ "order. Also raise any transient windows that it has."
-#~ msgstr ""
-#~ "Das aktuelle Fenster zu seiner höchsten erlaubten Stellung in der\n"
-#~ "Schichtung anheben. Auch alle Dialoge anheben, die dazugehören."
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid "Raise window and transients"
+msgstr "Fenster und Dialoge anheben"
 
-#~ msgid "Lower window and transients"
-#~ msgstr "Fenster und Dialoge absenken"
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid ""
+"Raise the current window to its highest allowed position in the stacking\n"
+"order. Also raise any transient windows that it has."
+msgstr ""
+"Das aktuelle Fenster zu seiner höchsten erlaubten Stellung in der\n"
+"Schichtung anheben. Auch alle Dialoge anheben, die dazugehören."
 
-#~ msgid ""
-#~ "Lower the current window to its lowest allowed position in the stacking\n"
-#~ "order. Also lower any transient windows that it has."
-#~ msgstr ""
-#~ "Das aktuelle Fenster zu seiner niedrigsten erlaubten Stellung in der\n"
-#~ "Schichtung absenken. Auch alle Dialoge absenken, die dazugehören."
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid "Lower window and transients"
+msgstr "Fenster und Dialoge absenken"
 
-#~ msgid "Raise lower window and transients"
-#~ msgstr "Fenster und Dialoge anheben/absenken"
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid ""
+"Lower the current window to its lowest allowed position in the stacking\n"
+"order. Also lower any transient windows that it has."
+msgstr ""
+"Das aktuelle Fenster zu seiner niedrigsten erlaubten Stellung in der\n"
+"Schichtung absenken. Auch alle Dialoge absenken, die dazugehören."
 
-#~ msgid ""
-#~ "If the window is at its highest possible position, then lower it to its\n"
-#~ "lowest possible position. Otherwise raise it as far as allowed. Also "
-#~ "changes\n"
-#~ "the level of any transient windows it has."
-#~ msgstr ""
-#~ "Falls das Fenster auf seiner höchsten möglichen Stellung ist, es auf\n"
-#~ "die niedrigstmögliche absenken. Es andernfalls so weit wie erlaubt\n"
-#~ "anheben. Auch die Ebene aller dazugehörigen Dialoge mit ändern."
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid "Raise lower window and transients"
+msgstr "Fenster und Dialoge anheben/absenken"
+
+#. ../lisp/sawfish/wm/state/transient.jl
+msgid ""
+"If the window is at its highest possible position, then lower it to its\n"
+"lowest possible position. Otherwise raise it as far as allowed. Also "
+"changes\n"
+"the level of any transient windows it has."
+msgstr ""
+"Falls das Fenster auf seiner höchsten möglichen Stellung ist, es auf\n"
+"die niedrigstmögliche absenken. Es andernfalls so weit wie erlaubt\n"
+"anheben. Auch die Ebene aller dazugehörigen Dialoge mit ändern."
+
+#. ../lisp/sawfish/wm/tabs/tab.jl
+msgid "Width of tab's left-edge decoration"
+msgstr ""
+
+#. ../lisp/sawfish/wm/tabs/tab.jl
+msgid "Width of tab's right-edge decoration"
+msgstr ""
+
+#. ../lisp/sawfish/wm/tabs/tab.jl
+msgid "Width of tab area's left-edge decoration"
+msgstr ""
+
+#. ../lisp/sawfish/wm/tabs/tab.jl
+msgid "Width of tab area's right-edge decoration"
+msgstr ""
 
+#. ../lisp/sawfish/wm/tabs/tab.jl
 #, fuzzy
-#~ msgid "Raise Tabs on Hover"
-#~ msgstr "Beim Fokussieren anheben"
+msgid "Raise Tabs on Hover"
+msgstr "Beim Fokussieren anheben"
 
+#. ../lisp/sawfish/wm/tabs/tab.jl
 #, fuzzy
-#~ msgid "Tab add to group"
-#~ msgstr "Gruppe absenken"
+msgid "Tab add to group"
+msgstr "Gruppe absenken"
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Tab release window"
-#~ msgstr "Fenster löschen"
+msgid "Tab release window"
+msgstr "Fenster löschen"
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Release active window from its group"
-#~ msgstr "Das Fenster aus dem minimierten Zustand zurückrufen."
+msgid "Release active window from its group"
+msgstr "Das Fenster aus dem minimierten Zustand zurückrufen."
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Tab raise left window"
-#~ msgstr "Fenster anheben/absenken"
+msgid "Tab raise left window"
+msgstr "Fenster anheben/absenken"
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Raise left window in current group"
-#~ msgstr "Fenster und Dialoge anheben/absenken"
+msgid "Raise left window in current group"
+msgstr "Fenster und Dialoge anheben/absenken"
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Tab raise right window"
-#~ msgstr "Einzelnes Fenster anheben"
+msgid "Tab raise right window"
+msgstr "Einzelnes Fenster anheben"
 
+#. ../lisp/sawfish/wm/tabs/tabgroup.jl
 #, fuzzy
-#~ msgid "Raise right window in current group"
-#~ msgstr "Fenster und Dialoge anheben/absenken"
+msgid "Raise right window in current group"
+msgstr "Fenster und Dialoge anheben/absenken"
 
-#~ msgid "Insert workspace"
-#~ msgstr "Arbeitsfläche einfügen"
+#. ../lisp/sawfish/wm/util/compat.jl
+msgid "Insert workspace"
+msgstr "Arbeitsfläche einfügen"
 
-#~ msgid "Unshade selected windows."
-#~ msgstr "Ausgewählte Fenster ausrollen."
+#. ../lisp/sawfish/wm/util/display-window.jl
+msgid "Unshade selected windows."
+msgstr "Ausgewählte Fenster ausrollen."
 
-#~ msgid "Display window without focusing"
-#~ msgstr "Fenster ohne Fokussieren anzeigen"
+#. ../lisp/sawfish/wm/util/display-window.jl
+msgid "Display window without focusing"
+msgstr "Fenster ohne Fokussieren anzeigen"
 
-#~ msgid "Display the workspace/viewport containing the window W."
-#~ msgstr "Die Arbeitsfläche / das Sichtfeld mit dem Fenster W anzeigen."
+#. ../lisp/sawfish/wm/util/display-window.jl
+msgid "Display the workspace/viewport containing the window W."
+msgstr "Die Arbeitsfläche / das Sichtfeld mit dem Fenster W anzeigen."
 
-#~ msgid "Display window"
-#~ msgstr "Fenster anzeigen"
+#. ../lisp/sawfish/wm/util/display-window.jl
+msgid "Display window"
+msgstr "Fenster anzeigen"
 
-#~ msgid "Display the workspace containing the window W, then focus on W."
-#~ msgstr ""
-#~ "Die Arbeitsfläche mit dem Fenster W anzeigen, dann auf W fokussieren."
+#. ../lisp/sawfish/wm/util/display-window.jl
+msgid "Display the workspace containing the window W, then focus on W."
+msgstr "Die Arbeitsfläche mit dem Fenster W anzeigen, dann auf W fokussieren."
+
+#. ../lisp/sawfish/wm/util/groups.jl
+msgid "New group"
+msgstr "Neue Gruppe"
+
+#. ../lisp/sawfish/wm/util/gtkrc.jl
+msgid "Gtkrc reload style"
+msgstr "gtkrc-Stil nachladen"
+
+#. ../lisp/sawfish/wm/util/gtkrc.jl
+msgid "Reload the gtkrc settings."
+msgstr "Die gtkrc-Einstellungen neu laden."
 
-#~ msgid "Gtkrc reload style"
-#~ msgstr "gtkrc-Stil nachladen"
+#. ../lisp/sawfish/wm/util/keymap.jl
+msgid "Describe key"
+msgstr "Taste beschreiben"
 
-#~ msgid "Reload the gtkrc settings."
-#~ msgstr "Die gtkrc-Einstellungen neu laden."
+#. ../lisp/sawfish/wm/util/keymap.jl
+msgid "Prompt for a key sequence, then print its binding."
+msgstr "Nach einer Tastenkombination fragen, dann ihre Bindung ausgeben."
 
-#~ msgid "Describe key"
-#~ msgstr "Taste beschreiben"
+#. ../lisp/sawfish/wm/util/keymap.jl
+msgid "Press key..."
+msgstr "Taste drücken �"
 
-#~ msgid "Prompt for a key sequence, then print its binding."
-#~ msgstr "Nach einer Tastenkombination fragen, dann ihre Bindung ausgeben."
+#. ../lisp/sawfish/wm/util/keymap.jl
+msgid "[Quote]"
+msgstr "[Quote]"
 
-#~ msgid "Quote event"
-#~ msgstr "Ereignis freistellen"
+#. ../lisp/sawfish/wm/util/keymap.jl
+msgid "Quote event"
+msgstr "Ereignis freistellen"
 
+#. ../lisp/sawfish/wm/util/keymap.jl
 #, fuzzy
-#~ msgid ""
-#~ "Sends the next key event directly to the focused client window, ignoring\n"
-#~ "any window manager bindings that it may have."
-#~ msgstr ""
-#~ "Sendet das nächste Tastaturereignis direkt zum fokussierten\n"
-#~ "Client-Fenster, ganz gleich, ob Fenstermanager-Funktionen daran\n"
-#~ "gebunden sind."
+msgid ""
+"Sends the next key event directly to the focused client window, ignoring\n"
+"any window manager bindings that it may have."
+msgstr ""
+"Sendet das nächste Tastaturereignis direkt zum fokussierten\n"
+"Client-Fenster, ganz gleich, ob Fenstermanager-Funktionen daran\n"
+"gebunden sind."
 
+#. ../lisp/sawfish/wm/util/marks.jl
 #, fuzzy
-#~ msgid "Mark window"
-#~ msgstr "Fenster nach oben packen"
+msgid "Mark window"
+msgstr "Fenster nach oben packen"
 
+#. ../lisp/sawfish/wm/util/marks.jl
 #, fuzzy
-#~ msgid "Unmark window"
-#~ msgstr "Fenster ausrollen"
+msgid "Unmark window"
+msgstr "Fenster ausrollen"
 
+#. ../lisp/sawfish/wm/util/marks.jl
 #, fuzzy
-#~ msgid "Unmark all windows"
-#~ msgstr "Fenster wiederherstellen"
+msgid "Unmark all windows"
+msgstr "Fenster wiederherstellen"
 
+#. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-#~ msgid ""
-#~ "The program used to play audio samples. If unset, built-in support for "
-#~ "ESD is used."
-#~ msgstr ""
-#~ "Das zum Abspielen von Klängen verwendete Programm. Wenn nicht angegeben, "
-#~ "wird die eingebaute ESD-Unterstützung verwendet."
+msgid "The program used to play audio samples."
+msgstr ""
+"Das zum Abspielen von Klängen verwendete Programm. Wenn nicht angegeben, "
+"wird die eingebaute ESD-Unterstützung verwendet."
 
-#~ msgid "prompt-keymap"
-#~ msgstr "Abfrage-Tastenbelegung"
+#. ../lisp/sawfish/wm/util/prompt-wm.jl
+msgid "Window:"
+msgstr "Fenster:"
 
-#~ msgid ""
-#~ "Keymap containing bindings active when reading a string from the user."
-#~ msgstr ""
-#~ "Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn eine "
-#~ "Zeichenkette vom Benutzer eingelesen wird."
+#. ../lisp/sawfish/wm/workspace.jl
+#. ../lisp/sawfish/wm/util/prompt-wm.jl
+#, c-format
+msgid "Workspace %d"
+msgstr "Arbeitsfläche %d"
 
-#~ msgid "When raising a window, also raise its: \\w"
-#~ msgstr "Anheben eines Fensters hebt auch: \\w"
+#. ../lisp/sawfish/wm/workspace.jl
+#. ../lisp/sawfish/wm/util/prompt-wm.jl
+msgid "Workspace:"
+msgstr "Arbeitsflächen:"
 
-#~ msgid "Raise window"
-#~ msgstr "Fenster anheben"
+#. ../lisp/sawfish/wm/util/prompt.jl
+msgid "Font for prompt: \\w"
+msgstr ""
 
-#~ msgid "Lower window"
-#~ msgstr "Fenster absenken"
+#. ../lisp/sawfish/wm/util/prompt.jl
+msgid "Prompt message's colors."
+msgstr ""
 
-#~ msgid "Raise lower window"
-#~ msgstr "Fenster anheben/absenken"
+#. ../lisp/sawfish/wm/util/prompt.jl
+msgid "prompt-keymap"
+msgstr "Abfrage-Tastenbelegung"
 
+#. ../lisp/sawfish/wm/util/prompt.jl
+msgid "Keymap containing bindings active when reading a string from the user."
+msgstr ""
+"Tastenbelegung mit Tastenkombinationen, die aktiv sind, wenn eine "
+"Zeichenkette vom Benutzer eingelesen wird."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid "When raising a window, also raise its: \\w"
+msgstr "Anheben eines Fensters hebt auch: \\w"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid "Raise window"
+msgstr "Fenster anheben"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
-#~ msgid "Windows uniconify to the current viewport."
-#~ msgstr "Gruppe in das aktuelle Sichtfeld verschieben"
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Das Fenster auf seine höchste erlaubte Stellung in der Schichtung\n"
+"anheben."
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid "Lower window"
+msgstr "Fenster absenken"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
-#~ msgid "Number of steps for viewport scrolling."
-#~ msgstr ""
-#~ "Anzahl von Pixeln beim Bewegen des Zeigers in »move-cursor-«-Befehlen."
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Das Fenster auf seine niedrigste erlaubte Stellung in der Schichtung\n"
+"absenken."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid "Raise lower window"
+msgstr "Fenster anheben/absenken"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
-#~ msgid "stop"
-#~ msgstr "Anpassen"
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Falls das Fenster auf seiner höchsten möglichen Stellung ist, es auf\n"
+"die niedrigstmögliche absenken. Es andernfalls so weit wie erlaubt\n"
+"anheben. Auch die Ebene aller dazugehörigen Dialoge mit ändern."
 
-#~ msgid "Activate viewport"
-#~ msgstr "Sichtfeld aktivieren"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Number of columns and rows in each virtual workspace: \\w"
+msgstr ""
 
-#~ msgid "Select the specified viewport."
-#~ msgstr "Das angegebene Sichtfeld auswählen."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid ""
+"Minimum number of columns and rows in each virtual workspace (if boundary "
+"mode is dynamic): \\w"
+msgstr ""
 
-#~ msgid "Activate viewport column"
-#~ msgstr "Sichtfelder-Spalte aktivieren"
+#. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
+msgid "Windows uniconify to the current viewport."
+msgstr "Gruppe in das aktuelle Sichtfeld verschieben"
 
-#~ msgid "Select the specified viewport column."
-#~ msgstr "Die angegebene Sichtfelder-Spalte auswählen."
+#. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
+msgid "Number of steps for viewport scrolling."
+msgstr "Anzahl von Pixeln beim Bewegen des Zeigers in »move-cursor-«-Befehlen."
 
-#~ msgid "Activate viewport row"
-#~ msgstr "Sichtfelder-Zeile aktivieren"
+#. ../lisp/sawfish/wm/workspace.jl
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "wrap-around"
+msgstr ""
 
-#~ msgid "Select the specified viewport row."
-#~ msgstr "Die angegebene Sichtfelder-Zeile auswählen."
+#. ../lisp/sawfish/wm/workspace.jl
+#. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
+msgid "stop"
+msgstr "Anpassen"
 
-#~ msgid "Move window to viewport"
-#~ msgstr "Fenster auf Sichtfeld verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "dynamic"
+msgstr ""
 
-#~ msgid "Move the current window to the specified viewport."
-#~ msgstr "Das aktuelle Fenster zum angegebenen Sichtfeld verschieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid ""
+"Whether to stop or wrap-around or grow the virtual workspace on first/last "
+"viewport"
+msgstr ""
 
-#~ msgid "Move viewport right"
-#~ msgstr "Sichtfeld nach rechts verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Activate viewport"
+msgstr "Sichtfeld aktivieren"
 
-#~ msgid "Move the viewport one screen to the right."
-#~ msgstr "Das Sichtfeld eine Bildschirmbreite nach rechts schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Select the specified viewport."
+msgstr "Das angegebene Sichtfeld auswählen."
 
-#~ msgid "Move viewport left"
-#~ msgstr "Sichtfeld nach links verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Column:"
+msgstr "Spalte:"
 
-#~ msgid "Move the viewport one screen to the left."
-#~ msgstr "Das Sichtfeld eine Bildschirmbreite nach links schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Row:"
+msgstr "Zeile"
 
-#~ msgid "Move viewport up"
-#~ msgstr "Sichtfeld nach oben schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Activate viewport column"
+msgstr "Sichtfelder-Spalte aktivieren"
 
-#~ msgid "Move the viewport one screen up."
-#~ msgstr "Das Sichtfeld eine Bildschirmhöhe nach oben schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Select the specified viewport column."
+msgstr "Die angegebene Sichtfelder-Spalte auswählen."
 
-#~ msgid "Move viewport down"
-#~ msgstr "Sichtfeld nach unten schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Activate viewport row"
+msgstr "Sichtfelder-Zeile aktivieren"
 
-#~ msgid "Move the viewport one screen down."
-#~ msgstr "Das Sichtfeld eine Bildschirmhöhe nach unten schieben."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Select the specified viewport row."
+msgstr "Die angegebene Sichtfelder-Zeile auswählen."
 
-#~ msgid "Move window right"
-#~ msgstr "Fenster nach rechts verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move window to viewport"
+msgstr "Fenster auf Sichtfeld verschieben"
 
-#~ msgid ""
-#~ "Move the window to the viewport on the right, and switch to that viewport."
-#~ msgstr ""
-#~ "Das Fenster in das Sichtfeld zur Rechten verschieben und auf das "
-#~ "Sichtfeld wechseln."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move the current window to the specified viewport."
+msgstr "Das aktuelle Fenster zum angegebenen Sichtfeld verschieben."
 
-#~ msgid "Move window left"
-#~ msgstr "Fenster nach links verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move viewport right"
+msgstr "Sichtfeld nach rechts verschieben"
 
-#~ msgid ""
-#~ "Move the window to the viewport on the left, and switch to that viewport."
-#~ msgstr ""
-#~ "Das Fenster in das Sichtfeld zur Linken verschieben und auf das Sichtfeld "
-#~ "wechseln.."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move the viewport one screen to the right."
+msgstr "Das Sichtfeld eine Bildschirmbreite nach rechts schieben."
 
-#~ msgid "Move window up"
-#~ msgstr "Fenster nach oben verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move viewport left"
+msgstr "Sichtfeld nach links verschieben"
 
-#~ msgid "Move the window to the viewport above, and switch to that viewport."
-#~ msgstr ""
-#~ "Das Fenster in das Sichtfeld nach oben verschieben und auf das Sichtfeld "
-#~ "wechseln."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move the viewport one screen to the left."
+msgstr "Das Sichtfeld eine Bildschirmbreite nach links schieben."
 
-#~ msgid "Move window down"
-#~ msgstr "Fenster nach unten verschieben"
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move viewport up"
+msgstr "Sichtfeld nach oben schieben."
 
-#~ msgid "Move the window to the viewport below, and switch to that viewport."
-#~ msgstr ""
-#~ "Das Fenster in das Sichtfeld  nach unten verschieben und auf das "
-#~ "Sichtfeld wechseln."
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move the viewport one screen up."
+msgstr "Das Sichtfeld eine Bildschirmhöhe nach oben schieben."
+
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move viewport down"
+msgstr "Sichtfeld nach unten schieben."
+
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move the viewport one screen down."
+msgstr "Das Sichtfeld eine Bildschirmhöhe nach unten schieben."
 
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move window right"
+msgstr "Fenster nach rechts verschieben"
+
+#. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-#~ msgid "Animation"
-#~ msgstr "Aktionen"
+msgid ""
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
+msgstr ""
+"Das Fenster in das Sichtfeld zur Rechten verschieben und auf das Sichtfeld "
+"wechseln."
 
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move window left"
+msgstr "Fenster nach links verschieben"
+
+#. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-#~ msgid "solid"
-#~ msgstr "Vermeiden"
+msgid ""
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
+msgstr ""
+"Das Fenster in das Sichtfeld zur Linken verschieben und auf das Sichtfeld "
+"wechseln.."
 
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move window up"
+msgstr "Fenster nach oben verschieben"
+
+#. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-#~ msgid "wireframe"
-#~ msgstr "Maximiert"
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
+msgstr ""
+"Das Fenster in das Sichtfeld nach oben verschieben und auf das Sichtfeld "
+"wechseln."
 
+#. ../lisp/sawfish/wm/viewport.jl
+msgid "Move window down"
+msgstr "Fenster nach unten verschieben"
+
+#. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-#~ msgid "Give focus to windows even when they haven't asked for it."
-#~ msgstr "Fenster anheben, wenn sie fokussiert werden."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
+msgstr ""
+"Das Fenster in das Sichtfeld  nach unten verschieben und auf das Sichtfeld "
+"wechseln."
 
+#. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
-#~ msgid "Whether to enable warping the cursor to windows."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
-#~ "überschneiden soll."
+msgid "Animation"
+msgstr "Aktionen"
 
+#. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
-#~ msgid "Whether to not ignore avoided windows by default."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
-#~ "überschneiden soll."
+msgid "solid"
+msgstr "Vermeiden"
 
+#. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
-#~ msgid "Whether to avoid any unspecified window by default."
-#~ msgstr ""
-#~ "Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
-#~ "überschneiden soll."
+msgid "wireframe"
+msgstr "Maximiert"
+
+#. ../lisp/sawfish/wm/window-anim.jl
+msgid "The default window animation mode"
+msgstr ""
+
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Give focus to windows even when they haven't asked for it."
+msgstr "Fenster anheben, wenn sie fokussiert werden."
 
-#~ msgid "Focus desktop"
-#~ msgstr "Fokus auf Desktop"
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Warping"
+msgstr ""
 
-#~ msgid "Transfer input focus to the desktop window (if one exists)."
-#~ msgstr "Eingabefokus auf die Desktop-Fenster (wenn eines existiert)"
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Offset (%) from window edges when warping pointer."
+msgstr ""
 
-#~ msgid "Delete window"
-#~ msgstr "Fenster löschen"
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Whether to enable warping the cursor to windows."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
+"überschneiden soll."
 
-#~ msgid "Delete the window."
-#~ msgstr "Das Fenster löschen."
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Whether to not avoid ignored windows by default."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
+"überschneiden soll."
 
-#~ msgid "Delete window safely"
-#~ msgstr "Fenster sicher löschen"
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Whether to avoid any unspecified window by default."
+msgstr ""
+"Ob es sich beim Wachsen oder Packen mit einem ignorierten Fenster\n"
+"überschneiden soll."
 
-#~ msgid "Delete the window, or beep if the window can't be closed safely."
-#~ msgstr ""
-#~ "Das Fenster löschen oder einen Warnton ausgeben, wenn es nicht sicher "
-#~ "geschlossen werden kann."
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Format to create unique window names."
+msgstr ""
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Focus desktop"
+msgstr "Fokus auf Desktop"
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Transfer input focus to the desktop window (if one exists)."
+msgstr "Eingabefokus auf die Desktop-Fenster (wenn eines existiert)"
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Delete window"
+msgstr "Fenster löschen"
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Delete the window."
+msgstr "Das Fenster löschen."
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Delete window safely"
+msgstr "Fenster sicher löschen"
 
-#~ msgid "Uniquify window name"
-#~ msgstr "Fenstername eindeutig machen"
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Delete the window, or beep if the window can't be closed safely."
+msgstr ""
+"Das Fenster löschen oder einen Warnton ausgeben, wenn es nicht sicher "
+"geschlossen werden kann."
+
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Uniquify window name"
+msgstr "Fenstername eindeutig machen"
 
-#~ msgid "Force the current window to have a unique title."
-#~ msgstr "Erzwingen, dass das aktuelle Fenster einen eindeutigen Titel hat."
+#. ../lisp/sawfish/wm/windows.jl
+msgid "Force the current window to have a unique title."
+msgstr "Erzwingen, dass das aktuelle Fenster einen eindeutigen Titel hat."
 
+#. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-#~ msgid "How to act when passing the first or last workspace."
-#~ msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
+msgid "Rename window"
+msgstr "Fenster anheben"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "keep-going"
+msgstr ""
 
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid ""
-#~ "How to act when passing the first or last workspace, while moving a window"
-#~ msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
+msgid "How to act when passing the first or last workspace."
+msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
 
-#~ msgid "Popup workspace list"
-#~ msgstr "Arbeitsflächen-Liste anzeigen"
+#. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
+msgid ""
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
+msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
 
-#~ msgid "Display the menu containing the list of all workspaces."
-#~ msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Workspace names"
+msgstr "Namen der Arbeitsflächen"
 
-#~ msgid "Popup window list"
-#~ msgstr "Fensterliste anzeigen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Preserve outermost empty workspaces in the pager."
+msgstr ""
 
-#~ msgid "Display the menu of all managed windows."
-#~ msgstr "Das Menü mit allen verwalteten Fenster anzeigen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "_Insert workspace"
+msgstr "Arbeitsfläche e_infügen"
 
-#~ msgid "Next workspace"
-#~ msgstr "Nächste Arbeitsfläche"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Select _next workspace"
+msgstr "_Nächste Arbeitsfläche auswählen"
 
-#~ msgid "Display the next workspace."
-#~ msgstr "Die nächste Arbeitsfläche anzeigen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Select _previous workspace"
+msgstr "_Vorherige Arbeitsfläche auswählen"
 
-#~ msgid "Previous workspace"
-#~ msgstr "Vorherige Arbeitsfläche"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Merge with next"
+msgstr "Mit der nächsten verschmelzen"
 
-#~ msgid "Display the previous workspace."
-#~ msgstr "Die vorherige Arbeitsfläche anzeigen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Merge with previous"
+msgstr "Mit der vorherigen verschmelzen"
 
-#~ msgid "Send to next workspace"
-#~ msgstr "Auf nächste Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move workspace _right"
+msgstr "Arbeitsfläche nach _rechts verschieben"
 
-#~ msgid "Move the window to the next workspace."
-#~ msgstr "Das Fenster auf die nächste Arbeitsfläche verschieben."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move workspace _left"
+msgstr "Arbeitsfläche nach _links verschieben"
 
-#~ msgid "Send to previous workspace"
-#~ msgstr "Auf vorherige Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/workspace.jl
+#, c-format
+msgid "space %d"
+msgstr "Fläche %d"
 
-#~ msgid "Move the window to the previous workspace."
-#~ msgstr "Das Fenster auf die vorherige Arbeitsfläche verschieben."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Popup workspace list"
+msgstr "Arbeitsflächen-Liste anzeigen"
 
-#~ msgid "Copy to next workspace"
-#~ msgstr "Auf nächste Arbeitsfläche kopieren"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Display the menu containing the list of all workspaces."
+msgstr "Das Menü mit der Liste aller Arbeitsflächen anzeigen."
 
-#~ msgid "Copy the window to the next workspace."
-#~ msgstr "Das Fenster auf die nächste Arbeitsfläche kopieren."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Popup window list"
+msgstr "Fensterliste anzeigen"
 
-#~ msgid "Copy to previous workspace"
-#~ msgstr "Auf vorherige Arbeitsfläche kopieren"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Display the menu of all managed windows."
+msgstr "Das Menü mit allen verwalteten Fenster anzeigen."
 
-#~ msgid "Copy the window to the previous workspace."
-#~ msgstr "Das Fenster auf die vorherige Arbeitsfläche kopieren."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Next workspace"
+msgstr "Nächste Arbeitsfläche"
 
-#~ msgid "Append workspace and send"
-#~ msgstr "Arbeitsfläche anhängen und darauf schicken"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Display the next workspace."
+msgstr "Die nächste Arbeitsfläche anzeigen."
 
-#~ msgid ""
-#~ "Create a new workspace at the end of the list, and move the window to it."
-#~ msgstr ""
-#~ "Eine neue Arbeitsfläche am Ende der Liste anlegen, und das Fenster "
-#~ "darauf\n"
-#~ "verschieben."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Previous workspace"
+msgstr "Vorherige Arbeitsfläche"
 
-#~ msgid "Prepend workspace and send"
-#~ msgstr "Arbeitsplatz voranstellen und darauf schicken"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Display the previous workspace."
+msgstr "Die vorherige Arbeitsfläche anzeigen."
 
-#~ msgid ""
-#~ "Create a new workspace at the start of the list, and move the window to "
-#~ "it."
-#~ msgstr ""
-#~ "Eine neue Arbeitsfläche am Anfang der Liste anlegen und das Fenster "
-#~ "darauf\n"
-#~ "verschieben."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Send to next workspace"
+msgstr "Auf nächste Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move the window to the next workspace."
+msgstr "Das Fenster auf die nächste Arbeitsfläche verschieben."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Send to previous workspace"
+msgstr "Auf vorherige Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move the window to the previous workspace."
+msgstr "Das Fenster auf die vorherige Arbeitsfläche verschieben."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy to next workspace"
+msgstr "Auf nächste Arbeitsfläche kopieren"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy the window to the next workspace."
+msgstr "Das Fenster auf die nächste Arbeitsfläche kopieren."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy to previous workspace"
+msgstr "Auf vorherige Arbeitsfläche kopieren"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy the window to the previous workspace."
+msgstr "Das Fenster auf die vorherige Arbeitsfläche kopieren."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Append workspace and send"
+msgstr "Arbeitsfläche anhängen und darauf schicken"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid ""
+"Create a new workspace at the end of the list, and move the window to it."
+msgstr ""
+"Eine neue Arbeitsfläche am Ende der Liste anlegen, und das Fenster darauf\n"
+"verschieben."
 
-#~ msgid "Merge next workspace"
-#~ msgstr "Mit nächster Arbeitsfläche verschmelzen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Prepend workspace and send"
+msgstr "Arbeitsplatz voranstellen und darauf schicken"
 
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid ""
-#~ "Delete the current workspace. Its member windows are relocated to the "
-#~ "next\n"
-#~ "workspace."
-#~ msgstr ""
-#~ "Die aktuelle Arbeitsfläche löschen. Ihre Fenster werden auf die nächste\n"
-#~ "verschoben."
+msgid ""
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
+msgstr ""
+"Eine neue Arbeitsfläche am Anfang der Liste anlegen und das Fenster darauf\n"
+"verschieben."
 
-#~ msgid "Merge previous workspace"
-#~ msgstr "Mit vorheriger Arbeitsfläche verschmelzen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Merge next workspace"
+msgstr "Mit nächster Arbeitsfläche verschmelzen"
 
-#~ msgid ""
-#~ "Delete the current workspace. Its member windows are relocated to the\n"
-#~ "previous workspace."
-#~ msgstr ""
-#~ "Die aktuelle Arbeitsfläche löschen. Ihre Fenster werden auf die "
-#~ "vorherige\n"
-#~ "verschoben."
+#. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
+msgid ""
+"Delete the current workspace. Its member windows are relocated to the next\n"
+"workspace."
+msgstr ""
+"Die aktuelle Arbeitsfläche löschen. Ihre Fenster werden auf die nächste\n"
+"verschoben."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Merge previous workspace"
+msgstr "Mit vorheriger Arbeitsfläche verschmelzen"
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid ""
+"Delete the current workspace. Its member windows are relocated to the\n"
+"previous workspace."
+msgstr ""
+"Die aktuelle Arbeitsfläche löschen. Ihre Fenster werden auf die vorherige\n"
+"verschoben."
 
-#~ msgid "Insert workspace after"
-#~ msgstr "Arbeitsfläche einfügen nach"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Insert workspace after"
+msgstr "Arbeitsfläche einfügen nach"
 
-#~ msgid "Create a new workspace following the current workspace."
-#~ msgstr "Eine neue Arbeitsfläche hinter der aktuellen anlegen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Create a new workspace following the current workspace."
+msgstr "Eine neue Arbeitsfläche hinter der aktuellen anlegen."
 
-#~ msgid "Insert workspace before"
-#~ msgstr "Arbeitsfläche einfügen vor"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Insert workspace before"
+msgstr "Arbeitsfläche einfügen vor"
 
-#~ msgid "Create a new workspace before the current workspace."
-#~ msgstr "Eine neue Arbeitsfläche vor der aktuellen anlegen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Create a new workspace before the current workspace."
+msgstr "Eine neue Arbeitsfläche vor der aktuellen anlegen."
 
-#~ msgid "Move workspace forwards"
-#~ msgstr "Arbeitsfläche vorwärts verschieben"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move workspace forwards"
+msgstr "Arbeitsfläche vorwärts verschieben"
 
-#~ msgid "Move the current workspace one place to the right."
-#~ msgstr "Die aktuelle Arbeitsfläche einen Platz nach rechts verlegen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move the current workspace one place to the right."
+msgstr "Die aktuelle Arbeitsfläche einen Platz nach rechts verlegen."
 
-#~ msgid "Move workspace backwards"
-#~ msgstr "Arbeitsfläche rückwärts verschieben"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move workspace backwards"
+msgstr "Arbeitsfläche rückwärts verschieben"
 
-#~ msgid "Move the current workspace one place to the left."
-#~ msgstr "Die aktuelle Arbeitsfläche einen Platz nach links verlegen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Move the current workspace one place to the left."
+msgstr "Die aktuelle Arbeitsfläche einen Platz nach links verlegen."
 
-#~ msgid "Delete empty workspaces"
-#~ msgstr "Leere Arbeitsflächen löschen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Delete empty workspaces"
+msgstr "Leere Arbeitsflächen löschen"
 
-#~ msgid "Delete any workspaces that don't contain any windows."
-#~ msgstr "Alle Arbeitsflächen löschen, die keine Fenster enthalten."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Delete any workspaces that don't contain any windows."
+msgstr "Alle Arbeitsflächen löschen, die keine Fenster enthalten."
 
-#~ msgid "Delete window instance"
-#~ msgstr "Fensterinstanz löschen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Delete window instance"
+msgstr "Fensterinstanz löschen"
 
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid ""
-#~ "Remove the copy of the window on the current workspace. If this is the\n"
-#~ "last instance remaining, then delete the actual window."
-#~ msgstr ""
-#~ "Die Kopie dieses Fensters auf der aktuellen Arbeitsfläche löschen. Falls\n"
-#~ "dies die letzte verbleibende Instanz ist, das Fenster selbst löschen."
+msgid ""
+"Remove the copy of the window on the current workspace. If this is the\n"
+"last instance remaining, then delete the actual window."
+msgstr ""
+"Die Kopie dieses Fensters auf der aktuellen Arbeitsfläche löschen. Falls\n"
+"dies die letzte verbleibende Instanz ist, das Fenster selbst löschen."
 
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid "Show desktop"
-#~ msgstr "Fokus auf Desktop"
+msgid "Show desktop"
+msgstr "Fokus auf Desktop"
 
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Hide all windows except the desktop window."
+msgstr ""
+
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid "Hide desktop"
-#~ msgstr "Fokus auf Desktop"
+msgid "Hide desktop"
+msgstr "Fokus auf Desktop"
 
-#~ msgid "Activate workspace"
-#~ msgstr "Arbeitsfläche aktivieren"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Undoes the effect of the `show-desktop' command."
+msgstr ""
 
-#~ msgid "Select the N'th workspace."
-#~ msgstr "Die n-te Arbeitsfläche auswählen."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Activate workspace"
+msgstr "Arbeitsfläche aktivieren"
 
-#~ msgid "Send to workspace"
-#~ msgstr "Auf Arbeitsfläche schicken"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Select the N'th workspace."
+msgstr "Die n-te Arbeitsfläche auswählen."
 
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Send to workspace"
+msgstr "Auf Arbeitsfläche schicken"
+
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid "Move the current window to the N'th workspace."
-#~ msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche kopieren."
+msgid "Move the current window to the N'th workspace."
+msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche kopieren."
+
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy to workspace"
+msgstr "Auf Arbeitsfläche kopieren"
 
-#~ msgid "Copy to workspace"
-#~ msgstr "Auf Arbeitsfläche kopieren"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Copy the current window to the N'th workspace."
+msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche kopieren."
 
-#~ msgid "Copy the current window to the N'th workspace."
-#~ msgstr "Das aktuelle Fenster auf die n-te Arbeitsfläche kopieren."
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Select workspace interactively"
+msgstr "Arbeitsfläche interaktiv auswählen"
 
-#~ msgid "Select workspace interactively"
-#~ msgstr "Arbeitsfläche interaktiv auswählen"
+#. ../lisp/sawfish/wm/workspace.jl
+msgid "Prompt for a workspace and switch to it."
+msgstr "Nach einer Arbeitsfläche fragen und darauf umschalten."
 
-#~ msgid "Prompt for a workspace and switch to it."
-#~ msgstr "Nach einer Arbeitsfläche fragen und darauf umschalten."
+#. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
+msgid "Wether to display workspace name upon switch"
+msgstr "Namen der Arbeitsflächen"
 
+#. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
-#~ msgid "Display workspace name"
-#~ msgstr "Namen der Arbeitsflächen"
+msgid "How long to display workspace name"
+msgstr "Namen der Arbeitsflächen"
+
+#. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
+msgid "Display workspace name"
+msgstr "Namen der Arbeitsflächen"
+
+#~ msgid "S_awfish-UI"
+#~ msgstr "S_awfish-UI"
 
 #~ msgid "Matched Windows"
 #~ msgstr "Fensterbedingungen"
diff --git a/po/dz.po b/po/dz.po
index 3955071..ae755fd 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-12-10 23:05+0530\n"
 "Last-Translator: yangka <yanang_ka hotmail com>\n"
 "Language-Team: dzongkha <pgeyleg dit gov bt>\n"
@@ -204,10 +204,10 @@ msgstr "�ི��ེ��"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -219,8 +219,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -228,21 +228,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -258,14 +258,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -286,10 +286,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -312,17 +312,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -330,8 +330,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -362,8 +362,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr "�ོས���ི�སེལ�འ�ུ�འ���"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,8 +427,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -436,7 +436,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -500,15 +500,15 @@ msgstr "������"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -516,14 +516,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -531,8 +531,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -547,7 +547,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -572,8 +572,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -659,8 +659,8 @@ msgstr "���སྡ�ས�-�ཨེ��ར��-ས��ྲ���
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -672,7 +672,7 @@ msgstr "�ོས���ར���ོ��ི�-ཨེ��ར��-ས
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -686,7 +686,7 @@ msgstr "��ར���-ཨེ��ར�-ས��ྲ���ོ��ོ
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -708,7 +708,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -721,14 +721,14 @@ msgstr "��ར���-ཨེ��ར�-ས��ྲ���ོ��ོ
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -741,18 +741,18 @@ msgstr "��ར���-ཨེ��ར�-ས��ྲ���ོ��ོ
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -764,7 +764,7 @@ msgstr "��ར���-ཨེ��ར�-ས��ྲ���ོ��ོ
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -777,7 +777,7 @@ msgstr "���སྡ�ས�-�ཨེ��ར��-ས��ྲ���
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -832,12 +832,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -845,7 +845,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -853,23 +853,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -885,8 +885,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -894,10 +894,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -916,7 +916,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -929,10 +929,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -980,16 +980,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1005,7 +1005,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1839,8 +1839,10 @@ msgid "Move selected window"
 msgstr "སེལ�འ�ུ�འ���ཡོ���ི��ི��ོ�སྤོ�"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "�ས�ུ��ལ��ལེ�����ི��ོ��ི��སེལ�འ�ུ�འ����ི��ོ��ལུ��ེ�ལས�����ུ��ཤུ�ས�ལྡ��སྦེ��ི��ོ��ེ�སྤོ�"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1848,8 +1850,10 @@ msgid "Resize selected window"
 msgstr "����ས�ྱར���ོ�འ���སེར�འ�ུ�འ���ཡོ���ི��ི��ོ�"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "�ས�ུ��ལ��ལེ����འ�ི��ི��ོ��ི��སེལ�འ�ུ�འ����ི��ོ��ལུ��ེ�ལས�����ུ��ཤུ�ས�ལྡ��སྦེ��ི��ོ��ེ�����ས�ྱར���ོ�"
 "འ���"
@@ -1929,40 +1933,88 @@ msgid "Shrink window left"
 msgstr "�ཤུ���ར����ི��ོ��ཡོ��"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "�ཤུ���ར����ི��ོ��ཡས�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "�ཤུ���ར����ི��ོ�ཡར�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "�ི��ོ��ར��ཤུ���ར���"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "�ི��ོ��ཡོ��སྦུ�����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "�ི��ོ��ཡས�སྦུ�����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "�ི��ོ�ཡར�སྦུ�����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "�ི��ོ��ར�ཡར��ས�ྱེ��"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "�ི��ོ�����ྱལ���ས�ོ���"
@@ -2284,6 +2336,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "༣��ི� �ས����ྲོ�ས�"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "�ོ��ཨ��ཨེ�སི���ར���"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "�ི��ོ�འ�ྱུ��ལས��ུ��ི��ོ��ལུ�ས�ྲ�ས����ུས��������"
@@ -2374,10 +2437,6 @@ msgstr "འ�ོལ����ུ���ྲ����ོ��"
 msgid "Display all errors that have occurred to the screen."
 msgstr "�སལ���ི�འ�ི�ལུ�འ�ྱུ��ཡོ���ི�འ�ོལ����ུ���������ྲ����ོ��འ���"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2601,11 +2660,6 @@ msgstr "��ས�ལུ�ས�"
 msgid "Other"
 msgstr "����"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "�ི��ོ��ེར��ས�ྱེ��"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "����ྲི��ལྡི����"
@@ -2798,6 +2852,18 @@ msgstr "ལཱ��ི�ས�ས�ོ��ཡས�ལུ������
 msgid "Send window to the workspace right of the current workspace"
 msgstr "�ི��ོ���ལ�ོའི�ལཱ��ི�ས�ས�ོ�འ�ི��ི�ལཱ��ི�ས�ས�ོ�འ�ི�ལུ������"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "����ཱའུསི������ྱེ��འ�ི��ིས�ཨི���ུ�ི��ེ����ི�ས�འ�ི������ོ���སྨོ�"
@@ -2824,18 +2890,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "�ེ��ུས���ུ����ོ�ཡོ���འི�ས��ས��ར�ོ���ོ���ུ�ར����ི���ྱིས�ཡ���ས�ྱར���ོ���སལ�འ���འོ���"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "ས�ོ��ས�ྲི��ཡི����ུ�ས: \\w"
 
@@ -3041,6 +3095,78 @@ msgstr ""
 " (�ཱའིསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "�ོས���ར���ོ��ི�-ཨེ��ར��-ས��ྲ���ོ��ོ�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ས��ྲ���ོ��ོ�སྡ�����ཤུ�ས�ལྡ���ུ�ཡོ���ི������ྱེ��འ�ི��ི��ོ��ི���ི����སྡ�ས�ཨེ��ར��འ�ི����ཨི���འི�ས��ས\n"
+" (�ཱའུསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "���སྡ�ས�-�ཨེ��ར��-ས��ྲ���ོ��ོ�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ས��ྲ���ོ��ོ�སྡ�����ཤུ�ས�ལྡ���ུ�ཡོ���ི������ྱེ��འ�ི��ི��ོ��ི���ི����སྡ�ས�ཨེ��ར��འ�ི����ཨི���འི�ས��ས\n"
+" (�ཱའུསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "��ར���-ཨེ��ར�-ས��ྲ���ོ��ོ�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ས��ྲ���ོ��ོ�སྡ�����ཤུ�ས�ལྡ���ུ�ཡོ���ི������ྱེ��འ�ི��ི��ོ��ི���ི���ར����ཨེ��ར��འ�ི����ཨི���འི�ས��ས\n"
+" (�ཱའིསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "���སྡ�ས�-�ཨེ��ར��-ས��ྲ���ོ��ོ�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ས��ྲ���ོ��ོ�སྡ�����ཤུ�ས�ལྡ���ུ�ཡོ���ི������ྱེ��འ�ི��ི��ོ��ི���ི����སྡ�ས�ཨེ��ར��འ�ི����ཨི���འི�ས��ས\n"
+" (�ཱའུསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "���སྡ�ས�-�ཨེ��ར��-ས��ྲ���ོ��ོ�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ས��ྲ���ོ��ོ�སྡ�����ཤུ�ས�ལྡ���ུ�ཡོ���ི������ྱེ��འ�ི��ི��ོ��ི���ི����སྡ�ས�ཨེ��ར��འ�ི����ཨི���འི�ས��ས\n"
+" (�ཱའུསི�སྡ������ུ�ར�ྱ����ི��ས��ྲ�འ�ི�����ར����ི��འ���ཡོ���ཨི��)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "ལེ�ས���ོས���ལྡེ��ི��(ཨེསི)ས�ོ��ས�ྲི����ྱོ�ས���ས��ུ��ི��ོ��ལུ�ལ��ལེ��འ���ཡོ���"
 
@@ -3250,6 +3376,11 @@ msgstr "འ�ོལ����ུ���ྲ����ོ��"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "�ོ��ཨ��ཨེ�སི���ར���"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "ལོ��འ�ོ���ུ�ས�"
 
@@ -3308,8 +3439,9 @@ msgid "Display the applications menu."
 msgstr "�ློ��རི����ར����འ�ི��ུ���ྲ����ོ��འ���"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "སྭ��ིཤི�རི��ས�ྲི�"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3348,7 +3480,6 @@ msgstr "�ི��ོ��རྩེ�ས�����ུ�ལ���ལ
 msgid "Raise single window"
 msgstr "�ི��ོ�ར�ྱ�����ེར��ས�ྱེ��འ����ི�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�རི�������ས�ས���ོ�ཤོས���ུ���ི�ལུ��ེར��ས�ྱེ��འ����ི�"
@@ -3357,7 +3488,6 @@ msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�ར
 msgid "Lower single window"
 msgstr "འོ���ི�ར�ྱ�����ི��ོ�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�རི�������ས�ས���འ�ཤོས���ུ���ི�ལུ���འ����ོ�"
@@ -3366,7 +3496,6 @@ msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�ར
 msgid "Raise lower single window"
 msgstr "འོ���ི�ར�ྱ�����ི��ོ��ེར��ས�ྱེ��འ����ི�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3565,8 +3694,10 @@ msgid "Unmaximize window"
 msgstr "�ི��ོ�སྦོ����ོ��ཤོལ�"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "��ོ���ྲ�ས��ི��ོ��ོ�རའི���ས�ལུ�ས�སྦོ����ོ��ཤོལ��ོ���ལུ�སོར��ུ��འ���"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3700,7 +3831,8 @@ msgstr "�ི��ོ��སལ���ི�����སོར�ས�
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "�ི��ོ�འ�ི��ི���ས�ལུ�ས�འ�ི��སྦོ����ོ�ཡོ���ི����སྦོ����ོ��ཤོལ��ར���སོར�ས�ོ��འ���"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3721,8 +3853,8 @@ msgstr "�ི��ོ��སལ���ི�����སོར�ས�
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "�ི��ོ�འ�ི��ི���ས�ལུ�ས�འ�ི�སྦོ����ོ�ཡོ����������སྦོ����ོ��ཤོལ�ཡོ����ར���སོར�ས�ོ��འ���"
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3943,9 +4075,7 @@ msgstr "�ི��ོ�སྦོ����ོ��ཤོལ�"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "ལས�རི��འ�ི��ིས�རྣར������ེ�����ུ�����ཡོ���ཨི�� ��ི�ས�ྲི���ཤོལ�ཡོ�����ི�����སྦྲ�ས�ར�ྱ��ས�ྱོར�ཨི�ཨེསི��ི�"
 "�ི��ོ��ལུ�ལ��ལེ��འ���ཡོ���ཨི��"
@@ -3990,13 +4120,39 @@ msgid "Raise window"
 msgstr "�ི��ོ��ེར��ས�ྱེ��"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�རི�������ས�ས���ོ�ཤོས���ུ���ི�ལུ��ེར��ས�ྱེ��འ����ི�"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "�ི��ོ��ར�འ���"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "�ི��ོ�འ�ི��རྩེ�ས�����ོ�རི�������ས�ས���འ�ཤོས���ུ���ི�ལུ���འ����ོ�"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "འོ���ི��ི��ོ��ེར��ས�ྱེ��"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"�ི��ོ�འ�ི��ོ�རའི�སྲི���འི���ས�ས���ོ�ཤོས�ལུ�ཨི�����ི���ེ�ལས�འ�ིའི�སྲི���འི���ས�ས���འ�ཤོས�ལུ���འ��"
+"��ོ�\n"
+"�ེ��ེ�����ི�����ེ��ི��འ�����ུ����ི���ེར��ས�ྱེ��འ��� ��རུ��ཡ��\n"
+"ཡུ�����ི��ོ��ུ����རུ��ཡོ���ི��ི���ས�རི���ས�ྱུར���ོས�འ����ཨི��"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4115,8 +4271,10 @@ msgid "Move window right"
 msgstr "�ི��ོ��ཡས�སྤོ�"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "�ི��ོ�འ�ི���ོ��སྣ����ུ��ལ���ཡས�འ�ི��ུ�ལུ�སྤོ��ི������ོ��སྣ����ུ��ལ���ེ�སོར��ས�ྱུར�འ���"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4124,8 +4282,10 @@ msgid "Move window left"
 msgstr "�ི��ོ��ཡོ��སྤོ�"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "�ི��ོ�འ�ི���ོ��སྣ����ུ�ལ���ཡོ��འ�ི��ུ�ལུ�སྤོ��ི������ོ��སྣ����ུ��ལ���ེ�སོར��ས�ྱུར�འ���"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4133,7 +4293,10 @@ msgid "Move window up"
 msgstr "�ི��ོ�ཡར�སྤོ�"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "�ི��ོ�འ�ི���ོ��སྣ����ུ��ལ��ལ��ལུ�སྤོ��ི������ོ��སྣ����ུ��ལ���ེ�སོར��ས�ྱུར�འ���"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4141,7 +4304,10 @@ msgid "Move window down"
 msgstr "�ི��ོ��ར�སྤོ�"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "�ི��ོ�འ�ི���ོ��སྣ����ུ��ལ��འོ��ལུ�སྤོ��ི������ོ��སྣ����ུ��ལ���ེ�ལུ�སོར��ས�ྱུར�འ���"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4182,7 +4348,7 @@ msgstr "སྣ���ེ��འ���ཡོ���ི��ི��ོ
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "སྣ���ེ��འ���ཡོ���ི��ི��ོ��ུ�ཡར��ས�ྱེ��ཡ���སྦུ�����ས��ས�སྦོ�སྦོ��ལུ�ཨི��རུ���ེ��རུ���"
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4226,6 +4392,11 @@ msgstr "�ི��ོ��ི����ུ���ོ����ཡི�
 msgid "Force the current window to have a unique title."
 msgstr "��ལ�ོའི��ི��ོ�འ�ི���ུ���ོ����ཡོ���འི���ོ��ི���ི�������ོ���"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "�ི��ོ��ེར��ས�ྱེ��"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4238,7 +4409,8 @@ msgstr "��ར����ལཱ��ི�ས�ས�ོ��ུ���
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "��ར����ལཱ��ི�ས�ས�ོ��ུ��������ྱི��ོ�ཡི��ཡོ���ི�འ�ི���ྲ����ོ��འ���"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4360,8 +4532,10 @@ msgid "Prepend workspace and send"
 msgstr "�ིརི��ེ��ི�ལཱ��ི�ས�ས�ོ���������"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "ལཱ��ི�ས�ས�ོ��སར���ི���ི��ོ�ཡི��འ�ོ���ུ�ས���ལུ��སར��ས�ྲུ��འ����ི�����ི��ོ��ེ�འ�ི�ལུ�སྤོ�"
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/el.po b/po/el.po
index 7947dba..664da47 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.2-gtk2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-11 18:56+0000\n"
 "Last-Translator: Simos Xenitellis <simos74 gmx net>\n"
 "Language-Team: Greek <nls tux hellug gr>\n"
@@ -208,10 +208,10 @@ msgstr "κανένα"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -223,8 +223,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -232,21 +232,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -254,7 +254,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -262,14 +262,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -290,10 +290,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -316,17 +316,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -334,8 +334,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -366,8 +366,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr "Î?Ï?ιλογή Ï?Ï?Ï?μαÏ?οÏ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,8 +431,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -504,15 +504,15 @@ msgstr "Ï?λα"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -520,14 +520,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -535,8 +535,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -551,7 +551,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -576,8 +576,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -593,7 +593,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -663,8 +663,8 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-κλεÏ?ίμαÏ?οÏ?"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -676,7 +676,7 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-εικονοÏ?οίηÏ?η
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -690,7 +690,7 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-μενοÏ?"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -712,7 +712,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -725,14 +725,14 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-μενοÏ?"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -745,18 +745,18 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-μενοÏ?"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -768,7 +768,7 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-μενοÏ?"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -781,7 +781,7 @@ msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-κλεÏ?ίμαÏ?οÏ?"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -836,12 +836,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -849,7 +849,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -857,23 +857,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -881,7 +881,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -889,8 +889,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -898,10 +898,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -920,7 +920,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -933,10 +933,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -984,16 +984,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1009,7 +1009,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1880,8 +1880,10 @@ msgid "Move selected window"
 msgstr "Î?εÏ?ακίνηÏ?η εÏ?ιλεγμένοÏ? Ï?αÏ?αθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Î?ναμονή για Ï?ο Ï?Ï?ήÏ?Ï?η να εÏ?ιλέξει Ï?αÏ?άθÏ?Ï?ο, έÏ?ειÏ?α διαδÏ?αÏ?Ï?ική μεÏ?ακίνηÏ?ή "
 "Ï?οÏ?."
@@ -1891,8 +1893,10 @@ msgid "Resize selected window"
 msgstr "Î?λλαγή μεγέθοÏ?Ï? εÏ?ιλεγμένοÏ? Ï?αÏ?αθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Î?ναμονή για Ï?ο Ï?Ï?ήÏ?Ï?η να εÏ?ιλέξει Ï?αÏ?άθÏ?Ï?ο, έÏ?ειÏ?α διαδÏ?αÏ?Ï?ική αλλαγή Ï?οÏ? "
 "μεγέθοÏ?Ï? Ï?οÏ?."
@@ -1976,40 +1980,88 @@ msgid "Shrink window left"
 msgstr "Î?α Ï?Ï?Ï?εÏ?αι Ï?ο Ï?αÏ?άθÏ?Ï?ο Ï?Ï?α αÏ?ιÏ?Ï?εÏ?ά"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Î?α Ï?Ï?Ï?εÏ?αι Ï?ο Ï?αÏ?άθÏ?Ï?ο Ï?Ï?α δεξιά"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Î?α Ï?Ï?Ï?εÏ?αι Ï?ο Ï?αÏ?άθÏ?Ï?ο Ï?άνÏ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Î?α Ï?Ï?Ï?εÏ?αι Ï?ο Ï?αÏ?άθÏ?Ï?ο κάÏ?Ï?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "ΣÏ?Ï?κεÏ?αÏ?ία Ï?αÏ?αθÏ?Ï?οÏ? αÏ?ιÏ?Ï?εÏ?ά"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "ΣÏ?Ï?κεÏ?αÏ?ία Ï?αÏ?αθÏ?Ï?οÏ? δεξιά"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "ΣÏ?Ï?κεÏ?αÏ?ία Ï?αÏ?αθÏ?Ï?οÏ? Ï?άνÏ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "ΣÏ?Ï?κεÏ?αÏ?ία Ï?αÏ?αθÏ?Ï?οÏ? κάÏ?Ï?"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Î?έγεθοÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?οÏ?θήκηÏ? γÏ?αμμήÏ?"
@@ -2357,6 +2409,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Î?νάδÏ?Ï?η μενοÏ? εÏ?αÏ?μογÏ?ν"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Î?ναÏ?αÏ?αγÏ?γή ηÏ?ηÏ?ικÏ?ν εÏ?Ï?έ Ï?Ï?α γεγονÏ?Ï?α Ï?Ï?ν Ï?αÏ?αθÏ?Ï?Ï?ν."
@@ -2451,10 +2514,6 @@ msgstr "ΠÏ?οβολή Ï?Ï?αλμάÏ?Ï?ν"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Î?μÏ?άνιÏ?η Ï?Ï?ην οθÏ?νη Ï?λÏ?ν Ï?Ï?ν Ï?Ï?αλμάÏ?Ï?ν Ï?οÏ? έÏ?οÏ?ν Ï?Ï?μβεί."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2678,11 +2737,6 @@ msgstr "Î?αÏ?άÏ?Ï?αÏ?η"
 msgid "Other"
 msgstr "Î?οιÏ?ά"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Î?ναÏ?ήκÏ?Ï?η Ï?αÏ?άθÏ?Ï?οÏ?"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ΣκίαÏ?η Î?εÏ?εÏ?Ï?ιÏ?μα"
@@ -2878,6 +2932,18 @@ msgstr "Î?Ï?οÏ?Ï?ολή Ï?Ï?ο Ï?Ï?Ï?ο εÏ?γαÏ?ίαÏ? αÏ?ιÏ?Ï?εÏ?ά"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Î?Ï?οÏ?Ï?ολή Ï?Ï?Ï?οÏ? εÏ?γαÏ?ίαÏ? δεξιά αÏ?Ï? Ï?ον Ï?Ï?έÏ?ονÏ?α Ï?Ï?Ï?ο εÏ?γαÏ?ίαÏ?"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "ΠÏ?Ï?ε ο δείκÏ?ηÏ? Ï?οÏ? Ï?ονÏ?ικιοÏ? εÏ?ηÏ?εάζει Ï?ην εÏ?Ï?ίαÏ?η Ï?ηÏ? ειÏ?Ï?δοÏ?."
@@ -2905,18 +2971,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Î?Ï?Ï?Ï?μαÏ?η εÏ?αναÏ?Ï?Ï?Ï?Ï?Ï?η Ï?Ï?ν θεμάÏ?Ï?ν Ï?Ï?αν ενημεÏ?Ï?νονÏ?αι."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Î?ξ οÏ?ιÏ?μοÏ? γÏ?αμμαÏ?οÏ?ειÏ?ά: \\w"
 
@@ -3128,6 +3182,82 @@ msgstr ""
 "Ï?ε αÏ?Ï?Ï? Ï?ο Ï?άÏ?Ï?η.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-εικονοÏ?οίηÏ?ηÏ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ΧάÏ?Ï?ηÏ? Ï?λήκÏ?Ï?Ï?ν με Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? ενεÏ?γοÏ?οιοÏ?νÏ?αι Ï?Ï?αν ο δείκÏ?ηÏ? είναι Ï?Ï?ο\n"
+"κοÏ?μÏ?ί κλειÏ?ίμαÏ?οÏ? ενÏ?Ï? Ï?αÏ?αθÏ?Ï?οÏ?. (Î?Ï?νο για Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? αÏ?οÏ?οÏ?ν Ï?ο "
+"Ï?ονÏ?ίκι.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-κλεÏ?ίμαÏ?οÏ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ΧάÏ?Ï?ηÏ? Ï?λήκÏ?Ï?Ï?ν με Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? ενεÏ?γοÏ?οιοÏ?νÏ?αι Ï?Ï?αν ο δείκÏ?ηÏ? είναι Ï?Ï?ο\n"
+"κοÏ?μÏ?ί κλειÏ?ίμαÏ?οÏ? ενÏ?Ï? Ï?αÏ?αθÏ?Ï?οÏ?. (Î?Ï?νο για Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? αÏ?οÏ?οÏ?ν Ï?ο "
+"Ï?ονÏ?ίκι.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-μενοÏ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ΧάÏ?Ï?ηÏ? Ï?λήκÏ?Ï?Ï?ν με Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? ενεÏ?γοÏ?οιοÏ?νÏ?αι Ï?Ï?αν ο δείκÏ?ηÏ? είναι Ï?Ï?ο\n"
+"κοÏ?μÏ?ί μενοÏ? ενÏ?Ï? Ï?αÏ?αθÏ?Ï?οÏ?. (Î?Ï?νο για Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? αÏ?οÏ?οÏ?ν Ï?ο Ï?ονÏ?ίκι.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-κλεÏ?ίμαÏ?οÏ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ΧάÏ?Ï?ηÏ? Ï?λήκÏ?Ï?Ï?ν με Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? ενεÏ?γοÏ?οιοÏ?νÏ?αι Ï?Ï?αν ο δείκÏ?ηÏ? είναι Ï?Ï?ο\n"
+"κοÏ?μÏ?ί κλειÏ?ίμαÏ?οÏ? ενÏ?Ï? Ï?αÏ?αθÏ?Ï?οÏ?. (Î?Ï?νο για Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? αÏ?οÏ?οÏ?ν Ï?ο "
+"Ï?ονÏ?ίκι.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Ï?άÏ?Ï?ηÏ?-Ï?λήκÏ?Ï?Ï?ν-κοÏ?μÏ?ιοÏ?-κλεÏ?ίμαÏ?οÏ?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ΧάÏ?Ï?ηÏ? Ï?λήκÏ?Ï?Ï?ν με Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? ενεÏ?γοÏ?οιοÏ?νÏ?αι Ï?Ï?αν ο δείκÏ?ηÏ? είναι Ï?Ï?ο\n"
+"κοÏ?μÏ?ί κλειÏ?ίμαÏ?οÏ? ενÏ?Ï? Ï?αÏ?αθÏ?Ï?οÏ?. (Î?Ï?νο για Ï?Ï?νδέÏ?ειÏ? Ï?οÏ? αÏ?οÏ?οÏ?ν Ï?ο "
+"Ï?ονÏ?ίκι.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "ΠλήκÏ?Ï?ο/α Ï?Ï?οÏ?οÏ?οίηÏ?ηÏ? για Ï?ιÏ? εξ οÏ?ιÏ?μοÏ? Ï?Ï?νÏ?ομεÏ?Ï?ειÏ?."
 
@@ -3337,6 +3467,11 @@ msgstr "ΠÏ?οβολή Ï?Ï?αλμάÏ?Ï?ν"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Î?νάδÏ?Ï?η μενοÏ? εÏ?αÏ?μογÏ?ν"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Î?Ï?ανεκκίνηÏ?η"
 
@@ -3397,8 +3532,9 @@ msgid "Display the applications menu."
 msgstr "Î?μÏ?άνιÏ?η Ï?οÏ? μενοÏ? εÏ?αÏ?μογÏ?ν."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "ΡÏ?θμιÏ?Ï?ήÏ? Ï?οÏ? ΠÏ?ιονÏ?Ï?αÏ?οÏ?"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3438,7 +3574,6 @@ msgstr "Î?ιαÏ?ήÏ?ηÏ?η Ï?Ï?ν βÏ?αÏ?Ï?βιÏ?ν Ï?αÏ?αθÏ?Ï?Ï?ν Ï?Ï?οι
 msgid "Raise single window"
 msgstr "Î?ναÏ?ήκÏ?Ï?η αÏ?λοÏ? Ï?αÏ?άθÏ?Ï?οÏ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3448,7 +3583,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Î?Ï?θιÏ?η αÏ?λοÏ? Ï?αÏ?άθÏ?Ï?οÏ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3458,7 +3592,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Î?ναÏ?ήκÏ?Ï?η Ï?αμηλοÏ? αÏ?λοÏ? Ï?αÏ?άθÏ?Ï?οÏ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3663,8 +3796,10 @@ msgid "Unmaximize window"
 msgstr "Î?Ï?Ï?μεγιÏ?Ï?οÏ?οίηÏ?η Ï?αÏ?αθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Î?Ï?αναÏ?οÏ?ά Ï?Ï?ν διαÏ?Ï?άÏ?εÏ?ν Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?ην αÏ?Ï?ική, μη μεγιÏ?Ï?οÏ?οιημένη, "
 "καÏ?άÏ?Ï?αÏ?η."
@@ -3805,7 +3940,8 @@ msgstr "Î?εγιÏ?Ï?οÏ?οίηÏ?η Ï?λήÏ?οÏ?Ï? οθÏ?νηÏ? Ï?αÏ?αθÏ?Ï?ο
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Î?λλαγή Ï?ηÏ? καÏ?άÏ?Ï?αÏ?ηÏ? Ï?αÏ?αθÏ?Ï?οÏ? μεÏ?αξÏ? μεγιÏ?Ï?οÏ?οιημένοÏ? και μη."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3826,8 +3962,8 @@ msgstr "Î?εγιÏ?Ï?οÏ?οίηÏ?η Ï?λήÏ?οÏ?Ï? οθÏ?νηÏ? Ï?αÏ?αθÏ?Ï?ο
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Î?λλαγή Ï?ηÏ? καÏ?άÏ?Ï?αÏ?ηÏ? Ï?αÏ?αθÏ?Ï?οÏ? μεÏ?αξÏ? μεγιÏ?Ï?οÏ?οιημένοÏ?-γεμιÏ?μένοÏ? και μη "
 "μεγιÏ?Ï?οÏ?οιημένοÏ?."
@@ -4054,9 +4190,7 @@ msgstr "Î?Ï?Ï?μεγιÏ?Ï?οÏ?οίηÏ?η Ï?αÏ?αθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Το Ï?Ï?Ï?γÏ?αμμα για αναÏ?αÏ?αγÏ?γή δειγμάÏ?Ï?ν ήÏ?οÏ?. Î?ν δεν οÏ?ιÏ?Ï?εί, θα "
 "Ï?Ï?ηÏ?ιμοÏ?οιηθεί εÏ?Ï?Ï?εÏ?ική Ï?Ï?οÏ?Ï?ήÏ?ιξη Ï?οÏ? ESD."
@@ -4103,13 +4237,42 @@ msgid "Raise window"
 msgstr "Î?ναÏ?ήκÏ?Ï?η Ï?αÏ?άθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Î?ναÏ?ήκÏ?Ï?η Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?ην Ï?ηλÏ?Ï?εÏ?η δÏ?ναÏ?ή θέÏ?η Ï?Ï?η Ï?ειÏ?ά Ï?Ï?οιβάγμαÏ?οÏ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "ΧαμήλÏ?μα Ï?αÏ?αθÏ?Ï?οÏ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Î?αÏ?έβαÏ?μα Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?η Ï?αμηλÏ?Ï?εÏ?η δÏ?ναÏ?ή θέÏ?η Ï?Ï?η Ï?ειÏ?ά Ï?Ï?οιβάγμαÏ?οÏ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Î?ναÏ?ήκÏ?Ï?η βÏ?θιÏ?μένοÏ? Ï?αÏ?αθÏ?Ï?οÏ?"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Î?ν Ï?ο Ï?αÏ?άθÏ?Ï?ο είναι Ï?Ï?ην Ï?ηλÏ?Ï?εÏ?η δÏ?ναÏ?ή θέÏ?η, Ï?Ï?Ï?ε καÏ?έβαÏ?έ Ï?ο Ï?Ï?η "
+"Ï?αμηλÏ?Ï?εÏ?η\n"
+"δÏ?ναÏ?ή θέÏ?η. Î?ιαÏ?οÏ?εÏ?ικά, αναÏ?ήκÏ?Ï?έ Ï?ο Ï?Ï?ο Ï?ιο Ï?ολÏ? εÏ?ιÏ?Ï?έÏ?εÏ?αι. Î?Ï?ίÏ?ειÏ?, "
+"αλλάζει\n"
+"Ï?ο εÏ?ίÏ?εδο οÏ?ιδήÏ?οÏ?ε βÏ?αÏ?Ï?βιÏ?ν Ï?αÏ?αθÏ?Ï?Ï?ν Ï?Ï?άÏ?Ï?οÏ?ν."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4229,8 +4392,10 @@ msgid "Move window right"
 msgstr "Î?εÏ?ακίνηÏ?η Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?οÏ? Ï?α δεξιά"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Î?εÏ?ακίνηÏ?η Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?η θÏ?Ï?α Ï?Ï?ηÏ? δεξιά, και αλλαγή Ï?ε αÏ?Ï?ήν Ï?ην θÏ?Ï?α "
 "Ï?Ï?ηÏ?."
@@ -4240,8 +4405,10 @@ msgid "Move window left"
 msgstr "Î?εÏ?ακίνηÏ?η Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?οÏ? Ï?α αÏ?ιÏ?Ï?εÏ?ά"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Î?εÏ?ακίνηÏ?η Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?η θÏ?Ï?α Ï?Ï?ηÏ? αÏ?ιÏ?Ï?εÏ?ά, και αλλαγή Ï?ε αÏ?Ï?ήν Ï?ην "
 "θÏ?Ï?α Ï?Ï?ηÏ?."
@@ -4251,7 +4418,10 @@ msgid "Move window up"
 msgstr "Î?εÏ?ακίνηÏ?η Ï?αÏ?αθÏ?Ï?οÏ? Ï?άνÏ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Î?εÏ?ακίνηÏ?η Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?η θÏ?Ï?α Ï?Ï?ηÏ? Ï?άνÏ?, και αλλαγή Ï?ε αÏ?Ï?ή Ï?η θÏ?Ï?α Ï?Ï?ηÏ?."
 
@@ -4260,7 +4430,10 @@ msgid "Move window down"
 msgstr "Î?εÏ?ακίνηÏ?η Ï?αÏ?αθÏ?Ï?οÏ? Ï?άνÏ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Î?εÏ?ακίνηÏ?η Ï?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? Ï?Ï?η θÏ?Ï?α Ï?Ï?ηÏ? κάÏ?Ï?, και αλλαγή Ï?ε αÏ?Ï?ή Ï?η θÏ?Ï?α Ï?Ï?ηÏ?."
 
@@ -4304,7 +4477,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Î?ν θα ακοÏ?μÏ?άει Ï?ε Ï?αÏ?άθÏ?Ï?α διαÏ?οÏ?εÏ?ικοÏ? βάθοÏ?Ï? καÏ?ά Ï?ο μεγάλÏ?μα ή Ï?η "
 "Ï?Ï?Ï?κεÏ?αÏ?ία."
@@ -4354,6 +4527,11 @@ msgstr "Î?Ï?οεικονοÏ?οίηÏ?η ονÏ?μαÏ?οÏ? Ï?αÏ?αθÏ?Ï?οÏ?"
 msgid "Force the current window to have a unique title."
 msgstr "Î?Ï?ιβολή Ï?οÏ? Ï?Ï?έÏ?ονÏ?οÏ? Ï?αÏ?αθÏ?Ï?οÏ? να έÏ?ει μοναδικÏ? Ï?ίÏ?λο."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Î?ναÏ?ήκÏ?Ï?η Ï?αÏ?άθÏ?Ï?οÏ?"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4366,7 +4544,8 @@ msgstr "Î?μÏ?άνιÏ?η Ï?οÏ? μενοÏ? Ï?οÏ? Ï?εÏ?ιέÏ?ει Ï?η λίÏ?Ï?
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Î?μÏ?άνιÏ?η Ï?οÏ? μενοÏ? Ï?οÏ? Ï?εÏ?ιέÏ?ει Ï?η λίÏ?Ï?α Ï?λÏ?ν Ï?Ï?ν Ï?Ï?Ï?Ï?ν εÏ?γαÏ?ίαÏ?."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4496,8 +4675,10 @@ msgid "Prepend workspace and send"
 msgstr "ΠÏ?οÏ?θήκη Ï?Ï?Ï?οÏ? εÏ?γαÏ?ίαÏ? και αÏ?οÏ?Ï?ολή"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Î?εÏ?ακίνηÏ?η Ï?οÏ? νέοÏ? Ï?Ï?Ï?οÏ? εÏ?γαÏ?ίαÏ? Ï?Ï?ην αÏ?Ï?ή Ï?ηÏ? λίÏ?Ï?αÏ? και μεÏ?ακίνηÏ?ε Ï?ο "
 "Ï?αÏ?άθÏ?Ï?ο Ï?ε αÏ?Ï?Ï?."
diff --git a/po/en_CA.po b/po/en_CA.po
index f57b5dc..8c1e0ff 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-09-26 23:58-0400\n"
 "Last-Translator: Adam Weinberger <adamw gnome org>\n"
 "Language-Team: Canadian English <adamw gnome org>\n"
@@ -196,10 +196,10 @@ msgstr "none"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -211,8 +211,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -220,21 +220,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,14 +250,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -278,10 +278,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -304,17 +304,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -322,8 +322,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -354,8 +354,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgstr "Select colour"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -378,7 +378,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -392,8 +392,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -401,8 +401,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,7 +428,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr "all"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -508,14 +508,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -523,8 +523,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -539,7 +539,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -564,8 +564,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -651,8 +651,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -664,7 +664,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -678,7 +678,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -713,14 +713,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -733,18 +733,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -756,7 +756,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -769,7 +769,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -824,12 +824,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -837,7 +837,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -845,23 +845,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -877,8 +877,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -886,10 +886,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -908,7 +908,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -921,10 +921,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -972,16 +972,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -997,7 +997,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1834,8 +1834,10 @@ msgid "Move selected window"
 msgstr "Move selected window"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Wait for the user to select a window, then interactively move that window."
 
@@ -1844,8 +1846,10 @@ msgid "Resize selected window"
 msgstr "Resize selected window"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Wait for the user to select a window, then interactively resize that window."
 
@@ -1924,40 +1928,88 @@ msgid "Shrink window left"
 msgstr "Slide window left"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Slide window right"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Slide window up"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Slide window down"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pack window left"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pack window right"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pack window up"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pack window down"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Size window add row"
@@ -2280,6 +2332,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup apps menu"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Play sound effects for window events."
@@ -2370,10 +2433,6 @@ msgstr "Display errors"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Display all errors that have occurred to the screen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2597,11 +2656,6 @@ msgstr "State"
 msgid "Other"
 msgstr "Other"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Raise window"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Hover"
@@ -2794,6 +2848,18 @@ msgstr "Send to workspace right"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Send window to the workspace right of the current workspace"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "When does the mouse pointer affect the input focus."
@@ -2820,18 +2886,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatically reload themes when they are updated."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Default font: \\w"
 
@@ -3035,6 +3089,78 @@ msgstr ""
 "of a window. (Only mouse-bindings are evaluated in this map.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the menu button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifier key(s) used for default shortcuts."
 
@@ -3244,6 +3370,11 @@ msgstr "Display errors"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup apps menu"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Restart"
 
@@ -3302,8 +3433,9 @@ msgid "Display the applications menu."
 msgstr "Display the applications menu."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish Configurator"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3342,7 +3474,6 @@ msgstr "Keep transient windows stacked above: \\w"
 msgid "Raise single window"
 msgstr "Raise single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3352,7 +3483,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Lower single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Lower the window to its lowest allowed position in the stacking order."
@@ -3361,7 +3491,6 @@ msgstr "Lower the window to its lowest allowed position in the stacking order."
 msgid "Raise lower single window"
 msgstr "Raise lower single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3560,8 +3689,10 @@ msgid "Unmaximize window"
 msgstr "Unmaximize window"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restore the dimensions of the window to its original, unmaximized, state."
 
@@ -3698,7 +3829,8 @@ msgstr "Maximize window fullscreen toggle"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Toggle the state of the window between maximized and unmaximized."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3719,8 +3851,8 @@ msgstr "Maximize window fullscreen toggle"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Toggle the state of the window between maximized-filled and unmaximized."
 
@@ -3941,9 +4073,7 @@ msgstr "Unmaximize window"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "The program used to play audio samples. If unset, built-in support for ESD "
 "is used."
@@ -3988,13 +4118,40 @@ msgid "Raise window"
 msgstr "Raise window"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Raise the window to its highest allowed position in the stacking order."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Lower window"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Lower the window to its lowest allowed position in the stacking order."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Raise lower window"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"If the window is at its highest possible position, then lower it to its\n"
+"lowest possible position. Otherwise raise it as far as allowed. Also "
+"changes\n"
+"the level of any transient windows it has."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4113,8 +4270,10 @@ msgid "Move window right"
 msgstr "Move window right"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Move the window to the viewport on the right, and switch to that viewport."
 
@@ -4123,8 +4282,10 @@ msgid "Move window left"
 msgstr "Move window left"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Move the window to the viewport on the left, and switch to that viewport."
 
@@ -4133,7 +4294,10 @@ msgid "Move window up"
 msgstr "Move window up"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Move the window to the viewport above, and switch to that viewport."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4141,7 +4305,10 @@ msgid "Move window down"
 msgstr "Move window down"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Move the window to the viewport below, and switch to that viewport."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4182,7 +4349,7 @@ msgstr "Whether to bump into ignored windows when growing or packing."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Whether to bump into ignored windows when growing or packing."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4226,6 +4393,11 @@ msgstr "Uniquify window name"
 msgid "Force the current window to have a unique title."
 msgstr "Force the current window to have a unique title."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Raise window"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4238,7 +4410,8 @@ msgstr "Display the menu containing the list of all workspaces."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Display the menu containing the list of all workspaces."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4361,8 +4534,10 @@ msgid "Prepend workspace and send"
 msgstr "Prepend workspace and send"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Create a new workspace at the start of the list, and move the window to it."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 5ba30fe..e6a3fef 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-04-16 12:19-0400\n"
 "Last-Translator: Gareth Owen <gowen72 yahoo com>\n"
 "Language-Team: British English\n"
@@ -206,10 +206,10 @@ msgstr "none"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -230,21 +230,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -252,7 +252,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -260,14 +260,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -288,10 +288,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -314,17 +314,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -332,8 +332,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -365,8 +365,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr "Select colour"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,8 +431,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -506,15 +506,15 @@ msgstr "all"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -522,14 +522,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -537,8 +537,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -553,7 +553,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -578,8 +578,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -595,7 +595,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -665,8 +665,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -678,7 +678,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -692,7 +692,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -714,7 +714,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -727,14 +727,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -747,18 +747,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -770,7 +770,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -783,7 +783,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -838,12 +838,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,7 +851,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -859,23 +859,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -883,7 +883,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -891,8 +891,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -900,10 +900,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -922,7 +922,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -935,10 +935,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -987,16 +987,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1012,7 +1012,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1890,8 +1890,10 @@ msgstr "Move selected window"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Wait for the user to select a window, then interactively move that window."
 
@@ -1901,8 +1903,10 @@ msgstr "Resize selected window"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Wait for the user to select a window, then interactively resize that window."
 
@@ -1981,40 +1985,88 @@ msgid "Shrink window left"
 msgstr "Slide window left"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Slide window right"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Slide window up"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Slide window down"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pack window left"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pack window right"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pack window up"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pack window down"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Size window add row"
@@ -2366,6 +2418,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup apps menu"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Play sound effects for window events."
@@ -2459,10 +2522,6 @@ msgstr "Display errors"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Display all errors that have occurred to the screen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2691,11 +2750,6 @@ msgstr "State"
 msgid "Other"
 msgstr "Other"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Raise window"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Hover"
@@ -2892,6 +2946,18 @@ msgstr "Send to workspace right"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Send window to the workspace right of the current workspace"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -2920,18 +2986,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatically reload themes when they are updated."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Default font: \\w"
 
@@ -3151,6 +3205,83 @@ msgstr ""
 "of a window. (Only mouse-bindings are evaluated in this map.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the menu button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap containing bindings active when the pointer is in the close button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifier key(s) used for default shortcuts."
 
@@ -3369,6 +3500,11 @@ msgstr "_Customise"
 msgid "Display Errors"
 msgstr "Display errors"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup apps menu"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3433,8 +3569,9 @@ msgid "Display the applications menu."
 msgstr "Display the applications menu."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish Configurator"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3473,7 +3610,6 @@ msgstr "Keep transient windows stacked above: \\w"
 msgid "Raise single window"
 msgstr "Raise single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3483,7 +3619,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Lower single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Lower the window to its lowest allowed position in the stacking order."
@@ -3492,7 +3627,6 @@ msgstr "Lower the window to its lowest allowed position in the stacking order."
 msgid "Raise lower single window"
 msgstr "Raise lower single window"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3704,8 +3838,10 @@ msgstr "Unmaximise window"
 
 # ../lisp/maximize.jl
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restore the dimensions of the window to its original, unmaximised, state."
 
@@ -3861,7 +3997,8 @@ msgstr "Maximise window fullscreen toggle"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Toggle the state of the window between maximised and unmaximised."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3884,8 +4021,8 @@ msgstr "Maximise window fullscreen toggle"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Toggle the state of the window between maximised-filled and unmaximised."
 
@@ -4118,9 +4255,7 @@ msgstr "Unmaximise window"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "The program used to play audio samples. If unset, built-in support for ESD "
 "is used."
@@ -4165,13 +4300,40 @@ msgid "Raise window"
 msgstr "Raise window"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Raise the window to its highest allowed position in the stacking order."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Lower window"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Lower the window to its lowest allowed position in the stacking order."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Raise lower window"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"If the window is at its highest possible position, then lower it to its\n"
+"lowest possible position. Otherwise raise it as far as allowed. Also "
+"changes\n"
+"the level of any transient windows it has."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4295,8 +4457,10 @@ msgid "Move window right"
 msgstr "Move window right"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Move the window to the viewport on the right, and switch to that viewport."
 
@@ -4305,8 +4469,10 @@ msgid "Move window left"
 msgstr "Move window left"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Move the window to the viewport on the left, and switch to that viewport."
 
@@ -4315,7 +4481,10 @@ msgid "Move window up"
 msgstr "Move window up"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Move the window to the viewport above, and switch to that viewport."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4323,7 +4492,10 @@ msgid "Move window down"
 msgstr "Move window down"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Move the window to the viewport below, and switch to that viewport."
 
 # ../src/sawmill-ui.jl
@@ -4366,7 +4538,7 @@ msgstr "Whether to bump into ignored windows when growing or packing."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Whether to bump into ignored windows when growing or packing."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4410,6 +4582,11 @@ msgstr "Uniquify window name"
 msgid "Force the current window to have a unique title."
 msgstr "Force the current window to have a unique title."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Raise window"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4424,7 +4601,8 @@ msgstr "Display the menu containing the list of all workspaces."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Display the menu containing the list of all workspaces."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4560,8 +4738,10 @@ msgstr "Prepend workspace and send"
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Create a new workspace at the start of the list, and move the window to it."
 
diff --git a/po/es.po b/po/es.po
index 6a0e2e3..fec1e5e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2009-03-19 13:06+0100\n"
 "Last-Translator: Jacinto Capote Robles <fastangel gmail com>\n"
 "Language-Team: Spanish <traductores es gnome org>\n"
@@ -202,10 +202,10 @@ msgstr "ninguno"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -226,21 +226,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,14 +256,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -284,10 +284,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -312,17 +312,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -330,8 +330,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -362,8 +362,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr "Selecciona color"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,8 +427,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -436,7 +436,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -500,15 +500,15 @@ msgstr "todas"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -516,14 +516,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -531,8 +531,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -547,7 +547,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -572,8 +572,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -659,8 +659,8 @@ msgstr "combinaciones-de-tecla-de-botón-cerrar"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -672,7 +672,7 @@ msgstr "combinaciones-de-teclas-de-botón-minimizar"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -686,7 +686,7 @@ msgstr "combinacion-de-teclas-de-botón-menú"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -708,7 +708,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -721,14 +721,14 @@ msgstr "combinacion-de-teclas-de-botón-menú"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -741,18 +741,18 @@ msgstr "combinacion-de-teclas-de-botón-menú"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -764,7 +764,7 @@ msgstr "combinacion-de-teclas-de-botón-menú"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -777,7 +777,7 @@ msgstr "combinaciones-de-tecla-de-botón-cerrar"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -832,12 +832,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -845,7 +845,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -853,23 +853,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -877,7 +877,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -885,8 +885,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -894,10 +894,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -916,7 +916,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -929,10 +929,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -982,16 +982,16 @@ msgstr "no"
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1007,7 +1007,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1841,7 +1841,8 @@ msgstr "Mover ventana seleccionada"
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Esperar a que el usuario elija una ventana, entonces redimensionar la "
 "ventana de forma interactiva."
@@ -1851,8 +1852,10 @@ msgid "Resize selected window"
 msgstr "Redimensionar ventana seleccionada"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Esperar a que el usuario elija una ventana, entonces redimensionar la "
 "ventana de forma interactiva."
@@ -1936,40 +1939,88 @@ msgid "Shrink window left"
 msgstr "Deslizar ventana a la izquierda"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Deslizar ventana a la derecha"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Deslizar ventana arriba"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Deslizar ventana abajo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Mover ventana a la izquierda"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Mover ventana a la derecha"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Mover ventana arriba"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Mover ventana abajo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Añadir fila al tamaño de la ventana"
@@ -2296,6 +2347,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Hack 3d"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Mostrar menú de aplicaciones"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
 msgid "Play sound effects for window events."
@@ -2393,10 +2455,6 @@ msgstr "Mostrar errores"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostrar todos los errores que hayan ocurrido en la ventana."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2621,11 +2679,6 @@ msgstr "Estado"
 msgid "Other"
 msgstr "Otros"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Traer ventana a primer plano"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2828,6 +2881,18 @@ msgstr "Enviar al escritorio de la derecha"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Envía la ventana al escritorio situado a la derecha del actual"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2856,18 +2921,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 #, fuzzy
 msgid "Default font: \\w"
 msgstr "Por omisión"
@@ -3055,6 +3108,63 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "combinaciones-de-teclas-de-botón-minimizar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "combinaciones-de-tecla-de-botón-cerrar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "combinacion-de-teclas-de-botón-menú"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "combinaciones-de-tecla-de-botón-cerrar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "combinaciones-de-tecla-de-botón-cerrar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3253,6 +3363,11 @@ msgstr "Mostrar errores"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Mostrar menú de aplicaciones"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Reiniciar"
 
@@ -3312,8 +3427,9 @@ msgid "Display the applications menu."
 msgstr "Muestra el menú de aplicaciones."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurador de Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3352,7 +3468,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "Traer ventana única al frente."
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3362,7 +3477,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Enviar al fondo ventana única"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid "Lower the window to its lowest allowed position in the stacking order."
@@ -3373,7 +3487,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Traer al frente ventana única del fondo"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3570,8 +3683,10 @@ msgid "Unmaximize window"
 msgstr "Restaurar ventana"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restaurar las dimensiones de la ventana a su estado original, no maximizado."
 
@@ -3708,7 +3823,8 @@ msgstr "Cambia el maximizado de la ventana a pantalla completa"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Cambiar el estado de la ventana entre maximizado y no maximizado."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3729,8 +3845,8 @@ msgstr "Cambia el maximizado de la ventana a pantalla completa"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Cambiar el estado de la ventana entre maximizado-rellenando y no maximizado."
 
@@ -3953,9 +4069,7 @@ msgid "Unmark all windows"
 msgstr "Restaurar ventana"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3998,13 +4112,40 @@ msgid "Raise window"
 msgstr "Traer ventana a primer plano"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Traer la ventana a su posición más alta posible en el orden de apilamiento."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Enviar ventana al fondo"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Traer la ventana a su posición más alta posible en el orden de apilamiento."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "A primer plano ventana desde el fondo"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Si la ventana está en la posición más alta posible, enviarla a su posición "
+"más baja posible. Sino, subirla tanto como sea posible. También cambia el "
+"nivel de cualquier ventana temporal que tenga."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4122,8 +4263,10 @@ msgid "Move window right"
 msgstr "Mover ventana a la derecha"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Mueve la ventana al espacio de trabajo de la derecha y se cambia a ese "
 "espacio de trabajo."
@@ -4133,8 +4276,10 @@ msgid "Move window left"
 msgstr "Mover ventana a la izquierda"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Mueve la ventana al espacio de trabajo de la izquierda y se cambia a ese "
 "espacio de trabajo."
@@ -4144,7 +4289,10 @@ msgid "Move window up"
 msgstr "Mover ventana arriba"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Mueve la ventana al espacio de trabajo de abajo y se cambia a ese espacio de "
 "trabajo."
@@ -4154,7 +4302,10 @@ msgid "Move window down"
 msgstr "Mover ventana abajo"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Mueve la ventana al espacio de trabajo de abajo y se cambia a ese espacio de "
 "trabajo."
@@ -4194,7 +4345,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4240,6 +4391,11 @@ msgstr "Hacer nombre de ventana único"
 msgid "Force the current window to have a unique title."
 msgstr "Forzar que la ventana actual tenga un título único."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Traer ventana a primer plano"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4252,7 +4408,8 @@ msgstr "Mostrar el menú con la lista de todos los escritorios."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Mostrar el menú con la lista de todos los escritorios."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4376,8 +4533,10 @@ msgid "Prepend workspace and send"
 msgstr "Añadir por delante escritorio y enviar"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Crear un escritorio nuevo al comienzo de la lista, y mover la ventana allí."
 
diff --git a/po/et.po b/po/et.po
index c2bd318..2bf59e6 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-05 22:25+0300\n"
 "Last-Translator: Tõivo Leedjärv <toivo linux ee>\n"
 "Language-Team: Estonian <gnome-et linux ee>\n"
@@ -203,10 +203,10 @@ msgstr "Ei ole"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -218,8 +218,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -227,21 +227,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -257,14 +257,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -285,10 +285,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -311,17 +311,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -329,8 +329,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -361,8 +361,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr "Vali värv"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -385,7 +385,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -399,8 +399,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -417,8 +417,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -426,8 +426,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -435,7 +435,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -499,15 +499,15 @@ msgstr "kõik"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -515,14 +515,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -530,8 +530,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -546,7 +546,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -571,8 +571,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -588,7 +588,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -658,8 +658,8 @@ msgstr "sulge-nupu-klahvivastend"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -671,7 +671,7 @@ msgstr "minimeeri-nupu-klahvivastend"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -685,7 +685,7 @@ msgstr "menüünupu-klahvivastend"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -707,7 +707,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -720,14 +720,14 @@ msgstr "menüünupu-klahvivastend"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -740,18 +740,18 @@ msgstr "menüünupu-klahvivastend"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -763,7 +763,7 @@ msgstr "menüünupu-klahvivastend"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -776,7 +776,7 @@ msgstr "sulge-nupu-klahvivastend"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -831,12 +831,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,7 +844,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -852,23 +852,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -876,7 +876,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -884,8 +884,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -893,10 +893,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -915,7 +915,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -928,10 +928,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -978,16 +978,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1003,7 +1003,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1847,7 +1847,8 @@ msgstr "Keri aken lahti"
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Vaheta töölauda ainult interaktiivsel akna liigutamisel."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1856,9 +1857,11 @@ msgid "Resize selected window"
 msgstr "Keri aken lahti"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
-msgstr ""
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
+msgstr "Vaheta töölauda ainult interaktiivsel akna liigutamisel."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
@@ -1924,40 +1927,88 @@ msgid "Shrink window left"
 msgstr "Liiguta aken vasakule"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Liiguta aken paremale"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Liiguta aken üles"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Liiguta aken alla"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Liiguta aken vasakule"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Liiguta aken paremale"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Liiguta aken üles"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Liiguta aken alla"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2304,6 +2355,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d häkk"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Näita eelmist töötsooni."
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Mängi aknasündmustele heliefekte."
@@ -2396,10 +2458,6 @@ msgstr "Näita veateateid"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Näita kõigi toimunud vigade kohta teateid ekraanil."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2628,11 +2686,6 @@ msgstr "Olek"
 msgid "Other"
 msgstr "Muu"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Maksimeeri aken"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2826,6 +2879,18 @@ msgstr "Saada paremasse töötsooni"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Saada aken aktiivsest paremale jäävasse töötsooni"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Millal mõjutab hiirekursor sisestusfookust."
@@ -2851,18 +2916,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Kui teemasid uuendatakse, lae need automaatselt uuesti."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Vaikimisi kirjatüüp: \\w"
 
@@ -3070,6 +3123,78 @@ msgstr ""
 "vastendis töötavad ainult hiireseosed.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "minimeeri-nupu-klahvivastend"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klahvivastend, mis sisaldab akna tiitliribal toimivaid seoseid. (Selles\n"
+"vastendis töötavad ainult hiireseosed.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "sulge-nupu-klahvivastend"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klahvivastend, mis sisaldab akna tiitliribal toimivaid seoseid. (Selles\n"
+"vastendis töötavad ainult hiireseosed.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menüünupu-klahvivastend"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klahvivastend, mis sisaldab akna tiitliribal toimivaid seoseid. (Selles\n"
+"vastendis töötavad ainult hiireseosed.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "sulge-nupu-klahvivastend"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klahvivastend, mis sisaldab akna tiitliribal toimivaid seoseid. (Selles\n"
+"vastendis töötavad ainult hiireseosed.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "sulge-nupu-klahvivastend"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klahvivastend, mis sisaldab akna tiitliribal toimivaid seoseid. (Selles\n"
+"vastendis töötavad ainult hiireseosed.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Aknahalduri vaikimisi kiirklahvidega kasutatav(ad) muuteklahv(id)."
 
@@ -3278,6 +3403,10 @@ msgid "Display Errors"
 msgstr "Näita veateateid"
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
 msgid "Restart Sawfish"
 msgstr "Taaskäivita"
@@ -3341,8 +3470,9 @@ msgid "Display the applications menu."
 msgstr "Näita eelmist töötsooni."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Saekala seadistaja"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3381,7 +3511,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "Maksimeeri aken"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3390,7 +3519,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3399,7 +3527,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3611,7 +3738,8 @@ msgstr "Taasta akna suurus"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Taasta aken minimeeritud olekust."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3751,9 +3879,11 @@ msgid "Maximize window fullscreen toggle"
 msgstr "Maksimeeri aken täisekraanile"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
+msgstr "Taasta aken minimeeritud olekust."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
@@ -3771,10 +3901,11 @@ msgid "Maximize window fullxinerama toggle"
 msgstr "Maksimeeri aken täisekraanile"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
+msgstr "Taasta aken minimeeritud olekust."
 
 #. ../lisp/sawfish/wm/state/shading.jl
 #, fuzzy
@@ -3982,9 +4113,7 @@ msgid "Unmark all windows"
 msgstr "Taasta akna suurus"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4032,15 +4161,34 @@ msgid "Raise window"
 msgstr "Maksimeeri aken"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Lower window"
 msgstr "Järgmine aken"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Raise lower window"
 msgstr "Maksimeeri aken"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4159,8 +4307,10 @@ msgid "Move window right"
 msgstr "Liiguta aken paremale"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Liiguta aken paremal asuvasse vaateavasse ja aktiveeri see vaateava."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4168,8 +4318,10 @@ msgid "Move window left"
 msgstr "Liiguta aken vasakule"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Liiguta aken vasakul asuvasse vaateavasse ja aktiveeri see vaateava."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4177,7 +4329,10 @@ msgid "Move window up"
 msgstr "Liiguta aken üles"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Liiguta aken üleval asuvasse vaateavasse ja aktiveeri see vaateava."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4185,7 +4340,10 @@ msgid "Move window down"
 msgstr "Liiguta aken alla"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Liiguta aken all asuvasse vaateavasse ja aktiveeri see vaateava."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4224,7 +4382,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4271,6 +4429,11 @@ msgstr "Unikaalne nimi"
 msgid "Force the current window to have a unique title."
 msgstr "Liiguta aktiivne aken määratud vaateavasse."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Maksimeeri aken"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4281,7 +4444,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4406,8 +4570,10 @@ msgid "Prepend workspace and send"
 msgstr "Saada algusess lisatud töötsooni"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Lisa uus töötsoon nimekirja algusesse ja liiguta aken sinna."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/eu.po b/po/eu.po
index 7ac160a..c5bb32c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2009-09-14 11:52+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
@@ -196,10 +196,10 @@ msgstr "Bat ere ez"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -211,8 +211,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -220,21 +220,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,14 +250,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -366,7 +366,7 @@ msgstr ""
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -390,8 +390,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -399,8 +399,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -417,8 +417,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -426,7 +426,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -488,15 +488,15 @@ msgstr ""
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -504,14 +504,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -519,8 +519,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -535,7 +535,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -560,8 +560,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -577,7 +577,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -637,8 +637,8 @@ msgstr ""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -649,7 +649,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -662,7 +662,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -695,14 +695,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -714,18 +714,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -736,7 +736,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -748,7 +748,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -803,12 +803,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -816,7 +816,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -824,23 +824,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -848,7 +848,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -856,8 +856,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -865,10 +865,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -887,7 +887,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -900,10 +900,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -947,16 +947,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -972,7 +972,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1776,7 +1776,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1785,7 +1786,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1850,40 +1852,88 @@ msgid "Shrink window left"
 msgstr "Uzkurtu ezkerrera"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Uzkurtu eskuinera"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Uzkurtu behera"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Uzkurtu behera"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Tiratu ezkerrerantz"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Tiratu eskuinerantz"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Tiratu beherantz"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Tiratu beherantz"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2219,6 +2269,16 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid "Update apps menu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2312,10 +2372,6 @@ msgstr "Bistaratu erroreak"
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2548,11 +2604,6 @@ msgstr "Egoera"
 msgid "Other"
 msgstr "Bestelakoa"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "_Bidali leihoa hona"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2748,6 +2799,18 @@ msgstr "Eraman laneko area _eskuinera"
 msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2774,18 +2837,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 #, fuzzy
 msgid "Default font: \\w"
 msgstr "Lehenetsia"
@@ -2968,6 +3019,58 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+msgid "sticky-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3152,6 +3255,10 @@ msgid "Display Errors"
 msgstr "Bistaratu erroreak"
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 msgid "Restart Sawfish"
 msgstr "Berrabiarazi Sawfish"
 
@@ -3209,8 +3316,9 @@ msgid "Display the applications menu."
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr "S_awfish-UI"
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish-en konfiguratzailea"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3249,7 +3357,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3258,7 +3365,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3267,7 +3373,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3464,7 +3569,8 @@ msgstr "_Desmaximizatu"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3588,7 +3694,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3605,8 +3712,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3804,9 +3911,7 @@ msgid "Unmark all windows"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3850,13 +3955,32 @@ msgid "Raise window"
 msgstr "Hil leihoa"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr ""
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -3976,7 +4100,8 @@ msgstr "Eraman laneko area _eskuinera"
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3986,7 +4111,8 @@ msgstr "Eraman laneko area e_zkerrera"
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3995,8 +4121,11 @@ msgid "Move window up"
 msgstr "_Bidali leihoa hona"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
+msgstr "Hautatu _aurreko laneko area"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
@@ -4004,8 +4133,11 @@ msgid "Move window down"
 msgstr "_Bidali leihoa hona"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
+msgstr "Hautatu _aurreko laneko area"
 
 #. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
@@ -4041,7 +4173,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4085,6 +4217,11 @@ msgstr ""
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "_Bidali leihoa hona"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4095,7 +4232,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4231,7 +4369,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4376,3 +4515,6 @@ msgstr ""
 #, fuzzy
 msgid "Display workspace name"
 msgstr "Laneko areen izenak"
+
+#~ msgid "S_awfish-UI"
+#~ msgstr "S_awfish-UI"
diff --git a/po/fi.po b/po/fi.po
index 1e743c4..38bef18 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish 0.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-09-06 12:57+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi Vainikainen iki fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
@@ -198,10 +198,10 @@ msgstr "ei mitään"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -213,8 +213,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -222,21 +222,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -252,14 +252,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -280,10 +280,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -306,17 +306,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -324,8 +324,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -356,8 +356,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -370,7 +370,7 @@ msgstr "Valitse väri"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -380,7 +380,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -394,8 +394,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -403,8 +403,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -412,8 +412,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -421,8 +421,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -430,7 +430,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -494,15 +494,15 @@ msgstr "kaikki"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -510,14 +510,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -525,8 +525,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -541,7 +541,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -566,8 +566,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -583,7 +583,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -653,8 +653,8 @@ msgstr "sulkemisnappi"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -666,7 +666,7 @@ msgstr "pienennysnappi"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -680,7 +680,7 @@ msgstr "valikkonappi"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -702,7 +702,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -715,14 +715,14 @@ msgstr "valikkonappi"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -735,18 +735,18 @@ msgstr "valikkonappi"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -758,7 +758,7 @@ msgstr "valikkonappi"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -771,7 +771,7 @@ msgstr "sulkemisnappi"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -826,12 +826,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -839,7 +839,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -847,23 +847,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -871,7 +871,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -879,8 +879,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -888,10 +888,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -910,7 +910,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -923,10 +923,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -974,16 +974,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -999,7 +999,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1838,8 +1838,10 @@ msgid "Move selected window"
 msgstr "Siirrä valittua ikkunaa"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Odota, että käyttäjä valitsee ikkunan, sitten siirrä kyseistä ikkunaa."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1847,8 +1849,10 @@ msgid "Resize selected window"
 msgstr "Avaa rullaus, kun ikkuna valitaan."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Odota, että käyttäjä valitsee ikkunan, sitten muuta kyseisen ikkunan kokoa."
 
@@ -1927,40 +1931,88 @@ msgid "Shrink window left"
 msgstr "Valuta ikkunaa vasemmalle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Valuta ikkunaa oikealle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Valuta ikkunaa ylöspäin"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Valuta ikkunaa alaspäin"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pakkaa ikkuna vasemmalle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pakkaa ikkuna oikealle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pakkaa ikkuna ylös"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pakkaa ikkuna alas"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Ikkunan koko lisää rivi"
@@ -2282,6 +2334,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d-viritys"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Näytä ohjelmavalikko"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Soita toimintoäänet ikkunatapahtumille."
@@ -2372,10 +2435,6 @@ msgstr "Näytä virheet"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Näytä kaikki sattuneet virheet ruudulla."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2599,11 +2658,6 @@ msgstr "Tila"
 msgid "Other"
 msgstr "Muu"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Nosta ikkuna"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "�lykäs rullaus"
@@ -2797,6 +2851,18 @@ msgstr "Lähetä työpöytä oikealle"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Lähetä ikkuna nykyisestä oikealla olevalle työpöydälle"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Milloin osoitin vaikuttaa kohdistukseen."
@@ -2823,18 +2889,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Lataa teemat uudelleen niiden päivityksen jälkeen."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Kirjasinlaji: \\w"
 
@@ -3036,6 +3090,78 @@ msgstr ""
 "Koskee vain hiiren nappeja."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "pienennysnappi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Aktiiviset näppäimet osoittimen ollessa ikkunan sulkemisnapin yllä.\n"
+"Koskee vain hiiren nappeja."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "sulkemisnappi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Aktiiviset näppäimet osoittimen ollessa ikkunan sulkemisnapin yllä.\n"
+"Koskee vain hiiren nappeja."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "valikkonappi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Aktiiviset näppäimet osoittimen ollessa ikkunan valikkonapin yllä.\n"
+"Koskee vain hiiren nappeja."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "sulkemisnappi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Aktiiviset näppäimet osoittimen ollessa ikkunan sulkemisnapin yllä.\n"
+"Koskee vain hiiren nappeja."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "sulkemisnappi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Aktiiviset näppäimet osoittimen ollessa ikkunan sulkemisnapin yllä.\n"
+"Koskee vain hiiren nappeja."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Muunnosnäppäin/näppäimet, jota käytetään oletusoikoteihin."
 
@@ -3245,6 +3371,11 @@ msgstr "Näytä virheet"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Näytä ohjelmavalikko"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Käynnistä uudelleen"
 
@@ -3303,8 +3434,9 @@ msgid "Display the applications menu."
 msgstr "Näytä ohjelmavalikko."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish-asetukset"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3344,7 +3476,6 @@ msgstr "Pidä ali-ikkunat näiden yläpuolella: \\w"
 msgid "Raise single window"
 msgstr "Nosta yksittäinen ikkuna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Nosta ikkuna sen pinoustason korkeimmalle sallitulle paikalle."
@@ -3353,7 +3484,6 @@ msgstr "Nosta ikkuna sen pinoustason korkeimmalle sallitulle paikalle."
 msgid "Lower single window"
 msgstr "Laske yksittäinen ikkuna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Laske ikkuna sen pinoustason alimmalle sallitulle paikalle."
@@ -3362,7 +3492,6 @@ msgstr "Laske ikkuna sen pinoustason alimmalle sallitulle paikalle."
 msgid "Raise lower single window"
 msgstr "Nosta alempi yksittäinen ikkuna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3560,8 +3689,10 @@ msgid "Unmaximize window"
 msgstr "Palauta koko"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Palauta ikkunan mitat alkuperäisiksi, suurentamattomiksi, arvoiksi."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3691,7 +3822,8 @@ msgstr "Suurenna ikkuna kokoruudun välillä"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Tee ikkunasta suurennettu tai palauta se normaaliksi."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3712,8 +3844,8 @@ msgstr "Suurenna ikkuna kokoruudun välillä"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Täytä ikkunan ympäristö tai palauta normaaliksi."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3929,9 +4061,7 @@ msgstr "Palauta koko"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "�änitiedostojen soittamiseen käytettävä ohjelma. Jos määrittelemätön, "
 "käytetään sisäänrakennettua ESD-tukea."
@@ -3976,13 +4106,38 @@ msgid "Raise window"
 msgstr "Nosta ikkuna"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Nosta ikkuna sen pinoustason korkeimmalle sallitulle paikalle."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Laske ikkuna"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Laske ikkuna sen pinoustason alimmalle sallitulle paikalle."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Nosta alempi ikkuna"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Jos ikkuna on korkeimmalla sallitulla paikalla, laske se alimmalle\n"
+"sallitulle paikalle. Muuten nosta mahdollisimman ylös. Vaikuttaa\n"
+"myös mahdollisten ali-ikkunoiden tasoon."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4101,8 +4256,10 @@ msgid "Move window right"
 msgstr "Siirrä ikkuna oikealle"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Siirrä ikkuna oikeanpuoleiselle näyttöalueelle ja vaihda siihen "
 "näyttöalueeseen."
@@ -4112,8 +4269,10 @@ msgid "Move window left"
 msgstr "Siirrä ikkuna vasemmalle"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Siirrä ikkuna vasemmanpuoleiselle näyttöalueelle ja vaihda siihen "
 "näyttöalueeseen."
@@ -4123,7 +4282,10 @@ msgid "Move window up"
 msgstr "Siirrä vikkuna ylös"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Siirrä ikkuna vasemmanpuoleiselle näyttöalueelle ja vaihda siihen "
 "näyttöalueeseen."
@@ -4133,7 +4295,10 @@ msgid "Move window down"
 msgstr "Siirrä ikkuna alas"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Siirrä ikkuna vasemmanpuoleiselle näyttöalueelle ja vaihda siihen "
 "näyttöalueeseen."
@@ -4176,7 +4341,7 @@ msgstr "Törmätäänkö ohitettaviin ikkunoihin kasvatettaessa ja pakatessa."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Törmätäänkö ohitettaviin ikkunoihin kasvatettaessa ja pakatessa."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4220,6 +4385,11 @@ msgstr "Aseta uniikki ikkunanimi"
 msgid "Force the current window to have a unique title."
 msgstr "Aseta ikkunalle uniikki ikkunanimi."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Nosta ikkuna"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4232,7 +4402,8 @@ msgstr "Näytä kaikki työpöydät listaava valikko."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Näytä kaikki työpöydät listaava valikko."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4354,8 +4525,10 @@ msgid "Prepend workspace and send"
 msgstr "Lisää työpöytä alkuun ja lähetä"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Luo listan alkuun uusi työpöytä, ja siirrä ikkuna sille."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/fr.po b/po/fr.po
index 2a7c4ad..4b01eea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-08-29 15:06+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox redfoxcenter org>\n"
 "Language-Team: GNOME French Team <gnomefr traduc org>\n"
@@ -205,10 +205,10 @@ msgstr "aucun"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -220,8 +220,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -229,21 +229,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -251,7 +251,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -259,14 +259,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -287,10 +287,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -313,17 +313,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -331,8 +331,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -363,8 +363,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -377,7 +377,7 @@ msgstr "Choisir une couleur"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -401,8 +401,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,8 +428,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -437,7 +437,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -501,15 +501,15 @@ msgstr "Tous"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -517,14 +517,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -532,8 +532,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -548,7 +548,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -573,8 +573,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -590,7 +590,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -660,8 +660,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -673,7 +673,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -687,7 +687,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -709,7 +709,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -722,14 +722,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -742,18 +742,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -765,7 +765,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -778,7 +778,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -833,12 +833,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -846,7 +846,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -854,23 +854,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -878,7 +878,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -886,8 +886,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -895,10 +895,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -917,7 +917,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -930,10 +930,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -981,16 +981,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1006,7 +1006,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1845,8 +1845,10 @@ msgid "Move selected window"
 msgstr "Déplacer la fenêtre sélectionnée"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Attendre que l'utilisateur sélectionne une fenêtre, puis déplacer\n"
 "interactivement celle-ci."
@@ -1856,8 +1858,10 @@ msgid "Resize selected window"
 msgstr "Redimensionner la fenêtre sélectionnée"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Attendre que l'utilisateur sélectionne une fenêtre, puis redimensionner "
 "interactivement celle-ci."
@@ -1937,40 +1941,88 @@ msgid "Shrink window left"
 msgstr "Glisser la fenêtre vers la gauche"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Glisser la fenêtre vers la droite"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Glisser la fenêtre vers le haut"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Glisser la fenêtre vers le bas"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Coller la fenêtre vers la gauche"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Coller la fenêtre vers la droite"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Coller la fenêtre vers le haut"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Coller la fenêtre vers le bas"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Ajouter une ligne à la taille de la fenêtre"
@@ -2309,6 +2361,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Logo 3d"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup le menu des apps"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Activer les effets audio pour les événements des fenêtres."
@@ -2402,10 +2465,6 @@ msgstr "Affichage des erreurs"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Afficher toutes les erreurs survenues à l'écran."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2629,11 +2688,6 @@ msgstr "Ã?tat"
 msgid "Other"
 msgstr "Autre"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Mettre au premier plan la fenêtre"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Over"
@@ -2836,6 +2890,18 @@ msgstr ""
 "Envoyer la fenêtre dans l'espace de travail à droite de l'espace de travail "
 "actuel."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Quand le pointeur de la souris affecte-t-il le focus d'entrée."
@@ -2864,18 +2930,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Recharger automatiquement les thèmes quand ils sont mis à jour."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Police par défaut : \\w"
 
@@ -3088,6 +3142,83 @@ msgstr ""
 "testés dans cette table.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Table des touches contenant les raccourcis actifs quand le pointeur est\n"
+"au-dessus du bouton fermer d'une fenêtre. (Seuls les raccourcis souris sont\n"
+"testés dans cette table.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Table des touches contenant les raccourcis actifs quand le pointeur est\n"
+"au-dessus du bouton fermer d'une fenêtre. (Seuls les raccourcis souris sont\n"
+"testés dans cette table.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Table des touches contenant les raccourcis actifs quand le pointeur est\n"
+"au-dessus du bouton menu d'une fenêtre. (Seuls les raccourcis souris sont\n"
+"testés dans cette table.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Table des touches contenant les raccourcis actifs quand le pointeur est\n"
+"au-dessus du bouton fermer d'une fenêtre. (Seuls les raccourcis souris sont\n"
+"testés dans cette table.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Table des touches contenant les raccourcis actifs quand le pointeur est\n"
+"au-dessus du bouton fermer d'une fenêtre. (Seuls les raccourcis souris sont\n"
+"testés dans cette table.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Touche(s) modificatrice utilisée(s) pour les raccourcis clavier par défaut."
@@ -3298,6 +3429,11 @@ msgstr "Affichage des erreurs"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup le menu des apps"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Redémarrer"
 
@@ -3356,8 +3492,9 @@ msgid "Display the applications menu."
 msgstr "Afficher le menu des applications."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurateur de Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3396,7 +3533,6 @@ msgstr "Garder les fenêtres temporaires empilées au-dessus : \\w"
 msgid "Raise single window"
 msgstr "Mettre au premier plan une simple fenêtre"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3407,7 +3543,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Diminuer une simple fenêtre"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3418,7 +3553,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Augmenter la diminution d'une simple fenêtre"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3618,8 +3752,10 @@ msgid "Unmaximize window"
 msgstr "Démaximiser la fenêtre"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restorer les dimensions d'une fenêtre à son état originel, état démaximisé."
 
@@ -3756,7 +3892,8 @@ msgstr "Basculer la maximisation de la fenêtre en plein écran"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Basculer l'état de la fenêtre de maximisé à démaximisé."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3777,8 +3914,8 @@ msgstr "Basculer la maximisation de la fenêtre en plein écran"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Basculer l'état de la fenêtre entre maximisé entièrement et démaximisé."
 
@@ -4004,9 +4141,7 @@ msgstr "Démaximiser la fenêtre"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Le programme utilisé pour jouer les échantillons sonores. Si non définit,\n"
 "le support interne d'ESD est utilisé."
@@ -4053,13 +4188,42 @@ msgid "Raise window"
 msgstr "Mettre au premier plan la fenêtre"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"�lever la fenêtre à sa position la plus haute autorisée dans\n"
+"l'ordre d'empilement."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Dépiler la fenêtre."
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Descendre la fenêtre à sa position la plus basse autorisée dans\n"
+"l'ordre d'empilement."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Augmenter la diminution de la fenêtre"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Si la fenêtre est a sa plus haute position possible, la descendre à\n"
+"sa position la plus basse possible. Sinon la descendre autant que\n"
+"possible. Change aussi le niveau de chaque fenêtre fille qu'elle possède."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4180,8 +4344,10 @@ msgid "Move window right"
 msgstr "Déplacer la fenêtre vers la droite"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Envoie la fenêtre vers le bureau de droite et affiche ce bureau."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4189,8 +4355,10 @@ msgid "Move window left"
 msgstr "Envoyer la fenêtre à gauche"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Envoie la fenêtre vers le bureau de gauche, et affiche ce bureau."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4198,7 +4366,10 @@ msgid "Move window up"
 msgstr "Envoyer la fenêtre vers le haut"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Envoie la fenêtre vers le bureau du dessus, et affiche ce bureau."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4206,7 +4377,10 @@ msgid "Move window down"
 msgstr "Envoyer la fenêtre vers le bas"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Envoie la fenêtre vers le bureau du dessous et affiche ce bureau."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4249,7 +4423,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Indique si on passe les fenêtres ignorées lorsqu'on les agrandit ou les "
 "empile."
@@ -4299,6 +4473,11 @@ msgstr "Le nom de la fenêtre devient unique"
 msgid "Force the current window to have a unique title."
 msgstr "Forcer la fenêtre courante à avoir un titre unique."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Mettre au premier plan la fenêtre"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4311,7 +4490,8 @@ msgstr "Afficher le menu contenant la liste de tous les espaces de travail."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Afficher le menu contenant la liste de tous les espaces de travail."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4435,8 +4615,10 @@ msgid "Prepend workspace and send"
 msgstr "Pré-ajouter un espace de travail et envoyer"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Créer un nouvel espace de travail au début de la liste, et déplacer la "
 "fenêtre vers celui-ci."
diff --git a/po/ga.po b/po/ga.po
index 95df82d..f9d6f2b 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-01-16 18:30-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry computer org>\n"
 "Language-Team: Irish <gaeilge-gnulinux lists sourceforge net>\n"
@@ -188,10 +188,10 @@ msgstr "ar bith"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -203,8 +203,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -212,21 +212,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -234,7 +234,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -242,14 +242,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -269,10 +269,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -295,17 +295,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -313,8 +313,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -344,8 +344,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -358,7 +358,7 @@ msgstr "Tóg Dath"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -368,7 +368,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -382,8 +382,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,7 +418,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -480,15 +480,15 @@ msgstr "gach rud"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -496,14 +496,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -511,8 +511,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -527,7 +527,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -552,8 +552,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -569,7 +569,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -627,8 +627,8 @@ msgstr ""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -639,7 +639,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -652,7 +652,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -673,7 +673,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -685,14 +685,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -704,18 +704,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -726,7 +726,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -738,7 +738,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -793,12 +793,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -806,7 +806,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -814,23 +814,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -838,7 +838,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -846,8 +846,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -855,10 +855,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -877,7 +877,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -890,10 +890,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -936,16 +936,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -961,7 +961,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1736,7 +1736,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1745,7 +1746,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1811,33 +1813,81 @@ msgid "Shrink window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window down"
 msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr ""
@@ -2156,6 +2206,16 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid "Update apps menu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2245,10 +2305,6 @@ msgstr ""
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2464,11 +2520,6 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Scríos"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2660,6 +2711,18 @@ msgstr ""
 msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2685,18 +2748,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr ""
 
@@ -2877,6 +2928,58 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+msgid "sticky-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3066,6 +3169,10 @@ msgid "Display Errors"
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 msgid "Restart Sawfish"
 msgstr ""
 
@@ -3123,8 +3230,9 @@ msgid "Display the applications menu."
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Earraidh as Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3162,7 +3270,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3171,7 +3278,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3180,7 +3286,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3372,7 +3477,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3494,7 +3600,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3511,8 +3618,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3706,9 +3813,7 @@ msgid "Unmark all windows"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3751,13 +3856,32 @@ msgid "Raise window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr ""
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -3874,7 +3998,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3883,7 +4008,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3891,7 +4017,9 @@ msgid "Move window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3899,7 +4027,9 @@ msgid "Move window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -3935,7 +4065,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -3980,6 +4110,11 @@ msgstr ""
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Scríos"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -3990,7 +4125,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4116,7 +4252,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/gl.po b/po/gl.po
index 7c070ce..b505546 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2001-08-19 13:25+0200\n"
 "Last-Translator: Jesús Bravo Álvarez <jba pobox com>\n"
 "Language-Team: Galician <trasno ceu fi udc es>\n"
@@ -204,10 +204,10 @@ msgstr "ning
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -219,8 +219,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -228,21 +228,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -258,14 +258,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -286,10 +286,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -314,17 +314,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -332,8 +332,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -364,8 +364,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -378,7 +378,7 @@ msgstr "Seleccionar cor"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -402,8 +402,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -420,8 +420,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -429,8 +429,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -438,7 +438,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -502,15 +502,15 @@ msgstr "todas"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -518,14 +518,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -533,8 +533,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -549,7 +549,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -574,8 +574,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -661,8 +661,8 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -674,7 +674,7 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -688,7 +688,7 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -710,7 +710,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -723,14 +723,14 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -743,18 +743,18 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -766,7 +766,7 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr "Mapa de teclado do bot
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -834,12 +834,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -847,7 +847,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -855,23 +855,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -879,7 +879,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -887,8 +887,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -896,10 +896,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -918,7 +918,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -931,10 +931,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -982,16 +982,16 @@ msgstr "Acerca"
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1007,7 +1007,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1817,8 +1817,10 @@ msgid "Move selected window"
 msgstr "Mover a fiestra seleccionada"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Agardar a que o usuario seleccione unha fiestra, e logo movela "
 "interactivamente."
@@ -1828,8 +1830,10 @@ msgid "Resize selected window"
 msgstr "Redimensionar a fiestra seleccionada"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Agardar a que o usuario seleccione unha fiestra, e logo redimensionala "
 "interactivamente."
@@ -1909,40 +1913,88 @@ msgid "Shrink window left"
 msgstr "Deslizar a fiestra para a esquerda"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Deslizar a fiestra para a dereita"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Deslizar a fiestra para arriba"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Deslizar a fiestra para abaixo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Empaquetar fiestra para a esquerda"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Empaquetar fiestra para a dereita"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Empaquetar fiestra para arriba"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Empaquetar fiestra para abaixo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Engadir unha ringleira á fiestra"
@@ -2266,6 +2318,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Hack 3d"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Amosar menú de aplicacións"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Reproducir efectos de son nos eventos das fiestras."
@@ -2360,10 +2423,6 @@ msgstr "Amosar os erros"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Amosar na pantalla os erros que ocorreron."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2586,11 +2645,6 @@ msgstr "Estado"
 msgid "Other"
 msgstr "Outro"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Elevar fiestra"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Desenrolar ao sobrevoar"
@@ -2798,6 +2852,18 @@ msgstr "Enviar para o escritorio"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Crear un novo escritorio antes do actual."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Cándo afecta o punteiro do rato ao foco de entrada."
@@ -2825,18 +2891,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Recargar automaticamente os temas cando son actualizados."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Fonte por defecto: \\w"
 
@@ -3041,6 +3095,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Mapa de teclado do botón de iconificar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado cos atallos activos cando o punteiro do rato está\n"
+"no botón de pechar dunha fiestra. (Só se evalúan as funcións do rato.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Mapa de teclado do botón de pechar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado cos atallos activos cando o punteiro do rato está\n"
+"no botón de pechar dunha fiestra. (Só se evalúan as funcións do rato.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Mapa de teclado do botón de menú"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado cos atallos activos cando o punteiro do rato está\n"
+"no botón de menú dunha fiestra. (Só se evalúan as funcións do rato.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Mapa de teclado do botón de pechar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado cos atallos activos cando o punteiro do rato está\n"
+"no botón de pechar dunha fiestra. (Só se evalúan as funcións do rato.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Mapa de teclado do botón de pechar"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado cos atallos activos cando o punteiro do rato está\n"
+"no botón de pechar dunha fiestra. (Só se evalúan as funcións do rato.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tecla(s) modificadoras usadas por omisión para os atallos."
 
@@ -3258,6 +3384,11 @@ msgstr "Amosar os erros"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Amosar menú de aplicacións"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Reiniciar"
 
@@ -3316,8 +3447,9 @@ msgid "Display the applications menu."
 msgstr "Amosar o menú de aplicacións."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configuración do sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3357,7 +3489,6 @@ msgstr "Manter as fiestras temporais por riba de: \\w"
 msgid "Raise single window"
 msgstr "Elevar fiestra simple"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Elevar a fiestra á posición máis alta permitida na pila."
@@ -3366,7 +3497,6 @@ msgstr "Elevar a fiestra 
 msgid "Lower single window"
 msgstr "Baixar fiestra simple"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Baixar a fiestra á posición máis baixa permitida na pila."
@@ -3375,7 +3505,6 @@ msgstr "Baixar a fiestra 
 msgid "Raise lower single window"
 msgstr "Elevar-Baixar fiestra simple"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3579,8 +3708,10 @@ msgid "Unmaximize window"
 msgstr "Restaurar fiestra"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restaurar as dimensións da fiestra ao seu estado orixinal sen maximizar."
 
@@ -3717,7 +3848,8 @@ msgstr "Trocar maximizaci
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Mudar o estado da fiestra entre maximizada e non maximizada."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3738,8 +3870,8 @@ msgstr "Trocar maximizaci
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Mudar o estado da fiestra entre maximizada-enchida e non maximizada."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3959,9 +4091,7 @@ msgstr "Restaurar fiestra"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "O programa para reproducir as gravacións de son. Se non se indica, usarase o "
 "soporte integrado para ESD."
@@ -4006,13 +4136,38 @@ msgid "Raise window"
 msgstr "Elevar fiestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Elevar a fiestra á posición máis alta permitida na pila."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Baixar fiestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Baixar a fiestra á posición máis baixa permitida na pila."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Elevar-Baixar fiestra"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Se a fiestra está na súa posición máis alta posible, baixala á posición\n"
+"máis baixa. Se non, elevala tanto como se poida. Cambia tamén o\n"
+"nivel das fiestras temporais asociadas."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4132,7 +4287,8 @@ msgstr "Mover a fiestra para a dereita"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Mover a fiestra á área virtual da dereita."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4142,7 +4298,8 @@ msgstr "Mover a fiestra para a esquerda"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Mover a fiestra á área virtual da esquerda."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4151,7 +4308,9 @@ msgstr "Mover a fiestra para arriba"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Mover a fiestra á área virtual da esquerda."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4160,7 +4319,9 @@ msgstr "Mover a fiestra para abaixo"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Mover a fiestra á área virtual da esquerda."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4205,7 +4366,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4253,6 +4414,11 @@ msgstr "Forzar a unicidade do nome da fiestra"
 msgid "Force the current window to have a unique title."
 msgstr "Forzar que a fiestra actual teña un título único."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Elevar fiestra"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr "continuar"
@@ -4265,7 +4431,8 @@ msgstr "Ao superar o primeiro ou derradeiro escritorio: \\w"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 "Ao superar o primeiro primeiro ou derradeiro escritorio movendo unha "
 "fiestra: \\w"
@@ -4395,8 +4562,10 @@ msgid "Prepend workspace and send"
 msgstr "Engadir escritorio ao inicio e enviar"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Crear un novo escritorio ao inicio da lista, e mover alí a fiestra."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/hu.po b/po/hu.po
index ce77a6b..6b87b81 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-10-18 16:43+0200\n"
 "Last-Translator: DOMA Peter <zelin pointernet hu>\n"
 "Language-Team: Hungarian <hu li org>\n"
@@ -200,10 +200,10 @@ msgstr "nincs"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -215,8 +215,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -224,21 +224,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -254,14 +254,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -282,10 +282,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -308,17 +308,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -326,8 +326,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -358,8 +358,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -372,7 +372,7 @@ msgstr "Szín kiválasztása"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -396,8 +396,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -405,8 +405,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -414,8 +414,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -423,8 +423,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -432,7 +432,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -496,15 +496,15 @@ msgstr "összes"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -512,14 +512,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -527,8 +527,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -543,7 +543,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -568,8 +568,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -655,8 +655,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -668,7 +668,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -682,7 +682,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -704,7 +704,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -717,14 +717,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -737,18 +737,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -760,7 +760,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -773,7 +773,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -828,12 +828,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -841,7 +841,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -849,23 +849,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -873,7 +873,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -881,8 +881,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -890,10 +890,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -912,7 +912,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -925,10 +925,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -976,16 +976,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1849,8 +1849,10 @@ msgid "Move selected window"
 msgstr "Kiválasztott ablak mozgatása"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Várok a felhasználóra, hogy kiválasszon egy ablakot, és mozgassa azt."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1858,8 +1860,10 @@ msgid "Resize selected window"
 msgstr "Kiválasztott ablak átméretezése"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Várakozás egy ablak kiválasztására, majd az ablak interaktív mozgatása."
 
@@ -1938,40 +1942,88 @@ msgid "Shrink window left"
 msgstr "Ablak csúsztatása balra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ablak csúsztatása jobbra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ablak csúsztatása felfelé"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ablak csúsztatása lefelé"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ablak tömörítése balra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ablak tömörítése jobbra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ablak tömörítése felfelé"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ablak tömörítése lefelé"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Ablakméret: sor hozzáadása"
@@ -2295,6 +2347,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Alkalmazás menü nyitása"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Ablak eseményekhez hangok lejátszása."
@@ -2386,10 +2449,6 @@ msgstr "Hibák megjelenítése"
 msgid "Display all errors that have occurred to the screen."
 msgstr "A képernyÅ?vel kapcsolatos összes hiba megjelenítése."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2613,11 +2672,6 @@ msgstr "Ã?llapot"
 msgid "Other"
 msgstr "Más"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ablak elÅ?hozása"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "LebegÅ? árnyékolás"
@@ -2826,6 +2880,18 @@ msgstr "Küldés munkaterületre"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "�j munkaterület létrehozása az aktuális munkaterület elé."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Mikor befolyásolja az egérmutató a bemenet fókuszt."
@@ -2852,18 +2918,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "A témák automatikus újratöltése frissítéskor."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Alap betűtípus: \\w"
 
@@ -3076,6 +3130,83 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"A billentyűtábla bejegyzései csak akkor aktívak, ha a mutató az ablak\n"
+"bezár gombján van. (Csak egér-hozzárendeléseket értékel ki ez a "
+"hozzárendelés.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"A billentyűtábla bejegyzései csak akkor aktívak, ha a mutató az ablak\n"
+"bezár gombján van. (Csak egér-hozzárendeléseket értékel ki ez a "
+"hozzárendelés.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"A billentyűtábla bejegyzései csak akkor aktívak, ha a mutató az ablak\n"
+"menü gombján van. (Csak egér-hozzárendeléseket értékel ki ez a "
+"hozzárendelés.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"A billentyűtábla bejegyzései csak akkor aktívak, ha a mutató az ablak\n"
+"bezár gombján van. (Csak egér-hozzárendeléseket értékel ki ez a "
+"hozzárendelés.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"A billentyűtábla bejegyzései csak akkor aktívak, ha a mutató az ablak\n"
+"bezár gombján van. (Csak egér-hozzárendeléseket értékel ki ez a "
+"hozzárendelés.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Az alapértelmezett ablakkezelÅ? gyorsbillentyűkhöz használt módosító billentyű"
@@ -3287,6 +3418,11 @@ msgstr "Hibák megjelenítése"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Alkalmazás menü nyitása"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "�jraindítás"
 
@@ -3345,8 +3481,9 @@ msgid "Display the applications menu."
 msgstr "Az alkalmazások menü megjelenítése."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish konfiguráló"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3386,7 +3523,6 @@ msgstr "Tranziens ablakok fölé nem kerülhet: \\w"
 msgid "Raise single window"
 msgstr "Ablak elÅ?hozása"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Az ablak legmagasabb pozícióba emelése a rétegek között."
@@ -3395,7 +3531,6 @@ msgstr "Az ablak legmagasabb pozícióba emelése a rétegek között."
 msgid "Lower single window"
 msgstr "Ablak hátraküldése"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Az ablak legmagasabb pozícióba süllyesztése a rétegek között."
@@ -3404,7 +3539,6 @@ msgstr "Az ablak legmagasabb pozícióba süllyesztése a rétegek között."
 msgid "Raise lower single window"
 msgstr "Alacsonyabb ablak elÅ?hozása"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3603,8 +3737,10 @@ msgid "Unmaximize window"
 msgstr "Ablak maximalizálásának visszaállítása"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Az ablak méreteinek visszaállítása az eredeti, nem maximalizált állapotára."
 
@@ -3753,7 +3889,8 @@ msgstr "Teljes képernyÅ?s maximalizálás kapcsolása"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 "Az ablak állapotának kapcsolása a maximalizált és a nem maximalizált\n"
 "között."
@@ -3776,8 +3913,8 @@ msgstr "Teljes képernyÅ?s maximalizálás kapcsolása"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Az ablak állapotának kapcsolása a maximalizált-kitöltött és a nem "
 "maximalizált\n"
@@ -3999,9 +4136,7 @@ msgstr "Ablak maximalizálásának visszaállítása"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "A hangok lejátszására használt program. Ha nincs beállítva, akkor a "
 "beépített ESD támogatás használható"
@@ -4048,13 +4183,38 @@ msgid "Raise window"
 msgstr "Ablak elÅ?hozása"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Az ablak legmagasabb pozícióba emelése a rétegek között."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Ablak lecsukása"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Az ablak legmagasabb pozícióba süllyesztése a rétegek között."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Alsó ablak elÅ?hozása"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ha az ablak a lehetÅ? legmagasabb pozíciójában van, akkor leküldi a\n"
+"lehetÅ? legalacsonyabb szintre. Egyéb esetben felemeli amennyire csak lehet.\n"
+"Az ablak tranziens ablakainak szintjét szintén változtatja."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4173,8 +4333,10 @@ msgid "Move window right"
 msgstr "Ablak mozgatása jobbra"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Mozgassa az ablakot a jobbra levÅ? nézetre, és kapcsoljon oda."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4182,8 +4344,10 @@ msgid "Move window left"
 msgstr "Ablak mozgatása balra"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Mozgassa az ablakot a balra levÅ? nézetre, és kapcsoljon oda."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4191,7 +4355,10 @@ msgid "Move window up"
 msgstr "Ablak mozgatása fel"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Ablak áthelyezése, majd váltás a fenti munkalapra."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4199,7 +4366,10 @@ msgid "Move window down"
 msgstr "Ablak mozgatása le"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Ablak áthelyezése, majd váltás a lenti munkalapra."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4242,7 +4412,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Növesztéskor vagy tömörítéskor az ablak figyelmen kívül hagyott ablakokkal "
 "való ütközésének kapcsolása."
@@ -4290,6 +4460,11 @@ msgstr "Ablak nevének egyedivé tétele"
 msgid "Force the current window to have a unique title."
 msgstr "A jelenlegi ablak kényszerítése egyedi címsor használatára."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ablak elÅ?hozása"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4302,7 +4477,8 @@ msgstr "Az összes munkaterület menüjének megjelenítése."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Az összes munkaterület menüjének megjelenítése."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4431,8 +4607,10 @@ msgid "Prepend workspace and send"
 msgstr "Munkaterület elÅ?re fűzése és küldés"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "�j munkaterület létrehozása a lista elején, és az ablak mozgatása erre a "
 "munkaterületre."
diff --git a/po/it.po b/po/it.po
index cd67a23..12d6c4a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2001-07-18 11:00+0200\n"
 "Last-Translator: Michele Campeotto <micampe f2s com>\n"
 "Language-Team: Italian <it li org>\n"
@@ -202,10 +202,10 @@ msgstr "Niente"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -226,21 +226,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,14 +256,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -284,10 +284,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -310,17 +310,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -328,8 +328,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -360,8 +360,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr "Seleziona il colore"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -398,8 +398,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -416,8 +416,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -425,8 +425,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -434,7 +434,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -498,15 +498,15 @@ msgstr "Tutti"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -514,14 +514,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -529,8 +529,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -545,7 +545,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -570,8 +570,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -587,7 +587,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -657,8 +657,8 @@ msgstr "Mappatura del pulsante `Chiudi'"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -670,7 +670,7 @@ msgstr "Mappatura del pulsante `Minimizza'"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -684,7 +684,7 @@ msgstr "Mappatura del pulsante `Men
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -719,14 +719,14 @@ msgstr "Mappatura del pulsante `Men
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -739,18 +739,18 @@ msgstr "Mappatura del pulsante `Men
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -762,7 +762,7 @@ msgstr "Mappatura del pulsante `Men
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -775,7 +775,7 @@ msgstr "Mappatura del pulsante `Chiudi'"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -830,12 +830,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -843,7 +843,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,23 +851,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -883,8 +883,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -892,10 +892,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -914,7 +914,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -927,10 +927,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -974,16 +974,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -999,7 +999,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1812,8 +1812,10 @@ msgid "Move selected window"
 msgstr "Sposta finestra selezionata"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Apetta che l'utente selezioni una finestra e poi spostala con il mouse."
 
@@ -1822,8 +1824,10 @@ msgid "Resize selected window"
 msgstr "Ridimensiona finestra selezionata"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Apetta che l'utente selezioni una finestra e poi ridimensionala con il mouse."
 
@@ -1902,40 +1906,88 @@ msgid "Shrink window left"
 msgstr "Scivola finestra a sinistra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Scivola finestra a destra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Scivola finestra in alto"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Scivola finestra in basso"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Compatta finestra a sinistra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Compatta finestra a destra"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Compatta finestra in alto"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Compatta finestra in basso"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Dimensione finestra aggiungi riga"
@@ -2263,6 +2315,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Trucchetto 3D"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Mostra menù applicazioni"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Attiva i suoni per gli eventi delle finestre."
@@ -2357,10 +2420,6 @@ msgstr "Mostra errori"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostra tutti gli errori sullo schermo."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2584,11 +2643,6 @@ msgstr "Stato"
 msgid "Other"
 msgstr "Altro"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Alza finestra"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Hover"
@@ -2797,6 +2851,18 @@ msgstr "Sposta in area"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Crea una nuova area di lavoro prima di quella corrente."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Modalità di focus."
@@ -2824,18 +2890,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ricarica automaticamente i temi quando vengono modificati."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Font predefinito: \\w"
 
@@ -3040,6 +3094,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Mappatura del pulsante `Minimizza'"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mappatura dei comandi attivi quando il puntatore è sul pulsante di chiusura "
+"di una finestra. (sono validi solo comandi per il mouse)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Mappatura del pulsante `Chiudi'"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mappatura dei comandi attivi quando il puntatore è sul pulsante di chiusura "
+"di una finestra. (sono validi solo comandi per il mouse)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Mappatura del pulsante `Menù'"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mappatura dei comandi attivi quando il puntatore è sul pulsante del menù di "
+"una finestra. (sono validi solo comandi per il mouse)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Mappatura del pulsante `Chiudi'"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mappatura dei comandi attivi quando il puntatore è sul pulsante di chiusura "
+"di una finestra. (sono validi solo comandi per il mouse)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Mappatura del pulsante `Chiudi'"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mappatura dei comandi attivi quando il puntatore è sul pulsante di chiusura "
+"di una finestra. (sono validi solo comandi per il mouse)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tasto/i modificatore/i usato/i per le scorciatoie predefinite."
 
@@ -3257,6 +3383,11 @@ msgstr "Mostra errori"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Mostra menù applicazioni"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Riavvia"
 
@@ -3315,8 +3446,9 @@ msgid "Display the applications menu."
 msgstr "Mostra il menù delle applicazioni."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurazione di Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3355,7 +3487,6 @@ msgstr "Mantieni le finestre di dialogo sopra a: \\w"
 msgid "Raise single window"
 msgstr "Alza finestra singola"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Alza la finestra al livello più alto del suo stack."
@@ -3364,7 +3495,6 @@ msgstr "Alza la finestra al livello pi
 msgid "Lower single window"
 msgstr "Abbassa finestra singola"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Abbassa la finestra al livello più basso del suo stack."
@@ -3373,7 +3503,6 @@ msgstr "Abbassa la finestra al livello pi
 msgid "Raise lower single window"
 msgstr "Alza/Abbassa finestra singola"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3578,8 +3707,10 @@ msgid "Unmaximize window"
 msgstr "DeMassimizza finestra"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Ripristina le dimensioni della finestra a quelle dello stato originale, non "
 "massimizzato."
@@ -3716,7 +3847,8 @@ msgstr "(De)Massimizza finestra"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Scambia lo stato della finestra tra massimizzata e normale."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3737,8 +3869,8 @@ msgstr "(De)Massimizza finestra"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Scambia lo stato della finestra tra massimizza-riempi e normale."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3957,9 +4089,7 @@ msgstr "DeMassimizza finestra"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Il programma usato per riprodurre i suoni. Se è vuoto viene usato il "
 "supporto integrato per ESD."
@@ -4004,13 +4134,37 @@ msgid "Raise window"
 msgstr "Alza finestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Alza la finestra al livello più alto del suo stack."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Abbassa finestra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Abbassa la finestra al livello più basso del suo stack."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Alza/Abbasso finestra"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Se la finestra è al suo livello massimo, abbassala al suo livello minimo, "
+"altrimenti alzala finché è possibile. Agisce anche sulle finestre di dialogo."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4132,7 +4286,8 @@ msgstr "Sposta finestra a destra"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Sposta la finestra alla viewport a destra."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4142,7 +4297,8 @@ msgstr "Sposta finestra a sinistra"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Sposta la finestra alla viewport a sinistra."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4151,7 +4307,9 @@ msgstr "Sposta finestra in alto"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Sposta la finestra alla viewport a sinistra."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4160,7 +4318,9 @@ msgstr "Sposta finestra in basso"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Sposta la finestra alla viewport a sinistra."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4199,7 +4359,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4245,6 +4405,11 @@ msgstr "Dai nome unico alla finestra"
 msgid "Force the current window to have a unique title."
 msgstr "Forza la finestra corrente ad avere un titolo unico."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Alza finestra"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4257,7 +4422,8 @@ msgstr "Mostra il men
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Mostra il menù con la lista di tutte le aree di lavoro."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4385,8 +4551,10 @@ msgid "Prepend workspace and send"
 msgstr "Inserisci area e sposta"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Crea una nuova area di lavoro all'inizio della lista e spostaci la finestra."
 
diff --git a/po/ja.po b/po/ja.po
index 649a2f4..9f47747 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-07-19 22:53+0900\n"
 "Last-Translator: Satoru SATOH <ss gnome gr jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
@@ -193,10 +193,10 @@ msgstr "ã?ªã??"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -208,8 +208,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -217,21 +217,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -239,7 +239,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -247,14 +247,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -275,10 +275,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -301,17 +301,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -319,8 +319,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -351,8 +351,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -365,7 +365,7 @@ msgstr "è?²ã??é?¸æ??"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -389,8 +389,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -398,8 +398,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -416,8 +416,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -425,7 +425,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -489,15 +489,15 @@ msgstr "ã??ã?¹ã?¦"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -505,14 +505,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -520,8 +520,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -536,7 +536,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -561,8 +561,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -578,7 +578,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -648,8 +648,8 @@ msgstr "é??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -661,7 +661,7 @@ msgstr "ã?¢ã?¤ã?³ã?³å??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -675,7 +675,7 @@ msgstr "ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -697,7 +697,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -710,14 +710,14 @@ msgstr "ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -730,18 +730,18 @@ msgstr "ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -753,7 +753,7 @@ msgstr "ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -766,7 +766,7 @@ msgstr "é??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -821,12 +821,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -834,7 +834,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,23 +842,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -866,7 +866,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -874,8 +874,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -883,10 +883,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -905,7 +905,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -918,10 +918,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -969,16 +969,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -994,7 +994,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1829,8 +1829,10 @@ msgid "Move selected window"
 msgstr "é?¸æ??ã??ã??ã?¦ã?£ã?³ã??ã?¦ã??移å??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "ã?¦ã?¼ã?¶ã??ã?¦ã?£ã?³ã??ã?¦ã??é?¸æ??ã??ã??ã?®ã??å¾?ã?¡ã??ã??ã??ã??ã??対話ç??ã?«ã?¦ã?£ã?³ã??ã?¦ã??移å??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1838,8 +1840,10 @@ msgid "Resize selected window"
 msgstr "é?¸æ??ã??ã??ã?¦ã?£ã?³ã??ã?¦ã??ã?ªã?µã?¤ã?º"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "ã?¦ã?¼ã?¶ã??ã?¦ã?£ã?³ã??ã?¦ã??é?¸æ??ã??ã??ã?®ã??å¾?ã?¡ã??ã??ã??ã??ã??対話ç??ã?«ã?ªã?µã?¤ã?º"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1917,40 +1921,88 @@ msgid "Shrink window left"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å·¦ã?«ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å?³ã?«ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å·¦ã?«è©°ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å?³ã?«è©°ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«è©°ã??ã??"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«è©°ã??ã??"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??横ã?«å¤§ã??ã??"
@@ -2272,6 +2324,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3Dã??ã??ã?¯"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¡ã??ã?¥ã?¼ã??ã??ã??ã??ã?¢ã??ã??"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?¤ã??ã?³ã??ã?§å?¹æ??é?³ã??é³´ã??ã??"
@@ -2362,10 +2425,6 @@ msgstr "���表示"
 msgid "Display all errors that have occurred to the screen."
 msgstr "ã??ã?¹ã?¦ã?®ã?¨ã?©ã?¼ã?«ã?¤ã??ã?¦ç?»é?¢ã?«è¡¨ç¤º"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2588,11 +2647,6 @@ msgstr "ç?¶æ??"
 msgid "Other"
 msgstr "ã??ã?®ä»?"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ã?·ã?§ã?¼ã??ã?®ç?¹æ»?"
@@ -2785,6 +2839,18 @@ msgstr "å?³ã?®ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã?«é??ã??"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ç?¾å?¨ã?®ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã?®å?³ã?®ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã?«é??ã??"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??å?¥å??ã??ã?©ã?¼ã?«ã?¹ã?«ã??ã?¤å½±é?¿ã??å??ã?¼ã??ã??"
@@ -2811,18 +2877,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "ã??ã?¼ã??æ?´æ?°æ??ã?«è?ªå??ç??ã?«å??読ã?¿è¾¼ã?¿"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "æ¨?æº?ã??ã?©ã?³ã??: \\w"
 
@@ -3034,6 +3088,83 @@ msgstr ""
 "ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??å??ã?§ã?¯ã??ã?¦ã?¹å?²ã??å½?ã?¦ã? ã??ã??æ??å?¹)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "ã?¢ã?¤ã?³ã?³å??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??ã?¦ã?£ã?³ã??ã?¦ã?®é??ã??ã?¿ã?³ä¸?ã?«ã??ã??ã?¨ã??ã?«æ??å?¹ã?ª\n"
+"ã?·ã?§ã?¼ã??ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??ã?§ã?¯ã??ã?¦ã?¹ã?®\n"
+"é?¢é?£ä»?ã??ã? ã??ã??è©?価ã??ã??ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "é??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??ã?¦ã?£ã?³ã??ã?¦ã?®é??ã??ã?¿ã?³ä¸?ã?«ã??ã??ã?¨ã??ã?«æ??å?¹ã?ª\n"
+"ã?·ã?§ã?¼ã??ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??ã?§ã?¯ã??ã?¦ã?¹ã?®\n"
+"é?¢é?£ä»?ã??ã? ã??ã??è©?価ã??ã??ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??ã?¦ã?£ã?³ã??ã?¦ã?®ã?¡ã??ã?¥ã?¼ã??ã?¿ã?³ä¸?ã?«ã??ã??ã?¨ã??ã?«æ??å?¹ã?ª\n"
+"ã?·ã?§ã?¼ã??ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??ã?§ã?¯ã??ã?¦ã?¹å?²ã??å½?ã?¦\n"
+"ã? ã??ã??è©?価ã??ã??ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "é??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??ã?¦ã?£ã?³ã??ã?¦ã?®é??ã??ã?¿ã?³ä¸?ã?«ã??ã??ã?¨ã??ã?«æ??å?¹ã?ª\n"
+"ã?·ã?§ã?¼ã??ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??ã?§ã?¯ã??ã?¦ã?¹ã?®\n"
+"é?¢é?£ä»?ã??ã? ã??ã??è©?価ã??ã??ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "é??ã??ã?¿ã?³ã?­ã?¼ã??ã??ã??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"ã??ã?¦ã?¹ã?«ã?¼ã?½ã?«ã??ã?¦ã?£ã?³ã??ã?¦ã?®é??ã??ã?¿ã?³ä¸?ã?«ã??ã??ã?¨ã??ã?«æ??å?¹ã?ª\n"
+"ã?·ã?§ã?¼ã??ã?«ã??ã??ã??å?«ã??ã?­ã?¼ã??ã??ã??(ã??ã?®ã??ã??ã??ã?§ã?¯ã??ã?¦ã?¹ã?®\n"
+"é?¢é?£ä»?ã??ã? ã??ã??è©?価ã??ã??ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "ã?·ã?§ã?¼ã??ã?«ã??ã??ã?®ã??ã??ã?©ã?«ã??ã?®ã?¢ã??ã?£ã??ã?¡ã?¤ã?¢ã?­ã?¼"
 
@@ -3243,6 +3374,11 @@ msgstr "���表示"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¡ã??ã?¥ã?¼ã??ã??ã??ã??ã?¢ã??ã??"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "å??èµ·å??"
 
@@ -3301,8 +3437,9 @@ msgid "Display the applications menu."
 msgstr "ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¡ã??ã?¥ã?¼ã??表示"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish 設å®?ã??ã?¼ã?«"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3341,7 +3478,6 @@ msgstr "ã??ã?¤ã?¢ã?­ã?°ã?? \\w ã?®å??é?¢ã?«å?ºã??"
 msgid "Raise single window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å??é?¢ã?«"
@@ -3350,7 +3486,6 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å??é?¢ã?«"
 msgid "Lower single window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å¾?é?¢ã?«"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å¾?é?¢ã?«"
@@ -3359,7 +3494,6 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å¾?é?¢ã?«"
 msgid "Raise lower single window"
 msgstr "ã??ã??å¾?é?¢ã?®ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3556,8 +3690,10 @@ msgid "Unmaximize window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??ã?®å¤§ã??ã??ã?«"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??ã?®æ??大å??ã??ã??ã?¦ã??ã?ªã??ç?¶æ??ã?«æ?»ã??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3693,7 +3829,8 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦ã?®å?¨ç?»é?¢è¡¨ç¤ºã??å??æ?¿"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?®æ??大å??/é??æ??大å??(æ?®é??ã?®)ç?¶æ??ã??å??æ?¿"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3714,8 +3851,8 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦ã?®å?¨ç?»é?¢è¡¨ç¤ºã??å??æ?¿"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "ã?¦ã?£ã?³ã??ã?¦ã?®æ??大ã??(ç?»é?¢ã??)è¦?ã??å°½ã??ã??ã?¦ã??ã??ç?¶æ??ã?¨æ?®é??ã?®\n"
 "ç?¶æ??ã??å??æ?¿"
@@ -3935,9 +4072,7 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??ã?®å¤§ã??ã??ã?«"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "ã?ªã?¼ã??ã?£ã?ªã?µã?³ã??ã?«ã??å??ç??ã??ã??ã??ã?­ã?°ã?©ã? . æ¨?æº?ã?§ã?¯ã?µã??ã?¼ã??çµ?ã?¿è¾¼ã?¿ã?®\n"
 "ESD ã??使ã??"
@@ -3982,13 +4117,38 @@ msgid "Raise window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å??é?¢ã?«"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å¾?é?¢ã?«"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ã?§ã??ã??ã??ã??ã??ã?¬ã?¤ã?¤ã?®æ??å¾?é?¢ã?«"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "ã??ã??å¾?é?¢ã?®ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"ã?¦ã?£ã?³ã??ã?¦ã??æ??å??é?¢ã?«ã??ã??ã?ªã??å?¯è?½ã?ªã??ã??ã??ã?¬ã?¤ã?¤ã?®å¾?é?¢ã?«ä¸?ã??ã??ã??\n"
+"ã??ã??ã?§ã?ªã??ã?ªã??ã?§ã??ã??ã??ã??ã??å??é?¢ã?«å?ºã??ã??ã??ã?¤ã?¢ã?­ã?°ã?«ã?¤ã??ã?¦ã??\n"
+"å??ã??ã??ã??ã?«ã??ã??"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4107,8 +4267,10 @@ msgid "Move window right"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å?³ã?«ç§»å??"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "å?³ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«ã?¦ã?£ã?³ã??ã?¦ã??移å??ã??ã??å??ã??æ?¿ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4116,8 +4278,10 @@ msgid "Move window left"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å·¦ã?«ç§»å??"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "å·¦ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«ã?¦ã?£ã?³ã??ã?¦ã??移å??ã??ã??å??ã??æ?¿ã??ã??ã??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4125,7 +4289,10 @@ msgid "Move window up"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«ç§»å??"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "ä¸?ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«ã?¦ã?£ã?³ã??ã?¦ã??移å??ã??ã??ã??ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«å??ã??æ?¿ã??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4133,7 +4300,10 @@ msgid "Move window down"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã??ä¸?ã?«ç§»å??"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "ä¸?ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«ã?¦ã?£ã?³ã??ã?¦ã??移å??ã??ã??ã??ã?®ã??ã?¥ã?¼ã??ã?¼ã??ã?«å??ã??æ?¿ã??"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4175,7 +4345,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "ã?¦ã?£ã?³ã??ã?¦ã??æ?¡å¤§/è©°ã??ã??é??ã?«ç?¡è¦?ã??ã??ã?¦ã??ã??ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã?£ã?¤ã??ã??ã??ã?©ã??ã??"
 
@@ -4221,6 +4391,11 @@ msgstr "ã?¦ã?£ã?³ã??ã?¦å??ã??ç?¬è?ªã?®ã??ã?®ã?«"
 msgid "Force the current window to have a unique title."
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?«ä¸?æ??ã?ªå??å??ã?®ã?¿ã?¤ã??ã?«ã??ã??ã?¤ã??ã??ã?«å¼·å?¶"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "ã?¦ã?£ã?³ã??ã?¦ã??å??é?¢ã?«"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4233,7 +4408,8 @@ msgstr "ã??ã?¹ã?¦ã?®ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã?®ã?ªã?¹ã??ã??å?«ã??ã?¡ã??ã?¥ã?¼ã??表
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "ã??ã?¹ã?¦ã?®ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã?®ã?ªã?¹ã??ã??å?«ã??ã?¡ã??ã?¥ã?¼ã??表示"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4355,8 +4531,10 @@ msgid "Prepend workspace and send"
 msgstr "ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã??å??ã?«è¿½å? ã??ã??é??ã??"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "æ?°è¦?ã?¯ã?¼ã?¯ã?¹ã??ã?¼ã?¹ã??ã?ªã?¹ã??ã?®æ??å??ã?«ã?¤ã??ã??ã?¦ã?£ã?³ã??ã?¦ã??ã??ã??ã?¸ç§»å??"
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/ko.po b/po/ko.po
index 7d23b06..c70ab4f 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-06-19 15:18GMT+10.00\n"
 "Last-Translator: Michelle Kim <mkim brisbane redhat com>\n"
 "Language-Team: Korean <ko li org>\n"
@@ -195,10 +195,10 @@ msgstr "ì??ì??"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr "ì??ì?? ì? í??"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -491,15 +491,15 @@ msgstr "모ë??"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -507,14 +507,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -522,8 +522,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -538,7 +538,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -563,8 +563,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -650,8 +650,8 @@ msgstr "�기-��-�맵"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -663,7 +663,7 @@ msgstr "iconify-��-�맵"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -677,7 +677,7 @@ msgstr "��-��-�맵"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -699,7 +699,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -712,14 +712,14 @@ msgstr "��-��-�맵"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -732,18 +732,18 @@ msgstr "��-��-�맵"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -755,7 +755,7 @@ msgstr "��-��-�맵"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -768,7 +768,7 @@ msgstr "�기-��-�맵"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -823,12 +823,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -836,7 +836,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,23 +844,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -868,7 +868,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -876,8 +876,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -885,10 +885,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -907,7 +907,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -920,10 +920,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -971,16 +971,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1832,8 +1832,10 @@ msgid "Move selected window"
 msgstr "ì? í??í?? ì°½ ì?´ë??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "ì°½ ì? í??í??기를 기ë?¤ë ¸ë?¤ê°? ê·¸ ì°½ì?? ì??ë??ì?¼ë¡? ì?´ë??ì??í?¤ê¸°"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1841,8 +1843,10 @@ msgid "Resize selected window"
 msgstr "ì? í??í?? ì°½ í?¬ê¸° ë?¤ì?? ì¡°ì ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "ì°½ ì? í??í??기를 기ë?¤ë ¸ë?¤ê°? ê·¸ ì°½ì?? í?¬ê¸°ë¥¼ ì??ë??ì?¼ë¡? ë³?ê²½í??기"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1920,40 +1924,88 @@ msgid "Shrink window left"
 msgstr "ì°½ì?? ì?¼ìª½ì?¼ë¡? ì??ì§?ì?´ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "ì°½ì?? ì?¤ë¥¸ìª½ì?¼ë¡? ì??ì§?ì?´ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "ì°½ì?? ì??ë¡? ì??ì§?ì?´ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "ì°½ì?? ì??ë??ë¡? ì??ì§?ì?´ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "ì°½ ì?¼ìª½ì?¼ë¡? ì±?ì??ë?£ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "ì°½ ì?¤ë¥¸ìª½ì?¼ë¡? ì±?ì??ë?£ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "ì°½ ì??쪽ì?¼ë¡? ì±?ì??ë?£ê¸°"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "ì°½ ë°?ì?¼ë¡? ì±?ì??ë?£ê¸°"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "ì°½ì?? ì¤? ì¶?ê°?í??ì?¬ í?¬ê¸° ì¡°ì ?"
@@ -2275,6 +2327,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "í?½ì?? ì??ì?© í??ë¡?ê·¸ë?¨ ë©?ë?´"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "ì°½ ì?´ë²¤í?¸ì?? ë??í??ì?¬ ì??í?¥ í?¨ê³¼ ì?¬ì?©."
@@ -2365,10 +2428,6 @@ msgstr "ì¶?ë ¥ ì??ë?¬"
 msgid "Display all errors that have occurred to the screen."
 msgstr "ë°?ì??í?? 모ë?  ì?¤ë¥?를 í??ë©´ì?? ë??í??ë??ë??ë?¤."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2592,11 +2651,6 @@ msgstr "ì??í??"
 msgid "Other"
 msgstr "기í??"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "창 �리기"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ì??ì?´ë?? í?¸ë²?"
@@ -2805,6 +2859,18 @@ msgstr "ì??ì??ê³µê°?ì?¼ë¡? ë³´ë?´ê¸°"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "í??ì?¬ ì??ì??ê³µê°? ì??ì?? ì??ë¡?ì?´ ê³µê°? ë§?ë?¤ê¸°"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "ë§?ì?°ì?¤ í?¬ì?¸í?°ê°? ì??ë ¥ ì´?ì ?ì?? ì??í?¥ì?? ì¤? ë??ë???"
@@ -2833,18 +2899,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "í??ë§?ê°? ê°±ì? ë??ë©´ ì??ë??ì?¼ë¡? ë?¤ì?? ì?½ê¸°"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "기본 �꼴: \\w"
 
@@ -3049,6 +3103,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-��-�맵"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"í?¬ì?¸í?°ê°? ë?«ê¸° ë²?í?¼ì?? ì??ì?? ë?? ì??ë??í??ë?? ë°?ì?¸ë?©ì?? ê°?ì§? í?¤ë§µ.\n"
+"(ì?´ 맵ì??ì??ë?? ë§?ì?°ì?¤ ë°?ì?¸ë?©ë§? ì??ë??í?©ë??ë?¤.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "�기-��-�맵"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"í?¬ì?¸í?°ê°? ë?«ê¸° ë²?í?¼ì?? ì??ì?? ë?? ì??ë??í??ë?? ë°?ì?¸ë?©ì?? ê°?ì§? í?¤ë§µ.\n"
+"(ì?´ 맵ì??ì??ë?? ë§?ì?°ì?¤ ë°?ì?¸ë?©ë§? ì??ë??í?©ë??ë?¤.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "��-��-�맵"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"í?¬ì?¸í?°ê°? ë©?ë?´ ë²?í?¼ì?? ì??ì?? ë?? ì??ë??í??ë?? ë°?ì?¸ë?©ì?? ê°?ì§? í?¤ë§µ.\n"
+"(ì?´ 맵ì??ì??ë?? ë§?ì?°ì?¤ ë°?ì?¸ë?©ë§? ì??ë??í?©ë??ë?¤.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "�기-��-�맵"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"í?¬ì?¸í?°ê°? ë?«ê¸° ë²?í?¼ì?? ì??ì?? ë?? ì??ë??í??ë?? ë°?ì?¸ë?©ì?? ê°?ì§? í?¤ë§µ.\n"
+"(ì?´ 맵ì??ì??ë?? ë§?ì?°ì?¤ ë°?ì?¸ë?©ë§? ì??ë??í?©ë??ë?¤.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "�기-��-�맵"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"í?¬ì?¸í?°ê°? ë?«ê¸° ë²?í?¼ì?? ì??ì?? ë?? ì??ë??í??ë?? ë°?ì?¸ë?©ì?? ê°?ì§? í?¤ë§µ.\n"
+"(ì?´ 맵ì??ì??ë?? ë§?ì?°ì?¤ ë°?ì?¸ë?©ë§? ì??ë??í?©ë??ë?¤.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "기본 ì°½ê´?리ì?? ë?¨ì¶?í?¤ì?? ì?¬ì?©ë??ë?? í?¤ ì??ì ?."
 
@@ -3258,6 +3384,11 @@ msgstr "ì¶?ë ¥ ì??ë?¬"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "í?½ì?? ì??ì?© í??ë¡?ê·¸ë?¨ ë©?ë?´"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "ì?¬ì??ì??"
 
@@ -3316,8 +3447,9 @@ msgid "Display the applications menu."
 msgstr "ì? í??리ì¼?ì?´ì?? ë©?ë?´ í??ì??"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "ì??í?¼ì?¬ ì?¤ì ?"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3356,7 +3488,6 @@ msgstr "ì??ì?? ì°½ì?? ì??ë¡? ì??ì?µë??ë?¤.: \\w"
 msgid "Raise single window"
 msgstr "ë?¨ë?? ì°½ ì??ë¡? ì?¬ë¦¬ê¸°"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "ì°½ì?? ê°?ì?¥ ì??ë¡? ì??ì?µë??ë?¤."
@@ -3365,7 +3496,6 @@ msgstr "ì°½ì?? ê°?ì?¥ ì??ë¡? ì??ì?µë??ë?¤."
 msgid "Lower single window"
 msgstr "ë?¨ë?? ì°½ ë°?ì?¼ë¡? ë?´ë¦¬ê¸°"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "ì°½ì?? ê°?ì?¥ ì??ë??ë¡? ì??ì?µë??ë?¤."
@@ -3374,7 +3504,6 @@ msgstr "ì°½ì?? ê°?ì?¥ ì??ë??ë¡? ì??ì?µë??ë?¤."
 msgid "Raise lower single window"
 msgstr "ë?®ì?? ë?¨ë?? ì°½ ì??ë¡? ì?¬ë¦¬ê¸°"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3573,8 +3702,10 @@ msgid "Unmaximize window"
 msgstr "ì°½ ìµ?ë??í?? í??ì§? ì??기"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "ì°½ í?¬ê¸°ë¥¼  ì??ë??ì?? ìµ?ë??í??í??ì§? ì??ì?? ì??í??ë¡? ë³µì??ì??í?µë??ë?¤."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3708,7 +3839,8 @@ msgstr "ì°½ ìµ?ë?? í??ë©´ì?¼ë¡? ìµ?ë??í?? ì?¬ë¶? í? ê¸?"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "ìµ?ë??í??/ë¹?ìµ?ë??í?? ì??í??를 í? ê¸?í?©ë??ë?¤."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3729,8 +3861,8 @@ msgstr "ì°½ ìµ?ë?? í??ë©´ì?¼ë¡? ìµ?ë??í?? ì?¬ë¶? í? ê¸?"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "ìµ?ë??ë¡? ì±?ì?´ ì??í??ì?? ê·¸ë ?ì§? ì??ì?? ì??í?? ì?¬ì?´ë¥¼ í? ê¸?í?©ë??ë?¤."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3949,9 +4081,7 @@ msgstr "ì°½ ìµ?ë??í?? í??ì§? ì??기"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr "ì?¤ë??ì?¤ ì??í??ì?? ì?°ì£¼í?  ë?? ì?¬ì?©í?  í??ë¡?ê·¸ë?¨.  ì?¤ì ?í??ì§? ì??ì?¼ë©´ ESD를 ì?¬ì?©í?¨"
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3994,13 +4124,39 @@ msgid "Raise window"
 msgstr "창 �리기"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "ì°½ì?? ê°?ì?¥ ì??ë¡? ì??ì?µë??ë?¤."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "창 �리기"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "ì°½ì?? ê°?ì?¥ ì??ë??ë¡? ì??ì?µë??ë?¤."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "ë?®ì?? ì°½ ì?¬ë¦¬ê¸°"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"ë§?ì?½ ì°½ì?´ ê°?ì?¥ ë??ì?? ì??ì¹?ì?? ì??ë?¤ë©´ ì°½ì?? ê°?ì?¥ ë?®ì?? ê³³ì?¼ë¡? ë?®ì¶¥ë??ë?¤\n"
+"ë°?ë??ì?? ê²½ì?° í??ë?½ë??ë??í?? ë??ì??ë??ë?¤. ë??í??í??ì?¬ 창과 ê´?ë ¨ë?? 모ë?  ì°½ì?? ë?¨ê³?ê°? ë³?í?©ë??"
+"ë?¤\n"
+" "
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4119,8 +4275,10 @@ msgid "Move window right"
 msgstr "ì°½ì?? ì?¤ë¥¸ìª½ì?¼ë¡? ì?´ë??"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "ì°½ì?? ì?¤ë¥¸ìª½ ë·°í?¬í?¸ë¡? ì?´ë?? í??, ì§?ì ?í?? ë·°í?¬í?¸ë¡? ì ?í??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4128,8 +4286,10 @@ msgid "Move window left"
 msgstr "ì°½ì?? ì?¼ìª½ì?¼ë¡? ì?´ë??"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "ì°½ì?? ì?¼ìª½ ë·°í?¬í?¸ë¡? ì?´ë?? í?? ì§?ì ?í?? ë·°í?¬í?¸ë¡? ì ?í??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4137,7 +4297,10 @@ msgid "Move window up"
 msgstr "ì°½ì?? ì??ë¡? ì?´ë??"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "ì°½ì?? ì??쪽 ë·°í?¬í?¸ë¡? ì?´ë?? í??, ì§?ì ?í?? ë·°í?¬í?¸ë¡? ì ?í??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4145,7 +4308,10 @@ msgid "Move window down"
 msgstr "ì°½ì?? ë°?ì?¼ë¡? ì?´ë??"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "ì°½ì?? ì??ë??쪽 ë·°í?¬í?¸ë¡? ì?´ë?? í??, ì§?ì ?í?? ë·°í?¬í?¸ë¡? ì ?í??"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4186,7 +4352,7 @@ msgstr "ì°½ì?? í??ë??í??ê±°ë?? ì¶?ì??í? ë?? 무ì??ë?? ì°½ì?? ë¶?ë??í?? ê²?ì?¸ì§?
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "ì°½ì?? í??ë??í??ê±°ë?? ì¶?ì??í? ë?? 무ì??ë?? ì°½ì?? ë¶?ë??í?? ê²?ì?¸ì§? ì?¬ë¶?."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4230,6 +4396,11 @@ msgstr "ì°½ ì? ì?¼í?? ì?´ë¦? ê°?ê²? í??기"
 msgid "Force the current window to have a unique title."
 msgstr "í??ì?¬ ì°½ì?´ ê³ ì?  í??ì?´í??ì?? ê°?ë??ë¡? ê°?ì ?"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "창 �리기"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4242,7 +4413,8 @@ msgstr "모ë?  ì??ì??ê³µê°?ì?? í?¬í?¨í??ë?? ë©?ë?´ ë³´ì?¬ì£¼ê¸°"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "모ë?  ì??ì??ê³µê°?ì?? í?¬í?¨í??ë?? ë©?ë?´ ë³´ì?¬ì£¼ê¸°"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4369,8 +4541,10 @@ msgid "Prepend workspace and send"
 msgstr "ì??ì?? ê³µê°? 미리 ì¶?ê°?í??ê³  ë³´ë?´ê¸°"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "목ë¡?ì?? 맨ì??ì?? ì??ë¡?ì?´ ì??ì??ê³µê°?ì?? ë§?ë?¤ê³  ì°½ì?? ê·¸ ê³³ì?¼ë¡? ì?´ë??ì??í?¤ê¸°"
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/lv.po b/po/lv.po
index c4140a2..2db57ce 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish for latvian\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-11-10 11:48+0200\n"
 "Last-Translator: Artis Trops <hornet navigators lv>\n"
 "Language-Team: Latvian <ll10nt ttc lv>\n"
@@ -197,10 +197,10 @@ msgstr "nekas"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -212,8 +212,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -221,21 +221,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -251,14 +251,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -279,10 +279,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -305,17 +305,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -323,8 +323,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -355,8 +355,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr "IzvÄ?lÄ?ties krÄ?su"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -393,8 +393,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -402,8 +402,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -420,8 +420,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -429,7 +429,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -493,15 +493,15 @@ msgstr "visi"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -509,14 +509,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -524,8 +524,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -540,7 +540,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -565,8 +565,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -652,8 +652,8 @@ msgstr "aizvÄ?rÅ¡anas-pogas-taustiÅ?karte"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -665,7 +665,7 @@ msgstr "ikonificÄ?Å¡anas-pogas-taustiÅ?karte"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -679,7 +679,7 @@ msgstr "izvÄ?lnes-pogas-taustiÅ?karte"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -701,7 +701,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -714,14 +714,14 @@ msgstr "izvÄ?lnes-pogas-taustiÅ?karte"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -734,18 +734,18 @@ msgstr "izvÄ?lnes-pogas-taustiÅ?karte"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -757,7 +757,7 @@ msgstr "izvÄ?lnes-pogas-taustiÅ?karte"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr "aizvÄ?rÅ¡anas-pogas-taustiÅ?karte"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -825,12 +825,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -838,7 +838,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -846,23 +846,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -878,8 +878,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -887,10 +887,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -909,7 +909,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -922,10 +922,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -973,16 +973,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -998,7 +998,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1841,8 +1841,10 @@ msgid "Move selected window"
 msgstr "PÄ?rvietot izvÄ?lÄ?to logu"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "UzgaidÄ«t lÄ«dz lietotÄ?js izvÄ?las logu, tad interaktÄ«vi pÄ?rvietot to."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1850,8 +1852,10 @@ msgid "Resize selected window"
 msgstr "IzmainÄ«t izmÄ?ru izvÄ?lÄ?tajam logam"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "UzgaidÄ«t lÄ«dz lietotÄ?js izvÄ?las logu, tad interaktÄ«vi mainÄ«t tÄ? izmÄ?ru."
 
@@ -1930,40 +1934,88 @@ msgid "Shrink window left"
 msgstr "Aizbīdīt logu pa kreisi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Aizbīdīt logu pa labi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Aizbīdīt logu augšup"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Aizbīdīt logu lejup"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "SamazinÄ?t logu pa kreisi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "SamazinÄ?t logu pa labi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "SamazinÄ?t logu no augÅ¡as"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "SamazinÄ?t logu no lejas"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "PalielinÄ?t logu, pievienojot rindu"
@@ -2287,6 +2339,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "ParÄ?dÄ«t applikÄ?ciju izvÄ?lni"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "AtskaÅ?ot skaÅ?as efektus logu notikumiem."
@@ -2377,10 +2440,6 @@ msgstr "ParÄ?dÄ«t kļūdas"
 msgid "Display all errors that have occurred to the screen."
 msgstr "ParÄ?dÄ«t visas kļūdas, kas atgadÄ«juÅ¡Ä?s, uz ekrÄ?na."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2604,11 +2663,6 @@ msgstr "StÄ?voklis"
 msgid "Other"
 msgstr "Cits"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "PaaugstinÄ?t logu"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Ä?noÅ¡anas SvÄ?rstÄ«bas"
@@ -2801,6 +2855,18 @@ msgstr "Sūtīt uz darba vietu pa labi"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "SÅ«tÄ«t logu uz darba vietu pa labi no paÅ¡reizÄ?jÄ?s darba vietas"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kad peles kursors ietekmÄ? ievades fokusu."
@@ -2827,18 +2893,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "AutomÄ?tiski pÄ?rlÄ?dÄ?t tÄ?mas, kad tÄ?s ir atjauninÄ?tas."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "NoklusÄ?tais fonts: \\w"
 
@@ -3047,6 +3101,83 @@ msgstr ""
 "(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "ikonificÄ?Å¡anas-pogas-taustiÅ?karte"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Sasaistu saturoÅ¡Ä? taustiÅ?karte aktÄ«va, kad kursors ir uz loga aizvÄ?rÅ¡anas "
+"pogas.\n"
+"(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "aizvÄ?rÅ¡anas-pogas-taustiÅ?karte"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Sasaistu saturoÅ¡Ä? taustiÅ?karte aktÄ«va, kad kursors ir uz loga aizvÄ?rÅ¡anas "
+"pogas.\n"
+"(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "izvÄ?lnes-pogas-taustiÅ?karte"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Sasaistu saturoÅ¡Ä? taustiÅ?karte aktÄ«va, kad kursors ir uz loga izvÄ?lnes "
+"pogas.\n"
+"(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "aizvÄ?rÅ¡anas-pogas-taustiÅ?karte"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Sasaistu saturoÅ¡Ä? taustiÅ?karte aktÄ«va, kad kursors ir uz loga aizvÄ?rÅ¡anas "
+"pogas.\n"
+"(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "aizvÄ?rÅ¡anas-pogas-taustiÅ?karte"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Sasaistu saturoÅ¡Ä? taustiÅ?karte aktÄ«va, kad kursors ir uz loga aizvÄ?rÅ¡anas "
+"pogas.\n"
+"(Tikai peles-sasaistes tiek Å?emtas vÄ?rÄ? Å¡ajÄ? kartÄ?.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifikatora taustiÅ?Å¡(i), kurus lieto noklusÄ?tajÄ?m saÄ«snÄ?m."
 
@@ -3256,6 +3387,11 @@ msgstr "ParÄ?dÄ«t kļūdas"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "ParÄ?dÄ«t applikÄ?ciju izvÄ?lni"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "PÄ?rstartÄ?t"
 
@@ -3314,8 +3450,9 @@ msgid "Display the applications menu."
 msgstr "ParÄ?dÄ«t aplikÄ?ciju izvÄ?lni."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish konfigurÄ?tors"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3354,7 +3491,6 @@ msgstr "PaturÄ?t pagaidu logus sakrautus virspusÄ?: \\w"
 msgid "Raise single window"
 msgstr "PaaugstinÄ?t vienu logu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "PaaugstinÄ?t logu uz tÄ? augstÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«bÄ?."
@@ -3363,7 +3499,6 @@ msgstr "PaaugstinÄ?t logu uz tÄ? augstÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«b
 msgid "Lower single window"
 msgstr "PazeminÄ?t vienu logu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "PazeminÄ?t logu uz tÄ? zemÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«bÄ?."
@@ -3372,7 +3507,6 @@ msgstr "PazeminÄ?t logu uz tÄ? zemÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«bÄ?."
 msgid "Raise lower single window"
 msgstr "PaaugstinÄ?t zemÄ?ko vienu logu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3570,8 +3704,10 @@ msgid "Unmaximize window"
 msgstr "AtmaksimizÄ?t logu"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Atjaunot loga dimensijas tÄ? oriÄ£inÄ?lajÄ?, atmaksimizÄ?tajÄ? stÄ?voklÄ«."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3705,7 +3841,8 @@ msgstr "SlÄ?gt loga pilnekrÄ?na maksimizÄ?Å¡anu"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "SlÄ?gt loga stÄ?vokli starp maksimizÄ?tu un atmaksimizÄ?tu."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3726,8 +3863,8 @@ msgstr "SlÄ?gt loga pilnekrÄ?na maksimizÄ?Å¡anu"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "SlÄ?gt loga stÄ?vokli starp maksimizÄ?tu-aizpildÄ«tu un atmaksimizÄ?tu."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3945,9 +4082,7 @@ msgstr "AtmaksimizÄ?t logu"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programma, kura atskaÅ?o mÅ«zikas paraugs. Ja nav uzstÄ?dÄ«ta, tiek izmantots "
 "ESD iebÅ«vÄ?tais atbalsts."
@@ -3994,13 +4129,38 @@ msgid "Raise window"
 msgstr "PaaugstinÄ?t logu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "PaaugstinÄ?t logu uz tÄ? augstÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«bÄ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "PazeminÄ?t logu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "PazeminÄ?t logu uz tÄ? zemÄ?ko iespÄ?jamo pozÄ«ciju krÄ?vuma secÄ«bÄ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "PaaugstinÄ?t zemÄ?ko logu"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ja logs ir tÄ? augstÄ?kajÄ? iespÄ?jamajÄ? pozÄ«cijÄ?, tad pazeminÄ?t to uz\n"
+"tÄ? zemÄ?ko pozÄ«ciju. CitÄ?di paaugstinÄ?t to, cik augstu vien iespÄ?jams. ArÄ«\n"
+"izmaina jebkura tam esoÅ¡Ä? pagaidu loga lÄ«meni."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4120,8 +4280,10 @@ msgid "Move window right"
 msgstr "PÄ?rvietot logu pa labi"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "PÄ?rvietot logu uz skatpunktu pa labi un pÄ?rslÄ?gties uz Å¡o skatpunktu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4129,8 +4291,10 @@ msgid "Move window left"
 msgstr "PÄ?rvietot logu pa kreisi"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "PÄ?rvietot logu uz skatpunktu pa kreisi un pÄ?rslÄ?gties uz Å¡o skatpunktu."
 
@@ -4139,7 +4303,10 @@ msgid "Move window up"
 msgstr "PÄ?rvietot logu augÅ¡up"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "PÄ?rvietot logu uz augÅ¡Ä?jo skatpunktu un pÄ?rslÄ?gties uz Å¡o skatpunktu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4147,7 +4314,10 @@ msgid "Move window down"
 msgstr "PÄ?rvietot logu lejup"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "PÄ?rvietot logu uz lejÄ?jo skatpunktu un pÄ?rslÄ?gties uz Å¡o skatpunktu."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4188,7 +4358,7 @@ msgstr "Vai uzskriet virsÅ« ignorÄ?tiem logiem, kad palielina vai samazina."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Vai uzskriet virsÅ« ignorÄ?tiem logiem, kad palielina vai samazina."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4232,6 +4402,11 @@ msgstr "UnikalizÄ?t loga nosaukumu"
 msgid "Force the current window to have a unique title."
 msgstr "Likt paÅ¡reizÄ?jam logam bÅ«t ar unikÄ?lu virsrakstu."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "PaaugstinÄ?t logu"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4244,7 +4419,8 @@ msgstr "ParÄ?dÄ«t saraksta izvÄ?lni par visÄ?m darba vietÄ?m."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "ParÄ?dÄ«t saraksta izvÄ?lni par visÄ?m darba vietÄ?m."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4371,8 +4547,10 @@ msgid "Prepend workspace and send"
 msgstr "Pievienot sÄ?kumÄ? darba vietu un sÅ«tÄ«t"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Izveidot jaunu darba vietu saraksta sÄ?kumÄ? un pÄ?rvietot logu uz to."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/mk.po b/po/mk.po
index b39d1c5..c5a5104 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish.gnome-2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-06-15 09:44+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <mk li org>\n"
@@ -210,10 +210,10 @@ msgstr "ниÑ?Ñ?о"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -225,8 +225,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -234,21 +234,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,7 +256,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -264,14 +264,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -292,10 +292,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -318,17 +318,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -336,8 +336,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -368,8 +368,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -382,7 +382,7 @@ msgstr "Ð?дбеÑ?и боÑ?а"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -392,7 +392,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,8 +433,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -442,7 +442,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -504,15 +504,15 @@ msgstr ""
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -520,14 +520,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -535,8 +535,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -551,7 +551,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -576,8 +576,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -593,7 +593,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -651,8 +651,8 @@ msgstr ""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -663,7 +663,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -676,7 +676,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -697,7 +697,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -709,14 +709,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -728,18 +728,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -750,7 +750,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -762,7 +762,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -817,12 +817,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -830,7 +830,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -838,23 +838,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -862,7 +862,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -870,8 +870,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -879,10 +879,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -901,7 +901,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -914,10 +914,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -965,16 +965,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -990,7 +990,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1812,7 +1812,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1821,7 +1822,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1887,33 +1889,81 @@ msgid "Shrink window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window down"
 msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr ""
@@ -2243,6 +2293,17 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ð?Ñ?икажи Ñ?а иконаÑ?а на пÑ?озоÑ?оÑ? во неговоÑ?о мени копÑ?е."
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2337,10 +2398,6 @@ msgstr ""
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2580,11 +2637,6 @@ msgstr "СоÑ?Ñ?оÑ?ба"
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?го"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "УниÑ?Ñ?и го пÑ?озоÑ?оÑ?"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2784,6 +2836,18 @@ msgstr "РабоÑ?ен пÑ?оÑ?Ñ?оÑ?"
 msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Ð?ога покажÑ?ваÑ?оÑ? од глÑ?вÑ?еÑ?о влиÑ?ае на Ñ?окÑ?Ñ?оÑ? за внеÑ?Ñ?ваÑ?е"
@@ -2809,18 +2873,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?вÑ?омаÑ?Ñ?ки пÑ?епÑ?оÑ?иÑ?аÑ? ги Ñ?емиÑ?е кога Ñ?е Ñ?е пÑ?оменаÑ?."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "СÑ?андаÑ?ден Ñ?онÑ?: \\w"
 
@@ -3040,6 +3092,83 @@ msgstr ""
 "пÑ?озоÑ?. (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "глобална мапа"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?Ñ?о Ñ?одÑ?жи повÑ?зÑ?ваÑ?а кои Ñ?е акÑ?ивни кога поинÑ?еÑ?оÑ? Ñ?е наоÑ?а на "
+"наÑ?ловнаÑ?а ленÑ?а\n"
+"од пÑ?озоÑ?оÑ? (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "глобална мапа"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?Ñ?о Ñ?одÑ?жи повÑ?зÑ?ваÑ?а кои Ñ?е акÑ?ивни кога поинÑ?еÑ?оÑ? Ñ?е наоÑ?а на "
+"наÑ?ловнаÑ?а ленÑ?а\n"
+"од пÑ?озоÑ?оÑ? (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "title-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?Ñ?о Ñ?одÑ?жи повÑ?зÑ?ваÑ?а кои Ñ?е акÑ?ивни кога поинÑ?еÑ?оÑ? Ñ?е наоÑ?а на "
+"наÑ?ловнаÑ?а ленÑ?а\n"
+"од пÑ?озоÑ?оÑ? (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "глобална мапа"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?Ñ?о Ñ?одÑ?жи повÑ?зÑ?ваÑ?а кои Ñ?е акÑ?ивни кога поинÑ?еÑ?оÑ? Ñ?е наоÑ?а на "
+"наÑ?ловнаÑ?а ленÑ?а\n"
+"од пÑ?озоÑ?оÑ? (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "глобална мапа"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?Ñ?о Ñ?одÑ?жи повÑ?зÑ?ваÑ?а кои Ñ?е акÑ?ивни кога поинÑ?еÑ?оÑ? Ñ?е наоÑ?а на "
+"наÑ?ловнаÑ?а ленÑ?а\n"
+"од пÑ?озоÑ?оÑ? (Ñ?амо повÑ?зÑ?ваÑ?аÑ?а на глÑ?вÑ?еÑ?о Ñ?е Ñ?азгледÑ?вааÑ? во оваа мапа)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3243,6 +3372,10 @@ msgid "Display Errors"
 msgstr "УниÑ?Ñ?и го пÑ?озоÑ?оÑ?"
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
 msgid "Restart Sawfish"
 msgstr "РеÑ?Ñ?аÑ?Ñ?иÑ?аÑ?"
@@ -3302,8 +3435,9 @@ msgid "Display the applications menu."
 msgstr "Ð?Ñ?икажи Ñ?а иконаÑ?а на пÑ?озоÑ?оÑ? во неговоÑ?о мени копÑ?е."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish конÑ?игÑ?Ñ?аÑ?оÑ?"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3342,7 +3476,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3351,7 +3484,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3360,7 +3492,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3560,7 +3691,8 @@ msgstr "Ð?акÑ?имизиÑ?аÑ?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3700,7 +3832,8 @@ msgstr "Ð?акÑ?имизиÑ?аÑ? пÑ?озоÑ?еÑ? веÑ?Ñ?икално"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3719,8 +3852,8 @@ msgstr "Ð?акÑ?имизиÑ?аÑ? пÑ?озоÑ?еÑ? веÑ?Ñ?икално"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3917,9 +4050,7 @@ msgid "Unmark all windows"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3966,14 +4097,33 @@ msgid "Raise window"
 msgstr "УниÑ?Ñ?и го пÑ?озоÑ?оÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Lower window"
 msgstr "УниÑ?Ñ?и го пÑ?озоÑ?оÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr ""
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4091,7 +4241,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4100,7 +4251,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4108,7 +4260,9 @@ msgid "Move window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4116,7 +4270,9 @@ msgid "Move window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4153,7 +4309,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4198,6 +4354,11 @@ msgstr ""
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "УниÑ?Ñ?и го пÑ?озоÑ?оÑ?"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4208,7 +4369,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4341,7 +4503,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/ms.po b/po/ms.po
index 9e8825a..611f36c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-02-27 01:41+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol ikhlas com>\n"
 "Language-Team: Projek Gabai (Bahasa Melayu) <gabai-penyumbang lists "
@@ -204,10 +204,10 @@ msgstr "tiada"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -219,8 +219,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -228,21 +228,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,7 +250,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -258,14 +258,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -286,10 +286,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -312,17 +312,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -330,8 +330,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -362,8 +362,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -376,7 +376,7 @@ msgstr "Pilih warna"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,8 +427,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -436,7 +436,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -500,15 +500,15 @@ msgstr "semua"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -516,14 +516,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -531,8 +531,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -547,7 +547,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -572,8 +572,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -589,7 +589,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -659,8 +659,8 @@ msgstr "Ingat _posisi"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -671,7 +671,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -717,14 +717,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -736,18 +736,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -758,7 +758,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -825,12 +825,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -838,7 +838,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -846,23 +846,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -878,8 +878,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -887,10 +887,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -909,7 +909,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -922,10 +922,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -973,16 +973,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -998,7 +998,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1855,7 +1855,8 @@ msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1864,7 +1865,8 @@ msgstr "Ubahsaiz tetingkap dipilih"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1931,40 +1933,88 @@ msgid "Shrink window left"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pindahkan tetingkap ke kiri"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Gerakkan tetingkap ke atas"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Gerakkan tetingkap ke bawah"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2309,6 +2359,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Godekan 3D"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup menu aplikasi"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
 msgid "Play sound effects for window events."
@@ -2403,10 +2464,6 @@ msgstr "Papar Ralat"
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2641,11 +2698,6 @@ msgstr "Keadaan"
 msgid "Other"
 msgstr "Lain-lain"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Angkat tetingkap"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2862,6 +2914,18 @@ msgstr "Hantar ke ruangkerja"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Cipta ruangkerja baru sebelum ruangkerja semasa."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Bila penuding tetikus memberi kesan ke fokus input."
@@ -2889,18 +2953,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatik ulangmuat tema bila ianya dikemaskini."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Font Default: \\w"
 
@@ -3109,6 +3161,71 @@ msgstr ""
 "Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "prompt-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "prompt-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "prompt-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Keymap mengandungi pengikatan aktif bila membaca rentetan dari pengguna."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3323,6 +3440,11 @@ msgstr "Papar Ralat"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup menu aplikasi"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ulanghidup"
 
@@ -3382,8 +3504,9 @@ msgid "Display the applications menu."
 msgstr "Papar menu aplikasii."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Pengkonfigurasi Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3421,7 +3544,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "Angkat tetingkap tunggal"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3431,7 +3553,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Turunkan satu tetingkap"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3441,7 +3562,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Angkat tetingkap tunggal bawahan"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3664,7 +3784,8 @@ msgstr "Nyah Maksima Tetingkap"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Jadikan tetingkap ada semua ruangkerja."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3808,9 +3929,11 @@ msgid "Maximize window fullscreen toggle"
 msgstr "Togol pemaksimaan skrinpenuh tetingkap"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
+msgstr "Jadikan tetingkap ada semua ruangkerja."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
@@ -3828,10 +3951,11 @@ msgid "Maximize window fullxinerama toggle"
 msgstr "Togol pemaksimaan skrinpenuh tetingkap"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
+msgstr "Jadikan tetingkap ada semua ruangkerja."
 
 #. ../lisp/sawfish/wm/state/shading.jl
 msgid "Shade window"
@@ -4042,9 +4166,7 @@ msgid "Unmark all windows"
 msgstr "Nyah Maksima Tetingkap"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4089,13 +4211,38 @@ msgid "Raise window"
 msgstr "Angkat tetingkap"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Angkat tetingkap ke posisi tertinggi yang dibenarkan dalam turutan timbunan."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Tetingkap bawah"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Turunkan tetingkap ke posisi terendah yang dibenarkan dalam turutan timbunan."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Angkat tetingkap bawah"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Angkat tetingkap ke posisi tertinggi yang dibenarkan dalam turutan timbunan."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4228,8 +4375,10 @@ msgid "Move window right"
 msgstr "Pilih tetingkap"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Pindah tetingkap ke viewport sebelah kanan, dan tukat ke viewport itu."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4239,7 +4388,8 @@ msgstr "Pindahkan tetingkap ke kiri"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Biarkan tetingkap di atas tetingkap lain\n"
 "jangan izinkan mereka menghadangnya."
@@ -4250,7 +4400,9 @@ msgstr "Gerakkan tetingkap ke atas"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Biarkan tetingkap di atas tetingkap lainjangan izinkan mereka menghadangnya."
 
@@ -4259,7 +4411,10 @@ msgid "Move window down"
 msgstr "Gerakkan tetingkap ke bawah"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Gerakkan tetingkap ke viewport di bawah, dan tuker ke viewport itu."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4297,7 +4452,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4342,6 +4497,11 @@ msgstr "Unikkan nama tetingkap"
 msgid "Force the current window to have a unique title."
 msgstr "Paksa tetingkap semasa untuk mempunyai tajuk unik."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Angkat tetingkap"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4354,7 +4514,8 @@ msgstr "Papar menu yang mengandungi senarai semua ruangkerja."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Papar menu yang mengandungi senarai semua ruangkerja."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4486,8 +4647,10 @@ msgid "Prepend workspace and send"
 msgstr "Simpan keadaan ruangkerja"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Cipta ruangkerja baru pada permulaan senarai, dan pindahkan tetingkap ke "
 "situ."
diff --git a/po/nb.po b/po/nb.po
index e9ae1ae..4e718b9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2005-12-06 23:35+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
@@ -195,10 +195,10 @@ msgstr "ingen"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr "Velg farge"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -491,15 +491,15 @@ msgstr "alt"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -507,14 +507,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -522,8 +522,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -538,7 +538,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -563,8 +563,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -650,8 +650,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -663,7 +663,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -677,7 +677,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -699,7 +699,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -712,14 +712,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -732,18 +732,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -755,7 +755,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -768,7 +768,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -823,12 +823,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -836,7 +836,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,23 +844,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -868,7 +868,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -876,8 +876,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -885,10 +885,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -907,7 +907,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -920,10 +920,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -971,16 +971,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1833,8 +1833,10 @@ msgid "Move selected window"
 msgstr "Flytt valgt vindu"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Vent til brukeren velger et vindu, flytt så dette interaktivt."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1842,8 +1844,10 @@ msgid "Resize selected window"
 msgstr "Endre størrelse på valgt vindu"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Vent til brukeren velger et vindu, endre så størrelsen på dette interaktivt."
 
@@ -1922,40 +1926,88 @@ msgid "Shrink window left"
 msgstr "La vindu gli til venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "La vindu gli til høyre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "La vindu gli oppover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "La vindu gli nedover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pakk vindu mot venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pakk vindu mot høyre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pakk vindu oppover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pakk vindu nedover"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Vindustørrelse legg til rad"
@@ -2279,6 +2331,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D-hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Vis applikasjonsmeny"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Spill lydeffekter for vindushendelser."
@@ -2369,10 +2432,6 @@ msgstr "Vis feil"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Vis alle feil som har oppstått på skjermen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2596,11 +2655,6 @@ msgstr "Status"
 msgid "Other"
 msgstr "Andre"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Hev vindu"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Overhengende skygge"
@@ -2793,6 +2847,18 @@ msgstr "Send til arbeidsområde til høyre"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Send vindu til arbeidsområde til høyre for aktivt arbeidsområde."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Når påvirker muspekeren input-fokus."
@@ -2819,18 +2885,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatisk gjenles temaer når de oppdateres."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Forvalgt skrifttype: \\w"
 
@@ -3037,6 +3091,79 @@ msgstr ""
 "skygge-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over "
+"meny-\n"
+"knappen i et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Endringstast(er) som brukes som standard snarveier."
 
@@ -3246,6 +3373,11 @@ msgstr "Vis feil"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Vis applikasjonsmeny"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Start på nytt"
 
@@ -3304,8 +3436,9 @@ msgid "Display the applications menu."
 msgstr "Vis applikasjosmenyen."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish konfigurator"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3345,7 +3478,6 @@ msgstr "Hold transiente vinduer stablet over: \\w"
 msgid "Raise single window"
 msgstr "Hev enkelt vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen."
@@ -3354,7 +3486,6 @@ msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen.
 msgid "Lower single window"
 msgstr "Senk enkelt vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
@@ -3363,7 +3494,6 @@ msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
 msgid "Raise lower single window"
 msgstr "Hev enkelt nedre vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3562,8 +3692,10 @@ msgid "Unmaximize window"
 msgstr "Av-maksimer vindu"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Gjenopprett dimensjonene for vinduet til opprinnelig, ikke-maksimert "
 "tilstand."
@@ -3699,7 +3831,8 @@ msgstr "Knapp for maksimering av vindu til fullskjerm"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Veksle tilstanden for vinduet mellom maksimert og ikke-maksimert."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3720,8 +3853,8 @@ msgstr "Knapp for maksimering av vindu til fullskjerm"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Veksle tilstanden for vinduet mellom maksimert-fylt og ikke-maksimert."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3940,9 +4073,7 @@ msgstr "Av-maksimer vindu"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programmet som brukes for å spille av lyder. Hvis dette ikke er satt blir "
 "innebygget støtte for ESD brukt."
@@ -3989,13 +4120,39 @@ msgid "Raise window"
 msgstr "Hev vindu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Senk vindu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Hev nedre vindu"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Hvis vinduet er ved den høyeste mulige posisjon, senk det til\n"
+"laveste mulige posisjon. Ellers hev det så langt som mulig. Endrer\n"
+"også\n"
+"nivå for eventuelle transiente vinduer det har."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4114,8 +4271,10 @@ msgid "Move window right"
 msgstr "Flytt vindu til høyre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til høyre og bytt til denne visningsporten."
 
@@ -4124,8 +4283,10 @@ msgid "Move window left"
 msgstr "Flytt vindu til venstre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til venstre og bytt til denne "
 "visningsporten."
@@ -4135,7 +4296,10 @@ msgid "Move window up"
 msgstr "Flytt vindu opp"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til over og bytt til denne visningsporten."
 
@@ -4144,7 +4308,10 @@ msgid "Move window down"
 msgstr "Flytt vindu ned"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til under og bytt til denne visningsporten."
 
@@ -4186,7 +4353,7 @@ msgstr "Om man skal dunke inn i ignorerte vinduer ved øking eller pakking."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Om man skal dunke inn i ignorerte vinduer ved øking eller pakking."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4231,6 +4398,11 @@ msgstr "Gjør navn på vindu unikt"
 msgid "Force the current window to have a unique title."
 msgstr "Tving aktivt vindu til å ha en unik tittel."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Hev vindu"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4243,7 +4415,8 @@ msgstr "Vis meny med liste over alle arbeidsområder."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Vis meny med liste over alle arbeidsområder."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4366,8 +4539,10 @@ msgid "Prepend workspace and send"
 msgstr "Legg til arbeidsområde foran og send"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Opprett et nytt arbeidsområde ved starten av listen, og flytt vinduet til "
 "det."
diff --git a/po/ne.po b/po/ne.po
index 33a8ae7..54bd57d 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish.HEAD.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-06-16 15:32+0545\n"
 "Last-Translator: Mahesh subedi <submanesh hotmail com>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -209,10 +209,10 @@ msgstr "��न� पनि ह��न"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -224,8 +224,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -233,21 +233,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -263,14 +263,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -291,10 +291,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -317,17 +317,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -335,8 +335,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -367,8 +367,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -381,7 +381,7 @@ msgstr "र� �यन �र�न�ह�स�"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -405,8 +405,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -414,8 +414,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -423,8 +423,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -432,8 +432,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -505,15 +505,15 @@ msgstr "सब�"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -521,14 +521,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -536,8 +536,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -552,7 +552,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -577,8 +577,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -594,7 +594,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -664,8 +664,8 @@ msgstr "ब�न ������मान�ित�र बन�द �र
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -677,7 +677,7 @@ msgstr "प�रतिमित ब�न ������ित�र"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -691,7 +691,7 @@ msgstr "म�न� ब�न ������मान�ित�र"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -713,7 +713,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -726,14 +726,14 @@ msgstr "म�न� ब�न ������मान�ित�र"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -746,18 +746,18 @@ msgstr "म�न� ब�न ������मान�ित�र"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -769,7 +769,7 @@ msgstr "म�न� ब�न ������मान�ित�र"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -782,7 +782,7 @@ msgstr "ब�न ������मान�ित�र बन�द �र
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -837,12 +837,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,7 +850,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -858,23 +858,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -882,7 +882,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -890,8 +890,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -899,10 +899,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -921,7 +921,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -934,10 +934,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -985,16 +985,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1010,7 +1010,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1845,8 +1845,10 @@ msgid "Move selected window"
 msgstr "�यन �रि��� स����यालला� सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "स����याल �यन �र�न�ा ला�ि प�रय���र�ताला� प�रत���षा �र�न�ह�स�, त�यसप�ि �न�तर��रियात�म� "
 "तरि�ाल� स����यालला� सार�न�ह�स�।"
@@ -1856,8 +1858,10 @@ msgid "Resize selected window"
 msgstr "�यन �रि��� स����याल रिसा�� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "स����याल �यन �र�न�ा ला�ि प�रय���र�ताला� प�रत���षा �र�न�ह�स�, त�यसप�ि स����यालला� "
 "�न�तर��रियात�म� तरि�ाल� रिसा�� �र�न�ह�स�।"
@@ -1937,40 +1941,88 @@ msgid "Shrink window left"
 msgstr "स����याल बाया�तिर स�ला�ड �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "स����यालला� दाया� सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "स����यालला� माथि सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "स����यालला� तलतिर सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "स����यालला� बाया� प�या� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "स����यालला� दाया� प�या� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "स����यालला� माथि प�या� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "स����यालला� तल प�या� �र�न�ह�स�"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "स����याल�� सा�� मिला�न�ह�स� र प����ति थप�न�ह�स�"
@@ -2296,6 +2348,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3 डि ह�या�"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "पप�प apps म�न�"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "स����याल ��नाहर��ा ला�ि �वा� �सरहर� प�ल� �र�न�ह�स�।"
@@ -2386,10 +2449,6 @@ msgstr "त�र��िहर� प�रदर�शन �र�न�ह
 msgid "Display all errors that have occurred to the screen."
 msgstr "पर�दामा भ��ा सब� त�र��िहर� प�रदर�शन �र�न�ह�स�।"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2613,11 +2672,6 @@ msgstr "स�थिति"
 msgid "Other"
 msgstr "�न�य"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "स����यालला� �ठा�न�ह�स�"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "�ाया� ह�भर"
@@ -2810,6 +2864,18 @@ msgstr "�ार�य��ष�त�रमा दाया� पठा�
 msgid "Send window to the workspace right of the current workspace"
 msgstr "स����यालला� �ार�य��ष�त�रमा �ाल� �ार�य��ष�त�र�� दाया� पठा�न�ह�स�"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "मा�स स���ल� ��त फ��समा �ति ब�ला �सर �र�द�"
@@ -2836,18 +2902,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "स�वा�ालित तरि�ाल� प�न: ल�ड विषयवस�त�हर� �ब तिनिहर� �द�यावधि� �रिन��न�"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "प�र�वनिर�धारित फन��: \\w"
 
@@ -3058,6 +3112,83 @@ msgstr ""
 "बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "प�रतिमित ब�न ������ित�र"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"�व स��� \n"
+"ब�न�� बन�द �र�न�स स����यालमा ह�न��, बा�न�डि� ������मान�ित�र स��रिय ह�न��न� (य� न��सामा मा�स "
+"बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "ब�न ������मान�ित�र बन�द �र�न�ह�स�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"�व स��� \n"
+"ब�न�� बन�द �र�न�स स����यालमा ह�न��, बा�न�डि� ������मान�ित�र स��रिय ह�न��न� (य� न��सामा मा�स "
+"बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "म�न� ब�न ������मान�ित�र"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"�व स��� \n"
+"म�न�ब�न�� स����यालमा ह�न��, बा�न�डि� ������मान�ित�र स��रिय ह�न��न� (य� न��सामा मा�स "
+"बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "ब�न ������मान�ित�र बन�द �र�न�ह�स�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"�व स��� \n"
+"ब�न�� बन�द �र�न�स स����यालमा ह�न��, बा�न�डि� ������मान�ित�र स��रिय ह�न��न� (य� न��सामा मा�स "
+"बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "ब�न ������मान�ित�र बन�द �र�न�ह�स�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"�व स��� \n"
+"ब�न�� बन�द �र�न�स स����यालमा ह�न��, बा�न�डि� ������मान�ित�र स��रिय ह�न��न� (य� न��सामा मा�स "
+"बा�न�डि���हर� मात�र म�ल�या���न� �रिन��न�।)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "प�र�वनिर�धारित सर����हर��ा ला�ि प�रय�� �रि��� परिमार��न ������(हर�)"
 
@@ -3267,6 +3398,11 @@ msgstr "त�र��िहर� प�रदर�शन �र�न�ह
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "पप�प apps म�न�"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "प�न: स�र� �र�न�ह�स�"
 
@@ -3325,8 +3461,9 @@ msgid "Display the applications menu."
 msgstr "�न�प�रय�� म�न� प�रदर�शन �र�न�ह�स�।"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "सविस �न�फि�र��र"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3365,7 +3502,6 @@ msgstr "�स�थाय� स����यालहर�ला� ध�
 msgid "Raise single window"
 msgstr "��ल स����यालला� माथि �ठा�न�ह�स�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "स����यालला� यस�� सब� भन�दा माथि निर�धारित स�थानमा �न���रम मिला�र बढा�न�ह�स�।"
@@ -3374,7 +3510,6 @@ msgstr "स����यालला� यस�� सब� भन�दा
 msgid "Lower single window"
 msgstr "��ल स����यालला� तल सार�न�ह�स�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "��ल स����यालला� तल निर�धारण �रि��� ठा�मा वढा�न� ��रममा सार�न�ह�स�"
@@ -3383,7 +3518,6 @@ msgstr "��ल स����यालला� तल निर�धार
 msgid "Raise lower single window"
 msgstr "तल�ल� ��ल स����यालला� माथि बढा�न�ह�स�"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3582,8 +3716,10 @@ msgid "Unmaximize window"
 msgstr "ठ�ल� नपारि��� स����याल"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "स����याल�� �यामि�ताला� यस�� म�लि�, ठ�ल� नपारि��� स�थितिमा फर��ा�न�ह�स�।"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3717,7 +3853,8 @@ msgstr "स����याल�� प�रापर�दाला� �
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "स����याल�� सा��मा ठ�ल� पारि��� �वस�था र सान� पारि��� �वस�था वि� ��ल �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3738,8 +3875,8 @@ msgstr "स����याल�� प�रापर�दाला� �
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "वढा����-भरि��� र नभरि��� स����याल�� �वस�थाला� ��ल �र�न�ह�स�।"
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3961,9 +4098,7 @@ msgstr "ठ�ल� नपारि��� स����याल"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr "�डिय� �ार�य��रम�� नम�ना �ला�न यदि नमिल�मा प�र�व निर�मित ESD मद�दत प�रय�� ह�न��।"
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4006,13 +4141,39 @@ msgid "Raise window"
 msgstr "स����यालला� �ठा�न�ह�स�"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "स����यालला� यस�� सब� भन�दा माथि निर�धारित स�थानमा �न���रम मिला�र बढा�न�ह�स�।"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "स����यालला� तल �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "��ल स����यालला� तल निर�धारण �रि��� ठा�मा वढा�न� ��रममा सार�न�ह�स�"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "तल�� स����यालला� �ठा�न�ह�स�"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"यद� स����याल यस�� सब�भन�दा माथ� स�भाव�य �वस�थामा � भन� यसला� यस��\n"
+"सब� भन�दा तल�� स�भाव�य �वस�थामा ल�या�न�ह�स�। ह��न भन� यसला� �न�मति दि���� स�थान सम�मम "
+"�ठा�न�ह�स�। यसमा भ��� �स�थिरता�� ��न� स����याल�� ��न� तह\n"
+"परिवर�तन �र�न�ह�स�।"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4131,8 +4292,10 @@ msgid "Move window right"
 msgstr "स����यालला� दाया� सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "स����याला� दाया��� द�श�य��न�द�रमा सार�न�ह�स�, र त�य� द�श�य��न�द�रमा स�वि� �र�न�ह�स�।"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4140,8 +4303,10 @@ msgid "Move window left"
 msgstr "स����यालला� बाया� सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "स����यालला� द�श�य��न�द�र�� बाया�मा सार�न�ह�स�, र त�यस द�श�य��न�द�रमा स�वि� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4149,7 +4314,10 @@ msgid "Move window up"
 msgstr "स����यालला� माथि सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "स����यालला� द�श�य��न�द�र मा माथि सार�न�ह�स�, र त�य� द�श�य��न�द�रमा स�वि� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4157,7 +4325,10 @@ msgid "Move window down"
 msgstr "स����यालला� तल सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "स����यालला� द�श�य��न�द�र�� तल सार�न�ह�स�, र त�य� द�श�य��न�द�रमा स�वि� �र�न�ह�स�"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4198,7 +4369,7 @@ msgstr "बढ�द� �र��� वा प�या�ि� �र�
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "बढ�द� �र��� वा प�या�ि� �र��� ब�लामा �प���षित स����यालहर�मा बम�प �र�न� �ि।"
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4242,6 +4413,11 @@ msgstr "स����याल�� नाम ��र�प �रा�न
 msgid "Force the current window to have a unique title."
 msgstr "�ाल� स����यालला� ��र�प श�र�ष� ह�न �र �र�न�ह�स�"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "स����यालला� �ठा�न�ह�स�"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4254,7 +4430,8 @@ msgstr "सम�प�र�ण �ार�य��ष�त�र समा
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "सम�प�र�ण �ार�य��ष�त�र समाविष�� म�न� द��ा�न�ह�स�"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4377,8 +4554,10 @@ msgid "Prepend workspace and send"
 msgstr "प�रिप�न�ड �ार�यस�थान र पठा�न�"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "तालि�ा�� स�र�मा नया� �ार�यस�थान सिर��ना �र�न�ह�स� र स����यालला� यसमा सार�न�ह�स�"
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/nl.po b/po/nl.po
index 1796246..d952509 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-05-02 01:47+0200\n"
 "Last-Translator: Vincent van Adrighem <V vanAdrighem dirck mine nu>\n"
 "Language-Team: Dutch <nl li org>\n"
@@ -225,10 +225,10 @@ msgstr "geen"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -240,8 +240,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -249,21 +249,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -271,7 +271,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -279,14 +279,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -307,10 +307,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -333,17 +333,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -351,8 +351,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -384,8 +384,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr "Kies kleur"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -409,7 +409,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -423,8 +423,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -432,8 +432,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -441,8 +441,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -450,8 +450,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -459,7 +459,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -525,15 +525,15 @@ msgstr "alles"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -541,14 +541,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -556,8 +556,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -572,7 +572,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -597,8 +597,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -614,7 +614,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -686,8 +686,8 @@ msgstr "sluitknop-toetsenkaart"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -699,7 +699,7 @@ msgstr "minimaliseerknop toetsenkaart"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -713,7 +713,7 @@ msgstr "menuknop-toetsenkaart"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -735,7 +735,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -748,14 +748,14 @@ msgstr "menuknop-toetsenkaart"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -768,18 +768,18 @@ msgstr "menuknop-toetsenkaart"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -791,7 +791,7 @@ msgstr "menuknop-toetsenkaart"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -804,7 +804,7 @@ msgstr "sluitknop-toetsenkaart"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -859,12 +859,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -872,7 +872,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -880,23 +880,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -904,7 +904,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -912,8 +912,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -921,10 +921,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -943,7 +943,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -956,10 +956,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -1008,16 +1008,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1033,7 +1033,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -2006,8 +2006,10 @@ msgstr "Verplaats huidige venster"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Laat de gebruiker een venster selecteren en verplaats het dan interactief."
 
@@ -2018,8 +2020,10 @@ msgstr "Verander venstergrootte"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Laat de gebruiker een venster selecteren en vergroot het dan interactief."
 
@@ -2109,30 +2113,60 @@ msgstr ""
 msgid "Shrink window left"
 msgstr "Verplaats venster naar links"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Verplaats venster naar rechts"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Verplaats venster naar boven"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Verplaats venster naar beneden"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Samenpersen naar links"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
@@ -2140,15 +2174,33 @@ msgid "Yank window right"
 msgstr "Samenpersen naar rechts"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Samenpersen naar boven"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Samenpersen naar beneden"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
@@ -2528,6 +2580,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Programma's snelmenu"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 # ugh.
 # ../lisp/tooltips.jl
 #. ../lisp/sawfish/wm/ext/audio-events.jl
@@ -2630,10 +2693,6 @@ msgstr "Fouten weergeven"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Alle voorgekomen fouten weergeven op het scherm."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 # ../lisp/custom.jl
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
@@ -2881,11 +2940,6 @@ msgstr "Staat"
 msgid "Other"
 msgstr "Anders"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Venster optillen"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Zweefrollen"
@@ -3105,6 +3159,18 @@ msgstr "Een werkruimte naar rechts sturen"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Het venster een werkruimte naar rechts sturen"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -3136,18 +3202,6 @@ msgstr "Standaard Vensterrand:"
 msgid "Automatically reload themes when they are updated."
 msgstr "Herlaad thema's automatisch zodra ze bij de tijd zijn gebracht."
 
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
 # ../lisp/frames.jl
 #. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
@@ -3374,6 +3428,83 @@ msgstr ""
 "venster staat. (Alleen muisbindingen werken hier)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "minimaliseerknop toetsenkaart"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Toetstabel met bindingen die werken als het pijltje op Sluiten knop van een\n"
+"venster staat. (Alleen muisbindingen werken hier.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "sluitknop-toetsenkaart"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Toetstabel met bindingen die werken als het pijltje op Sluiten knop van een\n"
+"venster staat. (Alleen muisbindingen werken hier.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menuknop-toetsenkaart"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Toetstabel met bindingen die werken als het pijltje op de menu knop van een\n"
+"venster staat. (Alleen muisbindingen werken hier.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "sluitknop-toetsenkaart"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Toetstabel met bindingen die werken als het pijltje op Sluiten knop van een\n"
+"venster staat. (Alleen muisbindingen werken hier.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "sluitknop-toetsenkaart"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Toetstabel met bindingen die werken als het pijltje op Sluiten knop van een\n"
+"venster staat. (Alleen muisbindingen werken hier.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Extra toets(en) om te gebruiken voor standaard toetsbindingen."
 
@@ -3614,6 +3745,11 @@ msgstr "_Aanpassen"
 msgid "Display Errors"
 msgstr "Fouten weergeven"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Programma's snelmenu"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3681,9 +3817,11 @@ msgstr "Programma's snelmenu"
 msgid "Display the applications menu."
 msgstr "Toon het menu met programma's."
 
+# ../src/sawmill-ui.jl
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish configuratie"
 
 # ../src/sawmill-ui.jl
 # MacOS gebruikt `Wijzig' ipv Bewerk
@@ -3726,7 +3864,6 @@ msgid "Raise single window"
 msgstr "Enkel venster optillen"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Til het venster naar de bovenkant van zijn stapelniveau."
@@ -3737,7 +3874,6 @@ msgstr "Enkel venster niveau verlagen"
 
 # ?
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Verlaag het venster naar de onderkant van zijn stapelniveau."
@@ -3747,7 +3883,6 @@ msgid "Raise lower single window"
 msgstr "Enkel venster niveau verhogen/verlagen"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3981,8 +4116,10 @@ msgstr "Herstel vensterformaat"
 
 # ../lisp/maximize.jl
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Herstel de afmetingen van het venster naar zijn niet-gemaximaliseerde\n"
 "toestand."
@@ -4144,7 +4281,8 @@ msgstr "Venster maximaliseren omschakelen"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Schakel de toestand van het venster om tussen maximaal en minimaal."
 
 # ../lisp/custom.jl
@@ -4169,8 +4307,8 @@ msgstr "Venster maximaliseren omschakelen"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Schakel het venster tussen maximaal-gevuld en niet-gemaximaliseerd."
 
 # ../lisp/menus.jl
@@ -4412,9 +4550,7 @@ msgstr "Herstel vensterformaat"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Het programma om geluiden mee af te spelen. Wanneer u niets heeft gekozen,\n"
 "zal de ingebouwde ESD ondersteuning gebruikt worden."
@@ -4464,15 +4600,43 @@ msgstr "Bij het optillen van vensters, til dan ook de: \\w op."
 msgid "Raise window"
 msgstr "Venster optillen"
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Til het venster naar de bovenkant van zijn stapelniveau."
+
 # ../lisp/ignore-window.jl
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Vernster omlaag duwen"
 
+# ?
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Verlaag het venster naar de onderkant van zijn stapelniveau."
+
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Venster optillen/omlaag duwen"
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Als het venster het bovenste venster in zijn stapelniveau is,\n"
+"verlaag het niveau dan. Til het anders naar de bovenkant van zijn niveau."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4610,8 +4774,10 @@ msgstr "Verplaats venster naar rechts"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Verplaats het venster naar het blikveld rechts en ga naar dat blikveld."
 
@@ -4622,8 +4788,10 @@ msgstr "Verplaats venster naar links"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Verplaats het venster naar het blikveld links en ga naar dat blikveld."
 
 # ../lisp/menus.jl
@@ -4633,7 +4801,10 @@ msgstr "Verplaats venster naar boven"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Verplaats het venster naar het blikveld hierboven en ga naar dat blikveld."
 
@@ -4644,7 +4815,10 @@ msgstr "Verplaats venster naar beneden"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Verplaats het venster naar het blikveld hieronder en ga naar dat blikveld."
 
@@ -4690,7 +4864,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Of er tegen genegeerde vensters aan gebotst moet worden bij het groeien of "
 "uitvullen."
@@ -4745,6 +4919,11 @@ msgstr "Maak vensternaam uniek"
 msgid "Force the current window to have a unique title."
 msgstr "Beveel het huidige venster een unieke titel te gebruiken."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Venster optillen"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4759,7 +4938,8 @@ msgstr "Toon het menu met alle werkruimtes"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Toon het menu met alle werkruimtes"
 
 # ../lisp/menus.jl
@@ -4911,8 +5091,10 @@ msgstr "Nieuwe werkruimte bovenaan"
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Maak nieuwe werkruimte aan het begin van de lijst en stuur het venster "
 "ernaartoe."
diff --git a/po/nn.po b/po/nn.po
index 3f33480..6d2ebc2 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2001-11-10 21:14+0100\n"
 "Last-Translator: Roy-Magne Mo <rmo sunnmore net>\n"
 "Language-Team: Norwegian <no li org>\n"
@@ -206,10 +206,10 @@ msgstr "ingen"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -230,21 +230,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -252,7 +252,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -260,14 +260,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -288,10 +288,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -314,17 +314,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -332,8 +332,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -364,8 +364,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -378,7 +378,7 @@ msgstr "Vel farge"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -402,8 +402,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -420,8 +420,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -429,8 +429,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -438,7 +438,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -502,15 +502,15 @@ msgstr "alle"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -518,14 +518,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -533,8 +533,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -549,7 +549,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -574,8 +574,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -661,8 +661,8 @@ msgstr "Meny for vindaugsoperasjonar"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -673,7 +673,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -686,7 +686,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -707,7 +707,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -719,14 +719,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -738,18 +738,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -760,7 +760,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -772,7 +772,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -827,12 +827,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -840,7 +840,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -848,23 +848,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -872,7 +872,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -880,8 +880,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -889,10 +889,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -911,7 +911,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -924,10 +924,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -971,16 +971,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1888,7 +1888,8 @@ msgstr "Flutt valde meny ned eit nivå"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 # gmenu/main.c:113 gmenu/main.c:143
@@ -1899,7 +1900,8 @@ msgstr "Flutt valde meny ned eit nivå"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1968,6 +1970,12 @@ msgstr ""
 msgid "Shrink window left"
 msgstr "Sett vindaugstittel"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # gnome-terminal/gnome-terminal.c:2692
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
@@ -1975,16 +1983,34 @@ msgid "Shrink window right"
 msgstr "Sett vindaugstittel"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Vel eit vindauge"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # gnome-terminal/gnome-terminal.c:2695
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Sett ikon for vindauget"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # panel/panel_config.c:1376
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
@@ -1992,21 +2018,45 @@ msgid "Yank window left"
 msgstr "Vindaugsnivå for panelet:"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "X window bilete"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Hovudvindauge"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # gmenu/main.c:113 gmenu/main.c:143
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Flytt ned"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2374,6 +2424,18 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+# panel/gnome-panel-properties.c:1190
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Popup-meny tast"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 # applets/tasklist/tasklist_properties.c:355
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
@@ -2474,10 +2536,6 @@ msgstr "Skrifttype i teiknruta"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Legg oppgåvelinja nedst på skjermen"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2719,11 +2777,6 @@ msgstr "Tilstand"
 msgid "Other"
 msgstr "Anna"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Hev vindauge"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2950,6 +3003,18 @@ msgstr "Sett arbeidsområde"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Opprette eit nytt delt visning av arbeidsboka"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2977,18 +3042,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Signer automatisk meldingar ved hjelp av PGP"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Forvald skrifttype: \\w"
 
@@ -3187,6 +3240,63 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Rediger tastekart"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Rediger tastekart"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Rediger tastekart"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Rediger tastekart"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Rediger tastekart"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3410,6 +3520,12 @@ msgstr "Til_pass"
 msgid "Display Errors"
 msgstr "Skrifttype i teiknruta"
 
+# panel/gnome-panel-properties.c:1190
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Popup-meny tast"
+
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
 msgid "Restart Sawfish"
@@ -3479,8 +3595,9 @@ msgid "Display the applications menu."
 msgstr "Program meny"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "KCalc-oppsett"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3520,7 +3637,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr " (I nytt vindauge)"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3530,7 +3646,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr " (I nytt vindauge)"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3540,7 +3655,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr " (I nytt vindauge)"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3776,7 +3890,8 @@ msgstr "Hovudvindauge"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "GÃ¥ til neste melding"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3928,9 +4043,11 @@ msgid "Maximize window fullscreen toggle"
 msgstr "Maksimeringsmodus"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
+msgstr "GÃ¥ til neste melding"
 
 # panel/menu.c:4792
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3951,10 +4068,11 @@ msgid "Maximize window fullxinerama toggle"
 msgstr "Maksimeringsmodus"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
-msgstr ""
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
+msgstr "GÃ¥ til neste melding"
 
 #. ../lisp/sawfish/wm/state/shading.jl
 #, fuzzy
@@ -4179,9 +4297,7 @@ msgid "Unmark all windows"
 msgstr "Hovudvindauge"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4225,16 +4341,35 @@ msgstr ""
 msgid "Raise window"
 msgstr "Hev vindauge"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
 # applets/tasklist/tasklist_menu.c:316
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Senk vindauge"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
 # panel/panel_config.c:1408
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Hev nederste vindauge"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4372,7 +4507,8 @@ msgstr "X window bilete"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "GÃ¥ til forrige melding"
 
 # applets/tasklist/tasklist_menu.c:316
@@ -4384,7 +4520,8 @@ msgstr "Lukk vindauge"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "GÃ¥ til forrige melding"
 
 # gmenu/main.c:113 gmenu/main.c:143
@@ -4395,7 +4532,9 @@ msgstr "Flytt ned"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "GÃ¥ til forrige melding"
 
 # gmenu/main.c:113 gmenu/main.c:143
@@ -4406,7 +4545,9 @@ msgstr "Flytt ned"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "GÃ¥ til forrige melding"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4444,7 +4585,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4491,6 +4632,11 @@ msgstr "Ukjend namn"
 msgid "Force the current window to have a unique title."
 msgstr "Kan ikkje setja rette løyve for oppsett-fila\n"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Hev vindauge"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4501,7 +4647,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4649,7 +4796,8 @@ msgstr "Sett arbeidsområde"
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/no.po b/po/no.po
index e9ae1ae..4e718b9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 0.37.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2005-12-06 23:35+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
@@ -195,10 +195,10 @@ msgstr "ingen"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr "Velg farge"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -491,15 +491,15 @@ msgstr "alt"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -507,14 +507,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -522,8 +522,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -538,7 +538,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -563,8 +563,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -650,8 +650,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -663,7 +663,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -677,7 +677,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -699,7 +699,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -712,14 +712,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -732,18 +732,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -755,7 +755,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -768,7 +768,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -823,12 +823,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -836,7 +836,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,23 +844,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -868,7 +868,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -876,8 +876,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -885,10 +885,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -907,7 +907,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -920,10 +920,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -971,16 +971,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -996,7 +996,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1833,8 +1833,10 @@ msgid "Move selected window"
 msgstr "Flytt valgt vindu"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Vent til brukeren velger et vindu, flytt så dette interaktivt."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1842,8 +1844,10 @@ msgid "Resize selected window"
 msgstr "Endre størrelse på valgt vindu"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Vent til brukeren velger et vindu, endre så størrelsen på dette interaktivt."
 
@@ -1922,40 +1926,88 @@ msgid "Shrink window left"
 msgstr "La vindu gli til venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "La vindu gli til høyre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "La vindu gli oppover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "La vindu gli nedover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pakk vindu mot venstre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pakk vindu mot høyre"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pakk vindu oppover"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pakk vindu nedover"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Vindustørrelse legg til rad"
@@ -2279,6 +2331,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D-hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Vis applikasjonsmeny"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Spill lydeffekter for vindushendelser."
@@ -2369,10 +2432,6 @@ msgstr "Vis feil"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Vis alle feil som har oppstått på skjermen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2596,11 +2655,6 @@ msgstr "Status"
 msgid "Other"
 msgstr "Andre"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Hev vindu"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Overhengende skygge"
@@ -2793,6 +2847,18 @@ msgstr "Send til arbeidsområde til høyre"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Send vindu til arbeidsområde til høyre for aktivt arbeidsområde."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Når påvirker muspekeren input-fokus."
@@ -2819,18 +2885,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatisk gjenles temaer når de oppdateres."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Forvalgt skrifttype: \\w"
 
@@ -3037,6 +3091,79 @@ msgstr ""
 "skygge-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over "
+"meny-\n"
+"knappen i et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tastaturkart som inneholder bindinger som er aktive når pekeren er over \n"
+"lukk-knappen på et vindu. (Kun musbindinger evalueres i dette kartet.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Endringstast(er) som brukes som standard snarveier."
 
@@ -3246,6 +3373,11 @@ msgstr "Vis feil"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Vis applikasjonsmeny"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Start på nytt"
 
@@ -3304,8 +3436,9 @@ msgid "Display the applications menu."
 msgstr "Vis applikasjosmenyen."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish konfigurator"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3345,7 +3478,6 @@ msgstr "Hold transiente vinduer stablet over: \\w"
 msgid "Raise single window"
 msgstr "Hev enkelt vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen."
@@ -3354,7 +3486,6 @@ msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen.
 msgid "Lower single window"
 msgstr "Senk enkelt vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
@@ -3363,7 +3494,6 @@ msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
 msgid "Raise lower single window"
 msgstr "Hev enkelt nedre vindu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3562,8 +3692,10 @@ msgid "Unmaximize window"
 msgstr "Av-maksimer vindu"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Gjenopprett dimensjonene for vinduet til opprinnelig, ikke-maksimert "
 "tilstand."
@@ -3699,7 +3831,8 @@ msgstr "Knapp for maksimering av vindu til fullskjerm"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Veksle tilstanden for vinduet mellom maksimert og ikke-maksimert."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3720,8 +3853,8 @@ msgstr "Knapp for maksimering av vindu til fullskjerm"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Veksle tilstanden for vinduet mellom maksimert-fylt og ikke-maksimert."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3940,9 +4073,7 @@ msgstr "Av-maksimer vindu"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programmet som brukes for å spille av lyder. Hvis dette ikke er satt blir "
 "innebygget støtte for ESD brukt."
@@ -3989,13 +4120,39 @@ msgid "Raise window"
 msgstr "Hev vindu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Hev vinduet til sin høyeste tillatte posisjon in stablingsrekkefølgen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Senk vindu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Senk vinduet til sin laveste tillatte posisjon i stablingsrekkefølgen."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Hev nedre vindu"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Hvis vinduet er ved den høyeste mulige posisjon, senk det til\n"
+"laveste mulige posisjon. Ellers hev det så langt som mulig. Endrer\n"
+"også\n"
+"nivå for eventuelle transiente vinduer det har."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4114,8 +4271,10 @@ msgid "Move window right"
 msgstr "Flytt vindu til høyre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til høyre og bytt til denne visningsporten."
 
@@ -4124,8 +4283,10 @@ msgid "Move window left"
 msgstr "Flytt vindu til venstre"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til venstre og bytt til denne "
 "visningsporten."
@@ -4135,7 +4296,10 @@ msgid "Move window up"
 msgstr "Flytt vindu opp"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til over og bytt til denne visningsporten."
 
@@ -4144,7 +4308,10 @@ msgid "Move window down"
 msgstr "Flytt vindu ned"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytt vinduet til visningsporten til under og bytt til denne visningsporten."
 
@@ -4186,7 +4353,7 @@ msgstr "Om man skal dunke inn i ignorerte vinduer ved øking eller pakking."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Om man skal dunke inn i ignorerte vinduer ved øking eller pakking."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4231,6 +4398,11 @@ msgstr "Gjør navn på vindu unikt"
 msgid "Force the current window to have a unique title."
 msgstr "Tving aktivt vindu til å ha en unik tittel."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Hev vindu"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4243,7 +4415,8 @@ msgstr "Vis meny med liste over alle arbeidsområder."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Vis meny med liste over alle arbeidsområder."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4366,8 +4539,10 @@ msgid "Prepend workspace and send"
 msgstr "Legg til arbeidsområde foran og send"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Opprett et nytt arbeidsområde ved starten av listen, og flytt vinduet til "
 "det."
diff --git a/po/oc.po b/po/oc.po
index 5126b57..d2323a8 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2007-08-07 14:02+0200\n"
 "Last-Translator: Yannig MARCHEGAY (Kokoyaya) <yannig marchegay org>\n"
 "Language-Team: Occitan (post 1500) <ubuntu-l10n-oci lists ubuntu com>\n"
@@ -195,10 +195,10 @@ msgstr "pas cap"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -276,10 +276,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -302,17 +302,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -320,8 +320,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -352,8 +352,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -366,7 +366,7 @@ msgstr "Seleccionar una color"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -376,7 +376,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -390,8 +390,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -399,8 +399,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -408,8 +408,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -417,8 +417,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -426,7 +426,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -490,15 +490,15 @@ msgstr "totes"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -506,14 +506,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -521,8 +521,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -537,7 +537,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -562,8 +562,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -579,7 +579,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -637,8 +637,8 @@ msgstr ""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -649,7 +649,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -662,7 +662,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -695,14 +695,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -714,18 +714,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -736,7 +736,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -748,7 +748,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -803,12 +803,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -816,7 +816,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -824,23 +824,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -848,7 +848,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -856,8 +856,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -865,10 +865,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -887,7 +887,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -900,10 +900,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -946,16 +946,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -971,7 +971,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1751,7 +1751,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1760,7 +1761,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1826,33 +1828,81 @@ msgid "Shrink window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window down"
 msgstr ""
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr ""
@@ -2172,6 +2222,16 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid "Update apps menu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2261,10 +2321,6 @@ msgstr ""
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2485,11 +2541,6 @@ msgstr "Estat"
 msgid "Other"
 msgstr "Autre"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Maximizar"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2677,6 +2728,18 @@ msgstr ""
 msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2703,18 +2766,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 #, fuzzy
 msgid "Default font: \\w"
 msgstr "Defaut"
@@ -2898,6 +2949,58 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+msgid "sticky-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3089,6 +3192,10 @@ msgid "Display Errors"
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
 msgid "Restart Sawfish"
 msgstr "Tornar lançar"
@@ -3147,7 +3254,7 @@ msgid "Display the applications menu."
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
+msgid "S_awfishConfig"
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
@@ -3186,7 +3293,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3195,7 +3301,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3204,7 +3309,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr ""
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3399,7 +3503,8 @@ msgstr "Maximizar"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3524,7 +3629,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3541,8 +3647,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3737,9 +3843,7 @@ msgid "Unmark all windows"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3782,13 +3886,32 @@ msgid "Raise window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr ""
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -3906,7 +4029,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3915,7 +4039,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3923,7 +4048,9 @@ msgid "Move window up"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -3931,7 +4058,9 @@ msgid "Move window down"
 msgstr ""
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -3968,7 +4097,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4013,6 +4142,11 @@ msgstr ""
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Maximizar"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4023,7 +4157,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4146,7 +4281,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/pa.po b/po/pa.po
index cac6e91..f60c155 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2005-01-17 16:44+0530\n"
 "Last-Translator: Amanpreet Singh Alam <aalam redhat com>\n"
 "Language-Team: Punjabi <fedora-trans-pa redhat com>\n"
@@ -197,10 +197,10 @@ msgstr ""
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -212,8 +212,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -221,21 +221,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -251,14 +251,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -279,10 +279,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -305,17 +305,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -323,8 +323,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -354,8 +354,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgstr "ਰੰ� ��ਣ�"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -378,7 +378,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -392,8 +392,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -401,8 +401,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,7 +428,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -488,15 +488,15 @@ msgstr ""
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -504,14 +504,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -519,8 +519,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -535,7 +535,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -560,8 +560,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -577,7 +577,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -635,8 +635,8 @@ msgstr ""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -647,7 +647,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -660,7 +660,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -681,7 +681,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -693,14 +693,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -712,18 +712,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -734,7 +734,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -746,7 +746,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -801,12 +801,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -814,7 +814,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -822,23 +822,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -846,7 +846,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -854,8 +854,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -863,10 +863,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -885,7 +885,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -898,10 +898,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -948,16 +948,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -973,7 +973,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1767,7 +1767,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1777,7 +1778,8 @@ msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1843,37 +1845,85 @@ msgid "Shrink window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Shrink window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "ਸਾ�ਡ �ਰ��ਾ ਹ�ਠਾ"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "ਸਾ�ਡ �ਰ��ਾ ਹ�ਠਾ"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window left"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 msgid "Yank window right"
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "ਸਾ�ਡ �ਰ��ਾ ਹ�ਠਾ"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2203,6 +2253,16 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid "Update apps menu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr ""
@@ -2294,10 +2354,6 @@ msgstr "ਵ��ਾ�ਣ �ਰ��ਾ"
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2518,11 +2574,6 @@ msgstr "ਸਥਿਤ�"
 msgid "Other"
 msgstr "ਹ�ਰ"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "�ਭਾਰਿ� �ਰ��ਾ"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr ""
@@ -2718,6 +2769,18 @@ msgstr "ਵਰ�ਸਪ�ਸ ਸ਼ਾਮਿਲ"
 msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2743,18 +2806,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr ""
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr ""
 
@@ -2938,6 +2989,58 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+msgid "sticky-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3137,6 +3240,10 @@ msgid "Display Errors"
 msgstr "ਵ��ਾ�ਣ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/menus.jl
+msgid "Reload Appsmenu"
+msgstr ""
+
+#. ../lisp/sawfish/wm/menus.jl
 msgid "Restart Sawfish"
 msgstr ""
 
@@ -3194,8 +3301,9 @@ msgid "Display the applications menu."
 msgstr ""
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "ਸਾ�ਫਿਸ਼ ਸੰਰ�ਨਾ�ਰਤਾ"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3234,7 +3342,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3244,7 +3351,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3254,7 +3360,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3455,7 +3560,8 @@ msgstr "�ਧਿ�ਤਮ"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3581,7 +3687,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3598,8 +3705,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3805,9 +3912,7 @@ msgid "Unmark all windows"
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3850,14 +3955,33 @@ msgid "Raise window"
 msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Raise lower window"
 msgstr "�ਭਾਰਿ� �ਰ��ਾ"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -3974,9 +4098,11 @@ msgid "Move window right"
 msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
-msgstr ""
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
+msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
@@ -3984,9 +4110,11 @@ msgid "Move window left"
 msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
-msgstr ""
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
+msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
@@ -3994,8 +4122,11 @@ msgid "Move window up"
 msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
+msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
@@ -4003,8 +4134,11 @@ msgid "Move window down"
 msgstr "ਸਾ�ਡ �ਰ��ਾ ਹ�ਠਾ"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
-msgstr ""
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
+msgstr "ਹ�ਠਲਾ �ਰ��ਾ"
 
 #. ../lisp/sawfish/wm/window-anim.jl
 #, fuzzy
@@ -4041,7 +4175,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4087,6 +4221,11 @@ msgstr "ਵੱ�ਰਾ ਨਾ�"
 msgid "Force the current window to have a unique title."
 msgstr ""
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "�ਭਾਰਿ� �ਰ��ਾ"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4097,7 +4236,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4231,7 +4371,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/pl.po b/po/pl.po
index 1c8b454..4207d85 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-06-01 15:19+0200\n"
 "Last-Translator: GNOME PL Team <translators gnome pl>\n"
 "Language-Team: Polish <pl li org>\n"
@@ -202,10 +202,10 @@ msgstr "brak"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -226,21 +226,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,14 +256,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -284,10 +284,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -310,17 +310,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -328,8 +328,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -360,8 +360,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr "Wskaż kolor"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -398,8 +398,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -416,8 +416,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -425,8 +425,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -434,7 +434,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -498,15 +498,15 @@ msgstr "wszystkich"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -514,14 +514,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -529,8 +529,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -545,7 +545,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -570,8 +570,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -587,7 +587,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -657,8 +657,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -670,7 +670,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -684,7 +684,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -719,14 +719,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -739,18 +739,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -762,7 +762,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -775,7 +775,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -830,12 +830,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -843,7 +843,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,23 +851,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -883,8 +883,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -892,10 +892,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -914,7 +914,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -927,10 +927,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -978,16 +978,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1003,7 +1003,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1841,8 +1841,10 @@ msgid "Move selected window"
 msgstr "PrzesuniÄ?cie wybranego okna"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Czeka na wybór okna do przeniesienia."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1850,8 +1852,10 @@ msgid "Resize selected window"
 msgstr "Zmiana rozmiaru wybranego okna"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "Czeka na wybór okna do zmiany rozmiaru."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1929,40 +1933,88 @@ msgid "Shrink window left"
 msgstr "PrzesuÅ? okno w lewo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "PrzesuÅ? okno w prawo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "PrzesuÅ? okno do góry"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "PrzesuÅ? okno w dóÅ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Upakowanie okna po lewej"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Upakowanie okna po prawej"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Upakowanie okna na górze"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Upakowanie okna na dole"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "PowiÄ?ksz okno o rzÄ?d"
@@ -2303,6 +2355,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Logo 3D"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Menu aplikacji"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
 msgid "Play sound effects for window events."
@@ -2396,10 +2459,6 @@ msgstr "WyÅ?wietlanie bÅ?Ä?dów"
 msgid "Display all errors that have occurred to the screen."
 msgstr "WyÅ?wietlenie wszystkiech bÅ?Ä?dów na ekranie."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2627,11 +2686,6 @@ msgstr "Stan"
 msgid "Other"
 msgstr "Inne"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "WydobÄ?dź okno"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Tymczasowe rozwijanie"
@@ -2840,6 +2894,18 @@ msgstr "WyÅ?lij na biurko"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Tworzy nowe biurko przed bieżÄ?cym biurkiem."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Tryb aktywacji okna za pomocÄ? wskaźnika myszy."
@@ -2867,18 +2933,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatyczne uwzglÄ?dnianie zmian motywów."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "DomyÅ?lna czcionka: \\w"
 
@@ -3084,6 +3138,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Zestaw skrótów aktywnych gdy wskaźnik znajduje siÄ?\n"
+"nad ikonÄ? zamkniÄ?cia okna (tylko skróty myszy). "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Zestaw skrótów aktywnych gdy wskaźnik znajduje siÄ?\n"
+"nad ikonÄ? zamkniÄ?cia okna (tylko skróty myszy). "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Zestaw skrótów aktywnych gdy wskaźnik znajduje siÄ?\n"
+"nad ikonÄ? menu okna (tylko skróty myszy). "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Zestaw skrótów aktywnych gdy wskaźnik znajduje siÄ?\n"
+"nad ikonÄ? zamkniÄ?cia okna (tylko skróty myszy). "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Zestaw skrótów aktywnych gdy wskaźnik znajduje siÄ?\n"
+"nad ikonÄ? zamkniÄ?cia okna (tylko skróty myszy). "
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Klawisz modyfikujÄ?cy dla domyÅ?lnych skrótów menedżera okien."
 
@@ -3301,6 +3427,11 @@ msgstr "WyÅ?wietlanie bÅ?Ä?dów"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Menu aplikacji"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Zrestartuj"
 
@@ -3359,8 +3490,9 @@ msgid "Display the applications menu."
 msgstr "WyÅ?wietla menu aplikacji."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Konfigurator Sawfisha"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3401,7 +3533,6 @@ msgstr "Utrzymywanie okien potomnych powyżej: \\w"
 msgid "Raise single window"
 msgstr "Wydobycie pojedynczego okna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid "Raise the window to its highest allowed position in the stacking order."
@@ -3411,7 +3542,6 @@ msgstr "Wydobywa okno na wierzchniÄ? warstwÄ?."
 msgid "Lower single window"
 msgstr "ZepchniÄ?cie pojedynczego okna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Spycha okno na spodniÄ? warstwÄ?."
@@ -3420,7 +3550,6 @@ msgstr "Spycha okno na spodniÄ? warstwÄ?."
 msgid "Raise lower single window"
 msgstr "Wydobycie lub zepchniÄ?cie pojedynczego okna"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3633,8 +3762,10 @@ msgid "Unmaximize window"
 msgstr "Przywrócenie okna"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Przywraca zmaksymalizowane okno do jego wczeÅ?niejszych rozmiarów."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3773,7 +3904,8 @@ msgstr "PrzeÅ?Ä?czenie trybu maksymalizacji okna"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "PrzeÅ?Ä?cza pomiÄ?dzy maksymalizacjÄ? a przywróceniem okna."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3794,8 +3926,8 @@ msgstr "PrzeÅ?Ä?czenie trybu maksymalizacji okna"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "PrzeÅ?Ä?cza pomiÄ?dzy dopeÅ?nieniem oknem, a jego przywróceniem."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -4012,9 +4144,7 @@ msgstr "Przywrócenie okna"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program używany do odtwarzania dźwiÄ?ków. JeÅ?li nie zaznaczone, uruchamiana "
 "jest wbudowana obsÅ?uga ESD."
@@ -4059,13 +4189,37 @@ msgid "Raise window"
 msgstr "WydobÄ?dź okno"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Wydobywa okno na wierzchniÄ? warstwÄ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "ZepchniÄ?cie okna"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Spycha okno na spodniÄ? warstwÄ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Wydobycie lub zepchniÄ?cie okna"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"JeÅ?li okno jest na wierzchniej warstwie, zepchnij je na spód; w przeciwnym\n"
+"wypadku wydobÄ?dź je. Dotyczy także wszystkich jego okien potomnych."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4188,7 +4342,8 @@ msgstr "Przeniesienie okna w prawo"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Przenosi okno na pulpit po prawej."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4198,7 +4353,8 @@ msgstr "Przeniesienie okna w lewo"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Przenosi okno na pulpit po lewej."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4207,7 +4363,9 @@ msgstr "Przeniesienie okna w górÄ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Przenosi okno na pulpit po lewej."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4216,7 +4374,9 @@ msgstr "Przeniesienie okna w dóÅ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Przenosi okno na pulpit po lewej."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4255,7 +4415,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4300,6 +4460,11 @@ msgstr "Unikalne nazywanie okien"
 msgid "Force the current window to have a unique title."
 msgstr "Wymuszanie unikalnej nazwy dla bieżÄ?cego okna."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "WydobÄ?dź okno"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4312,7 +4477,8 @@ msgstr "WyÅ?wietla menu zawierajÄ?ce listÄ? biurek."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "WyÅ?wietla menu zawierajÄ?ce listÄ? biurek."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4439,8 +4605,10 @@ msgid "Prepend workspace and send"
 msgstr "DoÅ?Ä?czenie biurka na poczÄ?tku i wysÅ?anie na nie"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Tworzy nowe biurko na poczÄ?tku listy i przenosi tam okno."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/pt.po b/po/pt.po
index b0827ce..de16385 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-04-06 18:36+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt hotmail com>\n"
 "Language-Team: Portuguese <gnome_pt yahoogroups com>\n"
@@ -218,10 +218,10 @@ msgstr "nenhuma"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -233,8 +233,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -242,21 +242,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -264,7 +264,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -272,14 +272,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -300,10 +300,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -326,17 +326,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -344,8 +344,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -377,8 +377,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -391,7 +391,7 @@ msgstr "Seleccionar cor"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -401,7 +401,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,8 +433,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -442,8 +442,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -451,7 +451,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -517,15 +517,15 @@ msgstr "todas"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -533,14 +533,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -548,8 +548,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -564,7 +564,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -589,8 +589,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -606,7 +606,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -678,8 +678,8 @@ msgstr "mapa de teclado de botão de fecho"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -691,7 +691,7 @@ msgstr "mapa de teclado de botão de minimizar"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr "mapa de teclado de botão de menu"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -740,14 +740,14 @@ msgstr "mapa de teclado de botão de menu"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -760,18 +760,18 @@ msgstr "mapa de teclado de botão de menu"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -783,7 +783,7 @@ msgstr "mapa de teclado de botão de menu"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -796,7 +796,7 @@ msgstr "mapa de teclado de botão de fecho"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -851,12 +851,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -864,7 +864,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -872,23 +872,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -896,7 +896,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -904,8 +904,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -913,10 +913,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -935,7 +935,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -948,10 +948,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -1000,16 +1000,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1025,7 +1025,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1960,8 +1960,10 @@ msgstr "Mover janela seleccionada"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Aguardar que o utilizador seleccione uma janela, e depois move-la "
 "interactivamente."
@@ -1973,8 +1975,10 @@ msgstr "Redimensionar janela seleccionada"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Aguardar que o utilizador seleccione uma janela, e depois redimensiona-la "
 "interactivamente."
@@ -2063,30 +2067,60 @@ msgstr ""
 msgid "Shrink window left"
 msgstr "Deslizar janela para a esquerda"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Deslizar janela para a direita"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Deslizar janela para cima"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Deslizar janela para baixo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Mover janela para a esquerda"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
@@ -2094,16 +2128,34 @@ msgid "Yank window right"
 msgstr "Mover janela para a direita"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Mover janela para cima"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Mover janela para baixo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
@@ -2480,6 +2532,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Mostrar menu aplicações"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 # ../lisp/tooltips.jl
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
@@ -2581,10 +2644,6 @@ msgstr "Mostrar erros"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostrar todos os erros ocorridos no ecrã."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 # ../lisp/custom.jl
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
@@ -2835,12 +2894,6 @@ msgstr "Estado"
 msgid "Other"
 msgstr "Outro"
 
-# ../lisp/menus.jl
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Elevar janela"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Pairar sobre Recolhido"
@@ -3060,6 +3113,18 @@ msgstr "Enviar para área de trabalho à direita"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Enviar janela para a área de trabalho à direita da actual"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -3091,18 +3156,6 @@ msgstr "Estilo de moldura por omissão:"
 msgid "Automatically reload themes when they are updated."
 msgstr "Recarregar temas automaticamente quando actualizados."
 
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
 # ../lisp/frames.jl
 #. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
@@ -3334,6 +3387,88 @@ msgstr ""
 "mapa.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "mapa de teclado de botão de minimizar"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado que contenha atalhos activos quando cursor estiver sobre o\n"
+"botão de fecho de uma janela. (Apenas atalhos de rato são avaliados neste "
+"mapa.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "mapa de teclado de botão de fecho"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado que contenha atalhos activos quando cursor estiver sobre o\n"
+"botão de fecho de uma janela. (Apenas atalhos de rato são avaliados neste "
+"mapa.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "mapa de teclado de botão de menu"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado que contenha atalhos activos quando cursor estiver sobre o\n"
+"botão de menu de uma janela. (Apenas atalhos de rato são avaliados neste "
+"mapa.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "mapa de teclado de botão de fecho"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado que contenha atalhos activos quando cursor estiver sobre o\n"
+"botão de fecho de uma janela. (Apenas atalhos de rato são avaliados neste "
+"mapa.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "mapa de teclado de botão de fecho"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa de teclado que contenha atalhos activos quando cursor estiver sobre o\n"
+"botão de fecho de uma janela. (Apenas atalhos de rato são avaliados neste "
+"mapa.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tecla(s) modificador(as) utilizada(s) para atalhos por omissão."
 
@@ -3578,6 +3713,11 @@ msgstr "_Costumizar"
 msgid "Display Errors"
 msgstr "Mostrar erros"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Mostrar menu aplicações"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3645,8 +3785,9 @@ msgid "Display the applications menu."
 msgstr "Mostrar o menu de aplicações."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurador Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3687,7 +3828,6 @@ msgid "Raise single window"
 msgstr "Elevar uma janela"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3698,7 +3838,6 @@ msgid "Lower single window"
 msgstr "Baixar janela única"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3708,7 +3847,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Elevar janela única baixada"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3941,8 +4079,10 @@ msgstr "Restaurar janela"
 
 # ../lisp/maximize.jl
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restaurar as dimensões da janela ao seu estado original, não maximizado."
 
@@ -4101,7 +4241,8 @@ msgstr "Alternar maximização da janela a todo o ecrã"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Alternar o estado da janela entre maximizada e restaurada."
 
 # ../lisp/custom.jl
@@ -4126,8 +4267,8 @@ msgstr "Alternar maximização da janela a todo o ecrã"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Alternar estado da janela entre maximizar enchimento e restaurar."
 
 # ../lisp/menus.jl
@@ -4370,9 +4511,7 @@ msgstr "Restaurar janela"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "A aplicação utilizada para reproduzir amostras audio. Se não definido, será "
 "utilizado o suporte integrado ESD."
@@ -4423,15 +4562,46 @@ msgstr "Ao elevar uma janela elevar também os seus: \\w"
 msgid "Raise window"
 msgstr "Elevar janela"
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Elevar a janela para posição mais elevada permitida na sua ordem de pilha."
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Rebaixar janela"
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Baixar a janela para posição mais baixa permitida na sua ordem de pilha."
+
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Elevar janela rebaixada"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Se a janela estiver na posição mais alta possível, rebaixa-la para a "
+"posição\n"
+"mais baixa possível. Caso contrário eleva-la o mais possível. Também "
+"modifica\n"
+"o nível de quaisquer janelas transientes que possua."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4565,8 +4735,10 @@ msgstr "Mover janela para a direita"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de trabalho à direita, e ir para essa área."
 
 # ../lisp/workspace.jl
@@ -4576,8 +4748,10 @@ msgstr "Mover janela para a esquerda"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Mover a janela para a área de trabalho à esquerda, e ir para essa área."
 
@@ -4588,7 +4762,10 @@ msgstr "Mover janela para cima"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de trabalho acima, e ir para essa área."
 
 # ../lisp/menus.jl
@@ -4598,7 +4775,10 @@ msgstr "Mover janela para baixo"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de trabalho abaixo, e ir para essa área."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4640,7 +4820,7 @@ msgstr "Se chocar ou não com janelas ignoradas ao crescer ou juntar."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Se chocar ou não com janelas ignoradas ao crescer ou juntar."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4688,6 +4868,12 @@ msgstr "Unificar nome das janelas"
 msgid "Force the current window to have a unique title."
 msgstr "Forçar a janela actual a ter um título único."
 
+# ../lisp/menus.jl
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Elevar janela"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4702,7 +4888,8 @@ msgstr "Mostrar o menu que contém a lista de todas as áreas."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Mostrar o menu que contém a lista de todas as áreas."
 
 # ../lisp/menus.jl
@@ -4853,8 +5040,10 @@ msgstr "Criar área de trabalho no início e enviar"
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Criar uma de área trabalho nova no início da lista e mover a janela para lá."
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cf89e37..0019b3e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-07-05 15:55-0300\n"
 "Last-Translator: Alexandre Folle de Menezes <afmenezes terra com br>\n"
 "Language-Team: Debian-BR <debian-l10n-portuguese lists debian org>, "
@@ -220,10 +220,10 @@ msgstr "nenhuma"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -235,8 +235,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -244,21 +244,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -266,7 +266,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -274,14 +274,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -302,10 +302,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -328,17 +328,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -346,8 +346,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -380,8 +380,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr "Selecionar cor"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -405,7 +405,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,8 +428,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -437,8 +437,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -446,8 +446,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -521,15 +521,15 @@ msgstr "todas"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -537,14 +537,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -552,8 +552,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -568,7 +568,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -593,8 +593,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -610,7 +610,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -684,8 +684,8 @@ msgstr "Mapa do botão fechar"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -697,7 +697,7 @@ msgstr "Mapa do botão minimizar"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -711,7 +711,7 @@ msgstr "Mapa do botão de menu"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -733,7 +733,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -746,14 +746,14 @@ msgstr "Mapa do botão de menu"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -766,18 +766,18 @@ msgstr "Mapa do botão de menu"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -789,7 +789,7 @@ msgstr "Mapa do botão de menu"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -802,7 +802,7 @@ msgstr "Mapa do botão fechar"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -857,12 +857,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -870,7 +870,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -878,23 +878,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -902,7 +902,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -910,8 +910,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -919,10 +919,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -941,7 +941,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -954,10 +954,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -1006,16 +1006,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1031,7 +1031,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -2017,8 +2017,10 @@ msgstr "Mover a janela selecionada"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Esperar o usuário escolher uma janela para, então, movê-la interativamente."
 
@@ -2029,8 +2031,10 @@ msgstr "Redimensionar a janela selecionada"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Esperar o usuário escolher a janela para, então, redimensioná-la "
 "interativamente."
@@ -2115,24 +2119,48 @@ msgstr ""
 msgid "Shrink window left"
 msgstr "Deslizar janela à esquerda"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Deslizar janela à direita"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Deslizar janela para cima"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Deslizar janela para baixo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
@@ -2140,6 +2168,12 @@ msgstr "Deslizar janela para baixo"
 msgid "Yank window left"
 msgstr "Ajustar à esquerda"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
@@ -2148,15 +2182,33 @@ msgid "Yank window right"
 msgstr "Ajustar à direita"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ajustar acima"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ajustar abaixo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
@@ -2536,6 +2588,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Extensão 3d"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Menu Programas"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 # ../lisp/tooltips.jl
 #
 #. ../lisp/sawfish/wm/ext/audio-events.jl
@@ -2639,10 +2702,6 @@ msgstr "Mostrar erros"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostrar todos os erros na tela."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 # ../lisp/custom.jl
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
@@ -2899,11 +2958,6 @@ msgstr "Estado"
 msgid "Other"
 msgstr "Outros"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Realçar janela"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Shade Hover"
@@ -3130,6 +3184,18 @@ msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 "Enviar a janela para a área de trabalho à direita da área de trabalho atual."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -3160,18 +3226,6 @@ msgstr "Estilo de moldura padrão:"
 msgid "Automatically reload themes when they are updated."
 msgstr "Recarregar automaticamente os temas atualizados."
 
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
 # ../lisp/frames.jl
 #
 #. ../lisp/sawfish/wm/frames.jl
@@ -3399,6 +3453,83 @@ msgstr ""
 "sombreamento de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Mapa do botão minimizar"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa contendo atalhos ativos quando o mouse está sobre o botão de\n"
+"fechamento de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Mapa do botão fechar"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa contendo atalhos ativos quando o mouse está sobre o botão de\n"
+"fechamento de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Mapa do botão de menu"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa contendo atalhos ativos quando o mouse está sobre o botão de\n"
+"menu de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Mapa do botão fechar"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa contendo atalhos ativos quando o mouse está sobre o botão de\n"
+"fechamento de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Mapa do botão fechar"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa contendo atalhos ativos quando o mouse está sobre o botão de\n"
+"fechamento de uma janela (só atalhos de mouse são reconhecidos neste mapa)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tecla(s) modificadoras utilizadas para os atalhos padrão."
 
@@ -3656,6 +3787,11 @@ msgstr "_Personalizar"
 msgid "Display Errors"
 msgstr "Mostrar erros"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Menu Programas"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3723,9 +3859,11 @@ msgstr "Menu Programas"
 msgid "Display the applications menu."
 msgstr "Mostrar o menu de programas."
 
+# ../src/sawmill-ui.jl
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurador do Sawfish"
 
 # ../src/sawmill-ui.jl
 #. ../lisp/sawfish/wm/menus.jl
@@ -3768,7 +3906,6 @@ msgid "Raise single window"
 msgstr "Levantar janela"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3779,7 +3916,6 @@ msgid "Lower single window"
 msgstr "Baixar janela"
 
 # ../lisp/stacking.jl
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Colocar a janela à posição mais baixa."
@@ -3788,7 +3924,6 @@ msgstr "Colocar a janela à posição mais baixa."
 msgid "Raise lower single window"
 msgstr "Levantar janela mais baixa"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -4033,8 +4168,10 @@ msgstr "Restaurar janela"
 
 # ../lisp/maximize.jl
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 "Restaurar as dimensões da janela ao seu estado original, não maximizado."
 
@@ -4194,7 +4331,8 @@ msgstr "Alternar maximizar janela em tela cheia"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Alternar o estado da janela entre maximizado e restaurado."
 
 # ../lisp/custom.jl
@@ -4219,8 +4357,8 @@ msgstr "Alternar maximizar janela em tela cheia"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Alternar o estado de maximização da janela sem obscurecer as outras."
 
 # ../lisp/menus.jl
@@ -4463,9 +4601,7 @@ msgstr "Restaurar janela"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programa para execução de sons. Se não configurado, utilizar o suporte a ESD "
 "embutido."
@@ -4515,15 +4651,43 @@ msgstr "Realçar uma janela também realça suas: \\w "
 msgid "Raise window"
 msgstr "Realçar janela"
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Elevar a janela à posição mais alta permitida na ordem de empilhamento."
+
 # ../lisp/ignore-window.jl
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Baixar janela."
 
+# ../lisp/stacking.jl
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Colocar a janela à posição mais baixa."
+
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Realçar janela de nível mais baixo"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Se a janela estiver em sua posição mais alta possível, descê-la à sua\n"
+"posição mais baixa possível. Senão, elevá-la o mais alto permitido.\n"
+"Também muda o nível de qualquer janela transitória que ela possuir."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4659,8 +4823,10 @@ msgstr "Mover janela para a direita"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de visualização à direita e ir para lá."
 
 # ../lisp/workspace.jl
@@ -4670,8 +4836,10 @@ msgstr "Mover janela para a esquerda"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de visualização à esquerda e ir para lá."
 
 # ../lisp/menus.jl
@@ -4681,7 +4849,10 @@ msgstr "Mover janela para cima"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de visualização acima e ir para lá."
 
 # ../lisp/menus.jl
@@ -4691,7 +4862,10 @@ msgstr "Mover janela para baixo"
 
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Mover a janela para a área de visualização abaixo e ir para lá."
 
 # ../src/sawmill-ui.jl
@@ -4734,7 +4908,7 @@ msgstr "Se chocar ou não com janelas ignoradas ao crescer ou juntar."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Se chocar ou não com janelas ignoradas ao crescer ou juntar."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4787,6 +4961,11 @@ msgstr "Tornar nome da janela único"
 msgid "Force the current window to have a unique title."
 msgstr "Forçar esta janela a ter título único."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Realçar janela"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4801,7 +4980,8 @@ msgstr "Exibir o menu contendo a lista de todas as áreas de trabalho."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Exibir o menu contendo a lista de todas as áreas de trabalho."
 
 # ../lisp/menus.jl
@@ -4955,8 +5135,10 @@ msgstr "Acrescentar área de trabalho no início e enviar"
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Criar uma nova área de trabalho no início da lista e mover a janela para lá."
 
diff --git a/po/ro.po b/po/ro.po
index adad7df..60c3f63 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish-1.0 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2001-11-11 12:42+0200\n"
 "Last-Translator: Tutu Valentin <valentin tutu ro>\n"
 "Language-Team: Românã <ro li org>\n"
@@ -209,10 +209,10 @@ msgstr "nimic"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -224,8 +224,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -233,21 +233,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -263,14 +263,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -291,10 +291,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -317,17 +317,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -335,8 +335,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -367,8 +367,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -381,7 +381,7 @@ msgstr "Selecteaz
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -391,7 +391,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -405,8 +405,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -414,8 +414,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -423,8 +423,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -432,8 +432,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -441,7 +441,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -507,15 +507,15 @@ msgstr "toate"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -523,14 +523,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -538,8 +538,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -554,7 +554,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -579,8 +579,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -596,7 +596,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -666,8 +666,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -679,7 +679,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -693,7 +693,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -715,7 +715,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -728,14 +728,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -748,18 +748,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -771,7 +771,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -784,7 +784,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -839,12 +839,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -852,7 +852,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -860,23 +860,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -884,7 +884,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -892,8 +892,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -901,10 +901,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -923,7 +923,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -936,10 +936,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -983,16 +983,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1008,7 +1008,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1834,8 +1834,10 @@ msgid "Move selected window"
 msgstr "Mutã fereastra selectatã"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Aºteaptã utilizatorul sã selecteze o fereastrã, apoi mutã interactiv acea "
 "fereastrã."
@@ -1845,8 +1847,10 @@ msgid "Resize selected window"
 msgstr "Redimensioneazã fereastra selectatã"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Aºteaptã utilizatorul sã selecteze o fereastrã, apoi redimensioneazã "
 "interactiv acea fereastrã."
@@ -1936,40 +1940,88 @@ msgid "Shrink window left"
 msgstr "Mãreºte fereastra cãtre stânga"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Mãreºte fereastra cãtre dreapta"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Mãreºte fereastra în sus"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Mãreºte fereastra în jos"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Mãreºte fereastra cãtre stânga"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Mãreºte fereastra cãtre dreapta"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Mãreºte fereastra în sus"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Mãreºte fereastra în jos"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2322,6 +2374,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Saltã meniul aplicaþiilor"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Efecte sonore pentru evenimentele ferestrelor."
@@ -2414,10 +2477,6 @@ msgstr "Afi
 msgid "Display all errors that have occurred to the screen."
 msgstr "Afiºeazã toate erorile care s-au petrecut."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2644,11 +2703,6 @@ msgstr "Stare"
 msgid "Other"
 msgstr "Altele"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ridicã fereastra"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2861,6 +2915,18 @@ msgstr "Trimite c
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Creazã un nou spaþiu de lucru înainte de cel prezent."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Când pointerul mouse-ului afecteazã focusul pentru intrare."
@@ -2889,18 +2955,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Reîncarcã temele automat când sunt modificate."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Font implicit:  \\w"
 
@@ -3114,6 +3168,82 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Combinaþiile de taste sunt active când cursorul este în butonul de "
+"închidere\n"
+"al unei ferestre. (Doar setãrile mouse-ului sunt evaluate)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Combinaþiile de taste sunt active când cursorul este în butonul de "
+"închidere\n"
+"al unei ferestre. (Doar setãrile mouse-ului sunt evaluate)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Combinaþiile de taste sunt active când cursorul este în butonul de meniu\n"
+"al unei ferestre. (Doar setãrile mouse-ului sunt evaluate)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Combinaþiile de taste sunt active când cursorul este în butonul de "
+"închidere\n"
+"al unei ferestre. (Doar setãrile mouse-ului sunt evaluate)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Combinaþiile de taste sunt active când cursorul este în butonul de "
+"închidere\n"
+"al unei ferestre. (Doar setãrile mouse-ului sunt evaluate)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Tasta (tastele) folositã pentru shortcut-urile implicite ale managerului de "
@@ -3331,6 +3461,11 @@ msgstr "Afi
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Saltã meniul aplicaþiilor"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Reporneºte"
 
@@ -3389,8 +3524,9 @@ msgid "Display the applications menu."
 msgstr "Afiºeazã meniul aplicaþiilor."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Configurarea Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3429,7 +3565,6 @@ msgstr "P
 msgid "Raise single window"
 msgstr "Ridicã singura fereastrã"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Urcã fereastra la cea mai inaltã poziþie de ordine permisã de stivã."
@@ -3438,7 +3573,6 @@ msgstr "Urc
 msgid "Lower single window"
 msgstr "Coboarã singura fereastrã"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Coboarã fereastra la cea mai joasã poziþie de ordine permisã de stivã."
@@ -3448,7 +3582,6 @@ msgstr "Coboar
 msgid "Raise lower single window"
 msgstr "Ridicã singura fereastrã coborâtã"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3658,8 +3791,10 @@ msgid "Unmaximize window"
 msgstr "Demaximizeazã fereastra"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Restaureazã dimensiunile ferestrei la starea originlã, nemaximizatã."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3808,7 +3943,8 @@ msgstr "Maximizeaz
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Activeazã starea ferestrei dintre cea de maximizare ºi cea normalã."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3829,8 +3965,8 @@ msgstr "Maximizeaz
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Activeazã starea ferestrei dintre cea de maximizare-plinã ºi cea normalã."
 
@@ -4054,9 +4190,7 @@ msgstr "Demaximizeaz
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programul folosit pentru a reda sunete. Dacã nu este setat, suportul nativ "
 "pentru ESD va fi folosit."
@@ -4103,13 +4237,38 @@ msgid "Raise window"
 msgstr "Ridicã fereastra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Urcã fereastra la cea mai inaltã poziþie de ordine permisã de stivã."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Coboarã fereastra"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Coboarã fereastra la cea mai joasã poziþie de ordine permisã de stivã."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ridicã fereastra inferioarã"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Dacã fereastra este la cea mai înaltã poziþie, atunci o cobor la\n"
+"cea mai joasã. Altfel o ridic atât cât e posibil. De asemenea schimb ºi\n"
+"nivelul ferestrelor sale tranzitorii."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4230,7 +4389,8 @@ msgstr "Mut
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Mutã fereastra cãtre viewport-ul din dreapta."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4240,7 +4400,8 @@ msgstr "Mut
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Mutã fereastra cãtre viewport-ul din stânga."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4249,7 +4410,9 @@ msgstr "Mut
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Mutã fereastra cãtre viewport-ul din stânga."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4258,7 +4421,9 @@ msgstr "Mut
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Mutã fereastra cãtre viewport-ul din stânga."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4297,7 +4462,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4342,6 +4507,11 @@ msgstr "Creaz
 msgid "Force the current window to have a unique title."
 msgstr "Forþeazã fereastra curenta sã aivã titlu unic."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ridicã fereastra"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4354,7 +4524,8 @@ msgstr "Afi
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Afiºeazã meniul cu lista tuturor spaþiilor de lucru."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4483,8 +4654,10 @@ msgid "Prepend workspace and send"
 msgstr "Adaugã spaþiu de lucru si trimite"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Creazã un nou spaþiu de lucru la începutul listei ºi mutã fereastra în el."
 
diff --git a/po/ru.po b/po/ru.po
index 76f77da..694e70f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-07-09 00:01+0300\n"
 "Last-Translator: Valek Filippov <frob at df dot ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
@@ -200,10 +200,10 @@ msgstr "<неÑ?>"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -215,8 +215,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -224,21 +224,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -254,14 +254,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -282,10 +282,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -308,17 +308,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -326,8 +326,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -358,8 +358,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -372,7 +372,7 @@ msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?веÑ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -396,8 +396,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -405,8 +405,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -414,8 +414,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -423,8 +423,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -432,7 +432,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -496,15 +496,15 @@ msgstr "вÑ?е"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -512,14 +512,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -527,8 +527,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -543,7 +543,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -568,8 +568,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -655,8 +655,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -668,7 +668,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -682,7 +682,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -704,7 +704,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -717,14 +717,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -737,18 +737,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -760,7 +760,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -773,7 +773,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -828,12 +828,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -841,7 +841,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -849,23 +849,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -873,7 +873,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -881,8 +881,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -890,10 +890,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -912,7 +912,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -925,10 +925,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -976,16 +976,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1847,8 +1847,10 @@ msgid "Move selected window"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? окно и пеÑ?емеÑ?Ñ?иÑ?Ñ? его"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Ð?даÑ?Ñ? пока полÑ?зоваÑ?елÑ? вÑ?беÑ?еÑ? окно, заÑ?ем инÑ?еÑ?акÑ?ивно пеÑ?емеÑ?аÑ?Ñ? Ñ?Ñ?о окно."
 
@@ -1857,8 +1859,10 @@ msgid "Resize selected window"
 msgstr "Ð?Ñ?бÑ?аÑ?Ñ? окно и измениÑ?Ñ? его Ñ?азмеÑ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Ð?даÑ?Ñ? пока полÑ?зоваÑ?елÑ? вÑ?беÑ?еÑ? окно, заÑ?ем инÑ?еÑ?акÑ?ивно изменÑ?Ñ?Ñ? Ñ?азмеÑ? "
 "Ñ?Ñ?ого окна."
@@ -1942,40 +1946,88 @@ msgid "Shrink window left"
 msgstr "СдвинÑ?Ñ?Ñ? окно влево"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "СдвинÑ?Ñ?Ñ? окно впÑ?аво"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "СдвинÑ?Ñ?Ñ? окно ввеÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "СдвинÑ?Ñ?Ñ? окно вниз"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ð?еÑ?едвинÑ?Ñ?Ñ? окно влево до Ñ?поÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ð?еÑ?едвинÑ?Ñ?Ñ? окно впÑ?аво до Ñ?поÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ð?еÑ?едвинÑ?Ñ?Ñ? окно ввеÑ?Ñ? до Ñ?поÑ?а"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ð?еÑ?едвинÑ?Ñ?Ñ? окно вниз до Ñ?поÑ?а"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "УвелиÑ?иÑ?Ñ? Ñ?азмеÑ? окна веÑ?Ñ?икалÑ?но"
@@ -2298,6 +2350,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D Hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ð?оказаÑ?Ñ? менÑ? пÑ?огÑ?амм"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Ð?клÑ?Ñ?иÑ?Ñ? звÑ?ковÑ?е Ñ?Ñ?Ñ?екÑ?Ñ? длÑ? Ñ?обÑ?Ñ?ий окон."
@@ -2388,10 +2451,6 @@ msgstr "Ð?оказаÑ?Ñ? Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Ð?оказаÑ?Ñ? Ñ?ообÑ?ениÑ? о вÑ?еÑ? оÑ?ибкаÑ? на Ñ?кÑ?ане"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2615,11 +2674,6 @@ msgstr "СоÑ?Ñ?оÑ?ние"
 msgid "Other"
 msgstr "Ð?Ñ?оÑ?ее"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ð?однÑ?Ñ?Ñ? окно"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Ð?Ñ?еменное авÑ?овÑ?двигание"
@@ -2812,6 +2866,18 @@ msgstr "Ð?оÑ?лаÑ?Ñ? на Ñ?абоÑ?ее меÑ?Ñ?о Ñ?пÑ?ава"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Ð?оÑ?лаÑ?Ñ? Ñ?абоÑ?ее меÑ?Ñ?о впÑ?аво оÑ? Ñ?екÑ?Ñ?его Ñ?абоÑ?его меÑ?Ñ?а."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "СпоÑ?об пеÑ?едаÑ?и Ñ?окÑ?Ñ?а Ñ?казаÑ?елем."
@@ -2838,18 +2904,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?вÑ?омаÑ?иÑ?еÑ?ки пеÑ?езагÑ?Ñ?жаÑ?Ñ? Ñ?емÑ? когда они обновлÑ?Ñ?Ñ?Ñ?Ñ?."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "ШÑ?иÑ?Ñ? по Ñ?молÑ?аниÑ?: \\w"
 
@@ -3053,6 +3107,78 @@ msgstr ""
 "(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбинаÑ?ии акÑ?ивнÑ?е, когда Ñ?казаÑ?елÑ? наÑ?одиÑ?Ñ?Ñ? на кнопке закÑ?Ñ?Ñ?иÑ? окна. "
+"(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбинаÑ?ии акÑ?ивнÑ?е, когда Ñ?казаÑ?елÑ? наÑ?одиÑ?Ñ?Ñ? на кнопке закÑ?Ñ?Ñ?иÑ? окна. "
+"(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбинаÑ?ии акÑ?ивнÑ?е, когда Ñ?казаÑ?елÑ? наÑ?одиÑ?Ñ?Ñ? на кнопке менÑ? окна. "
+"(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбинаÑ?ии акÑ?ивнÑ?е, когда Ñ?казаÑ?елÑ? наÑ?одиÑ?Ñ?Ñ? на кнопке закÑ?Ñ?Ñ?иÑ? окна. "
+"(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбинаÑ?ии акÑ?ивнÑ?е, когда Ñ?казаÑ?елÑ? наÑ?одиÑ?Ñ?Ñ? на кнопке закÑ?Ñ?Ñ?иÑ? окна. "
+"(Ð?опÑ?Ñ?Ñ?имÑ? Ñ?олÑ?ко Ñ?обÑ?Ñ?иÑ? мÑ?Ñ?и)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Ð?лавиÑ?и-модиÑ?икаÑ?оÑ?Ñ? длÑ? комбинаÑ?ий клавиÑ?."
 
@@ -3262,6 +3388,11 @@ msgstr "Ð?оказаÑ?Ñ? Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ?"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ð?оказаÑ?Ñ? менÑ? пÑ?огÑ?амм"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ð?еÑ?езапÑ?Ñ?Ñ?иÑ?Ñ?"
 
@@ -3320,8 +3451,9 @@ msgid "Display the applications menu."
 msgstr "Ð?оказаÑ?Ñ? менÑ? пÑ?иложений."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ð?онÑ?игÑ?Ñ?аÑ?оÑ? Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3360,7 +3492,6 @@ msgstr "СоÑ?Ñ?анÑ?Ñ?Ñ? пÑ?омежÑ?Ñ?оÑ?нÑ?е окна Ñ?обÑ?аннÑ?
 msgid "Raise single window"
 msgstr "Ð?однÑ?Ñ?Ñ? одно окно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Ð?однÑ?Ñ?Ñ? окно до наивÑ?Ñ?Ñ?ей допÑ?Ñ?Ñ?имой позиÑ?ии в Ñ?Ñ?опке."
@@ -3369,7 +3500,6 @@ msgstr "Ð?однÑ?Ñ?Ñ? окно до наивÑ?Ñ?Ñ?ей допÑ?Ñ?Ñ?имой п
 msgid "Lower single window"
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? одно окно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? окно до наинизÑ?ей допÑ?Ñ?Ñ?имой позиÑ?ии в Ñ?Ñ?опке."
@@ -3378,7 +3508,6 @@ msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? окно до наинизÑ?ей допÑ?Ñ?Ñ?имой 
 msgid "Raise lower single window"
 msgstr "Ð?однÑ?Ñ?Ñ?/опÑ?Ñ?Ñ?иÑ?Ñ? одно окно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3576,8 +3705,10 @@ msgid "Unmaximize window"
 msgstr "УбÑ?аÑ?Ñ? макÑ?имизаÑ?иÑ? окна"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? Ñ?азмеÑ?Ñ? окна до иÑ?Ñ?одного немакÑ?имизиÑ?ованного Ñ?оÑ?Ñ?оÑ?ниÑ?."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3717,7 +3848,8 @@ msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? макÑ?имизаÑ?иÑ? окна"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние окна междÑ? макÑ?имизиÑ?ованнÑ?м и немакÑ?имизиÑ?ованнÑ?м."
 
@@ -3739,8 +3871,8 @@ msgstr "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? макÑ?имизаÑ?иÑ? окна"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Ð?еÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?оÑ?Ñ?оÑ?ние окна междÑ? макÑ?имизиÑ?ованнÑ?м-заполненнÑ?м и "
 "немакÑ?имизиÑ?ованнÑ?м."
@@ -3961,9 +4093,7 @@ msgstr "УбÑ?аÑ?Ñ? макÑ?имизаÑ?иÑ? окна"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ð?Ñ?огÑ?амма иÑ?полÑ?зÑ?емаÑ? длÑ? воÑ?пÑ?оизведениÑ? звÑ?ков. Ð?Ñ?ли не Ñ?Ñ?Ñ?ановлена, "
 "иÑ?полÑ?зÑ?еÑ?Ñ?Ñ? вÑ?Ñ?Ñ?оеннаÑ? поддеÑ?жка длÑ? ESD."
@@ -4008,13 +4138,38 @@ msgid "Raise window"
 msgstr "Ð?однÑ?Ñ?Ñ? окно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Ð?однÑ?Ñ?Ñ? окно до наивÑ?Ñ?Ñ?ей допÑ?Ñ?Ñ?имой позиÑ?ии в Ñ?Ñ?опке."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? окно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Ð?пÑ?Ñ?Ñ?иÑ?Ñ? окно до наинизÑ?ей допÑ?Ñ?Ñ?имой позиÑ?ии в Ñ?Ñ?опке."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ð?однÑ?Ñ?Ñ?/опÑ?Ñ?Ñ?иÑ?Ñ? окно"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ð?Ñ?ли окно в наивÑ?Ñ?Ñ?ей возможной позиÑ?ии, Ñ?огда опÑ?Ñ?Ñ?иÑ?Ñ? его до наинизÑ?ей "
+"возможной позиÑ?ии. Ð? пÑ?оÑ?ивном Ñ?лÑ?Ñ?ае поднÑ?Ñ?Ñ? его как можно вÑ?Ñ?е. Также "
+"измениÑ?Ñ? Ñ?Ñ?овенÑ? вÑ?еÑ? его пÑ?омежÑ?Ñ?оÑ?нÑ?Ñ? окон."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4135,8 +4290,10 @@ msgid "Move window right"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно впÑ?аво"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно в облаÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?а Ñ?пÑ?ава и пеÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?Ñ?Ñ? облаÑ?Ñ?Ñ? "
 "пÑ?оÑ?моÑ?Ñ?а."
@@ -4146,8 +4303,10 @@ msgid "Move window left"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно влево"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно в облаÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?а Ñ?лева и пеÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?Ñ?Ñ? облаÑ?Ñ?Ñ? "
 "пÑ?оÑ?моÑ?Ñ?а."
@@ -4157,7 +4316,10 @@ msgid "Move window up"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно ввеÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно в облаÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?а Ñ?веÑ?Ñ?Ñ?  и пеÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?Ñ?Ñ? облаÑ?Ñ?Ñ? "
 "пÑ?оÑ?моÑ?Ñ?а."
@@ -4167,7 +4329,10 @@ msgid "Move window down"
 msgstr "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно вниз"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?емеÑ?Ñ?иÑ?Ñ? окно в облаÑ?Ñ?Ñ? пÑ?оÑ?моÑ?Ñ?а Ñ?низÑ?  и пеÑ?еклÑ?Ñ?иÑ?Ñ?Ñ?Ñ? в Ñ?Ñ?Ñ? облаÑ?Ñ?Ñ? "
 "пÑ?оÑ?моÑ?Ñ?а."
@@ -4210,7 +4375,7 @@ msgstr "УпиÑ?аÑ?Ñ?Ñ?Ñ? ли в игноÑ?иÑ?Ñ?емÑ?е окна во вÑ?е
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "УпиÑ?аÑ?Ñ?Ñ?Ñ? ли в игноÑ?иÑ?Ñ?емÑ?е окна во вÑ?емÑ? Ñ?аÑ?Ñ?Ñ?жениÑ? или Ñ?паковки"
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4254,6 +4419,11 @@ msgstr "Ð?Ñ?бÑ?аÑ?Ñ? Ñ?никалÑ?ное имÑ? длÑ? окна"
 msgid "Force the current window to have a unique title."
 msgstr "Ð?Ñ?инÑ?диÑ?елÑ?ное иÑ?полÑ?зование Ñ?никалÑ?ного заголовка Ñ?екÑ?Ñ?им окном."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ð?однÑ?Ñ?Ñ? окно"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4266,7 +4436,8 @@ msgstr "Ð?оказаÑ?Ñ? менÑ? Ñ?одеÑ?жаÑ?ее Ñ?пиÑ?ок вÑ?еÑ? Ñ?
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Ð?оказаÑ?Ñ? менÑ? Ñ?одеÑ?жаÑ?ее Ñ?пиÑ?ок вÑ?еÑ? Ñ?абоÑ?иÑ? меÑ?Ñ?."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4388,8 +4559,10 @@ msgid "Prepend workspace and send"
 msgstr "Ð?обавиÑ?Ñ? в наÑ?ало Ñ?абоÑ?ее меÑ?Ñ?о и поÑ?лаÑ?Ñ? на него окно"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "СоздаÑ?Ñ? новое Ñ?абоÑ?ее меÑ?Ñ?о в наÑ?але Ñ?пиÑ?ка и пеÑ?емеÑ?Ñ?иÑ?Ñ? окно на него."
 
diff --git a/po/rw.po b/po/rw.po
index 7c0dc25..18f17f8 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2005-03-31 20:55-0700\n"
 "Last-Translator: Steve Murphy <murf e-tools com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw lists sourceforge net>\n"
@@ -273,10 +273,10 @@ msgstr "ntacyo"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -288,8 +288,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -297,21 +297,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -319,7 +319,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -327,14 +327,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 # officecfg/registry\schema\org\openoffice\Office\DataAccess.xcs:....Column.Align..1.text
@@ -356,10 +356,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -382,17 +382,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -432,8 +432,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -446,7 +446,7 @@ msgstr "Ibara"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -456,7 +456,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -470,8 +470,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -479,8 +479,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -488,8 +488,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -497,8 +497,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -506,7 +506,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -572,15 +572,15 @@ msgstr "Byose"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -588,14 +588,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -603,8 +603,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -619,7 +619,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -644,8 +644,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -661,7 +661,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -731,8 +731,8 @@ msgstr "Gufunga Akabuto"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -744,7 +744,7 @@ msgstr "Akabuto"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -758,7 +758,7 @@ msgstr "Ibikubiyemo Akabuto"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -780,7 +780,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -793,14 +793,14 @@ msgstr "Ibikubiyemo Akabuto"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -813,18 +813,18 @@ msgstr "Ibikubiyemo Akabuto"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -836,7 +836,7 @@ msgstr "Ibikubiyemo Akabuto"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -849,7 +849,7 @@ msgstr "Gufunga Akabuto"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -904,12 +904,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -917,7 +917,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -925,23 +925,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -949,7 +949,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -957,8 +957,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -966,10 +966,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -988,7 +988,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -1001,10 +1001,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -1056,16 +1056,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -2027,7 +2027,8 @@ msgstr "Byahiswemo Idirishya"
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "kugirango i Ukoresha: Kuri Guhitamo a Idirishya Hanyuma Kwimura Idirishya"
 
@@ -2039,7 +2040,8 @@ msgstr "Byahiswemo Idirishya"
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "kugirango i Ukoresha: Kuri Guhitamo a Idirishya Hanyuma Ihindurangero "
 "Idirishya"
@@ -2126,40 +2128,88 @@ msgid "Shrink window left"
 msgstr "Idirishya Ibumoso:"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Idirishya Iburyo:"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Idirishya Hejuru"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Idirishya Hasi"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Idirishya Ibumoso:"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Idirishya Iburyo:"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Idirishya Hejuru"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Idirishya Hasi"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2553,6 +2603,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ibikubiyemo"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
 msgid "Play sound effects for window events."
@@ -2678,10 +2739,6 @@ msgstr "Amakosa"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Byose Amakosa Kuri i Mugaragaza"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2985,11 +3042,6 @@ msgstr "Leta"
 msgid "Other"
 msgstr "Ikindi"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Idirishya"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -3223,6 +3275,18 @@ msgid "Send window to the workspace right of the current workspace"
 msgstr ""
 "Idirishya Kuri i Umwanya- nkenerwa Iburyo: Bya i KIGEZWEHO Umwanya- nkenerwa"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 #, fuzzy
 msgid "When does the mouse pointer affect the input focus."
@@ -3253,18 +3317,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Kongera Gutangiza Insanganyamatsiko Ryari:"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 #, fuzzy
 msgid "Default font: \\w"
 msgstr "Intego- nyuguti"
@@ -3494,6 +3546,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Akabuto"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ibyafataranyijwe Gikora Ryari: i Mweretsi ni in i Gufunga a Idirishya Imbeba "
+"Ibyafataranyijwe in iyi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Gufunga Akabuto"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ibyafataranyijwe Gikora Ryari: i Mweretsi ni in i Gufunga a Idirishya Imbeba "
+"Ibyafataranyijwe in iyi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Ibikubiyemo Akabuto"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ibyafataranyijwe Gikora Ryari: i Mweretsi ni in i Ibikubiyemo a Idirishya "
+"Imbeba Ibyafataranyijwe in iyi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Gufunga Akabuto"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ibyafataranyijwe Gikora Ryari: i Mweretsi ni in i Gufunga a Idirishya Imbeba "
+"Ibyafataranyijwe in iyi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Gufunga Akabuto"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ibyafataranyijwe Gikora Ryari: i Mweretsi ni in i Gufunga a Idirishya Imbeba "
+"Ibyafataranyijwe in iyi"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Urufunguzo S kugirango Mburabuzi"
 
@@ -3733,6 +3857,11 @@ msgstr "Kunoza"
 msgid "Display Errors"
 msgstr "Amakosa"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ibikubiyemo"
+
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
 # setup2/source\ui\app.src:STR_RESTART_BTN_YES.text
 # #-#-#-#-#  setup2.pot (PACKAGE VERSION)  #-#-#-#-#
@@ -3809,8 +3938,9 @@ msgid "Display the applications menu."
 msgstr "i Porogaramu Ibikubiyemo"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ipajikwinjira"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3853,7 +3983,6 @@ msgstr "Birunze hejuru"
 msgid "Raise single window"
 msgstr "UMWE Idirishya"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid "Raise the window to its highest allowed position in the stacking order."
@@ -3864,7 +3993,6 @@ msgstr "i Idirishya Kuri kirekire kurusha ibindi Ibirindiro in i Itondekanya"
 msgid "Lower single window"
 msgstr "UMWE Idirishya"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid "Lower the window to its lowest allowed position in the stacking order."
@@ -3875,7 +4003,6 @@ msgstr "i Idirishya Kuri Byo hasi cyane Ibirindiro in i Itondekanya"
 msgid "Raise lower single window"
 msgstr "Ntoya UMWE Idirishya"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -4113,7 +4240,8 @@ msgstr "Idirishya"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "i Ingero Bya i Idirishya Kuri Umwimerere Leta"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -4265,7 +4393,8 @@ msgstr "Idirishya Mukomatanya"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "i Leta Bya i Idirishya hagati Na"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -4286,8 +4415,8 @@ msgstr "Idirishya Mukomatanya"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "i Leta Bya i Idirishya hagati Byuzuye Na"
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -4523,9 +4652,7 @@ msgstr "Idirishya"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr "Porogaramu Kuri Gukina Ingero- fatizo in Gushigikira kugirango ni"
 
 # sc/source\ui\src\optdlg.src:RID_SCPAGE_CONTENT.GB_WINDOW.text
@@ -4577,14 +4704,38 @@ msgstr "Idirishya"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "i Idirishya Kuri kirekire kurusha ibindi Ibirindiro in i Itondekanya"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
 msgid "Lower window"
 msgstr "Idirishya"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "i Idirishya Kuri Byo hasi cyane Ibirindiro in i Itondekanya"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
 msgid "Raise lower window"
 msgstr "Ntoya Idirishya"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"i Idirishya ni ku kirekire kurusha ibindi Ibirindiro Hanyuma Ntoya Kuri "
+"Ibirindiro Nka Nka urwego Bya"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4724,7 +4875,8 @@ msgstr "Idirishya Iburyo:"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "i Idirishya Kuri i ku i Iburyo: Na Hindura Kuri"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4735,7 +4887,8 @@ msgstr "Idirishya Ibumoso:"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "i Idirishya Kuri i ku i Ibumoso: Na Hindura Kuri"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4745,7 +4898,9 @@ msgstr "Idirishya Hejuru"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "i Idirishya Kuri i hejuru Na Hindura Kuri"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4755,7 +4910,9 @@ msgstr "Idirishya Hasi"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "i Idirishya Kuri i munsi Na Hindura Kuri"
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4794,7 +4951,7 @@ msgstr "Kuri Ryari: Cyangwa"
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Kuri Ryari: Cyangwa"
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4846,6 +5003,11 @@ msgstr "Idirishya Izina:"
 msgid "Force the current window to have a unique title."
 msgstr "i KIGEZWEHO Idirishya Kuri a Cyo nyine Umutwe"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Idirishya"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4858,7 +5020,8 @@ msgstr "i Ibikubiyemo i Urutonde Bya Byose"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "i Ibikubiyemo i Urutonde Bya Byose"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -5012,7 +5175,8 @@ msgstr "Umwanya- nkenerwa Na Kohereza"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "a Gishya Umwanya- nkenerwa ku i Gutangira Bya i Urutonde Na Kwimura i "
 "Idirishya Kuri"
diff --git a/po/sk.po b/po/sk.po
index 0c2d115..99b0fba 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish.HEAD.sk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-01-23 23:55+0100\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky kde org>\n"
 "Language-Team: Slovak <sk-i18n linux sk>\n"
@@ -201,10 +201,10 @@ msgstr "žiadna"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -225,21 +225,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,14 +255,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -283,10 +283,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -309,17 +309,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -327,8 +327,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -359,8 +359,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr "Vyberte farbu"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -397,8 +397,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,7 +433,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr "všetky"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -513,14 +513,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -528,8 +528,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -544,7 +544,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -569,8 +569,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -586,7 +586,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -656,8 +656,8 @@ msgstr "mapa zatváracieho tlaÄ?idla"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -669,7 +669,7 @@ msgstr "mapa minimalizaÄ?ného tlaÄ?idla"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr "mapa tlaÄ?idla menu"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -718,14 +718,14 @@ msgstr "mapa tlaÄ?idla menu"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -738,18 +738,18 @@ msgstr "mapa tlaÄ?idla menu"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -761,7 +761,7 @@ msgstr "mapa tlaÄ?idla menu"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr "mapa zatváracieho tlaÄ?idla"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -829,12 +829,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,7 +842,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,23 +850,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -882,8 +882,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -891,10 +891,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -913,7 +913,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -926,10 +926,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -977,16 +977,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1837,8 +1837,10 @@ msgid "Move selected window"
 msgstr "Presunúť vybrané okno"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "PoÄ?kaÅ¥, kým používateľ vyberie okno a potom ho interaktívne presunúť."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1846,8 +1848,10 @@ msgid "Resize selected window"
 msgstr "Zmeniť veľkosť vybraného okna"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "PoÄ?kaÅ¥, kým používateľ vyberie okno a potom mu interaktívne zmeniÅ¥ veľkosÅ¥."
 
@@ -1926,40 +1930,88 @@ msgid "Shrink window left"
 msgstr "Posunúť skupinu vľavo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Posunúť skupinu vpravo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Posunúť skupinu hore"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Posunúť okno dolu"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Stiahnuť okno doľava"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Stiahnuť okno doprava"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Stiahnuť okno hore"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Stiahnuť okno dolu"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Na _plochu"
@@ -2282,6 +2334,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Kontextové menu aplikácie"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Zahrať zvukové efekty pre udalosti okien."
@@ -2372,10 +2435,6 @@ msgstr "Zobraziť chyby"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Zobraziť všetky chyby, ktoré nastali na obrazovke."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2599,11 +2658,6 @@ msgstr "Stav"
 msgid "Other"
 msgstr "Iný"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Okno dopredu"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Auto-rozbaľovanie"
@@ -2796,6 +2850,18 @@ msgstr "Poslať na plochu vpravo"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Poslať okno na pracovnú plochu vpravo od aktuálnej plochy"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kedy kurzor myÅ¡i ovplyvÅ?uje fokus vstupu."
@@ -2822,18 +2888,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automaticky znovu naÄ?ítaÅ¥ témy pri ich obnovení."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Štandardné písmo: \\w"
 
@@ -3037,6 +3091,78 @@ msgstr ""
 "(Použijú sa len skratky myši.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "mapa minimalizaÄ?ného tlaÄ?idla"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové skratky aktívne keÄ? je kurzor nad zatváracím tlaÄ?idlom okna.\n"
+"(Použijú sa len skratky myši.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "mapa zatváracieho tlaÄ?idla"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové skratky aktívne keÄ? je kurzor nad zatváracím tlaÄ?idlom okna.\n"
+"(Použijú sa len skratky myši.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "mapa tlaÄ?idla menu"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové skratky aktívne keÄ? je kurzor nad tlaÄ?idlom menu okna.\n"
+"(Použijú sa len skratky myši.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "mapa zatváracieho tlaÄ?idla"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové skratky aktívne keÄ? je kurzor nad zatváracím tlaÄ?idlom okna.\n"
+"(Použijú sa len skratky myši.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "mapa zatváracieho tlaÄ?idla"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Klávesové skratky aktívne keÄ? je kurzor nad zatváracím tlaÄ?idlom okna.\n"
+"(Použijú sa len skratky myši.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifikátor použitý pre štandardné skratky."
 
@@ -3246,6 +3372,11 @@ msgstr "Zobraziť chyby"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Kontextové menu aplikácie"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Reštartovať"
 
@@ -3304,8 +3435,9 @@ msgid "Display the applications menu."
 msgstr "Zobraziť menu aplikácií."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Nastavenie Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3344,7 +3476,6 @@ msgstr "Udržiavať podriadené okná nad: \\w"
 msgid "Raise single window"
 msgstr "Dopredu jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Presunúť okno dopredu na najvyššiu povolenú pozíciu."
@@ -3353,7 +3484,6 @@ msgstr "Presunúť okno dopredu na najvyššiu povolenú pozíciu."
 msgid "Lower single window"
 msgstr "Dozadu jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Presunúť okno dozadu na najnižšiu úroveÅ?."
@@ -3362,7 +3492,6 @@ msgstr "Presunúť okno dozadu na najnižšiu úroveÅ?."
 msgid "Raise lower single window"
 msgstr "Presunúť dopredu jedno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3558,8 +3687,10 @@ msgid "Unmaximize window"
 msgstr "Odmaximalizovať okno"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Obnoviť rozmery okna na jeho pôvodnú, nemaximalizovanú veľkosť."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3696,7 +3827,8 @@ msgstr "Prepnutie maximalizácie okna na celú obrazovku"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Prepnúť stav okna medzi maximalizovaným a nemaximalizovaným."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3717,8 +3849,8 @@ msgstr "Prepnutie maximalizácie okna na celú obrazovku"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Prepnúť stav okna medzi maximalizovaným neobmedzujúcim ostatné okná\n"
 "a nemaximalizovaným."
@@ -3938,9 +4070,7 @@ msgstr "Odmaximalizovať okno"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program používaný pre prehrávanie zvukov. Ak nie je nastavený, použije sa "
 "zabudovaná podpora ESD."
@@ -3985,13 +4115,38 @@ msgid "Raise window"
 msgstr "Okno dopredu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Presunúť okno dopredu na najvyššiu povolenú pozíciu."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Okno dozadu"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Presunúť okno dozadu na najnižšiu úroveÅ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Dopredu dozadu okno"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ak je okno úplne vpredu, presunúť ho úplne dozadu na najnižšiu povolenú\n"
+"pozíciu. Inak ho presunúť Ä?o najviac dopredu. Spolu s ním presúvaÅ¥ aj jeho\n"
+"podriadené okná."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4110,8 +4265,10 @@ msgid "Move window right"
 msgstr "Presunúť okno doprava"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Presunúť okno na obrazovku vpravo a prepnúť na Å?u."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4119,8 +4276,10 @@ msgid "Move window left"
 msgstr "Presunúť okno doľava"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Presunúť okno na obrazovku vľavo a prepnúť na Å?u."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4128,7 +4287,10 @@ msgid "Move window up"
 msgstr "Presunúť okno hore"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Presunúť okno na obrazovku hore a prepnúť na Å?u."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4136,7 +4298,10 @@ msgid "Move window down"
 msgstr "Presunúť okno dolu"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Presunúť okno na obrazovku dolu a prepnúť na Å?u."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4178,7 +4343,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Ä?i sa má naraziÅ¥ do ignorovaných okien pri zväÄ?Å¡ovaní alebo balení okien."
 
@@ -4224,6 +4389,11 @@ msgstr "Vytvoriť unikátne meno okna"
 msgid "Force the current window to have a unique title."
 msgstr "VynútiÅ¥ si jednoznaÄ?ný titulok okna."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Okno dopredu"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4236,7 +4406,8 @@ msgstr "Zobraziť menu so zoznamom všetkých pracovných plôch."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Zobraziť menu so zoznamom všetkých pracovných plôch."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4358,8 +4529,10 @@ msgid "Prepend workspace and send"
 msgstr "PridaÅ¥ plochu na zaÄ?iatok a poslaÅ¥"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "VytvoriÅ¥ novú pracovnú plochu na zaÄ?iatku zoznamu a presunúť na Å?u okno."
 
diff --git a/po/sl.po b/po/sl.po
index 0e5a50e..a9d023d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2000-07-03 11:46+0200\n"
 "Last-Translator: Andraz Tori <andraz tori1 guest arnes si>\n"
 "Language-Team: Slovenian <sl li org>\n"
@@ -197,10 +197,10 @@ msgstr "brez"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -212,8 +212,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -221,21 +221,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -251,14 +251,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -279,10 +279,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -305,17 +305,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -323,8 +323,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -355,8 +355,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr "Izberi barvo"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -393,8 +393,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -402,8 +402,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -420,8 +420,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -429,7 +429,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -493,15 +493,15 @@ msgstr "vsemi"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -509,14 +509,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -524,8 +524,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -540,7 +540,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -565,8 +565,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -582,7 +582,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -652,8 +652,8 @@ msgstr "povezave tipk gumba \"zapri\""
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -665,7 +665,7 @@ msgstr "povezave tipk gumba \"skrÄ?i\""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -679,7 +679,7 @@ msgstr "povezave tipk gumba \"menu\""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -701,7 +701,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -714,14 +714,14 @@ msgstr "povezave tipk gumba \"menu\""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -734,18 +734,18 @@ msgstr "povezave tipk gumba \"menu\""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -757,7 +757,7 @@ msgstr "povezave tipk gumba \"menu\""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr "povezave tipk gumba \"zapri\""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -825,12 +825,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -838,7 +838,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -846,23 +846,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -878,8 +878,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -887,10 +887,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -909,7 +909,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -922,10 +922,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -973,16 +973,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -998,7 +998,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1836,8 +1836,10 @@ msgid "Move selected window"
 msgstr "Premakni izbrano okno"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "PoÄ?akaj, da uporabnik izbere okno, nato interaktivno premikaj to okno."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1845,8 +1847,10 @@ msgid "Resize selected window"
 msgstr "Spremeni velikost izbranega okna"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "PoÄ?akaj, da uporabnik izbere okno, nato interaktivno spreminjaj velikost "
 "tega okna."
@@ -1926,40 +1930,88 @@ msgid "Shrink window left"
 msgstr "Drsenje okna levo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Drsneje okna desno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Drsenje okna navzgor"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Drsenje okna navzdol"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pomanjšaj okno levo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Pomanjšaj okno desno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pomanjšaj okno navzgor"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pomanjšaj okno navzdol"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Dodaj vrstico k velikosti okna"
@@ -2281,6 +2333,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "VzkliÄ?ni menu programov"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Igraj zvoÄ?ne uÄ?inke za okenske dogodke."
@@ -2371,10 +2434,6 @@ msgstr "Kaži napake"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Na zaslonu pokaži vse napake, ki so se zgodile."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2598,11 +2657,6 @@ msgstr "Stanje"
 msgid "Other"
 msgstr "Drugo"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Dvigni okno"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ZaÄ?asna odsenÄ?itev"
@@ -2810,6 +2864,18 @@ msgstr "Pošlji na delovno površino"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Ustvari novo delovno površino, ki naj bo pred trenutno."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kdaj kazalec miške vpliva na fokus."
@@ -2836,18 +2902,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Samodejno znova naloži teme, ko so posodobljene."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Privzeta pisava: \\w"
 
@@ -3052,6 +3106,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "povezave tipk gumba \"skrÄ?i\""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapiranje tip, ki je dejavno kadar je kazalec nad gumbom za zapiranje\n"
+"(Delujejo le miškine povezave.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "povezave tipk gumba \"zapri\""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapiranje tip, ki je dejavno kadar je kazalec nad gumbom za zapiranje\n"
+"(Delujejo le miškine povezave.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "povezave tipk gumba \"menu\""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapiranje tipk, ki je dejavno kadar je kazalec nad gumbom za menu\n"
+"(Delujejo le miškine povezave.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "povezave tipk gumba \"zapri\""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapiranje tip, ki je dejavno kadar je kazalec nad gumbom za zapiranje\n"
+"(Delujejo le miškine povezave.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "povezave tipk gumba \"zapri\""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapiranje tip, ki je dejavno kadar je kazalec nad gumbom za zapiranje\n"
+"(Delujejo le miškine povezave.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Ubežna tipka, ki se uporablja za privzete bližnjice upravljalnika oken."
@@ -3262,6 +3388,11 @@ msgstr "Kaži napake"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "VzkliÄ?ni menu programov"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Znova zaženi"
 
@@ -3320,8 +3451,9 @@ msgid "Display the applications menu."
 msgstr "Kaži menu aplikacij."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish nastavitve"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3360,7 +3492,6 @@ msgstr "Pusti transistentna okna nad: \\w"
 msgid "Raise single window"
 msgstr "Dvigni za eno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Zvišaj okno na vrh znotraj njegovega sklada."
@@ -3369,7 +3500,6 @@ msgstr "Zvišaj okno na vrh znotraj njegovega sklada."
 msgid "Lower single window"
 msgstr "Spusti za eno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Znižaj okno na dno znotraj njegovega sklada."
@@ -3378,7 +3508,6 @@ msgstr "Znižaj okno na dno znotraj njegovega sklada."
 msgid "Raise lower single window"
 msgstr "Dvigni/spusti za eno okno"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3576,8 +3705,10 @@ msgid "Unmaximize window"
 msgstr "Odrazpni okno"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Povrni velikost okna na njegovo izhodišno, ne razpeto, stanje."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3709,7 +3840,8 @@ msgstr "Preklopi razpetost okna Ä?ez cel zaslon"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Preklopi stanje okna med razpetim in zmanjšanim."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3730,8 +3862,8 @@ msgstr "Preklopi razpetost okna Ä?ez cel zaslon"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Preklopi stanje med razpeto-polnjeno in nerazpeto."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3947,9 +4079,7 @@ msgstr "Odrazpni okno"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program za igranje zvoÄ?nih vzorcev. Ä?e ni nastavljeno bo uporabljena že "
 "vgrajena ESD podpora."
@@ -3994,13 +4124,38 @@ msgid "Raise window"
 msgstr "Dvigni okno"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Zvišaj okno na vrh znotraj njegovega sklada."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Spusti okno"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Znižaj okno na dno znotraj njegovega sklada."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Dvigni/spusti okno"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ä?e je okno na najviÅ¡jem možnem položaju, ga spusti na najnižji možen "
+"položaj,\n"
+"sicer pa ga dvigni Ä?imbolj na vrh. (spremeni tudi nivo dialogov)"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4119,8 +4274,10 @@ msgid "Move window right"
 msgstr "Prestavi okno desno"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Prestavi okno v pogled na desni in preklopi na ta pogled.."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4128,8 +4285,10 @@ msgid "Move window left"
 msgstr "Prestavi okno levo"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Prestavi okno v pogled na levi in preklopi na ta pogled."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4137,7 +4296,10 @@ msgid "Move window up"
 msgstr "Prestavi okno navzgor"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Prestavi okno v pogled zgoraj in preklopi na ta pogled."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4145,7 +4307,10 @@ msgid "Move window down"
 msgstr "Prestavi okno navzdol"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Prestavi okno v pogled spodaj in preklopi na ta pogled."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4186,7 +4351,7 @@ msgstr "Ali naj se ob poveÄ?evanju in zmanjÅ¡evanju zaletim v prezrta okna."
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr "Ali naj se ob poveÄ?evanju in zmanjÅ¡evanju zaletim v prezrta okna."
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4230,6 +4395,11 @@ msgstr "Nastavi enoznaÄ?no ime okna"
 msgid "Force the current window to have a unique title."
 msgstr "Prisili trenutno okno da ima unikaten naziv."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Dvigni okno"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4242,7 +4412,8 @@ msgstr "Pokaži menu, ki vsebuje seznam vseh delovnih površin."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Pokaži menu, ki vsebuje seznam vseh delovnih površin."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4369,8 +4540,10 @@ msgid "Prepend workspace and send"
 msgstr "Pripni delovno povrÅ¡ino na zaÄ?etek in poÅ¡lji"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Ustvari novo delovno povrÅ¡ino na zaÄ?etku seznama in prestavi okno vanjo."
 
diff --git a/po/sr.po b/po/sr.po
index 07c9a31..5a5e185 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-04-18 04:48+0200\n"
 "Last-Translator: Ð?анило Шеган <danilo prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
@@ -201,10 +201,10 @@ msgstr "ниÑ?едан"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -225,21 +225,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,14 +255,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -283,10 +283,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -309,17 +309,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -327,8 +327,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -359,8 +359,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr "Ð?забеÑ?иÑ?е боÑ?Ñ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -397,8 +397,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,7 +433,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr "Ñ?ве"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -513,14 +513,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -528,8 +528,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -544,7 +544,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -569,8 +569,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -586,7 +586,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -656,8 +656,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -669,7 +669,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -718,14 +718,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -738,18 +738,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -761,7 +761,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -829,12 +829,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,7 +842,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,23 +850,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -882,8 +882,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -891,10 +891,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -913,7 +913,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -926,10 +926,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -977,16 +977,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1838,8 +1838,10 @@ msgid "Move selected window"
 msgstr "Ð?Ñ?емеÑ?Ñ?и изабÑ?ани пÑ?озоÑ?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "СаÑ?екаÑ? да коÑ?иÑ?ник изабеÑ?е пÑ?озоÑ?, а заÑ?им га пÑ?емеÑ?Ñ?и."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1847,8 +1849,10 @@ msgid "Resize selected window"
 msgstr "Ð?Ñ?омени велиÑ?инÑ? изабÑ?аног пÑ?озоÑ?а"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "СаÑ?екаÑ? да коÑ?иÑ?ник изабеÑ?е пÑ?озоÑ?, а заÑ?им мÑ? измени велиÑ?инÑ?."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1930,41 +1934,89 @@ msgid "Shrink window left"
 msgstr "Ð?лизни пÑ?озоÑ? Ñ?лево"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ð?лизни пÑ?озоÑ? Ñ?деÑ?но"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ð?лизни пÑ?озоÑ? нагоÑ?е"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ð?лизни пÑ?озоÑ? надоле"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "СабиÑ? пÑ?озоÑ? Ñ?лево"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "СабиÑ? пÑ?озоÑ? Ñ?деÑ?но"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "СабиÑ? пÑ?озоÑ? нагоÑ?е"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # пакÑ?Ñ? = Ñ?абиÑ?
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "СабиÑ? пÑ?озоÑ? надоле"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "УвеÑ?аÑ? пÑ?озоÑ? за Ñ?едан Ñ?ед"
@@ -2287,6 +2339,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3Ð? Ñ?ак"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Ð?збаÑ?и мени пÑ?огÑ?ама"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "УкÑ?Ñ?Ñ?и звÑ?Ñ?не еÑ?екÑ?е за догаÑ?аÑ?е пÑ?озоÑ?а."
@@ -2378,10 +2441,6 @@ msgstr "Ð?Ñ?икажи гÑ?еÑ?ке"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Ð?Ñ?икажи на екÑ?анÑ? Ñ?ве гÑ?еÑ?ке коÑ?е Ñ?е догоде."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2605,11 +2664,6 @@ msgstr "СÑ?аÑ?е"
 msgid "Other"
 msgstr "Ð?Ñ?Ñ?ги"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ð?здигни пÑ?озоÑ?"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Ð?дмоÑ?аÑ? пÑ?и пÑ?елазÑ? миÑ?ем"
@@ -2802,6 +2856,18 @@ msgstr "Ð?оÑ?аÑ?и на Ñ?аднÑ? повÑ?Ñ?инÑ? деÑ?но"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Ð?оÑ?аÑ?и пÑ?озоÑ? на Ñ?аднÑ? повÑ?Ñ?инÑ? деÑ?но од Ñ?екÑ?Ñ?е Ñ?адне повÑ?Ñ?ине."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Ð?ада показиваÑ? миÑ?а Ñ?Ñ?иÑ?е на Ñ?окÑ?Ñ? Ñ?ноÑ?а."
@@ -2828,18 +2894,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?Ñ?Ñ?омаÑ?Ñ?ки оÑ?вежи Ñ?еме пÑ?и Ñ?иÑ?овоÑ? допÑ?ни."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "УобиÑ?аÑ?ено пиÑ?мо: \\w"
 
@@ -3049,6 +3103,82 @@ msgstr ""
 "замоÑ?аваÑ?е пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?е коÑ?а Ñ?адÑ?жи доделе коÑ?е Ñ?Ñ? акÑ?ивне када Ñ?е показиваÑ? изнад "
+"дÑ?гмеÑ?а\n"
+"за заÑ?ваÑ?аÑ?е пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?е коÑ?а Ñ?адÑ?жи доделе коÑ?е Ñ?Ñ? акÑ?ивне када Ñ?е показиваÑ? изнад "
+"дÑ?гмеÑ?а\n"
+"за заÑ?ваÑ?аÑ?е пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?е коÑ?а Ñ?адÑ?жи акÑ?ивне доделе када Ñ?е показиваÑ? изнад дÑ?гмеÑ?а\n"
+"за мени пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?е коÑ?а Ñ?адÑ?жи доделе коÑ?е Ñ?Ñ? акÑ?ивне када Ñ?е показиваÑ? изнад "
+"дÑ?гмеÑ?а\n"
+"за заÑ?ваÑ?аÑ?е пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?апа Ñ?аÑ?Ñ?аÑ?Ñ?Ñ?е коÑ?а Ñ?адÑ?жи доделе коÑ?е Ñ?Ñ? акÑ?ивне када Ñ?е показиваÑ? изнад "
+"дÑ?гмеÑ?а\n"
+"за заÑ?ваÑ?аÑ?е пÑ?озоÑ?а. (Само пÑ?еÑ?иÑ?е миÑ?а имаÑ?Ñ? знаÑ?аÑ?а Ñ? овоÑ? мапи.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "ТаÑ?Ñ?еÑ?и коÑ?и Ñ?е коÑ?иÑ?Ñ?е за Ñ?обиÑ?аÑ?ене пÑ?еÑ?иÑ?е."
 
@@ -3258,6 +3388,11 @@ msgstr "Ð?Ñ?икажи гÑ?еÑ?ке"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Ð?збаÑ?и мени пÑ?огÑ?ама"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ð?оново покÑ?ени"
 
@@ -3316,8 +3451,9 @@ msgid "Display the applications menu."
 msgstr "Ð?окажи мени пÑ?огÑ?ама."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ð?лаÑ? за подеÑ?аваÑ?е Sawfish-а"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3356,7 +3492,6 @@ msgstr "Слажи пÑ?ивÑ?емене пÑ?озоÑ?е изнад: \\w"
 msgid "Raise single window"
 msgstr "Ð?здигни Ñ?едан пÑ?озоÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Ð?здигни пÑ?озоÑ? на Ñ?емÑ? наÑ?виÑ?е дозвоÑ?ено меÑ?Ñ?о пÑ?и Ñ?лагаÑ?Ñ?."
@@ -3365,7 +3500,6 @@ msgstr "Ð?здигни пÑ?озоÑ? на Ñ?емÑ? наÑ?виÑ?е дозвоÑ?е
 msgid "Lower single window"
 msgstr "СпÑ?Ñ?Ñ?и Ñ?едан пÑ?озоÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "СпÑ?Ñ?Ñ?и пÑ?озоÑ? на Ñ?емÑ? наÑ?ниже дозвоÑ?ено меÑ?Ñ?о пÑ?и Ñ?лагаÑ?Ñ?."
@@ -3374,7 +3508,6 @@ msgstr "СпÑ?Ñ?Ñ?и пÑ?озоÑ? на Ñ?емÑ? наÑ?ниже дозвоÑ?ен
 msgid "Raise lower single window"
 msgstr "Ð?здигни/Ñ?пÑ?Ñ?Ñ?и Ñ?едан пÑ?озоÑ?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3572,8 +3705,10 @@ msgid "Unmaximize window"
 msgstr "Ð?ониÑ?Ñ?и Ñ?веÑ?аÑ?е пÑ?озоÑ?а"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Ð?Ñ?аÑ?и велиÑ?инÑ? пÑ?озоÑ?а Ñ? извоÑ?но, неÑ?веÑ?ано Ñ?Ñ?аÑ?е."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3709,7 +3844,8 @@ msgstr "Ð?Ñ?омени Ñ?веÑ?аÑ?е пÑ?озоÑ?а пÑ?еко Ñ?елог ек
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Ð?змени Ñ?Ñ?аÑ?е пÑ?озоÑ?а измеÑ?Ñ? Ñ?веÑ?аног и неÑ?веÑ?аног."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3730,8 +3866,8 @@ msgstr "Ð?Ñ?омени Ñ?веÑ?аÑ?е пÑ?озоÑ?а пÑ?еко Ñ?елог ек
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Ð?змени Ñ?Ñ?аÑ?е пÑ?озоÑ?а измеÑ?Ñ? Ñ?веÑ?аÑ?а пÑ?еко Ñ?лободне повÑ?Ñ?ине или неÑ?веÑ?аног."
 
@@ -3950,9 +4086,7 @@ msgstr "Ð?ониÑ?Ñ?и Ñ?веÑ?аÑ?е пÑ?озоÑ?а"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ð?Ñ?огÑ?ам коÑ?и Ñ?е коÑ?иÑ?Ñ?и за пÑ?Ñ?Ñ?аÑ?е звÑ?Ñ?ниÑ? даÑ?оÑ?ека. Ð?ко ниÑ?е поÑ?Ñ?авÑ?ен, "
 "коÑ?иÑ?Ñ?иÑ?е Ñ?е Ñ?гÑ?аÑ?ена подÑ?Ñ?ка за Ð?СÐ?."
@@ -3999,13 +4133,38 @@ msgid "Raise window"
 msgstr "Ð?здигни пÑ?озоÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Ð?здигни пÑ?озоÑ? на Ñ?емÑ? наÑ?виÑ?е дозвоÑ?ено меÑ?Ñ?о пÑ?и Ñ?лагаÑ?Ñ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "СпÑ?Ñ?Ñ?и пÑ?озоÑ?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "СпÑ?Ñ?Ñ?и пÑ?озоÑ? на Ñ?емÑ? наÑ?ниже дозвоÑ?ено меÑ?Ñ?о пÑ?и Ñ?лагаÑ?Ñ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ð?здигни/Ñ?пÑ?Ñ?Ñ?и пÑ?озоÑ?"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ð?ко Ñ?е пÑ?озоÑ? на наÑ?виÑ?оÑ? могÑ?Ñ?оÑ? позиÑ?иÑ?и Ñ?пÑ?Ñ?Ñ?а га на наÑ?нижÑ?\n"
+"могÑ?Ñ?Ñ? позиÑ?иÑ?Ñ?. У Ñ?Ñ?пÑ?оÑ?ном издиже пÑ?озоÑ? колико Ñ?е могÑ?Ñ?е. ТакоÑ?е\n"
+"меÑ?а и ниво Ñ?виÑ? Ñ?еговиÑ? пÑ?ивÑ?емениÑ? пÑ?озоÑ?а."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4124,8 +4283,10 @@ msgid "Move window right"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? деÑ?но"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? на поглед Ñ?деÑ?но и пÑ?ебаÑ?и на Ñ?аÑ? поглед."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4133,8 +4294,10 @@ msgid "Move window left"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? лево"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? на поглед Ñ?лево и пÑ?ебаÑ?и на Ñ?аÑ? поглед."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4142,7 +4305,10 @@ msgid "Move window up"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? нагоÑ?е"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? на поглед изнад и пÑ?ебаÑ?и на Ñ?аÑ? поглед."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4150,7 +4316,10 @@ msgid "Move window down"
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? надоле"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Ð?Ñ?емеÑ?Ñ?и пÑ?озоÑ? на поглед иÑ?под и пÑ?ебаÑ?и на Ñ?аÑ? поглед."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4192,7 +4361,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Ð?а ли да поÑ?авнава Ñ?а занемаÑ?еним пÑ?озоÑ?има пÑ?и Ñ?иÑ?еÑ?Ñ? или Ñ?абиÑ?аÑ?Ñ? пÑ?озоÑ?а."
 
@@ -4240,6 +4409,11 @@ msgstr "Ð?единÑ?Ñ?вено име пÑ?озоÑ?а"
 msgid "Force the current window to have a unique title."
 msgstr "Ð?амеÑ?ни Ñ?единÑ?Ñ?вено име овом пÑ?озоÑ?Ñ?."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ð?здигни пÑ?озоÑ?"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4252,7 +4426,8 @@ msgstr "Ð?Ñ?икажи мени коÑ?и Ñ?адÑ?жи Ñ?пиÑ?ак Ñ?виÑ? Ñ?а
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Ð?Ñ?икажи мени коÑ?и Ñ?адÑ?жи Ñ?пиÑ?ак Ñ?виÑ? Ñ?адниÑ? пÑ?оÑ?Ñ?оÑ?а."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4374,8 +4549,10 @@ msgid "Prepend workspace and send"
 msgstr "УмеÑ?ни Ñ?аднÑ? повÑ?Ñ?инÑ? и поÑ?аÑ?и"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Ð?одаÑ?Ñ?е новÑ? Ñ?аднÑ? повÑ?Ñ?инÑ? на поÑ?еÑ?ак Ñ?пиÑ?ка и пÑ?емеÑ?Ñ?иÑ?е пÑ?озоÑ? на Ñ?Ñ?."
 
diff --git a/po/sr Latn po b/po/sr Latn po
index 76eef07..27c3948 100644
--- a/po/sr Latn po
+++ b/po/sr Latn po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-04-18 04:48+0200\n"
 "Last-Translator: Danilo Å egan <danilo prevod org>\n"
 "Language-Team: Serbian (sr) <gnom prevod org>\n"
@@ -201,10 +201,10 @@ msgstr "nijedan"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -216,8 +216,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -225,21 +225,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -247,7 +247,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -255,14 +255,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -283,10 +283,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -309,17 +309,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -327,8 +327,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -359,8 +359,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -373,7 +373,7 @@ msgstr "Izaberite boju"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -397,8 +397,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -415,8 +415,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -424,8 +424,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -433,7 +433,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -497,15 +497,15 @@ msgstr "sve"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -513,14 +513,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -528,8 +528,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -544,7 +544,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -569,8 +569,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -586,7 +586,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -656,8 +656,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -669,7 +669,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -683,7 +683,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -705,7 +705,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -718,14 +718,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -738,18 +738,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -761,7 +761,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -829,12 +829,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,7 +842,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,23 +850,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -882,8 +882,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -891,10 +891,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -913,7 +913,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -926,10 +926,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -977,16 +977,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1840,8 +1840,10 @@ msgid "Move selected window"
 msgstr "Premesti izabrani prozor"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "SaÄ?ekaj da korisnik izabere prozor, a zatim ga premesti."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1849,8 +1851,10 @@ msgid "Resize selected window"
 msgstr "Promeni veliÄ?inu izabranog prozora"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "SaÄ?ekaj da korisnik izabere prozor, a zatim mu izmeni veliÄ?inu."
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1932,41 +1936,89 @@ msgid "Shrink window left"
 msgstr "Klizni prozor ulevo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Klizni prozor udesno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Klizni prozor nagore"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Klizni prozor nadole"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Sabij prozor ulevo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Sabij prozor udesno"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Sabij prozor nagore"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # pakuj = sabij
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Sabij prozor nadole"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "UveÄ?aj prozor za jedan red"
@@ -2289,6 +2341,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D hak"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Izbaci meni programa"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "UkljuÄ?i zvuÄ?ne efekte za dogaÄ?aje prozora."
@@ -2381,10 +2444,6 @@ msgstr "Prikaži greške"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Prikaži na ekranu sve greške koje se dogode."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2608,11 +2667,6 @@ msgstr "Stanje"
 msgid "Other"
 msgstr "Drugi"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Izdigni prozor"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Odmotaj pri prelazu mišem"
@@ -2805,6 +2859,18 @@ msgstr "Pošalji na radnu površinu desno"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "PoÅ¡anji prozor na radnu povrÅ¡inu desno od tekuÄ?e radne povrÅ¡ine."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Kada pokazivaÄ? miÅ¡a utiÄ?e na fokus unosa."
@@ -2831,18 +2897,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Automatski osveži teme pri njihovoj dopuni."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "UobiÄ?ajeno pismo: \\w"
 
@@ -3053,6 +3107,82 @@ msgstr ""
 "zamotavanje prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tastature koja sadrži dodele koje su aktivne kada je pokazivaÄ? iznad "
+"dugmeta\n"
+"za zatvaranje prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tastature koja sadrži dodele koje su aktivne kada je pokazivaÄ? iznad "
+"dugmeta\n"
+"za zatvaranje prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tastature koja sadrži aktivne dodele kada je pokazivaÄ? iznad dugmeta\n"
+"za meni prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tastature koja sadrži dodele koje su aktivne kada je pokazivaÄ? iznad "
+"dugmeta\n"
+"za zatvaranje prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Mapa tastature koja sadrži dodele koje su aktivne kada je pokazivaÄ? iznad "
+"dugmeta\n"
+"za zatvaranje prozora. (Samo preÄ?ice miÅ¡a imaju znaÄ?aja u ovoj mapi.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Tasteri koji se koriste za uobiÄ?ajene preÄ?ice."
 
@@ -3262,6 +3392,11 @@ msgstr "Prikaži greške"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Izbaci meni programa"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ponovo pokreni"
 
@@ -3320,8 +3455,9 @@ msgid "Display the applications menu."
 msgstr "Pokaži meni programa."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Alat za podešavanje Sawfish-a"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3360,7 +3496,6 @@ msgstr "Slaži privremene prozore iznad: \\w"
 msgid "Raise single window"
 msgstr "Izdigni jedan prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Izdigni prozor na njemu najviše dozvoljeno mesto pri slaganju."
@@ -3369,7 +3504,6 @@ msgstr "Izdigni prozor na njemu najviše dozvoljeno mesto pri slaganju."
 msgid "Lower single window"
 msgstr "Spusti jedan prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Spusti prozor na njemu najniže dozvoljeno mesto pri slaganju."
@@ -3378,7 +3512,6 @@ msgstr "Spusti prozor na njemu najniže dozvoljeno mesto pri slaganju."
 msgid "Raise lower single window"
 msgstr "Izdigni/spusti jedan prozor"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3576,8 +3709,10 @@ msgid "Unmaximize window"
 msgstr "PoniÅ¡ti uveÄ?anje prozora"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Vrati veliÄ?inu prozora u izvorno, neuveÄ?ano stanje."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3713,7 +3848,8 @@ msgstr "Promeni uveÄ?anje prozora preko celog ekrana"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Izmeni stanje prozora izmeÄ?u uveÄ?anog i neuveÄ?anog."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3734,8 +3870,8 @@ msgstr "Promeni uveÄ?anje prozora preko celog ekrana"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Izmeni stanje prozora izmeÄ?u uveÄ?anja preko slobodne povrÅ¡ine ili neuveÄ?anog."
 
@@ -3954,9 +4090,7 @@ msgstr "PoniÅ¡ti uveÄ?anje prozora"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Program koji se koristi za puÅ¡tanje zvuÄ?nih datoteka. Ako nije postavljen, "
 "koristiÄ?e se ugraÄ?ena podrÅ¡ka za ESD."
@@ -4003,13 +4137,38 @@ msgid "Raise window"
 msgstr "Izdigni prozor"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Izdigni prozor na njemu najviše dozvoljeno mesto pri slaganju."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Spusti prozor"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Spusti prozor na njemu najniže dozvoljeno mesto pri slaganju."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Izdigni/spusti prozor"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Ako je prozor na najviÅ¡oj moguÄ?oj poziciji spuÅ¡ta ga na najnižu\n"
+"moguÄ?u poziciju. U suprotnom izdiže prozor koliko je moguÄ?e. TakoÄ?e\n"
+"menja i nivo svih njegovih privremenih prozora."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4128,8 +4287,10 @@ msgid "Move window right"
 msgstr "Premesti prozor desno"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "Premesti prozor na pogled udesno i prebaci na taj pogled."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4137,8 +4298,10 @@ msgid "Move window left"
 msgstr "Premesti prozor levo"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Premesti prozor na pogled ulevo i prebaci na taj pogled."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4146,7 +4309,10 @@ msgid "Move window up"
 msgstr "Premesti prozor nagore"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Premesti prozor na pogled iznad i prebaci na taj pogled."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4154,7 +4320,10 @@ msgid "Move window down"
 msgstr "Premesti prozor nadole"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Premesti prozor na pogled ispod i prebaci na taj pogled."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4197,7 +4366,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Da li da poravnava sa zanemarenim prozorima pri Å¡irenju ili sabijanju "
 "prozora."
@@ -4247,6 +4416,11 @@ msgstr "Jedinstveno ime prozora"
 msgid "Force the current window to have a unique title."
 msgstr "Nametni jedinstveno ime ovom prozoru."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Izdigni prozor"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4259,7 +4433,8 @@ msgstr "Prikaži meni koji sadrži spisak svih radnih prostora."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Prikaži meni koji sadrži spisak svih radnih prostora."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4381,8 +4556,10 @@ msgid "Prepend workspace and send"
 msgstr "Umetni radnu površinu i pošalji"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 "Dodajte novu radnu povrÅ¡inu na poÄ?etak spiska i premestite prozor na nju."
 
diff --git a/po/sv.po b/po/sv.po
index ac17ff5..466346c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2009-01-25 02:43+0100\n"
 "Last-Translator: Daniel Nylander <po danielnylander se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
@@ -206,10 +206,10 @@ msgstr "inga"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -221,8 +221,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -230,21 +230,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -252,7 +252,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -260,14 +260,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -288,10 +288,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -314,17 +314,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -332,8 +332,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -364,8 +364,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -378,7 +378,7 @@ msgstr "Välj färg"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -388,7 +388,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -402,8 +402,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -411,8 +411,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -420,8 +420,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -429,8 +429,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -438,7 +438,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -502,15 +502,15 @@ msgstr "alla"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -518,14 +518,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -533,8 +533,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -549,7 +549,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -574,8 +574,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -591,7 +591,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -661,8 +661,8 @@ msgstr "stängknapp-tangentbindning"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -674,7 +674,7 @@ msgstr "minimeringsknapp-tangentbindning"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -688,7 +688,7 @@ msgstr "menyknapp-tangentbindning"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -710,7 +710,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -723,14 +723,14 @@ msgstr "menyknapp-tangentbindning"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -743,18 +743,18 @@ msgstr "menyknapp-tangentbindning"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -766,7 +766,7 @@ msgstr "menyknapp-tangentbindning"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -779,7 +779,7 @@ msgstr "stängknapp-tangentbindning"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -834,12 +834,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -847,7 +847,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -855,23 +855,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -879,7 +879,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -887,8 +887,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -896,10 +896,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -918,7 +918,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -931,10 +931,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -982,16 +982,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1007,7 +1007,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1846,8 +1846,10 @@ msgid "Move selected window"
 msgstr "Flytta valt fönster"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Vänta på att användaren väljer ett fönster, flytta sedan fönstret "
 "interaktivt."
@@ -1857,8 +1859,10 @@ msgid "Resize selected window"
 msgstr "Storleksändra valt fönster"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Vänta på att användaren väljer ett fönster, storleksändra sedan fönstret \n"
 "interaktivt."
@@ -1938,40 +1942,88 @@ msgid "Shrink window left"
 msgstr "Glid fönster åt vänster"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Glid fönster åt höger"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Glid fönster uppåt"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Glid fönster nedåt"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Packa fönster åt vänster"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Packa fönster åt höger"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Packa fönster uppåt"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Packa fönster nedåt"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Storleksändra fönster lägg till rad"
@@ -2293,6 +2345,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3d-hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Visa programmeny"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Spela upp ljudeffekter för fönsterhändelser."
@@ -2383,10 +2446,6 @@ msgstr "Visa fel"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Visa alla fel som har inträffat på skärmen."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2610,11 +2669,6 @@ msgstr "Tillstånd"
 msgid "Other"
 msgstr "Annat"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Höj fönster"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Skuggsvävning"
@@ -2808,6 +2862,18 @@ msgstr "Skicka till arbetsytan till höger"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Skicka fönster till arbetsytan till höger om den aktuella arbetsytan"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "När påverkar muspekaren inmatningsfokus?"
@@ -2834,18 +2900,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Läs om teman automatiskt när de uppdateras."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Standardtypsnitt: \\w"
 
@@ -3050,6 +3104,78 @@ msgstr ""
 "skuggknapp. (Endast musbindningar fungerar här)."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "minimeringsknapp-tangentbindning"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tangentbindning vars bindningar är aktiva när pekaren är på ett fönsters\n"
+"stängknapp. (Endast musbindningar fungerar här)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "stängknapp-tangentbindning"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tangentbindning vars bindningar är aktiva när pekaren är på ett fönsters\n"
+"stängknapp. (Endast musbindningar fungerar här)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menyknapp-tangentbindning"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tangentbindning vars bindningar är aktiva när pekaren är på ett fönsters\n"
+"menyknapp. (Endast musbindningar fungerar här)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "stängknapp-tangentbindning"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tangentbindning vars bindningar är aktiva när pekaren är på ett fönsters\n"
+"stängknapp. (Endast musbindningar fungerar här)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "stängknapp-tangentbindning"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Tangentbindning vars bindningar är aktiva när pekaren är på ett fönsters\n"
+"stängknapp. (Endast musbindningar fungerar här)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Modifierartangent(er) som ska användas för standardkortkommandon.."
 
@@ -3248,6 +3374,11 @@ msgstr "Visa fel"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Visa programmeny"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Starta om"
 
@@ -3306,8 +3437,9 @@ msgid "Display the applications menu."
 msgstr "Visa programmenyn."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Konfigurera Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3346,7 +3478,6 @@ msgstr "Håll tillfälliga fönster lagrade ovanpå: \\w"
 msgid "Raise single window"
 msgstr "Höj enstaka fönster"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Höj fönstret till högsta tillåtna nivå i dess lager."
@@ -3355,7 +3486,6 @@ msgstr "Höj fönstret till högsta tillåtna nivå i dess lager."
 msgid "Lower single window"
 msgstr "Sänk enstaka fönster"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Sänk fönstret till lägsta tillåtna nivå i dess lager."
@@ -3364,7 +3494,6 @@ msgstr "Sänk fönstret till lägsta tillåtna nivå i dess lager."
 msgid "Raise lower single window"
 msgstr "Höj nedre enstaka fönster"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3561,8 +3690,10 @@ msgid "Unmaximize window"
 msgstr "Avmaximera fönster"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "�terställ fönstret till dess ursprungliga, avmaximerade läge."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3694,7 +3825,8 @@ msgstr "Maximera fönster helskärm-växel"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Växla fönstrets läge mellan maximerad och avmaximerad."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3715,8 +3847,8 @@ msgstr "Maximera fönster helskärm-växel"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Växla fönsterläge mellan fyllnadsmaximerad och avmaximerad."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3934,9 +4066,7 @@ msgstr "Avmaximera fönster"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Programmet som ska användas för att spela ljudfiler. Om inget är valt "
 "används det inbyggda stödet för ESD."
@@ -3983,13 +4113,38 @@ msgid "Raise window"
 msgstr "Höj fönster"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Höj fönstret till högsta tillåtna nivå i dess lager."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Sänk fönster"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Sänk fönstret till lägsta tillåtna nivå i dess lager."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Höj lägre fönster"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Om fönstret är på sin högsta position, sänk det till dess lägsta\n"
+"position. Höj det annars till dess högsta position. Detta gäller alla\n"
+"tillfälliga fönster som fönstret har."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4108,8 +4263,10 @@ msgid "Move window right"
 msgstr "Flytta fönstret åt höger"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytta fönstret till skrivbordsvyn till höger, och byt till den "
 "skrivbordsvyn."
@@ -4119,8 +4276,10 @@ msgid "Move window left"
 msgstr "Flytta fönstret åt vänster"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytta fönstret till skrivbordsvyn till vänster, och byt till den "
 "skrivbordsvyn."
@@ -4130,7 +4289,10 @@ msgid "Move window up"
 msgstr "Flytta fönstret uppåt"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytta fönstret till skrivbordsvyn ovanför, och byt till den skrivbordsvyn."
 
@@ -4139,7 +4301,10 @@ msgid "Move window down"
 msgstr "Flytta fönstret nedåt"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr ""
 "Flytta fönstret till skrivbordsvyn nedanför, och byt till den skrivbordsvyn."
 
@@ -4182,7 +4347,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Huruvida ignorerade fönster ska krockas med vid växande eller packande."
 
@@ -4228,6 +4393,11 @@ msgstr "Gör fönsternamnet unikt"
 msgid "Force the current window to have a unique title."
 msgstr "Tvinga det aktuella fönstret att ha en unik titel."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Höj fönster"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4240,7 +4410,8 @@ msgstr "Visa menyn som innehåller listan med alla arbetsytor."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Visa menyn som innehåller listan med alla arbetsytor."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4362,8 +4533,10 @@ msgid "Prepend workspace and send"
 msgstr "Lägg till arbetsyta i början och skicka"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Skapa en ny arbetsyta i början av listan, och flytta fönstret dit."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/tr.po b/po/tr.po
index ba583e8..0861e77 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sawfish\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-09-18 05:27+0300\n"
 "Last-Translator: Ömer Fadýl USTA <omer_fad hotmail com>\n"
 "Language-Team: GNOME Turk <gnome-turk gnome org>\n"
@@ -215,10 +215,10 @@ msgstr "hi
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -230,8 +230,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -239,21 +239,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -261,7 +261,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -269,14 +269,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -297,10 +297,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -323,17 +323,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -341,8 +341,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -374,8 +374,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -388,7 +388,7 @@ msgstr "Rengi Se
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -412,8 +412,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -421,8 +421,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -430,8 +430,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -439,8 +439,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -448,7 +448,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -514,15 +514,15 @@ msgstr "hepsi"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -530,14 +530,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -545,8 +545,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -561,7 +561,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -586,8 +586,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -603,7 +603,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -675,8 +675,8 @@ msgstr "Program
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -687,7 +687,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -733,14 +733,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -752,18 +752,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -774,7 +774,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -786,7 +786,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -841,12 +841,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -854,7 +854,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -862,23 +862,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -886,7 +886,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -894,8 +894,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -903,10 +903,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -925,7 +925,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -938,10 +938,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -986,16 +986,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1011,7 +1011,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1935,7 +1935,8 @@ msgstr "Se
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 #, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "Sadece pencereyi etkileþimli taþýrken çevir."
 
 # ../lisp/workspace.jl
@@ -1943,10 +1944,13 @@ msgstr "Sadece pencereyi etkile
 msgid "Resize selected window"
 msgstr "Seçilmiþ olan pencereyi yeniden boyutlandýr"
 
+# ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
-msgstr ""
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
+msgstr "Sadece pencereyi etkileþimli taþýrken çevir."
 
 # ../lisp/match-window.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -2015,30 +2019,60 @@ msgstr ""
 msgid "Shrink window left"
 msgstr "Pencereyi sola slaytla"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Pencereyi saða slaytla"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Pencereyi yukarý slaytla"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Pencereyi aþaðý slaytla"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Pencereyi sola geniþlet"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
@@ -2046,15 +2080,33 @@ msgid "Yank window right"
 msgstr "Pencereyi saða paketle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Pencereyi yukarý paketle"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Pencereyi aþaðý paketle"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
@@ -2435,6 +2487,17 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Uygulamalar menüsü aç"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 # ../themer/themer.in
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
@@ -2537,10 +2600,6 @@ msgstr "Hatalar
 msgid "Display all errors that have occurred to the screen."
 msgstr ""
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 # ../lisp/custom.jl
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
@@ -2788,11 +2847,6 @@ msgstr "Durum"
 msgid "Other"
 msgstr "Diðer"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Pencereyi yükselt"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Gölgele"
@@ -3028,6 +3082,18 @@ msgstr "
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Grubu Aktif çalýþma alanýna yolla"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -3055,18 +3121,6 @@ msgstr "
 msgid "Automatically reload themes when they are updated."
 msgstr "Görünümler yenilenince görünümleri yeniden yükle "
 
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
 # ../lisp/frames.jl
 #. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
@@ -3292,6 +3346,83 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "dönen-anahtarharitasý"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Pencerelerin kapatma basmasýnýn üstünde geçerli olan tuþ haritasý\n"
+"(Sadece fare hareketleri analiz ediliyor)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "dönen-anahtarharitasý"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Pencerelerin kapatma basmasýnýn üstünde geçerli olan tuþ haritasý\n"
+"(Sadece fare hareketleri analiz ediliyor)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "baþlýk tuþ haritasý"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Pencerelerin menü düðmesinin üstünde geçerli olan tuþ haritasý\n"
+"(Sadece fare hareketleri analiz ediliyor.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "dönen-anahtarharitasý"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Pencerelerin kapatma basmasýnýn üstünde geçerli olan tuþ haritasý\n"
+"(Sadece fare hareketleri analiz ediliyor)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "dönen-anahtarharitasý"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Pencerelerin kapatma basmasýnýn üstünde geçerli olan tuþ haritasý\n"
+"(Sadece fare hareketleri analiz ediliyor)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Tanýmlayýcý anahtar(lar) varsayýlan pencere yöneticisi kýsa yollarý için "
@@ -3535,6 +3666,11 @@ msgstr "
 msgid "Display Errors"
 msgstr "Hatalarý göster"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Uygulamalar menüsü aç"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3602,8 +3738,9 @@ msgid "Display the applications menu."
 msgstr "Uygulama menüsünü göster."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish ayarlayýcýsý"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3642,7 +3779,6 @@ msgstr "Ufakca pencereleri, bunlardan 
 msgid "Raise single window"
 msgstr "Tek pencereyi yükselt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3651,7 +3787,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Tek pencereyi alçalt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3661,7 +3796,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Tek pencereyi yükselt"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid ""
 "If the window is at its highest possible position, then lower it to its\n"
@@ -3893,7 +4027,8 @@ msgstr "Pencereyi Normalle
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -4045,7 +4180,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -4067,8 +4203,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 # ../lisp/menus.jl
@@ -4290,9 +4426,7 @@ msgstr "Pencereyi Normalle
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ses parçalarýný çalacak olan uygulama. Belirtilmezse sesler ESD yardýmýyla "
 "çalýnacaktýr."
@@ -4344,16 +4478,35 @@ msgstr "Bir pencereyi y
 msgid "Raise window"
 msgstr "Pencereyi yükselt"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+
 # ../lisp/ignore-window.jl
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Pencereyi alçalt"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 #, fuzzy
 msgid "Raise lower window"
 msgstr "Tek pencereyi yükselt"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4490,10 +4643,13 @@ msgstr "Bak
 msgid "Move window right"
 msgstr "Pencereyi saða taþý"
 
+# ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
-msgstr ""
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
+msgstr "Geçerli pencereyi belirlenmiþ bakýþ noktasýna taþýr."
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4504,7 +4660,8 @@ msgstr "Pencereyi sola ta
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Geçerli pencereyi belirlenmiþ bakýþ noktasýna taþýr."
 
 # ../lisp/menus.jl
@@ -4515,7 +4672,9 @@ msgstr "Pencereyi yukar
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Geçerli pencereyi belirlenmiþ bakýþ noktasýna taþýr."
 
 # ../lisp/menus.jl
@@ -4526,7 +4685,9 @@ msgstr "Pencereyi a
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Geçerli pencereyi belirlenmiþ bakýþ noktasýna taþýr."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4566,7 +4727,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4615,6 +4776,11 @@ msgstr "Yegane pencere ismi"
 msgid "Force the current window to have a unique title."
 msgstr "Geçerli pencereyi belirlenmiþ bakýþ noktasýna taþýr."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Pencereyi yükselt"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4625,7 +4791,8 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr ""
 
 # ../lisp/menus.jl
@@ -4787,7 +4954,8 @@ msgstr "
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 # ../lisp/workspace.jl
diff --git a/po/uk.po b/po/uk.po
index f6a04c9..9964a9c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish-2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2003-01-23 03:44--500\n"
 "Last-Translator: Maxim Dzumanenko <mvd mylinux com ua>\n"
 "Language-Team: Ukrainian <uk li org>\n"
@@ -202,10 +202,10 @@ msgstr "немаÑ?"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -217,8 +217,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -226,21 +226,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -256,14 +256,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -284,10 +284,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -310,17 +310,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -328,8 +328,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -360,8 +360,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -374,7 +374,7 @@ msgstr "Ð?ибÑ?Ñ? колÑ?оÑ?Ñ?"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -384,7 +384,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -398,8 +398,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -416,8 +416,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -425,8 +425,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -434,7 +434,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -498,15 +498,15 @@ msgstr "вÑ?Ñ?"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -514,14 +514,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -529,8 +529,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -545,7 +545,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -570,8 +570,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -587,7 +587,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -657,8 +657,8 @@ msgstr "close-button-keymap"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -670,7 +670,7 @@ msgstr "iconify-button-keymap"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -684,7 +684,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -706,7 +706,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -719,14 +719,14 @@ msgstr "menu-button-keymap"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -739,18 +739,18 @@ msgstr "menu-button-keymap"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -762,7 +762,7 @@ msgstr "menu-button-keymap"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -775,7 +775,7 @@ msgstr "close-button-keymap"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -830,12 +830,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -843,7 +843,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -851,23 +851,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -875,7 +875,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -883,8 +883,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -892,10 +892,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -914,7 +914,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -927,10 +927,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -978,16 +978,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1003,7 +1003,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1854,8 +1854,10 @@ msgid "Move selected window"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вибÑ?ане вÑ?кно"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Ð?аÑ?екаÑ?и поки коÑ?иÑ?Ñ?Ñ?ваÑ? обеÑ?е вÑ?кно, а поÑ?Ñ?м Ñ?нÑ?еÑ?акÑ?ивно пеÑ?емÑ?Ñ?Ñ?ваÑ?и Ñ?е "
 "вÑ?кно."
@@ -1865,8 +1867,10 @@ msgid "Resize selected window"
 msgstr "Ð?мÑ?ниÑ?и Ñ?озмÑ?Ñ? вибÑ?аного вÑ?кна"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Ð?аÑ?екаÑ?и поки коÑ?иÑ?Ñ?Ñ?ваÑ? вибеÑ?е вÑ?кно, а поÑ?Ñ?м Ñ?нÑ?еÑ?акÑ?ивно змÑ?нÑ?ваÑ?и "
 "Ñ?озмÑ?Ñ?и Ñ?Ñ?ого вÑ?кна."
@@ -1946,40 +1950,88 @@ msgid "Shrink window left"
 msgstr "Ð?Ñ?Ñ?нÑ?Ñ?и вÑ?кно лÑ?воÑ?Ñ?Ñ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Ð?Ñ?Ñ?нÑ?Ñ?и вÑ?кно пÑ?авоÑ?Ñ?Ñ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Ð?Ñ?Ñ?нÑ?Ñ?и вÑ?кно вгоÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Ð?Ñ?Ñ?нÑ?Ñ?и вÑ?кно вниз"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно до лÑ?вого кÑ?аÑ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно до пÑ?авого кÑ?аÑ?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно догоÑ?и"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно вниз"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "Ð?бÑ?лÑ?Ñ?иÑ?и Ñ?озмÑ?Ñ? вÑ?кна по гоÑ?изонÑ?алÑ?"
@@ -2301,6 +2353,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "3D Hack"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "СпливаÑ?Ñ?е менÑ? пÑ?огÑ?ам"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "УвÑ?мкнÑ?Ñ?и звÑ?ковÑ? еÑ?екÑ?и длÑ? подÑ?й вÑ?кон."
@@ -2392,10 +2455,6 @@ msgstr "Ð?оказаÑ?и повÑ?домленнÑ? пÑ?о помилки"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Ð?Ñ?добÑ?ажаÑ?и вÑ?Ñ? помилки на екÑ?ан."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2619,11 +2678,6 @@ msgstr "СÑ?ан"
 msgid "Other"
 msgstr "Ð?нÑ?е"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "ТимÑ?аÑ?ове виÑ?Ñ?ваннÑ?"
@@ -2816,6 +2870,18 @@ msgstr "Ð?Ñ?дÑ?Ñ?лаÑ?и Ñ? Ñ?обоÑ?е мÑ?Ñ?Ñ?е пÑ?авоÑ?Ñ?Ñ?"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Ð?Ñ?дÑ?илаÑ? вÑ?кно Ñ? Ñ?обоÑ?е мÑ?Ñ?Ñ?е Ñ?озÑ?аÑ?оване нижÑ?е поÑ?оÑ?ного."
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Ð?оли вказÑ?вник миÑ?Ñ? впливаÑ? на Ñ?окÑ?Ñ? вводÑ?."
@@ -2842,18 +2908,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ð?вÑ?омаÑ?иÑ?но пеÑ?езаванÑ?ажÑ?ваÑ?и Ñ?еми пÑ?и Ñ?Ñ? оновленнÑ?."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Типовий Ñ?Ñ?иÑ?Ñ?: \\w"
 
@@ -3057,6 +3111,78 @@ msgstr ""
 "(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "iconify-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбÑ?наÑ?Ñ?Ñ? акÑ?ивнÑ? коли вказÑ?вник на кнопÑ?Ñ? закÑ?иÑ?Ñ?Ñ? вÑ?кна.\n"
+"(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбÑ?наÑ?Ñ?Ñ? акÑ?ивнÑ? коли вказÑ?вник на кнопÑ?Ñ? закÑ?иÑ?Ñ?Ñ? вÑ?кна.\n"
+"(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "menu-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбÑ?наÑ?Ñ?Ñ? акÑ?ивнÑ? коли вказÑ?вник на кнопÑ?Ñ? менÑ? вÑ?кна.\n"
+"(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбÑ?наÑ?Ñ?Ñ? акÑ?ивнÑ? коли вказÑ?вник на кнопÑ?Ñ? закÑ?иÑ?Ñ?Ñ? вÑ?кна.\n"
+"(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "close-button-keymap"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ð?омбÑ?наÑ?Ñ?Ñ? акÑ?ивнÑ? коли вказÑ?вник на кнопÑ?Ñ? закÑ?иÑ?Ñ?Ñ? вÑ?кна.\n"
+"(Ð?опÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? лиÑ?е подÑ?Ñ? миÑ?Ñ?)."
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 "Ð?лавÑ?Ñ?а-модиÑ?Ñ?каÑ?оÑ?, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?к Ñ?иповий модиÑ?Ñ?каÑ?оÑ? менеджеÑ?а "
@@ -3268,6 +3394,11 @@ msgstr "Ð?оказаÑ?и повÑ?домленнÑ? пÑ?о помилки"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "СпливаÑ?Ñ?е менÑ? пÑ?огÑ?ам"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Ð?еÑ?езапÑ?Ñ?Ñ?иÑ?и"
 
@@ -3326,8 +3457,9 @@ msgid "Display the applications menu."
 msgstr "Ð?оказаÑ?и менÑ? пÑ?огÑ?ам."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Ð?Ñ?огÑ?ама налаÑ?Ñ?овÑ?ваннÑ? Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3366,7 +3498,6 @@ msgstr "Ð?иÑ?аÑ?и пÑ?омÑ?жковÑ? вÑ?кна зÑ?бÑ?аними над:
 msgid "Raise single window"
 msgstr "Ð?Ñ?днÑ?Ñ?и одне вÑ?кно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно до найвиÑ?оÑ? можливоÑ? позиÑ?Ñ?Ñ? в Ñ?Ñ?оÑ?Ñ?."
@@ -3375,7 +3506,6 @@ msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно до найвиÑ?оÑ? можливоÑ? поз
 msgid "Lower single window"
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?и одне вÑ?кно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?и вÑ?кно до найнижÑ?оÑ? можливоÑ? позиÑ?Ñ?Ñ? в Ñ?Ñ?оÑ?Ñ?."
@@ -3384,7 +3514,6 @@ msgstr "Ð?пÑ?Ñ?Ñ?иÑ?и вÑ?кно до найнижÑ?оÑ? можливоÑ? п
 msgid "Raise lower single window"
 msgstr "Ð?Ñ?днÑ?Ñ?и/опÑ?Ñ?Ñ?иÑ?и одне вÑ?кно"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3582,8 +3711,10 @@ msgid "Unmaximize window"
 msgstr "РозмаÑ?имÑ?зÑ?ваÑ?и вÑ?кно"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Ð?Ñ?дновиÑ?и Ñ?озмÑ?Ñ?и вÑ?кна до поÑ?аÑ?кового Ñ?Ñ?анÑ?."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3719,7 +3850,8 @@ msgstr "Ð?еÑ?емикнÑ?Ñ?и маÑ?кимÑ?заÑ?Ñ?Ñ? на веÑ?Ñ? екÑ?ан
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Ð?еÑ?емикнÑ?Ñ?и Ñ?Ñ?ан вÑ?кна мÑ?ж макÑ?имÑ?зованим Ñ?а не макÑ?имÑ?зованим."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3740,8 +3872,8 @@ msgstr "Ð?еÑ?емикнÑ?Ñ?и маÑ?кимÑ?заÑ?Ñ?Ñ? на веÑ?Ñ? екÑ?ан
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 "Ð?еÑ?емикнÑ?Ñ?и Ñ?Ñ?ан вÑ?кна мÑ?ж макÑ?имÑ?зованим-заповненим Ñ? не макÑ?имÑ?зованим."
 
@@ -3959,9 +4091,7 @@ msgstr "РозмаÑ?имÑ?зÑ?ваÑ?и вÑ?кно"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Ð?Ñ?огÑ?ама, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? длÑ? вÑ?дÑ?воÑ?еннÑ? звÑ?кÑ?в. ЯкÑ?о не вÑ?Ñ?ановлено, "
 "викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? владнана пÑ?дÑ?Ñ?имка длÑ? ESD."
@@ -4006,13 +4136,38 @@ msgid "Raise window"
 msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно до найвиÑ?оÑ? можливоÑ? позиÑ?Ñ?Ñ? в Ñ?Ñ?оÑ?Ñ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Ð?пÑ?Ñ?Ñ?иÑ?и вÑ?кно"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Ð?пÑ?Ñ?Ñ?иÑ?и вÑ?кно до найнижÑ?оÑ? можливоÑ? позиÑ?Ñ?Ñ? в Ñ?Ñ?оÑ?Ñ?."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Ð?Ñ?днÑ?Ñ?и/опÑ?Ñ?Ñ?иÑ?и вÑ?кно"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"ЯкÑ?о вÑ?кно Ñ? найвиÑ?Ñ?й позиÑ?Ñ?Ñ?, Ñ?одÑ? опÑ?Ñ?Ñ?иÑ?и його до найнижÑ?оÑ?.\n"
+"Ð? Ñ?нÑ?омÑ? випадкÑ? пÑ?днÑ?Ñ?и його Ñ?кнайвиÑ?е. Також змÑ?ниÑ?и Ñ?Ñ?венÑ?\n"
+"бÑ?дÑ?-Ñ?киÑ? його Ñ?имÑ?аÑ?овиÑ? вÑ?кон."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4133,8 +4288,10 @@ msgid "Move window right"
 msgstr "Ð?еÑ?енеÑ?Ñ?и дÑ?лÑ?нкÑ? пеÑ?еглÑ?дÑ? пÑ?авоÑ?Ñ?Ñ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?енеÑ?Ñ?и вÑ?кно Ñ? дÑ?лÑ?нкÑ? пеÑ?еглÑ?дÑ? пÑ?авоÑ?Ñ?Ñ?, Ñ?а пеÑ?ейÑ?и до Ñ?Ñ?Ñ?Ñ? дÑ?лÑ?нки."
 
@@ -4143,8 +4300,10 @@ msgid "Move window left"
 msgstr "Ð?еÑ?еÑ?Ñ?нÑ?Ñ?и вÑ?кно лÑ?воÑ?Ñ?Ñ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?енеÑ?Ñ?и вÑ?кно Ñ? дÑ?лÑ?нкÑ? пеÑ?еглÑ?дÑ? лÑ?воÑ?Ñ?Ñ?, Ñ?а пеÑ?ейÑ?и до Ñ?Ñ?Ñ?Ñ? дÑ?лÑ?нки."
 
@@ -4153,7 +4312,10 @@ msgid "Move window up"
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно вгоÑ?Ñ?"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr ""
 "Ð?еÑ?енеÑ?Ñ?и вÑ?кно Ñ? гоÑ?Ñ?Ñ?нÑ? дÑ?лÑ?нкÑ? пеÑ?еглÑ?дÑ?, Ñ?а пеÑ?ейÑ?и до Ñ?Ñ?Ñ?Ñ? дÑ?лÑ?нки."
 
@@ -4162,7 +4324,10 @@ msgid "Move window down"
 msgstr "Ð?еÑ?еÑ?Ñ?нÑ?Ñ?и вÑ?кно нижÑ?е"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Ð?еÑ?енеÑ?Ñ?и вÑ?кно Ñ? нижнÑ? дÑ?лÑ?нкÑ? пеÑ?еглÑ?дÑ?, Ñ?а пеÑ?ейÑ?и до Ñ?Ñ?Ñ?Ñ? дÑ?лÑ?нки."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4205,7 +4370,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Чи поÑ?Ñ?Ñ?бно, Ñ?об вÑ?кна пÑ?и Ñ?озÑ?иÑ?еннÑ? або пакÑ?ваннÑ? зÑ?Ñ?Ñ?овÑ?Ñ?валиÑ?Ñ?\n"
 "з Ñ?Ñ?лком Ñ?гноÑ?ованими вÑ?кнами"
@@ -4254,6 +4419,11 @@ msgstr "УнÑ?Ñ?Ñ?кÑ?ваÑ?и назвÑ? вÑ?кна"
 msgid "Force the current window to have a unique title."
 msgstr "Ð?Ñ?имÑ?Ñ?ове викоÑ?иÑ?Ñ?аннÑ? Ñ?нÑ?калÑ?ного заголовка поÑ?оÑ?ним вÑ?кном."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Ð?Ñ?днÑ?Ñ?и вÑ?кно"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4266,7 +4436,8 @@ msgstr "Ð?оказаÑ?и менÑ?, Ñ?о мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок вÑ?Ñ?Ñ? Ñ?
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Ð?оказаÑ?и менÑ?, Ñ?о мÑ?Ñ?Ñ?иÑ?Ñ? Ñ?пиÑ?ок вÑ?Ñ?Ñ? Ñ?обоÑ?иÑ? мÑ?Ñ?Ñ?Ñ?."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4388,8 +4559,10 @@ msgid "Prepend workspace and send"
 msgstr "Ð?Ñ?Ñ?авиÑ?и Ñ?обоÑ?е мÑ?Ñ?Ñ?е Ñ?а вÑ?дÑ?Ñ?лаÑ?и до нÑ?ого"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "СÑ?воÑ?иÑ?и нове Ñ?обоÑ?е мÑ?Ñ?Ñ?е на поÑ?аÑ?кÑ? Ñ?пиÑ?кÑ? Ñ?а пеÑ?енеÑ?Ñ?и вÑ?кно Ñ?Ñ?ди."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/vi.po b/po/vi.po
index d881086..1548453 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2006-01-10 19:16+1030\n"
 "Last-Translator: Clytie Siddall <clytie riverland net au>\n"
 "Language-Team: Vietnamese <gnomevi-list lists sourceforge net>\n"
@@ -196,10 +196,10 @@ msgstr "không"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -211,8 +211,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -220,21 +220,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -242,7 +242,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -250,14 +250,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -278,10 +278,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -304,17 +304,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -322,8 +322,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -354,8 +354,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -368,7 +368,7 @@ msgstr "Ch�n màu"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -378,7 +378,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -392,8 +392,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -401,8 +401,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,7 +428,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -492,15 +492,15 @@ msgstr "tất cả"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -508,14 +508,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -523,8 +523,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -539,7 +539,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -564,8 +564,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -581,7 +581,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -651,8 +651,8 @@ msgstr "Ã?nh xạ nút Ä?óng"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -664,7 +664,7 @@ msgstr "�nh xạ nút làm hình nh�"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -678,7 +678,7 @@ msgstr "Ã?nh xạ nút trình Ä?Æ¡n"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -713,14 +713,14 @@ msgstr "Ã?nh xạ nút trình Ä?Æ¡n"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -733,18 +733,18 @@ msgstr "Ã?nh xạ nút trình Ä?Æ¡n"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -756,7 +756,7 @@ msgstr "Ã?nh xạ nút trình Ä?Æ¡n"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -769,7 +769,7 @@ msgstr "Ã?nh xạ nút Ä?óng"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -824,12 +824,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -837,7 +837,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -845,23 +845,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -869,7 +869,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -877,8 +877,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -886,10 +886,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -908,7 +908,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -921,10 +921,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -972,16 +972,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -997,7 +997,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1846,8 +1846,10 @@ msgid "Move selected window"
 msgstr "Chuyá»?n cá»­a sá»? Ä?ã chá»?n"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 "Ä?ợi ngÆ°á»?i dùng chá»?n cá»­a sá»?, sau Ä?ó di chuyá»?n cá»­a sá»? Ä?ó má»?t cách tÆ°Æ¡ng tác."
 
@@ -1856,8 +1858,10 @@ msgid "Resize selected window"
 msgstr "Ä?á»?i cỡ cá»­a sá»? Ä?ã chá»?n"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 "Ä?ợi ngÆ°á»?i dùng chá»?n cá»­a sá»?, sau Ä?ó Ä?á»?i kích cỡ cá»­a sá»? Ä?ó má»?t cách tÆ°Æ¡ng tác."
 
@@ -1936,40 +1940,88 @@ msgid "Shrink window left"
 msgstr "Trượt cửa s� sang trái"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Trượt cửa s� sang phải"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Trượt cửa s� lên trên"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Trượt cửa s� xu�ng dư�i"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Nén bên trái cửa s�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Nén bên phải cửa s�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Nén bên trên cửa s�"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Nén bên dư�i cửa s�"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "TÄ?ng cá»­a sá»? thêm hàng"
@@ -2291,6 +2343,17 @@ msgstr ""
 msgid "3d hack"
 msgstr "Viá»?c cá»? chá»?nh sá»­a ba chiá»?u"
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Bật trình Ä?Æ¡n ứng dụng lên"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "Phát hi�u ứng âm thanh khi xảy ra dữ ki�n cửa s�."
@@ -2381,10 +2444,6 @@ msgstr "Hiá»?n thá»? lá»?i"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Hiá»?n thá»? má»?i lá»?i Ä?ã xảy ra trên màn hình."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2608,11 +2667,6 @@ msgstr "Tình trạng"
 msgid "Other"
 msgstr "Khác"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Nâng cửa s� lên"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "Thoáng bóng"
@@ -2805,6 +2859,18 @@ msgstr "G�i qua vùng làm vi�c bên phải"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "G�i cửa s� qua vùng làm vi�c bên phải vùng làm vi�c hi�n th�i"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "Khi con chuá»?t tác Ä?á»?ng lên tiêu Ä?iá»?m nhập."
@@ -2833,18 +2899,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Tá»± Ä?á»?ng tải lại sắc thái khi Ä?ược cập nhật"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Phông chữ mặc Ä?á»?nh: \\w"
 
@@ -3055,6 +3109,83 @@ msgstr ""
 "(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "�nh xạ nút làm hình nh�"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ã?nh xạ phím chứa tá»? hợp hoạt Ä?á»?ng khi con trá»?\n"
+"có trên cái nút Ä?óng của cá»­a sá»?.\n"
+"(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "Ã?nh xạ nút Ä?óng"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ã?nh xạ phím chứa tá»? hợp hoạt Ä?á»?ng khi con trá»?\n"
+"có trên cái nút Ä?óng của cá»­a sá»?.\n"
+"(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "Ã?nh xạ nút trình Ä?Æ¡n"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ã?nh xạ phím chứa tá»? hợp hoạt Ä?á»?ng khi con trá»?\n"
+"có trên cái nút trình Ä?Æ¡n của cá»­a sá»?.\n"
+"(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "Ã?nh xạ nút Ä?óng"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ã?nh xạ phím chứa tá»? hợp hoạt Ä?á»?ng khi con trá»?\n"
+"có trên cái nút Ä?óng của cá»­a sá»?.\n"
+"(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "Ã?nh xạ nút Ä?óng"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"Ã?nh xạ phím chứa tá»? hợp hoạt Ä?á»?ng khi con trá»?\n"
+"có trên cái nút Ä?óng của cá»­a sá»?.\n"
+"(Ch� tính ra t� hợp con chu�t trong ánh xạ này.)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "Phím sá»­a Ä?á»?i dùng cho phím tắt mặc Ä?á»?nh."
 
@@ -3264,6 +3395,11 @@ msgstr "Hiá»?n thá»? lá»?i"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Bật trình Ä?Æ¡n ứng dụng lên"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Khá»?i Ä?á»?ng lại"
 
@@ -3322,8 +3458,9 @@ msgid "Display the applications menu."
 msgstr "Hiá»?n trình Ä?Æ¡n ứng dụng."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "B� cấu hình Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3362,7 +3499,6 @@ msgstr "Giữ cá»­a sá»? tạm Ä?ặt trên: \\w"
 msgid "Raise single window"
 msgstr "Nâng cá»­a sá»? Ä?Æ¡n lên"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "Nâng cá»­a sá»? lên vá»? trí cao nhất Ä?ược phép trong thứ tá»± chá»?ng."
@@ -3371,7 +3507,6 @@ msgstr "Nâng cá»­a sá»? lên vá»? trí cao nhất Ä?ược phép trong thứ t
 msgid "Lower single window"
 msgstr "Hạ thấp cá»­a sá»? Ä?Æ¡n thấp"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "Hạ thấp cá»­a sá»? xuá»?ng vá»? trí thấp nhất Ä?ược phép trong thứ tá»± chá»?ng."
@@ -3380,7 +3515,6 @@ msgstr "Hạ thấp cá»­a sá»? xuá»?ng vá»? trí thấp nhất Ä?ược phép tr
 msgid "Raise lower single window"
 msgstr "Nâng cá»­a sá»? Ä?Æ¡n thấp hÆ¡n lên"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3578,8 +3712,10 @@ msgid "Unmaximize window"
 msgstr "Ngừng phóng to cửa s�"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "Trả cửa s� v� tính trạng trư�c khi phóng to"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3709,7 +3845,8 @@ msgstr "Bật tắt phóng to cửa s� toàn màn hình"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "Bật tắt tính trạng phóng to của cửa s�"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3730,8 +3867,8 @@ msgstr "Bật tắt phóng to cửa s� toàn màn hình"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "Bật tắt tính trạng m� r�ng vừa của cửa s�."
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3948,9 +4085,7 @@ msgstr "Ngừng phóng to cửa s�"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "ChÆ°Æ¡ng trình Ä?ược dùng Ä?á»? phát mẫu âm thanh. Nếu bá»? chá»?n thì sẽ dùng sá»± há»? "
 "trợ ESD có sẵn."
@@ -3995,13 +4130,38 @@ msgid "Raise window"
 msgstr "Nâng cửa s� lên"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "Nâng cá»­a sá»? lên vá»? trí cao nhất Ä?ược phép trong thứ tá»± chá»?ng."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Hạ thấp cửa s�"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "Hạ thấp cá»­a sá»? xuá»?ng vá»? trí thấp nhất Ä?ược phép trong thứ tá»± chá»?ng."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Nâng/hạ thấp cửa s�"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Nếu cửa s� tại v� trí cao nhất có th�, hạ thấp nó xu�ng v� trí thấp nhất có "
+"thá»?. Nếu không thì nâng nó lên cao nhất Ä?ược phép. CÅ©ng thay Ä?á»?i lá»?p của cá»­a "
+"s� tạm nào của nó."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4120,8 +4280,10 @@ msgid "Move window right"
 msgstr "Ä?ẩy cá»­a sá»? sang phải"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr ""
 "Di chuyá»?n cá»­a sá»? sang cá»?ng xem bên phải, và chuyá»?n Ä?á»?i qua cá»?ng xem Ä?ó."
 
@@ -4130,8 +4292,10 @@ msgid "Move window left"
 msgstr "Ä?ẩy cá»­a sá»? sang trái"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "Di chuyên cá»­a sá»? sang cá»?ng xem bên trái và chuyá»?n Ä?á»?i qua cá»?ng xem Ä?ó."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4139,7 +4303,10 @@ msgid "Move window up"
 msgstr "Ä?ẩy cá»­a sá»? lên trên"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport above, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Di chuyên cá»­a sá»? sang cá»?ng xem bên trên và chuyá»?n Ä?á»?i qua cá»?ng xem Ä?ó."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4147,7 +4314,10 @@ msgid "Move window down"
 msgstr "Ä?ẩy cá»­a sá»? xuá»?ng dÆ°á»?i"
 
 #. ../lisp/sawfish/wm/viewport.jl
-msgid "Move the window to the viewport below, and switch to that viewport."
+#, fuzzy
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Di chuyên cá»­a sá»? sang cá»?ng xem bên dÆ°á»?i và chuyá»?n Ä?á»?i qua cá»?ng xem Ä?ó."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4190,7 +4360,7 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
 #, fuzzy
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 "Có nên Ä?âm sầm vào cá»­a sá»? bá»? bá»? qua hay không,\n"
 "khi tÄ?ng kích cỡ hoặc nén cá»­a sá»?."
@@ -4240,6 +4410,11 @@ msgstr "Làm cho tên cửa s� duy nhất"
 msgid "Force the current window to have a unique title."
 msgstr "Ã?p cá»­a sá»? hiá»?n thá»?i có tá»±a Ä?á»? duy nhất."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Nâng cửa s� lên"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4252,7 +4427,8 @@ msgstr "Hiá»?n trình Ä?Æ¡n chứa danh sách các vùng làm viá»?c."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Hiá»?n trình Ä?Æ¡n chứa danh sách các vùng làm viá»?c."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4376,8 +4552,10 @@ msgid "Prepend workspace and send"
 msgstr "Thêm vùng làm viá»?c Ä?ầu rá»?i gá»?i"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "Tạo vùng làm viá»?c má»?i tại Ä?ầu danh sách rá»?i chuyá»?n cá»­a sá»? tá»?i Ä?ó."
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/wa.po b/po/wa.po
index 5a942d4..ab509fa 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2004-09-09 14:00+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo walon org>\n"
 "Language-Team: Walloon <linux-wa walon org>\n"
@@ -208,10 +208,10 @@ msgstr "nouk"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -223,8 +223,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -232,21 +232,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -254,7 +254,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -262,14 +262,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -290,10 +290,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -316,17 +316,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -334,8 +334,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -366,8 +366,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -380,7 +380,7 @@ msgstr "Tchoezixhoz l' coleur"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -390,7 +390,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -404,8 +404,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -413,8 +413,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -422,8 +422,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -431,8 +431,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -440,7 +440,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -504,15 +504,15 @@ msgstr "tot"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -520,14 +520,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -535,8 +535,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -551,7 +551,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -576,8 +576,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -593,7 +593,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -663,8 +663,8 @@ msgstr "Si rmimbrer l' e_plaeçmint"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -675,7 +675,7 @@ msgstr ""
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -709,7 +709,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -721,14 +721,14 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -740,18 +740,18 @@ msgstr ""
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -762,7 +762,7 @@ msgstr ""
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgstr ""
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -829,12 +829,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -842,7 +842,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -850,23 +850,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -882,8 +882,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -891,10 +891,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -913,7 +913,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -926,10 +926,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -977,16 +977,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1002,7 +1002,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1826,7 +1826,8 @@ msgstr "Bodjî li purnea tchoezi"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1835,7 +1836,8 @@ msgstr "Candjî grandeu do purnea tchoezi"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr ""
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1904,40 +1906,88 @@ msgid "Shrink window left"
 msgstr "Fé crexhe li purnea a hintche"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "Fé crexhe li purnea a droete"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "Fé crexhe li purnea å dzeu"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "Fé crexhe li purnea å dzo"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "Fé crexhe li purnea a hintche"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "Fé crexhe li purnea a droete"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "Fé crexhe li purnea å dzeu"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "Fé crexhe li purnea å dzo"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 #, fuzzy
 msgid "Size window add row"
@@ -2283,6 +2333,17 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "Sipitante dressêye des programes"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 #, fuzzy
 msgid "Play sound effects for window events."
@@ -2378,10 +2439,6 @@ msgstr "HÃ¥yner li purnea"
 msgid "Display all errors that have occurred to the screen."
 msgstr "Mostrer el waitroûle totes les arokes k' i gn a-st avou."
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2610,11 +2667,6 @@ msgstr "Estat"
 msgid "Other"
 msgstr "Ã?te"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "Rimonter l' purnea"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2812,6 +2864,18 @@ msgstr "Evoyî å scribanne di droete"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "Vey li scribanne a droete di ci do moumint"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr ""
@@ -2840,18 +2904,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "Ritcherdjî otomaticmint les tinmes cwand i sont metous a djoû."
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "Prémetowe fonte: \\w"
 
@@ -3036,6 +3088,59 @@ msgid ""
 msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "sticky-button-keymap"
+msgstr "Si rmimbrer l' e_plaeçmint"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "lock-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "rename-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "move-resize-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid "raise-lower-button-keymap"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+
+#. ../lisp/sawfish/wm/keymaps.jl
 msgid "Modifier key(s) used for default shortcuts."
 msgstr ""
 
@@ -3245,6 +3350,11 @@ msgstr "HÃ¥yner li purnea"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "Sipitante dressêye des programes"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "Renonder"
 
@@ -3304,8 +3414,9 @@ msgid "Display the applications menu."
 msgstr "Mostrer li menu des programes."
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Apontieu di Sawfish"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3343,7 +3454,6 @@ msgstr ""
 msgid "Raise single window"
 msgstr "Rimonter purnea tot seu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr ""
@@ -3354,7 +3464,6 @@ msgstr ""
 msgid "Lower single window"
 msgstr "Baxhî purnea tot seu"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr ""
@@ -3365,7 +3474,6 @@ msgstr ""
 msgid "Raise lower single window"
 msgstr "Rimonter li purnea tot seu k' est å dzo"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3579,9 +3687,11 @@ msgid "Unmaximize window"
 msgstr "Mete li purnea å pus grand"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
-msgstr ""
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
+msgstr "Bodjî l' purnea sol sicribanne shuvant."
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
@@ -3716,7 +3826,8 @@ msgstr "Rimpli/disrimpli d' astampé"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3736,8 +3847,8 @@ msgstr "Rimpli/disrimpli d' astampé"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr ""
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3955,9 +4066,7 @@ msgstr "Disrôler l' purnea"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr ""
 "Li programe eployî po djouwer des bokets d' muzike. Si nén defini, c' est li "
 "sopoirt ESD copilé dins l' sistinme ki serè-st eployî."
@@ -4002,13 +4111,42 @@ msgid "Raise window"
 msgstr "Rimonter l' purnea"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Rimonter l' purnea disk' al pus hôte pôzucion possibe, dins l' ôre di "
+"l' epilaedje."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "Abaxhî l' purnea"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr ""
+"Baxhî l' purnea disk' al pus hôte pôzucion possibe, dins l' ôre di "
+"l' epilaedje."
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "Rimonter l' purnea k' est pus bas"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"Si l' purnea est a si pus hôte pôzucion, adon l' abaxhî disk' a\n"
+"si pus basse pôzucion. �trumint, el rimonter ossu lon k' possibe.\n"
+"Candjî eto l' livea di tos les purneas efants ki vont avou."
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4140,18 +4278,22 @@ msgid "Move window right"
 msgstr "Bodjî l' purnea sol droete"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
-msgstr ""
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
+msgstr "Bodjî l' purnea sol sicribanne di dvant."
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Move window left"
 msgstr "Bodjî l' purnea sol hintche"
 
 #. ../lisp/sawfish/wm/viewport.jl
+#, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
-msgstr ""
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
+msgstr "Bodjî l' purnea sol sicribanne di dvant."
 
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Move window up"
@@ -4159,7 +4301,9 @@ msgstr "Bodjî l' purnea viè l' hôt"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "Bodjî l' purnea sol sicribanne di dvant."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4168,7 +4312,9 @@ msgstr "Bodjî l' purnea viè l' bas"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "Bodjî l' purnea sol sicribanne di dvant."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4205,7 +4351,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4251,6 +4397,11 @@ msgstr "Fé ki l' no do purnea soeye unike"
 msgid "Force the current window to have a unique title."
 msgstr "Foirci li purnea do moumint a n' aveur k' on seu tite."
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "Rimonter l' purnea"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4263,7 +4414,8 @@ msgstr "Håyner li menu avou l' djivêye di tos les scribannes."
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "Håyner li menu avou l' djivêye di tos les scribannes."
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4388,7 +4540,8 @@ msgstr "Evoyî å scribanne do dzo"
 
 #. ../lisp/sawfish/wm/workspace.jl
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr ""
 
 #. ../lisp/sawfish/wm/workspace.jl
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7cdeae3..818c6b6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2002-01-15 21:42+0800\n"
 "Last-Translator: wangli <charlesw1234 163 com>\n"
 "Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
@@ -212,10 +212,10 @@ msgstr "æ? "
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -227,8 +227,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -236,21 +236,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -258,7 +258,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -266,14 +266,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -294,10 +294,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -320,17 +320,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -338,8 +338,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -371,8 +371,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -386,7 +386,7 @@ msgstr "é??æ?©é¢?è?²"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -396,7 +396,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -410,8 +410,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -419,8 +419,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -428,8 +428,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -437,8 +437,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -446,7 +446,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -512,15 +512,15 @@ msgstr "��"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -528,14 +528,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -543,8 +543,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -559,7 +559,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -584,8 +584,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -601,7 +601,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -673,8 +673,8 @@ msgstr "å?³é?­æ??é?®é?®ç??æ? å°?"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -686,7 +686,7 @@ msgstr "æ??å°?å??æ??é?®é?®ç??æ? å°?"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr "è??å??æ??é?®é?®ç??æ? å°?"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -722,7 +722,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -735,14 +735,14 @@ msgstr "è??å??æ??é?®é?®ç??æ? å°?"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -755,18 +755,18 @@ msgstr "è??å??æ??é?®é?®ç??æ? å°?"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -778,7 +778,7 @@ msgstr "è??å??æ??é?®é?®ç??æ? å°?"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -791,7 +791,7 @@ msgstr "å?³é?­æ??é?®é?®ç??æ? å°?"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -846,12 +846,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -859,7 +859,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -867,23 +867,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -891,7 +891,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -899,8 +899,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -908,10 +908,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -930,7 +930,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -943,10 +943,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 # ../themes/smaker/theme.jl
@@ -991,16 +991,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -1016,7 +1016,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1896,8 +1896,10 @@ msgstr "移å?¨é??å®?ç??çª?å?£"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "ç­?å¾?ç?¨æ?·é??æ?©çª?å?£ï¼?è??å??交äº?移å?¨é??å®?çª?å?£ã??"
 
 # ../lisp/workspace.jl
@@ -1907,8 +1909,10 @@ msgstr "æ?¹å??é??å®?çª?å?£ç??大å°?"
 
 # ../lisp/move-resize.jl
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "ç­?å¾?ç?¨æ?·é??æ?©çª?å?£ï¼?è??å??交äº?æ?¹å??é??å®?çª?å?£ç??大å°?ã??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1987,40 +1991,88 @@ msgid "Shrink window left"
 msgstr "左���"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "����"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "å??å·¦å½?æ?¢çª?å?£"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "å??å?³å½?æ?¢çª?å?£"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "å??ä¸?å½?æ?¢çª?å?£"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "å??ä¸?å½?æ?¢çª?å?£"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "��尺寸����"
@@ -2386,6 +2438,17 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "å¼¹å?ºåº?ç?¨è??å??"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "为çª?å?£äº?件æ?­æ?¾é?³æ??"
@@ -2483,10 +2546,6 @@ msgstr "æ?¾ç¤ºé??误"
 msgid "Display all errors that have occurred to the screen."
 msgstr "å°?æ??æ??å·²å?ºç?°ç??é??误æ?¾ç¤ºå?¨å±?å¹?ä¸?ã??"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 msgid "Infinite Desktop"
 msgstr ""
@@ -2720,11 +2779,6 @@ msgstr "ç?¶æ??"
 msgid "Other"
 msgstr "��"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "æ??å??çª?å?£"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 msgid "Shade Hover"
 msgstr "��������"
@@ -2950,6 +3004,18 @@ msgstr "å??é??å?°å·¥ä½?å?º"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "å?¨å½?å??å·¥ä½?å?ºä¹?å??å??建æ?°å·¥ä½?å?ºã??"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 # ../lisp/focus.jl
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
@@ -2981,18 +3047,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "主é¢?æ?´æ?°å??è?ªå?¨é??æ?°è£?å?¥ã??"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "�认���\\w"
 
@@ -3212,6 +3266,83 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "æ??å°?å??æ??é?®é?®ç??æ? å°?"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"é?®ç??æ? å°?å?«æ??å½?é¼ æ ?å??æ ?å?¨çª?å?£ç??å?³é?­æ??é?®ä¸­ç??\n"
+"æ?¶å??æ´»è·?ç??ç»?å®?ã??(该æ? å°?å?ªè??è??é¼ æ ?ç»?å®?ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "å?³é?­æ??é?®é?®ç??æ? å°?"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"é?®ç??æ? å°?å?«æ??å½?é¼ æ ?å??æ ?å?¨çª?å?£ç??å?³é?­æ??é?®ä¸­ç??\n"
+"æ?¶å??æ´»è·?ç??ç»?å®?ã??(该æ? å°?å?ªè??è??é¼ æ ?ç»?å®?ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "è??å??æ??é?®é?®ç??æ? å°?"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"é?®ç??æ? å°?å?«æ??å½?é¼ æ ?å??æ ?å?¨çª?å?£ç??è??å??æ??é?®ä¸­ç??\n"
+"æ?¶å??æ´»è·?ç??ç»?å®?ã??(该æ? å°?å?ªè??è??é¼ æ ?ç»?å®?ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "å?³é?­æ??é?®é?®ç??æ? å°?"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"é?®ç??æ? å°?å?«æ??å½?é¼ æ ?å??æ ?å?¨çª?å?£ç??å?³é?­æ??é?®ä¸­ç??\n"
+"æ?¶å??æ´»è·?ç??ç»?å®?ã??(该æ? å°?å?ªè??è??é¼ æ ?ç»?å®?ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "å?³é?­æ??é?®é?®ç??æ? å°?"
+
+# ../lisp/keymaps.jl
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"é?®ç??æ? å°?å?«æ??å½?é¼ æ ?å??æ ?å?¨çª?å?£ç??å?³é?­æ??é?®ä¸­ç??\n"
+"æ?¶å??æ´»è·?ç??ç»?å®?ã??(该æ? å°?å?ªè??è??é¼ æ ?ç»?å®?ã??)"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "ç?¨äº?é»?认çª?å?£ç®¡ç??å?¨å¿«æ?·é?®ç??æ?§å?¶é?®ã??"
 
@@ -3440,6 +3571,11 @@ msgstr "å®?å?¶(_C)"
 msgid "Display Errors"
 msgstr "æ?¾ç¤ºé??误"
 
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
+msgid "Reload Appsmenu"
+msgstr "å¼¹å?ºåº?ç?¨è??å??"
+
 # ../lisp/menus.jl
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
@@ -3505,8 +3641,9 @@ msgid "Display the applications menu."
 msgstr "æ?¾ç¤ºåº?ç?¨è??å??ã??"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish é??置工å?·"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3545,7 +3682,6 @@ msgstr "å°?临æ?¶çª?å?£ä¿?æ??å?¨å ?å? ä¹?ä¸?ï¼?\\w"
 msgid "Raise single window"
 msgstr "æ??å??å??个çª?å?£"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "å°?çª?å?£æ??å??å?°å ?å? é¡ºåº?æ??å??许ç??æ??é«?ä½?ç½®ã??"
@@ -3554,7 +3690,6 @@ msgstr "å°?çª?å?£æ??å??å?°å ?å? é¡ºåº?æ??å??许ç??æ??é«?ä½?ç½®ã??"
 msgid "Lower single window"
 msgstr "é??ä½?å??个çª?å?£"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "å°?çª?å?£é??ä½?å?°å ?å? é¡ºåº?æ??å??许ç??æ??ä½?ä½?ç½®ã??"
@@ -3563,7 +3698,6 @@ msgstr "å°?çª?å?£é??ä½?å?°å ?å? é¡ºåº?æ??å??许ç??æ??ä½?ä½?ç½®ã??"
 msgid "Raise lower single window"
 msgstr "æ??å??/é??ä½?å??个çª?å?£"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3788,8 +3922,10 @@ msgstr "çª?å?£(ä»?æ??大å??)å¤?å??"
 
 # ../lisp/maximize.jl
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "å°?çª?å?£å°ºå¯¸æ?¢å¤?å?°å??å§?ã??æ?ªæ??大å??ç??ç?¶æ??ã??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3947,7 +4083,8 @@ msgstr "çª?å?£æ??大å??å??æ?¢"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "å?¨çª?å?£æ??大å??å??é??æ??大å??ä¹?é?´å??æ?¢ã??"
 
 # ../lisp/custom.jl
@@ -3972,8 +4109,8 @@ msgstr "çª?å?£æ??大å??å??æ?¢"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "å?¨çª?å?£ç??æ??大填å??ç?¶æ??å??é??æ??大填å??ç?¶æ??é?´å??æ?¢ã??"
 
 # ../lisp/ignore-window.jl
@@ -4208,9 +4345,7 @@ msgstr "çª?å?£(ä»?æ??大å??)å¤?å??"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr "该ç¨?åº?ç?¨äº?æ?­æ?¾é?³æ??示ä¾?ã??è?¥æ?ªè®¾å®?ï¼?å??使ç?¨å??ç½® ESD æ?¯æ??ã??"
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -4252,15 +4387,40 @@ msgstr "å½?æ??å??çª?å?£æ?¶ï¼?å??æ?¶æ??å??å®?ç??ï¼?\\w"
 msgid "Raise window"
 msgstr "æ??å??çª?å?£"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "å°?çª?å?£æ??å??å?°å ?å? é¡ºåº?æ??å??许ç??æ??é«?ä½?ç½®ã??"
+
 # ../lisp/ignore-window.jl
 #. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "é??ä½?çª?å?£"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "å°?çª?å?£é??ä½?å?°å ?å? é¡ºåº?æ??å??许ç??æ??ä½?ä½?ç½®ã??"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "æ??å??/é??ä½?çª?å?£"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"è?¥çª?å?£å¤?äº?å?¯è?½ç??æ??é«?ä½?ç½®ï¼?é?£ä¹?å°?å?¶é??ä½?å?°å?¯è?½\n"
+"ç??æ??ä½?ä½?ç½®ã??å?¦å??å°±ä»?å?¯è?½æ??å??çª?å?£ã??å??æ?¶æ?¹å??\n"
+"çª?å?£æ??æ?¥æ??ç??æ??æ??临æ?¶çª?å?£ã??"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4390,7 +4550,8 @@ msgstr "�移��"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "å°?çª?å?£ç§»å?¨å?°å?³è¾¹ç??è§?å??中ã??"
 
 # ../lisp/workspace.jl
@@ -4402,7 +4563,8 @@ msgstr "左移��"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "å°?çª?å?£ç§»å?¨å?°å·¦è¾¹ç??è§?å??中ã??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4412,7 +4574,9 @@ msgstr "�移��"
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "å°?çª?å?£ç§»å?¨å?°å·¦è¾¹ç??è§?å??中ã??"
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4422,7 +4586,9 @@ msgstr "�移��"
 # ../lisp/viewport.jl
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "å°?çª?å?£ç§»å?¨å?°å·¦è¾¹ç??è§?å??中ã??"
 
 # ../src/sawmill-ui.jl
@@ -4463,7 +4629,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4507,6 +4673,11 @@ msgstr "çª?å?£å??ç?¬æ??å??"
 msgid "Force the current window to have a unique title."
 msgstr "强è¡?使å½?å??çª?å?£å?·æ??ç?¬æ??ç??æ ?é¢?ã??"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "æ??å??çª?å?£"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4521,7 +4692,8 @@ msgstr "æ?¾ç¤ºå?«æ??æ??æ??å·¥ä½?å?ºå??表ç??è??å??ã??"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "æ?¾ç¤ºå?«æ??æ??æ??å·¥ä½?å?ºå??表ç??è??å??ã??"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4668,8 +4840,10 @@ msgstr "å??æ??å·¥ä½?å?ºå¹¶å??é??"
 
 # ../lisp/workspace.jl
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "å?¨å??表ç??èµ·ç?¹å??建æ?°å·¥ä½?å?ºï¼?并å°?çª?å?£ç§»å?¨å?°å?¶ä¸­ã??"
 
 # ../lisp/workspace.jl
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 09e0c4d..3e5a492 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sawfish 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 17:40+0200\n"
+"POT-Creation-Date: 2009-10-18 15:29+0200\n"
 "PO-Revision-Date: 2001-08-15 14:59+0800\n"
 "Last-Translator: Abel Cheung <maddog linux org hk>\n"
 "Language-Team: traditional Chinese <zh-l10n linux org tw>\n"
@@ -195,10 +195,10 @@ msgstr "ç?¡"
 msgid ""
 "decoration mode\n"
 "\n"
-"set the mode 'when to draw a titlebar and window buttons'. the decoration "
+"Set the mode 'when to draw a titlebar and window buttons'.  The decoration "
 "mode 'all' means that all windows, even transients/dialogs, will get a "
-"titlebar and buttons. none means no window will get any :-). usually "
-"transients only have a contents-border. this option is for reimplementing a "
+"titlebar and buttons.  None means no window will get any :-).  Usually "
+"transients only have a contents-border.  This option is for reimplementing a "
 "sawfish feature that is gone in the latest version."
 msgstr ""
 
@@ -210,8 +210,8 @@ msgstr ""
 msgid ""
 "customize title string\n"
 "\n"
-"see the tooltip for the 'title string' option below for more information. "
-"(NOTE: i hope the redrawing problems with this option are solved. if not, "
+"See the tooltip for the 'title string' option below for more information.  "
+"(NOTE: I hope the redrawing problems with this option are solved.  If not, "
 "write an email please!)"
 msgstr ""
 
@@ -219,21 +219,21 @@ msgstr ""
 msgid ""
 "title string\n"
 "\n"
-"the string you insert here will be your new title string. variables always "
-"start with a dollar-sign $ and are replaced with their actual values. to get "
-"the value of an environment variable use $(variable), eg $(DISPLAY). to get "
-"the value of an rep/sawfish function use $[fuction], eg $[current-time-"
-"string]. the following vars are built-in: $name, $fullname, $width, $width-"
+"The string you insert here will be your new title string.  Variables always "
+"start with a dollar-sign ($) and are replaced with their actual values.  To "
+"get the value of an environment variable use $(variable), eg $(DISPLAY).  To "
+"get the value of an rep/sawfish function use $[fuction], eg $[current-time-"
+"string].  The following vars are built-in: $name, $fullname, $width, $width-"
 "content, $height, $height-content, $depth, $x-pos, $y-pos, $current-ws and "
-"$last-ws. (NOTE: i hope the redrawing problems with this option are solved. "
-"if not, write an email please!"
+"$last-ws. (NOTE: I hope the redrawing problems with this option are solved.  "
+"If not, write an email please!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "update title string periodically\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (eg "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid ""
 "title string update interval (1 - 1000000 s)\n"
 "\n"
-"this is useful if your title string changes without user interaction (eg "
+"This is useful if your title string changes without user interaction (e.g., "
 "because it displays the current time or something like that)."
 msgstr ""
 
@@ -249,14 +249,14 @@ msgstr ""
 msgid ""
 "title string font\n"
 "\n"
-"you should really choose a better font. verdana bold 8 pt looks nice."
+"You should really choose a better font.  Verdana bold 8 pt looks nice."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize title position\n"
 "\n"
-"by default the title string is centered horizontally and vertically."
+"By default the title string is centered horizontally and vertically."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -277,10 +277,10 @@ msgstr ""
 msgid ""
 "title string horizontal align adjustment (-10000 - 10000 pixel)\n"
 "\n"
-"the horizontal position of the title string can only be adjusted if the "
-"horizontal alignment is not 'center'. the range also depends on the setting "
-"of the option above. it the title string is already aligned left, you cannot "
-"adjust it to be even further left because there are button in the way."
+"The horizontal position of the title string can only be adjusted if the "
+"horizontal alignment is not 'center'.  The range also depends on the setting "
+"of the option above.  It the title string is already aligned left, you "
+"cannot adjust it to be even further left because there are button in the way."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -303,17 +303,17 @@ msgstr ""
 msgid ""
 "gradient titlebar background (experimental)\n"
 "\n"
-"when activating the gradient background the normal titlebar background "
-"colors will be ignored. besides the button background colors will be "
-"ignored. (NOTE: this can be very cpu intensive if you set the quality to a "
-"low value, ie high quality.)"
+"When activating the gradient background the normal titlebar background "
+"colors will be ignored.  Besides the button background colors will be "
+"ignored.  (NOTE: This can be very cpu intensive if you set the quality to a "
+"low value, i.e., high quality.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "gradient mode\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
 "colors in the list are used."
 msgstr ""
 
@@ -321,8 +321,8 @@ msgstr ""
 msgid ""
 "gradient quality (1 best - 20 worst)\n"
 "\n"
-"the value here is the factor the calculated gradient image will be scaled "
-"down. this increases speed but decreases quality."
+"The value here is the factor the calculated gradient image will be scaled "
+"down.  This increases speed but decreases quality."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -353,8 +353,8 @@ msgstr ""
 msgid ""
 "\n"
 "\n"
-"with gradient mode vertical or diagonal only the first or last (reversed) 2 "
-"colors in the list are used. besides the gradient color mode must be set to "
+"With gradient mode vertical or diagonal only the first or last (reversed) 2 "
+"colors in the list are used.  Besides the gradient color mode must be set to "
 "custom to activate this list."
 msgstr ""
 
@@ -367,7 +367,7 @@ msgstr "é?¸æ??é¡?è?²"
 msgid ""
 "unfocused/highlighted titlebar colors hue (0 - 360)\n"
 "\n"
-"this value changes the hue of a color, by moving (0 - 360) degress around "
+"This value changes the hue of a color, by moving (0 - 360) degress around "
 "the color cycle...180 for example inverts the color"
 msgstr ""
 
@@ -377,7 +377,7 @@ msgid ""
 "unfocused/highlighted titlebar colors saturation (0 - 100% of the focused "
 "color)\n"
 "\n"
-"the saturation of a color is a measurement of the color intensity"
+"The saturation of a color is a measurement of the color intensity"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -391,8 +391,8 @@ msgstr ""
 msgid ""
 "  focused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -400,8 +400,8 @@ msgstr ""
 msgid ""
 "unfocused titlebar color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -409,8 +409,8 @@ msgstr ""
 msgid ""
 "  focused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -418,8 +418,8 @@ msgstr ""
 msgid ""
 "unfocused title string color\n"
 "\n"
-"this is one of the 4 base colors. you can set these 4 colors and keep the "
-"extended colors deactivated. all other color options of the theme will then "
+"This is one of the 4 base colors.  You can set these 4 colors and keep the "
+"extended colors deactivated.  All other color options of the theme will then "
 "depend on these 4 colors."
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid ""
 "customize extended title string colors\n"
 "\n"
-"you can customize additional colors of the title string. if you deactivate "
+"You can customize additional colors of the title string.  If you deactivate "
 "this, these colors will be set to the focused title string color."
 msgstr ""
 
@@ -491,15 +491,15 @@ msgstr "��"
 msgid ""
 "button icon set (experimental)\n"
 "\n"
-"the number at the end is the width/height of the button icons in the icon "
-"set. (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
+"The number at the end is the width/height of the button icons in the icon "
+"set.  (NOTE: YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON ICON SET!)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize button size\n"
 "\n"
-"by default the button size follows the size of the titlebar, but by "
+"By default the button size follows the size of the titlebar, but by "
 "activating this you can set it to something different."
 msgstr ""
 
@@ -507,14 +507,14 @@ msgstr ""
 msgid ""
 "buttons size (1 - 1000 pixel)\n"
 "\n"
-"a buttons size that is bigger than your current titlebar height is ignored."
+"A buttons size that is bigger than your current titlebar height is ignored."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "button vertical alignment\n"
 "\n"
-"if a button is smaller than the titlebar you might want to set its vertical "
+"If a button is smaller than the titlebar you might want to set its vertical "
 "alignment."
 msgstr ""
 
@@ -522,8 +522,8 @@ msgstr ""
 msgid ""
 "scale button icons (experimental)\n"
 "\n"
-"in case you don't like the default size of 9 pixel you might activate button-"
-"scaling. YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
+"In case you don't like the default size of 9 pixel you might activate button-"
+"scaling.  YOU NEED TO RESTART SAWFISH AFTER CHANGING THE BUTTON SCALE!"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -538,7 +538,7 @@ msgstr ""
 msgid ""
 "display window icon on menu button\n"
 "\n"
-"many people like having the window-icon displayed on the menu-button. this "
+"Many people like having the window-icon displayed on the menu-button.  This "
 "icon is defined by the application itself and is also shown in your pager "
 "and task-list."
 msgstr ""
@@ -563,8 +563,8 @@ msgstr ""
 msgid ""
 "customize button position (-1 -2 -3 .. title string .. +3 +2 +1)\n"
 "\n"
-"enabling this will allow you to set the positon of each button in the "
-"titlebar manually. a negative/positiv value means the button will be drawn "
+"Enabling this will allow you to set the positon of each button in the "
+"titlebar manually.  A negative/positiv value means the button will be drawn "
 "on left/right side of the titlebar."
 msgstr ""
 
@@ -580,7 +580,7 @@ msgstr ""
 msgid ""
 "button position model\n"
 "\n"
-"'titel-height' means calculate position as multiple of title height. when "
+"'title-height' means calculate position as multiple of title height. when "
 "selecting 'pixel' you can adjust the button position pixelwise, but keep in "
 "mind that several buttons might slide on top of each other. 'none' means no "
 "buttons at all."
@@ -650,8 +650,8 @@ msgstr "é??é??æ??é??æ??é?µå°?æ??"
 msgid ""
 "customize sticky button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: toggle sticky "
-"state of window"
+"By default a button will work as it's name suggests.\n"
+"Button1: toggle sticky state of window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -663,7 +663,7 @@ msgstr "å??示å??æ??é??æ??é?µå°?æ??"
 msgid ""
 "customize previous button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "previous workspace - button2 workspace-list - button3 send window to first "
 "workspace - button6 pack window left"
 msgstr ""
@@ -677,7 +677,7 @@ msgstr "é?¸å?®æ??é??æ??é?µå°?æ??"
 msgid ""
 "customize next button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: send window to "
+"By default a button will work as it's name suggests. Button1: send window to "
 "next workspace - button2 workspace-list - button3 send window to last "
 "workspace - button6 pack window right"
 msgstr ""
@@ -699,7 +699,7 @@ msgstr ""
 msgid ""
 "customize configure button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: start sawfish-"
+"By default a button will work as it's name suggests. Button1: start sawfish-"
 "config - button3: toggle custom title string"
 msgstr ""
 
@@ -712,14 +712,14 @@ msgstr "é?¸å?®æ??é??æ??é?µå°?æ??"
 msgid ""
 "\n"
 "\n"
-"button1: start sawfish-config - button3: toggle custom title string"
+"Button1: start sawfish-config - button3: toggle custom title string"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize info button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: window list - "
+"By default a button will work as it's name suggests. Button1: window list - "
 "button3 window snooper (not included by default)"
 msgstr ""
 
@@ -732,18 +732,18 @@ msgstr "é?¸å?®æ??é??æ??é?µå°?æ??"
 msgid ""
 "always on top depth (-1000 - 1000)\n"
 "\n"
-"a window will have this depth after you have pressed the always-on-top "
-"button. 0 is the normal window level. every positive value means above other "
-"windows, a negative value means below. keept it at a positive value in order "
-"to have the always-on-top button do it's job."
+"A window will have this depth after you have pressed the always-on-top "
+"button.  0 is the normal window level.  Every positive value means above "
+"other windows, a negative value means below.  Keep it at a positive value in "
+"order to have the always-on-top button do it's job."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "customize always-on-top button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: sets window "
-"depth to the adjusted value"
+"By default a button will work as it's name suggests. Button1: sets window "
+"depth to the adjusted value."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -755,7 +755,7 @@ msgstr "é?¸å?®æ??é??æ??é?µå°?æ??"
 msgid ""
 "customize look button keymap\n"
 "\n"
-"by default a button will work as it's name suggests. button1: lock window "
+"By default a button will work as it's name suggests. Button1: lock window "
 "position"
 msgstr ""
 
@@ -768,7 +768,7 @@ msgstr "é??é??æ??é??æ??é?µå°?æ??"
 msgid ""
 "customize button-colors\n"
 "\n"
-"when you active this you will be able to set custom button colors. by "
+"When you active this you will be able to set custom button colors.  By "
 "default the button colors depend on the titlebar colors."
 msgstr ""
 
@@ -823,12 +823,12 @@ msgstr ""
 msgid ""
 "border width for maximized windows (0 - 1000 pixel)\n"
 "\n"
-"when you like having a big border around your windows you might have noticed "
-"that sawfish still draws that big border when the window is maximized. if "
+"When you like having a big border around your windows you might have noticed "
+"that sawfish still draws that big border when the window is maximized.  If "
 "you don't want that, set the border width for maximized windows smaller than "
-"the border width for unmaximized windows. (NOTE: this feature is still buggy "
-"as sawfish does not resize the windows correctly yet, so the best might be "
-"to set it to the normal border width.)"
+"the border width for unmaximized windows.  (NOTE: this feature is still "
+"buggy as sawfish does not resize the windows correctly yet, so the best "
+"might be to set it to the normal border width.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -836,7 +836,7 @@ msgid ""
 "customize border for focused windows (experimental)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -844,23 +844,23 @@ msgid ""
 "border width for focused windows (0 - 1000 pixel)\n"
 "\n"
 "(NOTE: this works but it is VERY cpu intensive and might slow down your "
-"computer noticably. so turn it on at your own risk.)"
+"computer noticably.  So turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "title-contents border width (0 - 1000 pixel)\n"
 "\n"
-"sets the widths of the line between titlebar and contents window"
+"Sets the widths of the line between titlebar and contents window"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "border offset (-1000 - 1000 pixel)\n"
 "\n"
-"adjust the point where the border actually starts. many gtk2 apps draw a "
+"Adjust the point where the border actually starts.  Many gtk2 apps draw a "
 "small black border around their contents window and this is just ugly when "
-"sawfish draws another border around the window. with a border offset of -1 "
+"sawfish draws another border around the window. With a border offset of -1 "
 "the sawfish window border will overlay the gtk2 border exactly."
 msgstr ""
 
@@ -868,7 +868,7 @@ msgstr ""
 msgid ""
 "keep window borders and corners at their place when shading a window\n"
 "\n"
-"when shading a window borders and corners will stay where they were and not "
+"When shading a window borders and corners will stay where they were and not "
 "merge with the titlebar."
 msgstr ""
 
@@ -876,8 +876,8 @@ msgstr ""
 msgid ""
 "show window corners\n"
 "\n"
-" the corners are used to resize a window in two directions at the same time. "
-"usually the width and length of window corners are determined by the border "
+"The corners are used to resize a window in two directions at the same time.  "
+"Usually the width and length of window corners are determined by the border "
 "width but you can adjust them below."
 msgstr ""
 
@@ -885,10 +885,10 @@ msgstr ""
 msgid ""
 "corners length adjustement (-1 - 100 pixel)\n"
 "\n"
-"increasing the corner length will grow the window corners along the window "
-"border (i.e. make them longer). with a border width of 1 pixel it is hard to "
-"grab the 1 pixel corner to be able to resize the window in two directions; "
-"thus, make it bigger."
+"Increasing the corner length will grow the window corners along the window "
+"border (i.e. make them longer).  With a border width of 1 pixel it is hard "
+"to grab the 1 pixel corner to be able to resize the window in two "
+"directions; thus, make it bigger."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -907,7 +907,7 @@ msgstr ""
 msgid ""
 "corners width adjustement (0 - 100 pixel)\n"
 "\n"
-"this option makes the window corners broader. with a border width of 1 pixel "
+"This option makes the window corners broader. with a border width of 1 pixel "
 "it is hard to grab this 1 pixel corner to be able to resize the window in "
 "two directions; thus, make it bigger."
 msgstr ""
@@ -920,10 +920,10 @@ msgstr ""
 msgid ""
 "fake shadow (experimental)\n"
 "\n"
-"draw a small additional border around your windows emulating a solid shadow "
-"effect. use the options below to adjust its width and direction. (NOTE: this "
-"is VERY cpu intensive and might slow down your computer noticably. so turn "
-"it on at your own risk.)"
+"Draw a small additional border around your windows emulating a solid shadow "
+"effect.  Use the options below to adjust its width and direction.  (NOTE: "
+"this is VERY cpu intensive and might slow down your computer noticably.  So "
+"turn it on at your own risk.)"
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
@@ -967,16 +967,16 @@ msgstr ""
 msgid ""
 "fake shadow light source\n"
 "\n"
-"set the direction of the fake shadow. usually only 2 or 3 borders of your "
-"window have a fake shadow. this depends on where the light comes from."
+"Set the direction of the fake shadow.  Usually only 2 or 3 borders of your "
+"window have a fake shadow.  This depends on where the light comes from."
 msgstr ""
 
 #. ../themes/mxflat/theme.jl
 msgid ""
 "fake shadow light distance (0 - 100)\n"
 "\n"
-"this option has only an effect on the north, east, south and west light "
-"sources. the further away the light source is, the smaller will the two "
+"This option has only an effect on the north, east, south and west light "
+"sources.  The further away the light source is, the smaller will the two "
 "'side' shadows be."
 msgstr ""
 
@@ -992,7 +992,7 @@ msgstr ""
 msgid ""
 "customize border colors\n"
 "\n"
-"you can customize your border colors here. if you deactivate this, these "
+"You can customize your border colors here. If you deactivate this, these "
 "colors will be set to the focused title string color."
 msgstr ""
 
@@ -1811,8 +1811,10 @@ msgid "Move selected window"
 msgstr "移å??é?¸å®?ç??è¦?çª?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively move that window."
+"Wait for the user to select a window, then interactively move\n"
+"that window."
 msgstr "ç­?å¾?使ç?¨è??é?¸æ??並æ??å??移å??è¦?çª?ã??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1820,8 +1822,10 @@ msgid "Resize selected window"
 msgstr "æ?¹è®?é?¸å®?ç??è¦?çª?大å°?"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
+#, fuzzy
 msgid ""
-"Wait for the user to select a window, then interactively resize that window."
+"Wait for the user to select a window, then interactively resize\n"
+"that window."
 msgstr "ç­?å¾?使ç?¨è??é?¸æ??è¦?çª?ï¼?ç?¶å¾?æ??å??æ?¹è®?å?¶å¤§å°?ã??"
 
 #. ../lisp/sawfish/wm/commands/move-resize.jl
@@ -1901,40 +1905,88 @@ msgid "Shrink window left"
 msgstr "å??å·¦æ»?å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the right edge to the left until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window right"
 msgstr "å??å?³æ»?å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the left edge to the right until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window up"
 msgstr "å??ä¸?æ»?å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the lower edge upwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Shrink window down"
 msgstr "å??ä¸?æ»?å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Shrinks WINDOW by moving the upper edge downwards until it\n"
+"intersects with one window less than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window left"
 msgstr "è¦?çª?å??左移"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the left until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window right"
 msgstr "è¦?çª?å??å?³ç§»"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW to the right until it inserts with one window less\n"
+"than before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window up"
 msgstr "è¦?çª?å??ä¸?移"
 
 #. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW upwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
 #, fuzzy
 msgid "Yank window down"
 msgstr "è¦?çª?å??ä¸?移"
 
+#. ../lisp/sawfish/wm/commands/shrink-yank.jl
+msgid ""
+"Yanks WINDOW downwards until it inserts with one window less than\n"
+"before."
+msgstr ""
+
 #. ../lisp/sawfish/wm/commands/size-window.jl
 msgid "Size window add row"
 msgstr "�����"
@@ -2268,6 +2320,17 @@ msgstr ""
 msgid "3d hack"
 msgstr ""
 
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+#, fuzzy
+msgid "Update apps menu"
+msgstr "顯示����"
+
+#. ../lisp/sawfish/wm/ext/apps-menu.jl
+msgid ""
+"Set `apps-menu' to `user-apps-menu', and if `apps-menu-autogen' is non-nil,\n"
+"append the auto generated one."
+msgstr ""
+
 #. ../lisp/sawfish/wm/ext/audio-events.jl
 msgid "Play sound effects for window events."
 msgstr "ç?ºè¦?çª?äº?件æ?­æ?¾é?³æ??ã??"
@@ -2361,10 +2424,6 @@ msgstr "顯示�誤"
 msgid "Display all errors that have occurred to the screen."
 msgstr "顯示å?¨é??è?¢å¹?æ??æ??ç?¼ç??é??ç??é?¯èª¤ã??"
 
-#. ../lisp/sawfish/wm/ext/fdo-menu.jl
-msgid "Update saw menu"
-msgstr ""
-
 #. ../lisp/sawfish/wm/ext/infinite-desktop.jl
 #, fuzzy
 msgid "Infinite Desktop"
@@ -2594,11 +2653,6 @@ msgstr "ç??æ??"
 msgid "Other"
 msgstr "��"
 
-#. ../lisp/sawfish/wm/ext/match-window.jl
-#, fuzzy
-msgid "Rename window"
-msgstr "æ??æ??è¦?çª?"
-
 #. ../lisp/sawfish/wm/ext/shade-hover.jl
 #, fuzzy
 msgid "Shade Hover"
@@ -2809,6 +2863,18 @@ msgstr "é??å?°å·¥ä½?å??"
 msgid "Send window to the workspace right of the current workspace"
 msgstr "å?¨ç?®å??å·¥ä½?å??ä¹?å??建ç«?æ?°å·¥ä½?å??ã??"
 
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Use custom font colors for frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for active frames"
+msgstr ""
+
+#. ../lisp/sawfish/wm/extras.jl
+msgid "Font color for inactive frames"
+msgstr ""
+
 #. ../lisp/sawfish/wm/focus.jl
 msgid "When does the mouse pointer affect the input focus."
 msgstr "游æ¨?ä½?æ??æ??å½±é?¿å?°è¼¸å?¥ç?¦é»?ã??"
@@ -2836,18 +2902,6 @@ msgid "Automatically reload themes when they are updated."
 msgstr "ç?¶ä½?æ?¯ä¸»é¡?被æ?´æ?°æ??è?ªå??é??æ?°è¼?å?¥ã??"
 
 #. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for active frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Font color for inactive frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
-msgid "Use custom font colors for frames"
-msgstr ""
-
-#. ../lisp/sawfish/wm/frames.jl
 msgid "Default font: \\w"
 msgstr "�設�形�\\w"
 
@@ -3048,6 +3102,78 @@ msgstr ""
 
 #. ../lisp/sawfish/wm/keymaps.jl
 #, fuzzy
+msgid "sticky-button-keymap"
+msgstr "å??示å??æ??é??æ??é?µå°?æ??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the sticky button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"游æ¨?å?¨è¦?çª?é??é??æ??é??ä¸?æ??ç??æ??æ??æ??é?µå°?æ??ã??ï¼?å?¨é??å°?æ??中å?ªæ??æ»?é¼ ç??æ??é?µçµ?å??æ??被\n"
+"è??æ?®ã??ï¼?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "lock-button-keymap"
+msgstr "é??é??æ??é??æ??é?µå°?æ??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the lock button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"游æ¨?å?¨è¦?çª?é??é??æ??é??ä¸?æ??ç??æ??æ??æ??é?µå°?æ??ã??ï¼?å?¨é??å°?æ??中å?ªæ??æ»?é¼ ç??æ??é?µçµ?å??æ??被\n"
+"è??æ?®ã??ï¼?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "rename-button-keymap"
+msgstr "é?¸å?®æ??é??æ??é?µå°?æ??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the rename button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"游æ¨?å?¨è¦?çª?é?¸å?®æ??é??ä¸?æ??ç??æ??æ??æ??é?µå°?æ??ã??ï¼?å?¨é??å°?æ??中å?ªæ??æ»?é¼ ç??æ??é?µçµ?å??æ??被\n"
+"è??æ?®ã??ï¼?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "move-resize-button-keymap"
+msgstr "é??é??æ??é??æ??é?µå°?æ??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the move/resize "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"游æ¨?å?¨è¦?çª?é??é??æ??é??ä¸?æ??ç??æ??æ??æ??é?µå°?æ??ã??ï¼?å?¨é??å°?æ??中å?ªæ??æ»?é¼ ç??æ??é?µçµ?å??æ??被\n"
+"è??æ?®ã??ï¼?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid "raise-lower-button-keymap"
+msgstr "é??é??æ??é??æ??é?µå°?æ??"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
+msgid ""
+"Keymap containing bindings active when the pointer is in the raise/lower "
+"button\n"
+"of a window. (Only mouse-bindings are evaluated in this map.)"
+msgstr ""
+"游æ¨?å?¨è¦?çª?é??é??æ??é??ä¸?æ??ç??æ??æ??æ??é?µå°?æ??ã??ï¼?å?¨é??å°?æ??中å?ªæ??æ»?é¼ ç??æ??é?µçµ?å??æ??被\n"
+"è??æ?®ã??ï¼?"
+
+#. ../lisp/sawfish/wm/keymaps.jl
+#, fuzzy
 msgid "Modifier key(s) used for default shortcuts."
 msgstr "è¦?çª?管ç??ç¨?å¼?é ?設快é??é?µç??è®?å??é?µçµ?å??ã??"
 
@@ -3265,6 +3391,11 @@ msgstr "顯示�誤"
 
 #. ../lisp/sawfish/wm/menus.jl
 #, fuzzy
+msgid "Reload Appsmenu"
+msgstr "顯示����"
+
+#. ../lisp/sawfish/wm/menus.jl
+#, fuzzy
 msgid "Restart Sawfish"
 msgstr "é??æ?°å??å??"
 
@@ -3324,8 +3455,9 @@ msgid "Display the applications menu."
 msgstr "顯示æ??ç?¨ç¨?å¼?é?¸å?®ã??"
 
 #. ../lisp/sawfish/wm/menus.jl
-msgid "S_awfish-UI"
-msgstr ""
+#, fuzzy
+msgid "S_awfishConfig"
+msgstr "Sawfish 設�工�"
 
 #. ../lisp/sawfish/wm/menus.jl
 msgid "Edit theme..."
@@ -3364,7 +3496,6 @@ msgstr "è®?é??渡ç??è¦?çª?ç??æ?¾æ?¼ä½?è??ä¹?ä¸?ï¼?\\w"
 msgid "Raise single window"
 msgstr "æ??æ??å?®ä¸?è¦?çª?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Raise the window to its highest allowed position in the stacking order."
 msgstr "å°?è¦?çª?æ??æ??å?°æ??é«?ç??ç??æ?¾é ?åº?ã??"
@@ -3373,7 +3504,6 @@ msgstr "å°?è¦?çª?æ??æ??å?°æ??é«?ç??ç??æ?¾é ?åº?ã??"
 msgid "Lower single window"
 msgstr "é??ä½?å?®ä¸?è¦?çª?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 msgid "Lower the window to its lowest allowed position in the stacking order."
 msgstr "å°?è¦?çª?é??ä½?å?°æ??ä½?ç??ç??æ?¾é ?åº?ã??"
@@ -3382,7 +3512,6 @@ msgstr "å°?è¦?çª?é??ä½?å?°æ??ä½?ç??ç??æ?¾é ?åº?ã??"
 msgid "Raise lower single window"
 msgstr "æ??æ??è¼?ä½?ç??å?®ä¸?è¦?çª?"
 
-#. ../lisp/sawfish/wm/util/stacking.jl
 #. ../lisp/sawfish/wm/stacking.jl
 #, fuzzy
 msgid ""
@@ -3582,8 +3711,10 @@ msgid "Unmaximize window"
 msgstr "é??å??æ??大å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
+#, fuzzy
 msgid ""
-"Restore the dimensions of the window to its original, unmaximized, state."
+"Restore the dimensions of the window to its original,\n"
+"unmaximized, state."
 msgstr "é??å??è¦?çª?大å°?è?³å?¶æ?¬ä¾?ã??æ?ªæ??大å??å??ç??ç??æ??ã??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3715,7 +3846,8 @@ msgstr "æ??大å??è¦?çª?å??æ??"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized and unmaximized."
+"Toggle the state of the window between fullscreen maximized and\n"
+"unmaximized."
 msgstr "å??æ??è¦?çª?æ??被æ??大å??é??æ?¯è¢«é??å??ã??"
 
 #. ../lisp/sawfish/wm/state/maximize.jl
@@ -3736,8 +3868,8 @@ msgstr "æ??大å??è¦?çª?å??æ??"
 #. ../lisp/sawfish/wm/state/maximize.jl
 #, fuzzy
 msgid ""
-"Toggle the state of the window between fullscreen maximized across all "
-"Xinerama and unmaximized."
+"Toggle the state of the window between fullscreen maximized\n"
+"across all Xinerama and unmaximized."
 msgstr "å??æ??è¦?çª?æ??æ??大å??å¡«å??ç?«é?¢é??æ?¯è¢«é??å??ã??"
 
 #. ../lisp/sawfish/wm/state/shading.jl
@@ -3949,9 +4081,7 @@ msgstr "é??å??æ??大å??è¦?çª?"
 
 #. ../lisp/sawfish/wm/util/play-audio.jl
 #, fuzzy
-msgid ""
-"The program used to play audio samples. If unset, built-in support for ESD "
-"is used."
+msgid "The program used to play audio samples."
 msgstr "ç?¨ä¾?æ?­æ?¾é?³æ??ç??ç¨?å¼?ã??è?¥ç?¡è¨­å®?ï¼?å??使ç?¨å?§ç½®ç?? ESD æ?¯æ?´ã??"
 
 #. ../lisp/sawfish/wm/util/prompt-wm.jl
@@ -3996,13 +4126,37 @@ msgid "Raise window"
 msgstr "æ??æ??è¦?çª?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Raise the window to its highest allowed position in the stacking\n"
+"order."
+msgstr "å°?è¦?çª?æ??æ??å?°æ??é«?ç??ç??æ?¾é ?åº?ã??"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Lower window"
 msgstr "é??ä½?è¦?çª?"
 
 #. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"Lower the window to its lowest allowed position in the stacking\n"
+"order."
+msgstr "å°?è¦?çª?é??ä½?å?°æ??ä½?ç??ç??æ?¾é ?åº?ã??"
+
+#. ../lisp/sawfish/wm/util/stacking.jl
 msgid "Raise lower window"
 msgstr "æ??æ??è¼?ä½?ç??è¦?çª?"
 
+#. ../lisp/sawfish/wm/util/stacking.jl
+#, fuzzy
+msgid ""
+"If the window is at its highest possible position, then lower it\n"
+"to its lowest possible position. Otherwise raise it as far as\n"
+"allowed."
+msgstr ""
+"è?¥è¦?çª?å?¨æ??é«?ç??ä½?ç½®å??å°?ä¹?é??è?³æ??ä½?ç??ä½?ç½®ã??å?¦å??å°?å®?æ??è?³æ??é«?ç??ä½?ç½®ã??\n"
+"並å??æ??æ?¹è®?æ??æ??æ??é??ç??é??渡è¦?çª?ç??ç??æ?¾é«?度ã??"
+
 #. ../lisp/sawfish/wm/viewport.jl
 msgid "Number of columns and rows in each virtual workspace: \\w"
 msgstr ""
@@ -4139,7 +4293,8 @@ msgstr "����移"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the right, and switch to that viewport."
+"Move the window to the viewport on the right, and switch to that\n"
+"viewport."
 msgstr "å°?è¦?çª?移å?°å?³é??ç??è¦?ç??."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4149,7 +4304,8 @@ msgstr "���左移"
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
 msgid ""
-"Move the window to the viewport on the left, and switch to that viewport."
+"Move the window to the viewport on the left, and switch to that\n"
+"viewport."
 msgstr "å°?è¦?çª?移å?°å·¦é??ç??è¦?ç??."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4158,7 +4314,9 @@ msgstr "����移"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport above, and switch to that viewport."
+msgid ""
+"Move the window to the viewport above, and switch to that\n"
+"viewport."
 msgstr "å°?è¦?çª?移å?°å·¦é??ç??è¦?ç??."
 
 #. ../lisp/sawfish/wm/viewport.jl
@@ -4167,7 +4325,9 @@ msgstr "����移"
 
 #. ../lisp/sawfish/wm/viewport.jl
 #, fuzzy
-msgid "Move the window to the viewport below, and switch to that viewport."
+msgid ""
+"Move the window to the viewport below, and switch to that\n"
+"viewport."
 msgstr "å°?è¦?çª?移å?°å·¦é??ç??è¦?ç??."
 
 #. ../lisp/sawfish/wm/window-anim.jl
@@ -4206,7 +4366,7 @@ msgid "Whether to enable warping the cursor to windows."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
-msgid "Whether to not ignore avoided windows by default."
+msgid "Whether to not avoid ignored windows by default."
 msgstr ""
 
 #. ../lisp/sawfish/wm/windows.jl
@@ -4250,6 +4410,11 @@ msgstr "é??å??示å??è¦?çª?ã??"
 msgid "Force the current window to have a unique title."
 msgstr "å¼·å?¶ç?®å??è¦?çª?è¦?æ??ç?¨æ??ç??æ¨?é¡?ã??"
 
+#. ../lisp/sawfish/wm/windows.jl
+#, fuzzy
+msgid "Rename window"
+msgstr "æ??æ??è¦?çª?"
+
 #. ../lisp/sawfish/wm/workspace.jl
 msgid "keep-going"
 msgstr ""
@@ -4262,7 +4427,8 @@ msgstr "顯示å??å?«æ??æ??å·¥ä½?å??å??表ç??é?¸å?®ã??"
 #. ../lisp/sawfish/wm/workspace.jl
 #, fuzzy
 msgid ""
-"How to act when passing the first or last workspace, while moving a window"
+"How to act when passing the first or last workspace, while moving\n"
+"a window"
 msgstr "顯示å??å?«æ??æ??å·¥ä½?å??å??表ç??é?¸å?®ã??"
 
 #. ../lisp/sawfish/wm/workspace.jl
@@ -4389,8 +4555,10 @@ msgid "Prepend workspace and send"
 msgstr "é??å?°æ?°å? å?¥ç??å??端工ä½?å??"
 
 #. ../lisp/sawfish/wm/workspace.jl
+#, fuzzy
 msgid ""
-"Create a new workspace at the start of the list, and move the window to it."
+"Create a new workspace at the start of the list, and move the\n"
+"window to it."
 msgstr "å?¨å·¥ä½?å??å??表ä¹?å??建ç«?ä¸?å??æ?°ç??å·¥ä½?å??ï¼?並å°?è¦?çª?移é??å?»ã??"
 
 #. ../lisp/sawfish/wm/workspace.jl



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]