From 75fa1d1b09ed25b1aa1fce1da0184050d7725e5c Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Fri, 8 Feb 2002 06:50:09 +0000
Subject: [PATCH] grab buttons 2 and 3 also, so you can focus a window with
 those, #70840

002-02-08  Havoc Pennington  <hp@pobox.com>

	* src/display.c (meta_display_grab_focus_window_button): grab
	buttons 2 and 3 also, so you can focus a window with those,
	#70840
	(event_callback): fix this to let you focus a window with any
	unmodified click, and also with Alt+button1

	* configure.in (AC_OUTPUT): add po/Makefile.in

	* autogen.sh: port to glib-gettextize, remove stupid
	auto-find-subdirs crap

	* Makefile.am (SUBDIRS): add po to subdirs, #70615

	* src/window.c (meta_window_activate): unshaded window if shaded,
	I thought this was in bugzilla but I don't see it. anyway thanks
	whoever mentioned it to me.
---
 ChangeLog     |  19 ++
 Makefile.am   |   2 +-
 autogen.sh    |  57 +----
 configure.in  |   1 +
 po/ChangeLog  |   5 +
 po/da.po      | 395 +++++++++++++++++-------------
 po/es.po      | 547 ++++++++++++++++++++++++++++-------------
 po/gl.po      | 541 ++++++++++++++++++++++++++++++-----------
 po/lv.po      | 661 ++++++++++++++++++++++++++++++--------------------
 po/ms.po      | 522 ++++++++++++++++++++++++++-------------
 po/no.po      | 479 ++++++++++++++++++++++--------------
 po/pt.po      | 507 ++++++++++++++++++++++++++------------
 po/ru.po      | 517 +++++++++++++++++++++++++++------------
 po/sk.po      | 479 ++++++++++++++++++++++--------------
 po/sv.po      | 468 ++++++++++++++++++++++-------------
 po/tr.po      | 403 +++++++++++++++++++-----------
 po/uk.po      | 541 ++++++++++++++++++++++++++++++-----------
 src/display.c |  39 ++-
 src/window.c  |   3 +
 19 files changed, 4067 insertions(+), 2119 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7babea3a6..761e4483d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2002-02-08  Havoc Pennington  <hp@pobox.com>
+
+	* src/display.c (meta_display_grab_focus_window_button): grab
+	buttons 2 and 3 also, so you can focus a window with those, 
+	#70840
+	(event_callback): fix this to let you focus a window with any 
+	unmodified click, and also with Alt+button1
+
+	* configure.in (AC_OUTPUT): add po/Makefile.in
+
+	* autogen.sh: port to glib-gettextize, remove stupid
+	auto-find-subdirs crap
+
+	* Makefile.am (SUBDIRS): add po to subdirs, #70615
+
+	* src/window.c (meta_window_activate): unshaded window if shaded, 
+	I thought this was in bugzilla but I don't see it. anyway thanks
+	whoever mentioned it to me.	
+
 2002-02-08  Havoc Pennington  <hp@pobox.com>
 
 	* src/tools/metacity-window-demo.c (menu_items): add modal dialog test
diff --git a/Makefile.am b/Makefile.am
index d439b1041..54728ebce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS=src 
+SUBDIRS=src po
 
 EXTRA_DIST=HACKING theme-format.txt
diff --git a/autogen.sh b/autogen.sh
index 2ec8ceb21..a0708ab49 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -38,7 +38,7 @@ DIE=0
   }
 }
 
-grep "^AM_GNU_GETTEXT" configure.in >/dev/null && {
+grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null && {
   grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
@@ -67,61 +67,6 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
-for coin in `find . -name configure.in -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
-    ( cd $dr
-      aclocalinclude="$ACLOCAL_FLAGS"
-      for k in $macrodirs; do
-  	if test -d $k; then
-          aclocalinclude="$aclocalinclude -I $k"
-  	##else 
-	##  echo "**Warning**: No such directory \`$k'.  Ignored."
-        fi
-      done
-      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "Running gettextize...  Ignore non-fatal messages."
-	  echo "no" | gettextize --force --copy
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
-      fi
-      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running gettextize...  Ignore non-fatal messages."
-	echo "no" | gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
-	echo "Running libtoolize..."
-	libtoolize --force --copy
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
 conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
 
 cd "$ORIGDIR"
diff --git a/configure.in b/configure.in
index dad9e498e..30222f924 100644
--- a/configure.in
+++ b/configure.in
@@ -140,4 +140,5 @@ src/Makefile
 src/wm-tester/Makefile
 src/tools/Makefile
 src/themes/Makefile
+po/Makefile.in
 ])
diff --git a/po/ChangeLog b/po/ChangeLog
index 82c752075..51b72297f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-08  Havoc Pennington  <hp@pobox.com>
+
+	* da.po: fix a missing newline that made build fail once po was
+	added to subdirs
+
 2002-02-02  Kjartan Maraas  <kmaraas@gnome.org>
 
 	* no.po: Updated Norwegian (bokm�l) translation.
diff --git a/po/da.po b/po/da.po
index 37f128456..427887e51 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Metacity CVS\n"
-"POT-Creation-Date: 2002-02-04 07:44-0500\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-02-05 01:13+0100\n"
 "Last-Translator: Kenneth Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -14,10 +14,10 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "Det mislykkedes at �bne X-vinduessk�rmen '%s\\n"
+msgstr "Det mislykkedes at �bne X-vinduessk�rmen '%s'\n"
 
 #: src/errors.c:93
 #, c-format
@@ -32,137 +32,24 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IO-fejl %d (%s) p� sk�rmen '%s'.\n"
 
-#: src/frames.c:178
-msgid "Left edge"
-msgstr "Venstre kant"
-
-#: src/frames.c:178
-msgid "Left window edge width"
-msgstr "Venstre vindues kantbredde"
-
-#: src/frames.c:179
-msgid "Right edge"
-msgstr "H�jre kant"
-
-#: src/frames.c:179
-msgid "Right window edge width"
-msgstr "H�jre vindues kantbredde"
-
-#: src/frames.c:180
-msgid "Bottom edge"
-msgstr "Nederste kant"
-
-#: src/frames.c:180
-msgid "Bottom window edge height"
-msgstr "Nederste vindues kanth�jde"
-
-#: src/frames.c:182
-msgid "Title border"
-msgstr "Titelkant"
-
-#: src/frames.c:182
-msgid "Border around title area"
-msgstr "Kant rundt om titelomr�det"
-
-#: src/frames.c:183
-msgid "Text border"
-msgstr "Tekstkant"
-
-#: src/frames.c:183
-msgid "Border around window title text"
-msgstr ""
-
-#: src/frames.c:185
-msgid "Spacer padding"
-msgstr ""
-
-#: src/frames.c:185
-msgid "Padding on either side of spacer"
-msgstr ""
-
-#: src/frames.c:186
-msgid "Spacer width"
-msgstr ""
-
-#: src/frames.c:186
-msgid "Width of spacer"
-msgstr ""
-
-#: src/frames.c:187
-msgid "Spacer height"
-msgstr ""
-
-#: src/frames.c:187
-msgid "Height of spacer"
-msgstr ""
-
-#. same as right_width left_width by default
-#: src/frames.c:190
-msgid "Right inset"
-msgstr ""
-
-#: src/frames.c:190
-msgid "Distance of buttons from right edge of frame"
-msgstr ""
-
-#: src/frames.c:191
-msgid "Left inset"
-msgstr ""
-
-#: src/frames.c:191
-msgid "Distance of menu button from left edge of frame"
-msgstr ""
-
-#: src/frames.c:193
-msgid "Button width"
-msgstr ""
-
-#: src/frames.c:193
-msgid "Width of buttons"
-msgstr ""
-
-#: src/frames.c:194
-msgid "Button height"
-msgstr ""
-
-#: src/frames.c:194
-msgid "Height of buttons"
-msgstr ""
-
-#: src/frames.c:196
-msgid "Button border"
-msgstr ""
-
-#: src/frames.c:196
-msgid "Border around buttons"
-msgstr ""
-
-#: src/frames.c:197
-msgid "Inner button border"
-msgstr ""
-
-#: src/frames.c:197
-msgid "Border around the icon inside buttons"
-msgstr ""
-
-#: src/frames.c:699
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Luk vindue"
 
-#: src/frames.c:702
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Vinduemenu"
 
-#: src/frames.c:705
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minim�r vindue"
 
-#: src/frames.c:708
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maksim�r vindue"
 
 # Gendan bruges bl.a. i Windows
-#: src/frames.c:711
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Gendan vindue"
 
@@ -173,84 +60,89 @@ msgid ""
 "binding\n"
 msgstr ""
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Genstart mislykkedes: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Luk"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minim�r"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ksim�r"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Gendan"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "Rul _op"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "Rul _ned"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Fl_yt"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "�ndr st�rre_lse"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Put p� _alle arbejdsomr�der"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Kun p� _dette arbejdsomr�de"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Kun p� arbejdsomr�det %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Flyt til arbejdsomr�det %s%d"
 
-#: src/prefs.c:272 src/prefs.c:288 src/prefs.c:304 src/prefs.c:320
-#: src/prefs.c:340 src/prefs.c:356
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Conf-n�glen '%s' er sat til en ugyldig type\n"
 
-#: src/prefs.c:390
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "GConf-n�glen '%s' er sat til en ugyldig v�rdi"
 
-#: src/prefs.c:424
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunne ikke parse skrifttypebeskrivelsen '%s' fra GConf-n�glen %s\n"
 
-#: src/prefs.c:461
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr ""
 
-#: src/prefs.c:487
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -321,96 +213,234 @@ msgstr "Ukendt attribut %s hos <geometry>-elementet"
 msgid "Unknown element %s"
 msgstr "Ukendt element %s"
 
-#: src/theme.c:584
-#, c-format
-msgid "Coordinate expression contains character '%c' which is not allowed"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
 
-#: src/theme.c:611
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
+#, c-format
+msgid ""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Kunne ikke oprette kataloget '%s': %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:625
+#: src/theme.c:1247
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:731
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:870 src/theme.c:880 src/theme.c:905
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:913
+#: src/theme.c:1562
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:961
+#: src/theme.c:1619
 #, c-format
 msgid ""
-"Coordinate expression has an operator \"%c\" where an operand was expected"
+"Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:970
+#: src/theme.c:1628
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:978
+#: src/theme.c:1636
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:988
+#: src/theme.c:1646
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1089
+#: src/theme.c:1765
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
 msgstr ""
 
-#: src/theme.c:1118
+#: src/theme.c:1794
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1139
+#: src/theme.c:1857
 #, c-format
-msgid "Coordinate expression had unknown variable \"%s\""
+msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1196
+#: src/theme.c:1914
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1207
+#: src/theme.c:1925
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:1364 src/theme.c:1386 src/theme.c:1407
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#. someone is on crack
-#: src/window.c:3411
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
-msgstr ""
-
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:3376
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Fejl under l�sning af gemt sessionsfil: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
 #: src/xprops.c:53
@@ -424,3 +454,30 @@ msgstr ""
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Egenskab %s p� vindue 0x%lx indeholder ugyldig UTF-8\n"
+
+#~ msgid "Left edge"
+#~ msgstr "Venstre kant"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Venstre vindues kantbredde"
+
+#~ msgid "Right edge"
+#~ msgstr "H�jre kant"
+
+#~ msgid "Right window edge width"
+#~ msgstr "H�jre vindues kantbredde"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Nederste kant"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Nederste vindues kanth�jde"
+
+#~ msgid "Title border"
+#~ msgstr "Titelkant"
+
+#~ msgid "Border around title area"
+#~ msgstr "Kant rundt om titelomr�det"
+
+#~ msgid "Text border"
+#~ msgstr "Tekstkant"
diff --git a/po/es.po b/po/es.po
index ad698029d..40d092f87 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.13\n"
-"POT-Creation-Date: 2001-10-27 22:15+0200\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-10-13 22:43+0200\n"
 "Last-Translator: H�ctor Garc�a �lvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,12 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:153
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Error al abrir el display del Sistema de Ventanas X '%s'\n"
 
-#: src/errors.c:92
+#: src/errors.c:93
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -27,145 +27,32 @@ msgid ""
 "the window manager.\n"
 msgstr ""
 
-#: src/errors.c:99
+#: src/errors.c:100
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Error fatal de ES %s (%s) en la pantalla '%s'.\n"
 
-#: src/frames.c:229
-msgid "Left edge"
-msgstr "Borde izquierdo"
-
-#: src/frames.c:229
-msgid "Left window edge width"
-msgstr "Ancho del borde izquierdo de la ventana"
-
-#: src/frames.c:230
-msgid "Right edge"
-msgstr "Borde derecho"
-
-#: src/frames.c:230
-msgid "Right window edge width"
-msgstr "Anchura del borde derecho de la ventana"
-
-#: src/frames.c:231
-msgid "Bottom edge"
-msgstr "Borde inferior"
-
-#: src/frames.c:231
-msgid "Bottom window edge height"
-msgstr "Altura del borde inferior de la ventana"
-
-#: src/frames.c:233
-msgid "Title border"
-msgstr "Borde del t�tulo"
-
-#: src/frames.c:233
-msgid "Border around title area"
-msgstr ""
-
-#: src/frames.c:234
-msgid "Text border"
-msgstr "Borde del texto"
-
-#: src/frames.c:234
-msgid "Border around window title text"
-msgstr "Borde alrededor del texto del t�tulo de la ventana"
-
-#: src/frames.c:236
-msgid "Spacer padding"
-msgstr ""
-
-#: src/frames.c:236
-msgid "Padding on either side of spacer"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Spacer width"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Width of spacer"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Spacer height"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Height of spacer"
-msgstr ""
-
-#. same as right_width left_width by default
-#: src/frames.c:241
-msgid "Right inset"
-msgstr ""
-
-#: src/frames.c:241
-msgid "Distance of buttons from right edge of frame"
-msgstr "Distacia de los botones al borde derecho"
-
-#: src/frames.c:242
-msgid "Left inset"
-msgstr ""
-
-#: src/frames.c:242
-msgid "Distance of menu button from left edge of frame"
-msgstr "Distacia del menu al borde izquierdo"
-
-#: src/frames.c:244
-msgid "Button width"
-msgstr "Anchura del bot�n"
-
-#: src/frames.c:244
-msgid "Width of buttons"
-msgstr "Anchura de los botones"
-
-#: src/frames.c:245
-msgid "Button height"
-msgstr "Altura del bot�n"
-
-#: src/frames.c:245
-msgid "Height of buttons"
-msgstr "Altura de los botones"
-
-#: src/frames.c:247
-msgid "Button border"
-msgstr "Borde del bot�n"
-
-#: src/frames.c:247
-msgid "Border around buttons"
-msgstr "Borde alrededor de los botones"
-
-#: src/frames.c:248
-msgid "Inner button border"
-msgstr "Borde interior del bot�n"
-
-#: src/frames.c:248
-msgid "Border around the icon inside buttons"
-msgstr "Borde alrededor del icono dentro del bot�n"
-
-#: src/frames.c:889
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Cerrar ventana"
 
-#: src/frames.c:892
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Men� de la ventana"
 
-#: src/frames.c:895
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimizar ventana"
 
-#: src/frames.c:898
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maximizar ventana"
 
-#: src/frames.c:901
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Des-maximizar ventana"
 
-#: src/keybindings.c:210
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -174,130 +61,466 @@ msgstr ""
 "Alg�n otro programa est� usando la clave %s con el modificador %s como "
 "referencia\n"
 
-#: src/menu.c:47
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
+#, fuzzy, c-format
+msgid "Failed to restart: %s\n"
+msgstr "Error al parsear el archivo de sesi�n guardado: %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/menu.c:48
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimizar"
 
-#: src/menu.c:49
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
-#: src/menu.c:50
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Des-maximizar"
 
-#: src/menu.c:51
+#: src/menu.c:53
 msgid "_Shade"
 msgstr ""
 
-#: src/menu.c:52
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr ""
 
-#: src/menu.c:53
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Mo_ver"
 
-#: src/menu.c:54
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_Redimensionar"
 
 #. separator
-#: src/menu.c:56
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Poner en todas l_as areas de trabajo"
 
-#: src/menu.c:57
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Poner en es_te area de trabajo"
 
-#: src/menu.c:260
-#, c-format
-msgid "Only on workspace _%d"
+#: src/menu.c:298
+#, fuzzy, c-format
+msgid "Only on workspace %s%d"
 msgstr "Solo en el area de trabajo _%d"
 
-#: src/menu.c:263
-#, c-format
-msgid "Move to workspace _%d"
+#: src/menu.c:301
+#, fuzzy, c-format
+msgid "Move to workspace %s%d"
 msgstr "Mover al area de trabajo _%d"
 
-#: src/screen.c:168
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr ""
+
+#: src/prefs.c:415
+#, c-format
+msgid "GConf key '%s' is set to an invalid value"
+msgstr ""
+
+#: src/prefs.c:487
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr ""
+
+#: src/prefs.c:524
+#, c-format
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr ""
+
+#: src/prefs.c:550
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
+msgstr ""
+
+#: src/screen.c:174
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La ventana %d en la patalla '%s' no es v�lida\n"
 
-#: src/screen.c:183
+#: src/screen.c:190
 #, c-format
 msgid "Screen %d on display '%s' already has a window manager\n"
 msgstr "La ventana %d en la patalla '%s' ya tiene un gestor de ventanas\n"
 
-#: src/session.c:746 src/session.c:753
+#: src/screen.c:268
+#, fuzzy, c-format
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "No pude crear el directorio '%s': %s\n"
+
+#: src/session.c:760 src/session.c:767
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "No pude crear el directorio '%s': %s\n"
 
-#: src/session.c:763
+#: src/session.c:777
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "No pude abrir el archivo de sesi�n '%s'para escritura: %s\n"
 
-#: src/session.c:895
+#: src/session.c:909
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Error escribiendo el archivo de sesi�n '%s': %s\n"
 
-#: src/session.c:900
+#: src/session.c:914
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Error cerrando el archivo de sesi�n '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:988
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Error al leer el archivo de sesi�n guardado %s: %s\n"
 
-#: src/session.c:1008
+#: src/session.c:1022
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Error al parsear el archivo de sesi�n guardado: %s\n"
 
-#: src/session.c:1046
+#: src/session.c:1060
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1096 src/session.c:1128
+#: src/session.c:1110 src/session.c:1142
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr ""
 
-#: src/session.c:1188
+#: src/session.c:1202
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr ""
 
-#: src/session.c:1208
+#: src/session.c:1222
 #, c-format
 msgid "Unknown element %s"
 msgstr "Elemento desconocido %s"
 
-#. someone is on crack
-#: src/window.c:2881
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"La ventana %s pone su anchura m�xima %d menor que la m�nima %d, "
-"deshabilitando el redimensionado\n"
 
-#. another cracksmoker
-#: src/window.c:2891
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"La ventana %s pone su altura m�xima %d menor que la m�nima %d, deshabilitando "
-"el redimensionado\n"
 
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "No pude crear el directorio '%s': %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Error al leer el archivo de sesi�n guardado %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
+msgstr ""
+
+#: src/xprops.c:53
+#, c-format
+msgid ""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
+msgstr ""
+
+#: src/xprops.c:281
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr ""
+
+#~ msgid "Left edge"
+#~ msgstr "Borde izquierdo"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Ancho del borde izquierdo de la ventana"
+
+#~ msgid "Right edge"
+#~ msgstr "Borde derecho"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Anchura del borde derecho de la ventana"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Borde inferior"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Altura del borde inferior de la ventana"
+
+#~ msgid "Title border"
+#~ msgstr "Borde del t�tulo"
+
+#~ msgid "Text border"
+#~ msgstr "Borde del texto"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Borde alrededor del texto del t�tulo de la ventana"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Distacia de los botones al borde derecho"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Distacia del menu al borde izquierdo"
+
+#~ msgid "Button width"
+#~ msgstr "Anchura del bot�n"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Anchura de los botones"
+
+#~ msgid "Button height"
+#~ msgstr "Altura del bot�n"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Altura de los botones"
+
+#~ msgid "Button border"
+#~ msgstr "Borde del bot�n"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Borde alrededor de los botones"
+
+#~ msgid "Inner button border"
+#~ msgstr "Borde interior del bot�n"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Borde alrededor del icono dentro del bot�n"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "La ventana %s pone su anchura m�xima %d menor que la m�nima %d, "
+#~ "deshabilitando el redimensionado\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "La ventana %s pone su altura m�xima %d menor que la m�nima %d, "
+#~ "deshabilitando el redimensionado\n"
diff --git a/po/gl.po b/po/gl.po
index 1e8711f73..9cd4ba890 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Metacity 2.3.34\n"
-"POT-Creation-Date: 2001-12-19 07:30-0500\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-12-19 21:25+0100\n"
 "Last-Translator: Manuel A. Fern�ndez Montecelo <manuel@sindominio.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:155
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Fallo ao abrir o sistema X Window, display '%s'\n"
@@ -34,140 +34,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Erro fatal de E/S %d (%s) no display '%s'.\n"
 
-#: src/frames.c:231
-msgid "Left edge"
-msgstr "Beira esquerda"
-
-#: src/frames.c:231
-msgid "Left window edge width"
-msgstr "Anchura da beira esquerda da fiestra"
-
-#: src/frames.c:232
-msgid "Right edge"
-msgstr "Beira dereita"
-
-#: src/frames.c:232
-msgid "Right window edge width"
-msgstr "Anchura da beira dereita da fiestra"
-
-#: src/frames.c:233
-msgid "Bottom edge"
-msgstr "Beira inferior"
-
-#: src/frames.c:233
-msgid "Bottom window edge height"
-msgstr "Anchura da beira inferior da fiestra"
-
-#: src/frames.c:235
-msgid "Title border"
-msgstr "Bordo do t�tulo"
-
-#: src/frames.c:235
-msgid "Border around title area"
-msgstr "Bordo arredor da �rea do t�tulo"
-
-#: src/frames.c:236
-msgid "Text border"
-msgstr "Bordo do texto"
-
-#: src/frames.c:236
-msgid "Border around window title text"
-msgstr "Bordo arredor do texto de t�tulo da fiestra"
-
-#: src/frames.c:238
-msgid "Spacer padding"
-msgstr "Recheo do espaciador"
-
-#: src/frames.c:238
-msgid "Padding on either side of spacer"
-msgstr "Recheo a calquera lado do espaciador"
-
-#: src/frames.c:239
-msgid "Spacer width"
-msgstr "Anchura do espaciador"
-
-#: src/frames.c:239
-msgid "Width of spacer"
-msgstr "Anchura do espaciador"
-
-#: src/frames.c:240
-msgid "Spacer height"
-msgstr "Altura do espaciador"
-
-#: src/frames.c:240
-msgid "Height of spacer"
-msgstr "Altura do espaciador"
-
-#. same as right_width left_width by default
-#: src/frames.c:243
-msgid "Right inset"
-msgstr "Inserci�n dereita"
-
-#: src/frames.c:243
-msgid "Distance of buttons from right edge of frame"
-msgstr "Distancia dos bot�ns desde a beira dereita do cadro"
-
-#: src/frames.c:244
-msgid "Left inset"
-msgstr "Inserci�n esquerda"
-
-#: src/frames.c:244
-msgid "Distance of menu button from left edge of frame"
-msgstr "Distancia do bot�n de men� desde a beira esquerda do cadro"
-
-#: src/frames.c:246
-msgid "Button width"
-msgstr "Anchura dos bot�ns"
-
-#: src/frames.c:246
-msgid "Width of buttons"
-msgstr "Anchura dos bot�ns"
-
-#: src/frames.c:247
-msgid "Button height"
-msgstr "Altura dos bot�ns"
-
-#: src/frames.c:247
-msgid "Height of buttons"
-msgstr "Altura dos bot�ns"
-
-#: src/frames.c:249
-msgid "Button border"
-msgstr "Bordo dos bot�ns"
-
-#: src/frames.c:249
-msgid "Border around buttons"
-msgstr "Bordo arredor dos bot�ns"
-
-#: src/frames.c:250
-msgid "Inner button border"
-msgstr "Bordo interior dos bot�ns"
-
-#: src/frames.c:250
-msgid "Border around the icon inside buttons"
-msgstr "Bordo arredor do icono dentro dos bot�ns"
-
-#: src/frames.c:891
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Pechar Fiestra"
 
-#: src/frames.c:894
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Men� da Fiestra"
 
-#: src/frames.c:897
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimizar Fiestra"
 
-#: src/frames.c:900
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maximizar Fiestra"
 
-#: src/frames.c:903
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Restaurar Fiestra"
 
-#: src/keybindings.c:215
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -176,67 +63,110 @@ msgstr ""
 "Alg�n outro programa est� usando xa a tecla %s cos modificadores %x como "
 "asignaci�n (binding)\n"
 
-#: src/menu.c:48
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
+#, fuzzy, c-format
+msgid "Failed to restart: %s\n"
+msgstr "Fallo ao interpretar o ficheiro de sesi�n gardada: %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Pechar"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimizar"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "Resta_urar"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Enrolar"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr " Dese_nrolar"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Mo_ver"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_Redimensionar"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Po�er en _Todos os Escritorios"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Namais _Neste Escritorio"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Namais no escritorio %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Mover ao escritorio %s%d"
 
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr ""
+
+#: src/prefs.c:415
+#, c-format
+msgid "GConf key '%s' is set to an invalid value"
+msgstr ""
+
+#: src/prefs.c:487
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr ""
+
+#: src/prefs.c:524
+#, c-format
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr ""
+
+#: src/prefs.c:550
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
+msgstr ""
+
 #: src/screen.c:174
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A pantalla %d no display '%s' non � v�lida\n"
 
-#: src/screen.c:189
+#: src/screen.c:190
 #, c-format
 msgid "Screen %d on display '%s' already has a window manager\n"
 msgstr "A pantalla %d no display '%s' ten xa un xestor de fiestras\n"
 
+#: src/screen.c:268
+#, fuzzy, c-format
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "Non se puido crear o directorio '%s': %s\n"
+
 #: src/session.c:760 src/session.c:767
 #, c-format
 msgid "Could not create directory '%s': %s\n"
@@ -286,19 +216,340 @@ msgstr "Atributo %s desco
 msgid "Unknown element %s"
 msgstr "Elemento %s desco�ecido"
 
-#. someone is on crack
-#: src/window.c:2939
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"A fiestra %s establece a anchura m�xima en %d, menor que a anchura m�nima %"
-"d, desactivando o redimensionamento\n"
 
-#. another cracksmoker
-#: src/window.c:2949
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"A fiestra %s establece a altura m�xima en %d, menor que a altura m�nima %d, "
-"desactivando o redimensionamento\n"
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Non se puido crear o directorio '%s': %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Fallo ao ler o ficheiro de sesi�n gardada '%s': %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
+msgstr ""
+
+#: src/xprops.c:53
+#, c-format
+msgid ""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
+msgstr ""
+
+#: src/xprops.c:281
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr ""
+
+#~ msgid "Left edge"
+#~ msgstr "Beira esquerda"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Anchura da beira esquerda da fiestra"
+
+#~ msgid "Right edge"
+#~ msgstr "Beira dereita"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Anchura da beira dereita da fiestra"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Beira inferior"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Anchura da beira inferior da fiestra"
+
+#~ msgid "Title border"
+#~ msgstr "Bordo do t�tulo"
+
+#~ msgid "Border around title area"
+#~ msgstr "Bordo arredor da �rea do t�tulo"
+
+#~ msgid "Text border"
+#~ msgstr "Bordo do texto"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Bordo arredor do texto de t�tulo da fiestra"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Recheo do espaciador"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Recheo a calquera lado do espaciador"
+
+#~ msgid "Spacer width"
+#~ msgstr "Anchura do espaciador"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Anchura do espaciador"
+
+#~ msgid "Spacer height"
+#~ msgstr "Altura do espaciador"
+
+#~ msgid "Height of spacer"
+#~ msgstr "Altura do espaciador"
+
+#~ msgid "Right inset"
+#~ msgstr "Inserci�n dereita"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Distancia dos bot�ns desde a beira dereita do cadro"
+
+#~ msgid "Left inset"
+#~ msgstr "Inserci�n esquerda"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Distancia do bot�n de men� desde a beira esquerda do cadro"
+
+#~ msgid "Button width"
+#~ msgstr "Anchura dos bot�ns"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Anchura dos bot�ns"
+
+#~ msgid "Button height"
+#~ msgstr "Altura dos bot�ns"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Altura dos bot�ns"
+
+#~ msgid "Button border"
+#~ msgstr "Bordo dos bot�ns"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Bordo arredor dos bot�ns"
+
+#~ msgid "Inner button border"
+#~ msgstr "Bordo interior dos bot�ns"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Bordo arredor do icono dentro dos bot�ns"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "A fiestra %s establece a anchura m�xima en %d, menor que a anchura m�nima "
+#~ "%d, desactivando o redimensionamento\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "A fiestra %s establece a altura m�xima en %d, menor que a altura m�nima %"
+#~ "d, desactivando o redimensionamento\n"
diff --git a/po/lv.po b/po/lv.po
index 18e1157c6..98bc6be86 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity for latvian\n"
-"POT-Creation-Date: 2002-01-25 07:26-0500\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-01-27 22:50+0200\n"
 "Last-Translator: Peteris Krisjanis <peteris.krisjanis@ttc.lv>\n"
 "Language-Team: Latvian <ll10nt@ttc.lv>\n"
@@ -13,14 +13,10 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
-msgid ""
-"Failed to open X Window System display '%s'\n"
-""
-msgstr ""
-"Nevarēja atvērt X Logu Sistēmas displeju '%s'\n"
-""
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Nevarēja atvērt X Logu Sistēmas displeju '%s'\n"
 
 #: src/errors.c:93
 #, c-format
@@ -28,357 +24,185 @@ msgid ""
 "Lost connection to the display '%s';\n"
 "most likely the X server was shut down or you killed/destroyed\n"
 "the window manager.\n"
-""
 msgstr ""
 "Zaudēju savienojumu ar displeju  '%s';\n"
 "ļoti iespējams, X serveris ir ticis izslēgts vai arī jūs apturējāt\n"
 "logu pārvaldnieku.\n"
-""
 
 #: src/errors.c:100
 #, c-format
-msgid ""
-"Fatal IO error %d (%s) on display '%s'.\n"
-""
-msgstr ""
-"Fatāla IO kļūda %d (%s) displejā '%s'.\n"
-""
+msgid "Fatal IO error %d (%s) on display '%s'.\n"
+msgstr "Fatāla IO kļūda %d (%s) displejā '%s'.\n"
 
-#: src/frames.c:175
-msgid "Left edge"
-msgstr "Kreisā mala"
-
-#: src/frames.c:175
-msgid "Left window edge width"
-msgstr "Loga kreisās malas platums"
-
-#: src/frames.c:176
-msgid "Right edge"
-msgstr "Labā mala"
-
-#: src/frames.c:176
-msgid "Right window edge width"
-msgstr "Loga labās malas platums"
-
-#: src/frames.c:177
-msgid "Bottom edge"
-msgstr "Apakšējā mala"
-
-#: src/frames.c:177
-msgid "Bottom window edge height"
-msgstr "Loga apakšējās malas augstums"
-
-#: src/frames.c:179
-msgid "Title border"
-msgstr "Virsraksta robeža"
-
-#: src/frames.c:179
-msgid "Border around title area"
-msgstr "Virsraksta apkārtējā robeža"
-
-#: src/frames.c:180
-msgid "Text border"
-msgstr "Teksta robeža"
-
-#: src/frames.c:180
-msgid "Border around window title text"
-msgstr "Apmale ap loga virsraksta tekstu"
-
-#: src/frames.c:182
-msgid "Spacer padding"
-msgstr "Sadalītāja papildinājums"
-
-#: src/frames.c:182
-msgid "Padding on either side of spacer"
-msgstr "Sadalītāja papildinājums"
-
-#: src/frames.c:183
-msgid "Spacer width"
-msgstr "Sadalītāja platums"
-
-#: src/frames.c:183
-msgid "Width of spacer"
-msgstr "Sadalītāja platums"
-
-#: src/frames.c:184
-msgid "Spacer height"
-msgstr "Sadalītāja augstums"
-
-#: src/frames.c:184
-msgid "Height of spacer"
-msgstr "Sadalītāja augstums"
-
-#. same as right_width left_width by default
-#: src/frames.c:187
-msgid "Right inset"
-msgstr "Kreisais ielaidums"
-
-#: src/frames.c:187
-msgid "Distance of buttons from right edge of frame"
-msgstr "Pogu attālums no rāmja labās malas"
-
-#: src/frames.c:188
-msgid "Left inset"
-msgstr "Kreisais ielaidums"
-
-#: src/frames.c:188
-msgid "Distance of menu button from left edge of frame"
-msgstr "Izvēlnes pogas attālums no rāmja kreisās malas"
-
-#: src/frames.c:190
-msgid "Button width"
-msgstr "Pogu platums"
-
-#: src/frames.c:190
-msgid "Width of buttons"
-msgstr "Pogu platums"
-
-#: src/frames.c:191
-msgid "Button height"
-msgstr "Pogu augstums"
-
-#: src/frames.c:191
-msgid "Height of buttons"
-msgstr "Pogu augstums"
-
-#: src/frames.c:193
-msgid "Button border"
-msgstr "Pogas apmale"
-
-#: src/frames.c:193
-msgid "Border around buttons"
-msgstr "Apmale apkārt pogām"
-
-#: src/frames.c:194
-msgid "Inner button border"
-msgstr "Iekšējā pogas apmale"
-
-#: src/frames.c:194
-msgid "Border around the icon inside buttons"
-msgstr "Apmale apkārt ikonai iekšpus pogām"
-
-#: src/frames.c:658
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Aizvērt Logu"
 
-#: src/frames.c:661
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Loga Izvēlne"
 
-#: src/frames.c:664
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Samazināt Logu"
 
-#: src/frames.c:667
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Palielināt Logu"
 
-#: src/frames.c:670
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Atjaunot Logu"
 
 #: src/keybindings.c:228
 #, c-format
 msgid ""
-"Some other program is already using the key %s with modifiers %x as a binding\n"
-""
+"Some other program is already using the key %s with modifiers %x as a "
+"binding\n"
 msgstr ""
 "Kāda cita programma jau lieto taustiņu %s ar modifcētājiem %x kā sasaisti\n"
-""
 
-#: src/main.c:252
+#: src/main.c:227
 #, c-format
-msgid ""
-"Failed to restart: %s\n"
-""
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
-"Nevarēja pārstartēt: %s\n"
-""
 
-#: src/menu.c:48
+#: src/main.c:273
+#, c-format
+msgid "Failed to restart: %s\n"
+msgstr "Nevarēja pārstartēt: %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Aizvērt"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Samazināt"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "_Palielināt"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Atjaunot"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "Ē_not"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "_Atēnot"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "_Pārvietot"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_Mainīt"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Uzstādīt uz visām d_arba virsmām"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Tikai uz Šīs Darba vie_tas"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Tikai uz darba virsmas %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Pārvietot uz darba virsmas %s%d"
 
-#: src/prefs.c:264
-#: src/prefs.c:280
-#: src/prefs.c:296
-#: src/prefs.c:312
-#: src/prefs.c:332
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
-msgid ""
-"GConf key \"%s\" is set to an invalid type\n"
-""
-msgstr ""
-"GConf taustiņš \"%s\" ir uzstādīts uz nepareizo tipu\n"
-""
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr "GConf taustiņš \"%s\" ir uzstādīts uz nepareizo tipu\n"
 
-#: src/prefs.c:365
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "GConf taustiņš '%s'ir uzstādīts uz nepareizo tipu"
 
-#: src/prefs.c:399
+#: src/prefs.c:487
 #, c-format
-msgid ""
-"Could not parse font description \"%s\" from GConf key %s\n"
-""
-msgstr ""
-"Nespēja parsēt fontu aprakstu \"%s\" no GConf taustiņa %s\n"
-""
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr "Nespēja parsēt fontu aprakstu \"%s\" no GConf taustiņa %s\n"
 
-#: src/prefs.c:436
+#: src/prefs.c:524
 #, c-format
-msgid ""
-"%d stored in GConf key %s is not a valid font size\n"
-""
-msgstr ""
-"Uz GConf atslēgu %s glabātajam %d nav pareizs fontu izmērs\n"
-""
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr "Uz GConf atslēgu %s glabātajam %d nav pareizs fontu izmērs\n"
 
-#: src/prefs.c:462
+#: src/prefs.c:550
 #, c-format
 msgid ""
-"%d stored in GConf key %s is not a reasonable number of workspaces, current maximum is %d\n"
-""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
 msgstr ""
-"Uz GConf atslēgu %s glabātais %d nesatur pieļaujamu darba virsmu skaitu, pašreizējais maksimums ir %d\n"
-""
+"Uz GConf atslēgu %s glabātais %d nesatur pieļaujamu darba virsmu skaitu, "
+"pašreizējais maksimums ir %d\n"
 
 #: src/screen.c:174
 #, c-format
-msgid ""
-"Screen %d on display '%s' is invalid\n"
-""
-msgstr ""
-"Displeja '%s' ekrāns %d  ir nepareizs\n"
-""
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Displeja '%s' ekrāns %d  ir nepareizs\n"
 
 #: src/screen.c:190
 #, c-format
-msgid ""
-"Screen %d on display '%s' already has a window manager\n"
-""
-msgstr ""
-"Displeja '%s' ekrānam %d  jau ir logu menedžeris\n"
-""
+msgid "Screen %d on display '%s' already has a window manager\n"
+msgstr "Displeja '%s' ekrānam %d  jau ir logu menedžeris\n"
 
 #: src/screen.c:268
 #, c-format
-msgid ""
-"Could not release screen %d on display '%s'\n"
-""
-msgstr ""
-"Nevarēja izlaist displeja '%s' ekrānu %d\n"
-""
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "Nevarēja izlaist displeja '%s' ekrānu %d\n"
 
-#: src/session.c:760
-#: src/session.c:767
+#: src/session.c:760 src/session.c:767
 #, c-format
-msgid ""
-"Could not create directory '%s': %s\n"
-""
-msgstr ""
-"Nevarēja izveidot direktoriju '%s': %s\n"
-""
+msgid "Could not create directory '%s': %s\n"
+msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
 
 #: src/session.c:777
 #, c-format
-msgid ""
-"Could not open session file '%s' for writing: %s\n"
-""
-msgstr ""
-"Nevarēja atvērt sesijas failu '%s' rakstīšanai: %s\n"
-""
+msgid "Could not open session file '%s' for writing: %s\n"
+msgstr "Nevarēja atvērt sesijas failu '%s' rakstīšanai: %s\n"
 
 #: src/session.c:909
 #, c-format
-msgid ""
-"Error writing session file '%s': %s\n"
-""
-msgstr ""
-"Kļūda ierakstot sesijas failu '%s': %s\n"
-""
+msgid "Error writing session file '%s': %s\n"
+msgstr "Kļūda ierakstot sesijas failu '%s': %s\n"
 
 #: src/session.c:914
 #, c-format
-msgid ""
-"Error closing session file '%s': %s\n"
-""
-msgstr ""
-"Kļūda aizverot sesijas failu '%s': %s\n"
-""
+msgid "Error closing session file '%s': %s\n"
+msgstr "Kļūda aizverot sesijas failu '%s': %s\n"
 
 #: src/session.c:988
 #, c-format
-msgid ""
-"Failed to read saved session file %s: %s\n"
-""
-msgstr ""
-"Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
-""
+msgid "Failed to read saved session file %s: %s\n"
+msgstr "Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
 
 #: src/session.c:1022
 #, c-format
-msgid ""
-"Failed to parse saved session file: %s\n"
-""
-msgstr ""
-"Kļūda parsējot saglabāto sesijas failu: %s\n"
-""
+msgid "Failed to parse saved session file: %s\n"
+msgstr "Kļūda parsējot saglabāto sesijas failu: %s\n"
 
 #: src/session.c:1060
 msgid "nested <window> tag"
 msgstr "ligzdots <loga> tags"
 
-#: src/session.c:1110
-#: src/session.c:1142
+#: src/session.c:1110 src/session.c:1142
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
@@ -393,41 +217,342 @@ msgstr "Nezināms atribūts %s <ģeogrāfijas> elementam"
 msgid "Unknown element %s"
 msgstr "Nezināms elements %s"
 
-#. someone is on crack
-#: src/window.c:3411
-#, c-format
-msgid ""
-"Window %s sets max width %d less than min width %d, disabling resize\n"
-""
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"Logs %s uzstāda maksimālo platumu %d mazāku kā minimālo platumu %d, atsēdzot izmainīšanu\n"
-""
 
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
-""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"Logs %s uzstāda maksimālo augstumu %d mazāku kā minimālo augstumu %d, atslēdzot izmainīšanu\n"
-""
 
 #: src/xprops.c:53
 #, c-format
 msgid ""
-"Window 0x%lx has property %s that was expected to have type %s format %d and actually has type %s format %d n_items %d\n"
-""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
 msgstr ""
-"Logam 0x%lx ir rekvizīts %s kam vajadzēja būt ar tipu %s formātu %d un īstenībā bija ar tipu %s formātu %d priekšmetiem (n_items) %d\n"
-""
+"Logam 0x%lx ir rekvizīts %s kam vajadzēja būt ar tipu %s formātu %d un "
+"īstenībā bija ar tipu %s formātu %d priekšmetiem (n_items) %d\n"
 
 #: src/xprops.c:281
 #, c-format
-msgid ""
-"Property %s on window 0x%lx contained invalid UTF-8\n"
-""
-msgstr ""
-"Loga 0x%lx Rekvizīts %s saturēja nepareizu UTF-8\n"
-""
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr "Loga 0x%lx Rekvizīts %s saturēja nepareizu UTF-8\n"
 
+#~ msgid "Left edge"
+#~ msgstr "Kreisā mala"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Loga kreisās malas platums"
+
+#~ msgid "Right edge"
+#~ msgstr "Labā mala"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Loga labās malas platums"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Apakšējā mala"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Loga apakšējās malas augstums"
+
+#~ msgid "Title border"
+#~ msgstr "Virsraksta robeža"
+
+#~ msgid "Border around title area"
+#~ msgstr "Virsraksta apkārtējā robeža"
+
+#~ msgid "Text border"
+#~ msgstr "Teksta robeža"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Apmale ap loga virsraksta tekstu"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Sadalītāja papildinājums"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Sadalītāja papildinājums"
+
+#~ msgid "Spacer width"
+#~ msgstr "Sadalītāja platums"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Sadalītāja platums"
+
+#~ msgid "Spacer height"
+#~ msgstr "Sadalītāja augstums"
+
+#~ msgid "Height of spacer"
+#~ msgstr "Sadalītāja augstums"
+
+#~ msgid "Right inset"
+#~ msgstr "Kreisais ielaidums"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Pogu attālums no rāmja labās malas"
+
+#~ msgid "Left inset"
+#~ msgstr "Kreisais ielaidums"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Izvēlnes pogas attālums no rāmja kreisās malas"
+
+#~ msgid "Button width"
+#~ msgstr "Pogu platums"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Pogu platums"
+
+#~ msgid "Button height"
+#~ msgstr "Pogu augstums"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Pogu augstums"
+
+#~ msgid "Button border"
+#~ msgstr "Pogas apmale"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Apmale apkārt pogām"
+
+#~ msgid "Inner button border"
+#~ msgstr "Iekšējā pogas apmale"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Apmale apkārt ikonai iekšpus pogām"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "Logs %s uzstāda maksimālo platumu %d mazāku kā minimālo platumu %d, "
+#~ "atsēdzot izmainīšanu\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "Logs %s uzstāda maksimālo augstumu %d mazāku kā minimālo augstumu %d, "
+#~ "atslēdzot izmainīšanu\n"
diff --git a/po/ms.po b/po/ms.po
index f3ce269ab..66666b2bf 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2,11 +2,10 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # 1. Hasbullah Bin Pit <sebol@ikhlas.com>, 2002.
 # 2. ??
-
 msgid ""
 msgstr ""
 "Project-Id-Version: Metacity 2.3.x\n"
-"POT-Creation-Date: 2002-01-23 04:46+0800\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-12-31 02:53+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai (Bahasa Melayu) <gabai-penyumbang@lists."
@@ -15,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gagal membuka paparan %s Sistem X Window\n"
@@ -36,136 +35,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Ralat IO fatal %d (%s) pada paparan '%s'.\n"
 
-#: src/frames.c:175
-msgid "Left edge"
-msgstr "Pinggir Kiri"
-
-#: src/frames.c:175
-msgid "Left window edge width"
-msgstr "Lebar pinggir tetingkap kiri"
-
-#: src/frames.c:176
-msgid "Right edge"
-msgstr "Pinggir Kanan"
-
-#: src/frames.c:176
-msgid "Right window edge width"
-msgstr "Lebar pinggir tetingkap kanan"
-
-#: src/frames.c:177
-msgid "Bottom edge"
-msgstr "Pinggir bawah"
-
-#: src/frames.c:177
-msgid "Bottom window edge height"
-msgstr "Tinggi pinggir tetingkap bawah"
-
-#: src/frames.c:179
-msgid "Title border"
-msgstr "Sempadan tajuk"
-
-#: src/frames.c:179
-msgid "Border around title area"
-msgstr "Sempadan sekeliling kawasan tajuk"
-
-#: src/frames.c:180
-msgid "Text border"
-msgstr "Sempadan teks"
-
-#: src/frames.c:180
-msgid "Border around window title text"
-msgstr "Sempadan sekeliling teks tajuk tetingkap"
-
-#: src/frames.c:182
-msgid "Spacer padding"
-msgstr "Padding ruangjarak"
-
-#: src/frames.c:182
-msgid "Padding on either side of spacer"
-msgstr "Padding pada kedua-dua belah ruangjarak"
-
-#: src/frames.c:183
-msgid "Spacer width"
-msgstr "Lebar ruangjarak"
-
-#: src/frames.c:183
-msgid "Width of spacer"
-msgstr "Lebar bagi ruangjarak"
-
-#: src/frames.c:184
-msgid "Spacer height"
-msgstr "Tinggi Ruangjarak"
-
-#: src/frames.c:184
-msgid "Height of spacer"
-msgstr "Tinggi bagi ruangjarak"
-
-#. same as right_width left_width by default
-#: src/frames.c:187
-msgid "Right inset"
-msgstr "Inset kanan"
-
-#: src/frames.c:187
-msgid "Distance of buttons from right edge of frame"
-msgstr "Jarak dari butang ke pinggir kanan bingkai"
-
-#: src/frames.c:188
-msgid "Left inset"
-msgstr "Inset kiri"
-
-#: src/frames.c:188
-msgid "Distance of menu button from left edge of frame"
-msgstr "Jarak dari butang menu ke pinggir kiri bingkai"
-
-#: src/frames.c:190
-msgid "Button width"
-msgstr "Lebar butang"
-
-#: src/frames.c:190
-msgid "Width of buttons"
-msgstr "Lebar bagi butang"
-
-#: src/frames.c:191
-msgid "Button height"
-msgstr "Tinggi butang"
-
-#: src/frames.c:191
-msgid "Height of buttons"
-msgstr "Tinggi bagi butang"
-
-#: src/frames.c:193
-msgid "Button border"
-msgstr "Sempadan butang"
-
-#: src/frames.c:193
-msgid "Border around buttons"
-msgstr "Sempadan sekeliling butang"
-
-#: src/frames.c:194
-msgid "Inner button border"
-msgstr "Sempadan dalaman butang"
-
-#: src/frames.c:194
-msgid "Border around the icon inside buttons"
-msgstr "Sempadan sekeliling ikon di dalam butang"
-
-#: src/frames.c:658
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Tutup Tetingkap"
 
-#: src/frames.c:661
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Menu Tetingkap"
 
-#: src/frames.c:664
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Miniatur Tetingkap"
 
-#: src/frames.c:667
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maksima tetingkap"
 
-#: src/frames.c:670
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Nyah Maksima Tetingkap"
 
@@ -179,84 +65,89 @@ msgstr ""
 "Terdaoat program lain yang sudah menggunakan kekukci %s dengan modifier %x "
 "sebagai binding\n"
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Gagal mengulanghidupkan: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Tutup"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Miniatur"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ksima"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Nyah maksima"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Suram"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "_NyahSuram"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Ge_rak"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_Ubahsaiz"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Letak pada Semu_a Ruangkerja"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "_Ikon pada Ruangkerja ini"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Hanya pada ruangkerja %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Pindah ke  ruangkerja %s%d"
 
-#: src/prefs.c:264 src/prefs.c:280 src/prefs.c:296 src/prefs.c:312
-#: src/prefs.c:332
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Kekunci GConf \"%s\" ditetapkan kepada jenis yang tidak sah\n"
 
-#: src/prefs.c:365
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "Kekunci GConf \"%s\" ditetapkan kepada nilai yang tidak sah"
 
-#: src/prefs.c:399
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Tak dapat menghantar huraian font \"%s\" daripada kekunci GConf %s\n"
 
-#: src/prefs.c:436
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr "%d yang disimpan pada kekunci GConf adalah saiz font tidak sah\n"
 
-#: src/prefs.c:462
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -329,22 +220,237 @@ msgstr "Atirbut tidak dikenali pada unsur <geometry>"
 msgid "Unknown element %s"
 msgstr "Unsur yang tidak dikenali %s"
 
-#. someone is on crack
-#: src/window.c:3411
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"Tetingkap %s menetapkan lebar max %d kurang daripasa lebar min, mematikan "
-"ubahsaiz\n"
 
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:350
+#, fuzzy
+msgid "bottom"
+msgstr "Kekal di bawah"
+
+#: src/theme.c:352
+#, fuzzy
+msgid "left"
+msgstr "Pilih"
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, fuzzy, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr "bilangan hujah salah pada spesifikasi kursor"
+
+#: src/theme.c:866
+#, fuzzy, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr "bilangan hujah salah pada spesifikasi kursor"
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, fuzzy, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr "%s:tak dapat stat fail \"%s\" pada direktori menu"
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "tak boleh menghantar warna \"%s\""
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "tak dapat memuatkan pixmap tekstur \"%s\":%s"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"Tetingkap %s menetapkan tinggi max %d kurang daripasa tinggi min, mematikan "
-"ubahsaiz\n"
 
 #: src/xprops.c:53
 #, c-format
@@ -360,6 +466,102 @@ msgstr ""
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 
+#~ msgid "Left edge"
+#~ msgstr "Pinggir Kiri"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Lebar pinggir tetingkap kiri"
+
+#~ msgid "Right edge"
+#~ msgstr "Pinggir Kanan"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Lebar pinggir tetingkap kanan"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Pinggir bawah"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Tinggi pinggir tetingkap bawah"
+
+#~ msgid "Title border"
+#~ msgstr "Sempadan tajuk"
+
+#~ msgid "Border around title area"
+#~ msgstr "Sempadan sekeliling kawasan tajuk"
+
+#~ msgid "Text border"
+#~ msgstr "Sempadan teks"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Sempadan sekeliling teks tajuk tetingkap"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Padding ruangjarak"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Padding pada kedua-dua belah ruangjarak"
+
+#~ msgid "Spacer width"
+#~ msgstr "Lebar ruangjarak"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Lebar bagi ruangjarak"
+
+#~ msgid "Spacer height"
+#~ msgstr "Tinggi Ruangjarak"
+
+#~ msgid "Height of spacer"
+#~ msgstr "Tinggi bagi ruangjarak"
+
+#~ msgid "Right inset"
+#~ msgstr "Inset kanan"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Jarak dari butang ke pinggir kanan bingkai"
+
+#~ msgid "Left inset"
+#~ msgstr "Inset kiri"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Jarak dari butang menu ke pinggir kiri bingkai"
+
+#~ msgid "Button width"
+#~ msgstr "Lebar butang"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Lebar bagi butang"
+
+#~ msgid "Button height"
+#~ msgstr "Tinggi butang"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Tinggi bagi butang"
+
+#~ msgid "Button border"
+#~ msgstr "Sempadan butang"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Sempadan sekeliling butang"
+
+#~ msgid "Inner button border"
+#~ msgstr "Sempadan dalaman butang"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Sempadan sekeliling ikon di dalam butang"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "Tetingkap %s menetapkan lebar max %d kurang daripasa lebar min, mematikan "
+#~ "ubahsaiz\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "Tetingkap %s menetapkan tinggi max %d kurang daripasa tinggi min, "
+#~ "mematikan ubahsaiz\n"
+
 #~ msgid "Error"
 #~ msgstr "Ralat"
 
@@ -510,9 +712,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "out of memory reading bitmap file \"%s\""
 #~ msgstr "kehausan memori ketika membaca fail bitmap \"%s\""
 
-#~ msgid "bad number of arguments in cursor specification"
-#~ msgstr "bilangan hujah salah pada spesifikasi kursor"
-
 #~ msgid "unknown builtin cursor name \"%s\""
 #~ msgstr "nama kursor dalaman tidak diketahui  \"%s\""
 
@@ -1019,9 +1218,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "could not load mask bitmap file \"%s\". Won't use mask"
 #~ msgstr "tak dapat memuatkanfail bitmap mask \"%s\". Tidak akan guna mask"
 
-#~ msgid "could not parse color \"%s\""
-#~ msgstr "tak boleh menghantar warna \"%s\""
-
 #~ msgid "could not allocate color \"%s\""
 #~ msgstr "tak dapat memperuntukkan warna \"%s\""
 
@@ -1128,9 +1324,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "out of memory while constructing directory menu %s"
 #~ msgstr "tak cukup memori semasa membina menu direktori %s"
 
-#~ msgid "%s:could not stat file \"%s\" in menu directory"
-#~ msgstr "%s:tak dapat stat fail \"%s\" pada direktori menu"
-
 #~ msgid "Commands"
 #~ msgstr "Arahan"
 
@@ -1247,9 +1440,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "image file \"%s\" used as texture could not be found."
 #~ msgstr "fail imej \"%s\" digunakan sebagai tekstur tak dijumpai."
 
-#~ msgid "could not load texture pixmap \"%s\":%s"
-#~ msgstr "tak dapat memuatkan pixmap tekstur \"%s\":%s"
-
 #~ msgid "library \"%s\" cound not be opened."
 #~ msgstr "Pustaka \"%s\" tak dapat dibuka."
 
@@ -1283,9 +1473,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "Keep on top"
 #~ msgstr "Kekal di atas"
 
-#~ msgid "Keep at bottom"
-#~ msgstr "Kekal di bawah"
-
 #, fuzzy
 #~ msgid "Hide Others"
 #~ msgstr "Abaikan 'Hide Others'"
@@ -1293,9 +1480,6 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 #~ msgid "Resize/Move"
 #~ msgstr "Ubahsaiz/Pindah"
 
-#~ msgid "Select"
-#~ msgstr "Pilih"
-
 #~ msgid "Attributes..."
 #~ msgstr "Atribut..."
 
diff --git a/po/no.po b/po/no.po
index 4fcd4901a..5e55a54a0 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 0.1\n"
-"POT-Creation-Date: 2002-02-02 01:29+0100\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-02-02 01:34+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (bokm�l) <i18n-no@lister.ping.uio.no>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under �pning av X Window System skjerm �%s�\n"
@@ -34,136 +34,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Fatal IU-feil %d (%s) p� skjerm �%s�.\n"
 
-#: src/frames.c:178
-msgid "Left edge"
-msgstr "Venstre kant"
-
-#: src/frames.c:178
-msgid "Left window edge width"
-msgstr "Bredde p� venstre vinduskant"
-
-#: src/frames.c:179
-msgid "Right edge"
-msgstr "H�yre kant"
-
-#: src/frames.c:179
-msgid "Right window edge width"
-msgstr "Bredde p� h�yde vinduskant"
-
-#: src/frames.c:180
-msgid "Bottom edge"
-msgstr "Nedre kant"
-
-#: src/frames.c:180
-msgid "Bottom window edge height"
-msgstr "H�yde p� nedre vinduskant"
-
-#: src/frames.c:182
-msgid "Title border"
-msgstr "Tittelkant"
-
-#: src/frames.c:182
-msgid "Border around title area"
-msgstr "Kant rundt tittelomr�det"
-
-#: src/frames.c:183
-msgid "Text border"
-msgstr "Tekstkant"
-
-#: src/frames.c:183
-msgid "Border around window title text"
-msgstr "Kant rundt teksten i vindustittelen"
-
-#: src/frames.c:185
-msgid "Spacer padding"
-msgstr "Mellomromsfyll"
-
-#: src/frames.c:185
-msgid "Padding on either side of spacer"
-msgstr "Fyll p� hver side av �spacer�"
-
-#: src/frames.c:186
-msgid "Spacer width"
-msgstr "Bredde p� mellomrom"
-
-#: src/frames.c:186
-msgid "Width of spacer"
-msgstr "Bredde for mellomrom"
-
-#: src/frames.c:187
-msgid "Spacer height"
-msgstr "H�yde p� mellomrom"
-
-#: src/frames.c:187
-msgid "Height of spacer"
-msgstr "H�yde p� mellomrom"
-
-#. same as right_width left_width by default
-#: src/frames.c:190
-msgid "Right inset"
-msgstr "H�yre innrykk"
-
-#: src/frames.c:190
-msgid "Distance of buttons from right edge of frame"
-msgstr "Avstand fra knapper til h�yre kant av rammen"
-
-#: src/frames.c:191
-msgid "Left inset"
-msgstr "Venstre innrykk"
-
-#: src/frames.c:191
-msgid "Distance of menu button from left edge of frame"
-msgstr "Avstand fra menyknapper til venstre kant av rammen"
-
-#: src/frames.c:193
-msgid "Button width"
-msgstr "Knappbredde"
-
-#: src/frames.c:193
-msgid "Width of buttons"
-msgstr "Bredde p� knapper"
-
-#: src/frames.c:194
-msgid "Button height"
-msgstr "Knapph�yde"
-
-#: src/frames.c:194
-msgid "Height of buttons"
-msgstr "H�yde p� knapper"
-
-#: src/frames.c:196
-msgid "Button border"
-msgstr "Knappekant"
-
-#: src/frames.c:196
-msgid "Border around buttons"
-msgstr "Kant rundt knappene"
-
-#: src/frames.c:197
-msgid "Inner button border"
-msgstr "Indre ramme rundt knapp"
-
-#: src/frames.c:197
-msgid "Border around the icon inside buttons"
-msgstr "Kant rundt ikonet inne i knapper"
-
-#: src/frames.c:699
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Lukk vindu"
 
-#: src/frames.c:702
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Vindumeny"
 
-#: src/frames.c:705
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimer vindu"
 
-#: src/frames.c:708
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maksimer vindu"
 
-#: src/frames.c:711
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Gjenopprett vindu"
 
@@ -176,84 +63,89 @@ msgstr ""
 "Et annet program bruker allerede n�kkelen %s med modifikatorer %x som "
 "binding\n"
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Feil under omstart: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Lukk"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimer"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ksimer"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Gjenopprett"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Skyggelegg"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "Fjer_n skygge"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "_Flytt"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "End_re st�rrelse"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Plasser p� _alle arbeidsomr�der"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Kun p� de_tte arbeidsomr�det"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Kun p� arbeidsomr�de %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Flytt til arbeidsomr�de %s%d"
 
-#: src/prefs.c:272 src/prefs.c:288 src/prefs.c:304 src/prefs.c:320
-#: src/prefs.c:340 src/prefs.c:356
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-n�kkel �%s� er satt til en ugyldig type\n"
 
-#: src/prefs.c:390
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "GConf-n�kkel �%s� er satt til en ugyldig verdi"
 
-#: src/prefs.c:424
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunne ikke tolke skriftbeskrivelsen �%s� fra GConf-n�kkel %s\n"
 
-#: src/prefs.c:461
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr "%d lagret i GConf-n�kkel %s er ikke en gyldig skriftst�rrelse\n"
 
-#: src/prefs.c:487
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -326,101 +218,240 @@ msgstr "Ukjent attributt %s p
 msgid "Unknown element %s"
 msgstr "Ukjent element %s"
 
-#: src/theme.c:378
+#: src/theme.c:348
+msgid "top"
+msgstr ""
+
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
 #, c-format
-msgid "Coordinate expression contains character '%c' which is not allowed"
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
+#, c-format
+msgid ""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Kunne ikke opprette katalog �%s�: %s\n"
+
+#: src/theme.c:1206
+#, fuzzy, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn �%c� som ikke er tillatt"
 
-#: src/theme.c:405
+#: src/theme.c:1233
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrykk inneholder flyttall �%s� som ikke kunne tolkes"
 
-#: src/theme.c:419
+#: src/theme.c:1247
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrykk inneholder heltall �%s� som ikke kunne tolkes"
 
-#: src/theme.c:524
+#: src/theme.c:1314
+#, fuzzy, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr "Koordinatuttrykket haddeen ukjent variabel �%s�"
+
+#: src/theme.c:1371
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forst�tt"
 
-#: src/theme.c:663 src/theme.c:673 src/theme.c:698
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"
 
-#: src/theme.c:706
+#: src/theme.c:1562
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrykket pr�ver � bruke mod-operator p� et flyttall"
 
-#: src/theme.c:754
-#, c-format
+#: src/theme.c:1619
+#, fuzzy, c-format
 msgid ""
-"Coordinate expression has an operator \"%c\" where an operand was expected"
+"Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator �%c� hvor en operand var ventet"
 
-#: src/theme.c:763
+#: src/theme.c:1628
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"
 
-#: src/theme.c:771
+#: src/theme.c:1636
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrykket sluttet med en operator i stedet for en operand"
 
-#: src/theme.c:781
+#: src/theme.c:1646
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
-msgstr "Koordinatuttrykket har en operator �%c� etter en operator �%c� og ingen operand mellom dem."
+msgstr ""
+"Koordinatuttrykket har en operator �%c� etter en operator �%c� og ingen "
+"operand mellom dem."
 
-#: src/theme.c:883
+#: src/theme.c:1765
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
-msgstr "Koordinatuttrykkets tolkeprosess overfl�t bufferen sin. Dette er virkelig en Metacity feil, men er du sikker p� at du trenger s� store uttrykk?"
+msgstr ""
+"Koordinatuttrykkets tolkeprosess overfl�t bufferen sin. Dette er virkelig en "
+"Metacity feil, men er du sikker p� at du trenger s� store uttrykk?"
 
-#: src/theme.c:912
+#: src/theme.c:1794
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"
 
-#: src/theme.c:927
-#, c-format
-msgid "Coordinate expression had unknown variable \"%s\""
+#: src/theme.c:1857
+#, fuzzy, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel �%s�"
 
-#: src/theme.c:984
+#: src/theme.c:1914
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en �pen parantes uten en avsluttende parantes"
 
-#: src/theme.c:995
+#: src/theme.c:1925
 msgid "Coordinate expression doesn't seem to have any operators or operands"
-msgstr "Koordinatuttrykket ser ikke ut til � ha noen operatorer eller operander"
+msgstr ""
+"Koordinatuttrykket ser ikke ut til � ha noen operatorer eller operander"
 
-#: src/theme.c:1163 src/theme.c:1187 src/theme.c:1209
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Tema inneholdt et uttrykk �%s��som resulterte i en feil: %s\n"
 
-#. someone is on crack
-#: src/window.c:3411
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
-msgstr ""
-"Vindu %s setter maks bredde %d mindre enn minimum bredde %d, deaktiverer "
-"endring av st�rrelse\n"
-
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:3376
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Feil under lesing av lagret sesjonsfil %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"Vindu %s setter maks h�yde %d mindre enn minimum h�yde %d, deaktiverer "
-"endring av st�rrelse\n"
 
 #: src/xprops.c:53
 #, c-format
@@ -435,3 +466,99 @@ msgstr ""
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Egenskap %s p� vindu 0x%lx inneholdt ugyldig UTF-8\n"
+
+#~ msgid "Left edge"
+#~ msgstr "Venstre kant"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Bredde p� venstre vinduskant"
+
+#~ msgid "Right edge"
+#~ msgstr "H�yre kant"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Bredde p� h�yde vinduskant"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Nedre kant"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "H�yde p� nedre vinduskant"
+
+#~ msgid "Title border"
+#~ msgstr "Tittelkant"
+
+#~ msgid "Border around title area"
+#~ msgstr "Kant rundt tittelomr�det"
+
+#~ msgid "Text border"
+#~ msgstr "Tekstkant"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Kant rundt teksten i vindustittelen"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Mellomromsfyll"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Fyll p� hver side av �spacer�"
+
+#~ msgid "Spacer width"
+#~ msgstr "Bredde p� mellomrom"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Bredde for mellomrom"
+
+#~ msgid "Spacer height"
+#~ msgstr "H�yde p� mellomrom"
+
+#~ msgid "Height of spacer"
+#~ msgstr "H�yde p� mellomrom"
+
+#~ msgid "Right inset"
+#~ msgstr "H�yre innrykk"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Avstand fra knapper til h�yre kant av rammen"
+
+#~ msgid "Left inset"
+#~ msgstr "Venstre innrykk"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Avstand fra menyknapper til venstre kant av rammen"
+
+#~ msgid "Button width"
+#~ msgstr "Knappbredde"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Bredde p� knapper"
+
+#~ msgid "Button height"
+#~ msgstr "Knapph�yde"
+
+#~ msgid "Height of buttons"
+#~ msgstr "H�yde p� knapper"
+
+#~ msgid "Button border"
+#~ msgstr "Knappekant"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Kant rundt knappene"
+
+#~ msgid "Inner button border"
+#~ msgstr "Indre ramme rundt knapp"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Kant rundt ikonet inne i knapper"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "Vindu %s setter maks bredde %d mindre enn minimum bredde %d, deaktiverer "
+#~ "endring av st�rrelse\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "Vindu %s setter maks h�yde %d mindre enn minimum h�yde %d, deaktiverer "
+#~ "endring av st�rrelse\n"
diff --git a/po/pt.po b/po/pt.po
index b92143135..eb8aeb1c0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0\n"
-"POT-Creation-Date: 2002-01-08 23:40+0000\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-01-08 23:52+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <none@none.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:156
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir ecr� Sistema Janelas X '%s'\n"
@@ -34,140 +34,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Erro IO fatal %d (%s) no ecr� '%s'.\n"
 
-#: src/frames.c:232
-msgid "Left edge"
-msgstr "Limite esquerdo"
-
-#: src/frames.c:232
-msgid "Left window edge width"
-msgstr "Largura do limite esquerdo da janela"
-
-#: src/frames.c:233
-msgid "Right edge"
-msgstr "Limite direito"
-
-#: src/frames.c:233
-msgid "Right window edge width"
-msgstr "Largura do limite direito da janela"
-
-#: src/frames.c:234
-msgid "Bottom edge"
-msgstr "Limite inferior"
-
-#: src/frames.c:234
-msgid "Bottom window edge height"
-msgstr "Largura do limite inferior da janela"
-
-#: src/frames.c:236
-msgid "Title border"
-msgstr "Margem t�tulo"
-
-#: src/frames.c:236
-msgid "Border around title area"
-msgstr "Margem � volta da �rea de t�tulo"
-
-#: src/frames.c:237
-msgid "Text border"
-msgstr "Margem de texto"
-
-#: src/frames.c:237
-msgid "Border around window title text"
-msgstr "Margem � volta do texto do t�tulo da janela"
-
-#: src/frames.c:239
-msgid "Spacer padding"
-msgstr "Espa�amento do ajuste"
-
-#: src/frames.c:239
-msgid "Padding on either side of spacer"
-msgstr "Espa�amento em ambos os lados do ajuste"
-
-#: src/frames.c:240
-msgid "Spacer width"
-msgstr "Largura ajuste"
-
-#: src/frames.c:240
-msgid "Width of spacer"
-msgstr "Largura do ajuste"
-
-#: src/frames.c:241
-msgid "Spacer height"
-msgstr "Altura ajuste"
-
-#: src/frames.c:241
-msgid "Height of spacer"
-msgstr "Altura do ajuste"
-
-#. same as right_width left_width by default
-#: src/frames.c:244
-msgid "Right inset"
-msgstr "Entrada direita"
-
-#: src/frames.c:244
-msgid "Distance of buttons from right edge of frame"
-msgstr "Dist�ncia dos bot�es da margem direita da moldura"
-
-#: src/frames.c:245
-msgid "Left inset"
-msgstr "Entrada esquerda"
-
-#: src/frames.c:245
-msgid "Distance of menu button from left edge of frame"
-msgstr "Dist�ncia dos bot�es da margem esquerda da moldura"
-
-#: src/frames.c:247
-msgid "Button width"
-msgstr "Largura bot�es"
-
-#: src/frames.c:247
-msgid "Width of buttons"
-msgstr "Largura dos bot�es"
-
-#: src/frames.c:248
-msgid "Button height"
-msgstr "Altura bot�es"
-
-#: src/frames.c:248
-msgid "Height of buttons"
-msgstr "Altura dos bot�es"
-
-#: src/frames.c:250
-msgid "Button border"
-msgstr "Margem bot�es"
-
-#: src/frames.c:250
-msgid "Border around buttons"
-msgstr "Margem � volta dos bot�es"
-
-#: src/frames.c:251
-msgid "Inner button border"
-msgstr "Margem interna bot�es"
-
-#: src/frames.c:251
-msgid "Border around the icon inside buttons"
-msgstr "Margem � volta do �cone dentro dos bot�es"
-
-#: src/frames.c:892
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Fechar Janela"
 
-#: src/frames.c:895
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Menu Janela"
 
-#: src/frames.c:898
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimizar Janela"
 
-#: src/frames.c:901
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maximizar Janela"
 
-#: src/frames.c:904
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Restaurar Janela"
 
-#: src/keybindings.c:215
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -176,84 +63,89 @@ msgstr ""
 "Outra aplica��o est� j� a utilizar a chave %s com modificadores %x como "
 "binding\n"
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Falha ao reiniciar: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "Fe_char"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimizar"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ximizar"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "Resta_urar"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Sombra"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "_N�o-sombra"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Mo_ver"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_Redimensionar"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Colocar em Todas as _�reas Trabalho"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Apenas Nesta �rea _Trabalho"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Apenas na �rea de trabalho %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Mover para �rea de trabalho %s%d"
 
-#: src/prefs.c:264 src/prefs.c:280 src/prefs.c:296 src/prefs.c:312
-#: src/prefs.c:332
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Chave GConf \"%s\" est� definida para um tipo inv�lido\n"
 
-#: src/prefs.c:365
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "Chave GConf '%s' est� definida para um valor inv�lido"
 
-#: src/prefs.c:399
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Incapaz de parsear descri��o de fonte \"%s\" da chave GConf %s\n"
 
-#: src/prefs.c:436
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr "%d armazenado na chave GConf %s n�o � um tamanho de fonte v�lido\n"
 
-#: src/prefs.c:462
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -326,22 +218,235 @@ msgstr "Atributo %s desconhecido no elemento de <geometria>"
 msgid "Unknown element %s"
 msgstr "Elemento %s desconhecido"
 
-#. someone is on crack
-#: src/window.c:3058
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"Janela %s define largura m�xima %d menor que largura m�nima %d, a "
-"desabilitar redimensionamento\n"
 
-#. another cracksmoker
-#: src/window.c:3068
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Incapaz de criar direct�rio '%s': %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Falha ao ler ficheiro de sess�o gravado %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"Janela %s define altura m�xima %d menor que altura m�nima %d, a desabilitar "
-"redimensionamento\n"
 
 #: src/xprops.c:53
 #, c-format
@@ -349,10 +454,106 @@ msgid ""
 "Window 0x%lx has property %s that was expected to have type %s format %d and "
 "actually has type %s format %d n_items %d\n"
 msgstr ""
-"Janela 0x%lx tem propriedade %s que se esperava ter tipo %s formato %d mas na "
-"verdade tem tipo %s formato %d n_itens %d\n"
+"Janela 0x%lx tem propriedade %s que se esperava ter tipo %s formato %d mas "
+"na verdade tem tipo %s formato %d n_itens %d\n"
 
 #: src/xprops.c:281
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Propriedade %s na janela 0x%lx continha UTF-8 inv�lido\n"
+
+#~ msgid "Left edge"
+#~ msgstr "Limite esquerdo"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Largura do limite esquerdo da janela"
+
+#~ msgid "Right edge"
+#~ msgstr "Limite direito"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Largura do limite direito da janela"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Limite inferior"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Largura do limite inferior da janela"
+
+#~ msgid "Title border"
+#~ msgstr "Margem t�tulo"
+
+#~ msgid "Border around title area"
+#~ msgstr "Margem � volta da �rea de t�tulo"
+
+#~ msgid "Text border"
+#~ msgstr "Margem de texto"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Margem � volta do texto do t�tulo da janela"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Espa�amento do ajuste"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Espa�amento em ambos os lados do ajuste"
+
+#~ msgid "Spacer width"
+#~ msgstr "Largura ajuste"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Largura do ajuste"
+
+#~ msgid "Spacer height"
+#~ msgstr "Altura ajuste"
+
+#~ msgid "Height of spacer"
+#~ msgstr "Altura do ajuste"
+
+#~ msgid "Right inset"
+#~ msgstr "Entrada direita"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Dist�ncia dos bot�es da margem direita da moldura"
+
+#~ msgid "Left inset"
+#~ msgstr "Entrada esquerda"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Dist�ncia dos bot�es da margem esquerda da moldura"
+
+#~ msgid "Button width"
+#~ msgstr "Largura bot�es"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Largura dos bot�es"
+
+#~ msgid "Button height"
+#~ msgstr "Altura bot�es"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Altura dos bot�es"
+
+#~ msgid "Button border"
+#~ msgstr "Margem bot�es"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Margem � volta dos bot�es"
+
+#~ msgid "Inner button border"
+#~ msgstr "Margem interna bot�es"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Margem � volta do �cone dentro dos bot�es"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "Janela %s define largura m�xima %d menor que largura m�nima %d, a "
+#~ "desabilitar redimensionamento\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "Janela %s define altura m�xima %d menor que altura m�nima %d, a "
+#~ "desabilitar redimensionamento\n"
diff --git a/po/ru.po b/po/ru.po
index 6062a2d51..e26fda453 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2001-10-14 16:17+0400\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-10-14 16:24+0400\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -12,12 +12,12 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:153
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 
-#: src/errors.c:92
+#: src/errors.c:93
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -25,270 +25,471 @@ msgid ""
 "the window manager.\n"
 msgstr ""
 
-#: src/errors.c:99
+#: src/errors.c:100
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:229
-msgid "Left edge"
-msgstr "����� ����"
-
-#: src/frames.c:229
-msgid "Left window edge width"
-msgstr ""
-
-#: src/frames.c:230
-msgid "Right edge"
-msgstr "������ ����"
-
-#: src/frames.c:230
-msgid "Right window edge width"
-msgstr ""
-
-#: src/frames.c:231
-msgid "Bottom edge"
-msgstr "������ ����"
-
-#: src/frames.c:231
-msgid "Bottom window edge height"
-msgstr ""
-
-#: src/frames.c:233
-msgid "Title border"
-msgstr "������� ���������"
-
-#: src/frames.c:233
-msgid "Border around title area"
-msgstr "������� ������ ������� ���������"
-
-#: src/frames.c:234
-msgid "Text border"
-msgstr "������� ������"
-
-#: src/frames.c:234
-msgid "Border around window title text"
-msgstr "������� ������ ������ ��������� ����"
-
-#: src/frames.c:236
-msgid "Spacer padding"
-msgstr ""
-
-#: src/frames.c:236
-msgid "Padding on either side of spacer"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Spacer width"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Width of spacer"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Spacer height"
-msgstr ""
-
-#: src/frames.c:238
-msgid "Height of spacer"
-msgstr ""
-
-#. same as right_width left_width by default
-#: src/frames.c:241
-msgid "Right inset"
-msgstr ""
-
-#: src/frames.c:241
-msgid "Distance of buttons from right edge of frame"
-msgstr ""
-
-#: src/frames.c:242
-msgid "Left inset"
-msgstr ""
-
-#: src/frames.c:242
-msgid "Distance of menu button from left edge of frame"
-msgstr "���������� �� ������ ���� �� ������ ���� �����"
-
-#: src/frames.c:244
-msgid "Button width"
-msgstr "������ ������"
-
-#: src/frames.c:244
-msgid "Width of buttons"
-msgstr "������ ������"
-
-#: src/frames.c:245
-msgid "Button height"
-msgstr "������ ������"
-
-#: src/frames.c:245
-msgid "Height of buttons"
-msgstr "������ ������"
-
-#: src/frames.c:247
-msgid "Button border"
-msgstr "������� ������"
-
-#: src/frames.c:247
-msgid "Border around buttons"
-msgstr "������� ������ ������"
-
-#: src/frames.c:248
-msgid "Inner button border"
-msgstr ""
-
-#: src/frames.c:248
-msgid "Border around the icon inside buttons"
-msgstr ""
-
-#: src/frames.c:883
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "������� ����"
 
-#: src/frames.c:886
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "���� ����"
 
-#: src/frames.c:889
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "�������������� ����"
 
-#: src/frames.c:892
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "��������������� ����"
 
-#: src/frames.c:895
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:203
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/menu.c:47
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
+#, fuzzy, c-format
+msgid "Failed to restart: %s\n"
+msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "�������"
 
-#: src/menu.c:48
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "��������������"
 
-#: src/menu.c:49
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "���������������"
 
-#: src/menu.c:50
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr ""
 
-#: src/menu.c:51
+#: src/menu.c:53
 msgid "_Shade"
 msgstr ""
 
-#: src/menu.c:52
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr ""
 
-#: src/menu.c:53
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "�����������"
 
-#: src/menu.c:54
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "�������� ������"
 
 #. separator
-#: src/menu.c:56
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "��������� �� ��� ������� �����"
 
-#: src/menu.c:57
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "������ �� ���� ������� �����"
 
-#: src/menu.c:260
-#, c-format
-msgid "Only on workspace _%d"
+#: src/menu.c:298
+#, fuzzy, c-format
+msgid "Only on workspace %s%d"
 msgstr "������ �� ������� ����� %d"
 
-#: src/menu.c:263
-#, c-format
-msgid "Move to workspace _%d"
+#: src/menu.c:301
+#, fuzzy, c-format
+msgid "Move to workspace %s%d"
 msgstr "����������� �� ������� ���� %d"
 
-#: src/screen.c:168
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr ""
+
+#: src/prefs.c:415
+#, c-format
+msgid "GConf key '%s' is set to an invalid value"
+msgstr ""
+
+#: src/prefs.c:487
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr ""
+
+#: src/prefs.c:524
+#, c-format
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr ""
+
+#: src/prefs.c:550
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
+msgstr ""
+
+#: src/screen.c:174
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr ""
 
-#: src/screen.c:183
+#: src/screen.c:190
 #, c-format
 msgid "Screen %d on display '%s' already has a window manager\n"
 msgstr ""
 
-#: src/session.c:751 src/session.c:758
+#: src/screen.c:268
+#, fuzzy, c-format
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "�� ������� ������� ������� \"%s\": %s\n"
+
+#: src/session.c:760 src/session.c:767
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "�� ������� ������� ������� \"%s\": %s\n"
 
-#: src/session.c:768
+#: src/session.c:777
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "�� ������� ������� ��� ������ ���� ������ \"%s\": %s\n"
 
-#: src/session.c:900
+#: src/session.c:909
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "������ ������ ����� ������ \"%s\": %s\n"
 
-#: src/session.c:905
+#: src/session.c:914
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "������ �������� ����� ������ \"%s\": %s\n"
 
-#: src/session.c:979
+#: src/session.c:988
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/session.c:1013
+#: src/session.c:1022
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr ""
 
-#: src/session.c:1051
+#: src/session.c:1060
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1101 src/session.c:1133
+#: src/session.c:1110 src/session.c:1142
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr ""
 
-#: src/session.c:1193
+#: src/session.c:1202
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr ""
 
-#: src/session.c:1213
+#: src/session.c:1222
 #, c-format
 msgid "Unknown element %s"
 msgstr "����������� ������� %s"
 
-#. someone is on crack
-#: src/window.c:2852
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
 
-#. another cracksmoker
-#: src/window.c:2862
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
 msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "�� ������� ������� ������� \"%s\": %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
+msgstr ""
+
+#: src/xprops.c:53
+#, c-format
+msgid ""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
+msgstr ""
+
+#: src/xprops.c:281
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr ""
+
+#~ msgid "Left edge"
+#~ msgstr "����� ����"
+
+#~ msgid "Right edge"
+#~ msgstr "������ ����"
+
+#~ msgid "Bottom edge"
+#~ msgstr "������ ����"
+
+#~ msgid "Title border"
+#~ msgstr "������� ���������"
+
+#~ msgid "Border around title area"
+#~ msgstr "������� ������ ������� ���������"
+
+#~ msgid "Text border"
+#~ msgstr "������� ������"
+
+#~ msgid "Border around window title text"
+#~ msgstr "������� ������ ������ ��������� ����"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "���������� �� ������ ���� �� ������ ���� �����"
+
+#~ msgid "Button width"
+#~ msgstr "������ ������"
+
+#~ msgid "Width of buttons"
+#~ msgstr "������ ������"
+
+#~ msgid "Button height"
+#~ msgstr "������ ������"
+
+#~ msgid "Height of buttons"
+#~ msgstr "������ ������"
+
+#~ msgid "Button border"
+#~ msgstr "������� ������"
+
+#~ msgid "Border around buttons"
+#~ msgstr "������� ������ ������"
diff --git a/po/sk.po b/po/sk.po
index 166df71d5..f66ea2de7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-01-30 16:19+0100\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-01-30 16:23CET\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepodarilo sa otvoriť displej X Window '%s'\n"
@@ -34,136 +34,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Kritická chyba V/V %d (%s) na displeji '%s'\n"
 
-#: src/frames.c:178
-msgid "Left edge"
-msgstr "Ľavý okraj"
-
-#: src/frames.c:178
-msgid "Left window edge width"
-msgstr "Šírka ľavého okraja okna"
-
-#: src/frames.c:179
-msgid "Right edge"
-msgstr "Pravý okraj"
-
-#: src/frames.c:179
-msgid "Right window edge width"
-msgstr "Šírka oravého okraja okna"
-
-#: src/frames.c:180
-msgid "Bottom edge"
-msgstr "Dolný okraj"
-
-#: src/frames.c:180
-msgid "Bottom window edge height"
-msgstr "Šírka oolného okraja okna"
-
-#: src/frames.c:182
-msgid "Title border"
-msgstr "Okraj okolo titulku"
-
-#: src/frames.c:182
-msgid "Border around title area"
-msgstr "Okraj okolo oblasti titulku"
-
-#: src/frames.c:183
-msgid "Text border"
-msgstr "Okraj okolo textu"
-
-#: src/frames.c:183
-msgid "Border around window title text"
-msgstr "Okraj okolo textu titulku okna"
-
-#: src/frames.c:185
-msgid "Spacer padding"
-msgstr "Medzera oddeľovača"
-
-#: src/frames.c:185
-msgid "Padding on either side of spacer"
-msgstr "Medzery na každej strane oddeľovača"
-
-#: src/frames.c:186
-msgid "Spacer width"
-msgstr "Šírka oddeľovača"
-
-#: src/frames.c:186
-msgid "Width of spacer"
-msgstr "Šírka oddeľovača"
-
-#: src/frames.c:187
-msgid "Spacer height"
-msgstr "Výška oddeľovača"
-
-#: src/frames.c:187
-msgid "Height of spacer"
-msgstr "Výška oddeľovača"
-
-#. same as right_width left_width by default
-#: src/frames.c:190
-msgid "Right inset"
-msgstr "Pravá vzdialenosť"
-
-#: src/frames.c:190
-msgid "Distance of buttons from right edge of frame"
-msgstr "Vzdialenosť tlačidiel od pravého okraja rámu"
-
-#: src/frames.c:191
-msgid "Left inset"
-msgstr "Ľavá vzdialenosť"
-
-#: src/frames.c:191
-msgid "Distance of menu button from left edge of frame"
-msgstr "Vzdialenosť tlačidiel od ľavého okraja rámu"
-
-#: src/frames.c:193
-msgid "Button width"
-msgstr "Šírka tlačidiel"
-
-#: src/frames.c:193
-msgid "Width of buttons"
-msgstr "Šírka tlačidiel"
-
-#: src/frames.c:194
-msgid "Button height"
-msgstr "Výška tlačidiel"
-
-#: src/frames.c:194
-msgid "Height of buttons"
-msgstr "Výška tlačidiel"
-
-#: src/frames.c:196
-msgid "Button border"
-msgstr "Okraj tlačidiel"
-
-#: src/frames.c:196
-msgid "Border around buttons"
-msgstr "Okraj okolo tlačidiel"
-
-#: src/frames.c:197
-msgid "Inner button border"
-msgstr "Vnútorný okraj tlačidiel"
-
-#: src/frames.c:197
-msgid "Border around the icon inside buttons"
-msgstr "Okraj okolo ikony na tlačidlách"
-
-#: src/frames.c:699
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "Zavrieť okno"
 
-#: src/frames.c:702
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "Menu okna"
 
-#: src/frames.c:705
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimalizovať okno"
 
-#: src/frames.c:708
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maximalizovať okno"
 
-#: src/frames.c:711
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Odmaximalizovať okno"
 
@@ -172,86 +59,92 @@ msgstr "Odmaximalizovať okno"
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
-msgstr "Iný program už používa kláves %s s modifikátormi %x ako klávesovú skratku.\n"
+msgstr ""
+"Iný program už používa kláves %s s modifikátormi %x ako klávesovú skratku.\n"
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Nepodarilo znovu spustiť: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_Zavrieť"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimalizovať"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ximalizovať"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Odmaximalizovať"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "Za_baliť"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "_Rozbaliť"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "_Presunúť"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "Zmeniť _veľkosť"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Na _všetky plochy"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Len na _tejto ploche"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Len na ploche %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Presunúť na plochu %s%d"
 
-#: src/prefs.c:272 src/prefs.c:288 src/prefs.c:304 src/prefs.c:320
-#: src/prefs.c:340 src/prefs.c:356
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf kľúč \"%s\" má nastavený neplatný typ\n"
 
-#: src/prefs.c:390
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "GConf kľúč \"%s\" má nastavený neplatnú hodnotu"
 
-#: src/prefs.c:424
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nepodarilo sa spracovať popis písma \"%s\" z GConf kľúča %s\n"
 
-#: src/prefs.c:461
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr "%d uložená v GConf kľúči %s nie je platná veľkosť písma\n"
 
-#: src/prefs.c:487
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -324,49 +217,136 @@ msgstr "Neznámy atribúť %s v elemente <geometry>"
 msgid "Unknown element %s"
 msgstr "Neznámy element %s"
 
-#: src/theme.c:378
+#: src/theme.c:348
+msgid "top"
+msgstr ""
+
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
 #, c-format
-msgid "Coordinate expression contains character '%c' which is not allowed"
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
+#, c-format
+msgid ""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Nepodarilo sa vytvoriť priečinok '%s': %s\n"
+
+#: src/theme.c:1206
+#, fuzzy, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Výraz umiestnenia obsahuje znak '%c', ktorý nie je povolený"
 
-#: src/theme.c:405
+#: src/theme.c:1233
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
-msgstr "Výraz umiestnenia obsahuje reálne číslo '%s', ktoré nie je možné spracovať."
+msgstr ""
+"Výraz umiestnenia obsahuje reálne číslo '%s', ktoré nie je možné spracovať."
 
-#: src/theme.c:419
+#: src/theme.c:1247
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
-msgstr "Výraz umiestnenia obsahuje celé čísl '%s', ktoré nie je možné spracovať."
+msgstr ""
+"Výraz umiestnenia obsahuje celé čísl '%s', ktoré nie je možné spracovať."
 
-#: src/theme.c:524
+#: src/theme.c:1314
+#, fuzzy, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr "Výraz umiestnenie obsahuje neznámu premennú \"%s\""
+
+#: src/theme.c:1371
 msgid "Coordinate expression was empty or not understood"
 msgstr "Výraz umiestnenia je prázdny alebo nerozpoznaný"
 
-#: src/theme.c:663 src/theme.c:673 src/theme.c:698
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
 msgid "Coordinate expression results in division by zero"
 msgstr "Výsledok výrazu umiestnenia je delenie nulou"
 
-#: src/theme.c:706
-msgid "Coordinate expression tries to use mod operator on a floating-point number"
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Výraz umiestnenia sa snaží použiť operátor modulo na reálne číslo"
 
-#: src/theme.c:754
-#, c-format
-msgid "Coordinate expression has an operator \"%c\" where an operand was expected"
+#: src/theme.c:1619
+#, fuzzy, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Výraz umiestnenie obsahuje operátor \"%c\" tam, kde sa očakáva operand"
 
-#: src/theme.c:763
+#: src/theme.c:1628
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Výraz umiestnenie obsahuje operand tam, kde sa očakáva operátor"
 
-#: src/theme.c:771
+#: src/theme.c:1636
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Výraz umiestnenie skončil operátorom namiesto operandom"
 
-#: src/theme.c:781
+#: src/theme.c:1646
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -375,51 +355,103 @@ msgstr ""
 "Výraz umiestnenie obsahuje operátor \"%c\" za operátorom \"%c\" bez "
 "operandov medzi nimi."
 
-#: src/theme.c:883
+#: src/theme.c:1765
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
 msgstr ""
-"Pri spracovaní výrazu umiestnenia bola pretečená pamäť. Toto je "
-"chyba Metacity, ale naozaj potrebujete taký veľký výraz?"
+"Pri spracovaní výrazu umiestnenia bola pretečená pamäť. Toto je chyba "
+"Metacity, ale naozaj potrebujete taký veľký výraz?"
 
-#: src/theme.c:912
+#: src/theme.c:1794
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Výraz umiestnenie obsahuje zatváraciu zátvorku bez otváracej zátvorky"
 
-#: src/theme.c:927
-#, c-format
-msgid "Coordinate expression had unknown variable \"%s\""
+#: src/theme.c:1857
+#, fuzzy, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Výraz umiestnenie obsahuje neznámu premennú \"%s\""
 
-#: src/theme.c:984
+#: src/theme.c:1914
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Výraz umiestnenie má otváraciu zátvorku bez zatváracej zátvorky"
 
-#: src/theme.c:995
+#: src/theme.c:1925
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Výraz umiestnenie asi neobsahuje žiadne operátory ani operandy"
 
-#: src/theme.c:1163 src/theme.c:1187 src/theme.c:1209
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Téma obsahuje výraz \"%s\", ktorý vrátil chybu: %s\n"
 
-#. someone is on crack
-#: src/window.c:3411
+#: src/theme.c:3376
 #, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
 msgstr ""
-"Okno %s nastavuje maximálnu šírku %d menšiu ako je minimálna šírka %d, "
-"vypínam zmenu veľkosťi\n"
 
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:3785 src/theme.c:3817
 #, c-format
-msgid "Window %s sets max height %d less than min height %d, disabling resize\n"
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Nepodarilo sa prečítať uložený súbor sedenia %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"Okno %s nastavuje maximálnu výšku %d menšiu ako je minimálna výška %d, "
-"vypínam zmenu veľkosťi\n"
 
 #: src/xprops.c:53
 #, c-format
@@ -435,3 +467,98 @@ msgstr ""
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Vlastnosť %s pre okno 0x%lx obsahuje neplatné UTF-8\n"
 
+#~ msgid "Left edge"
+#~ msgstr "Ľavý okraj"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Šírka ľavého okraja okna"
+
+#~ msgid "Right edge"
+#~ msgstr "Pravý okraj"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Šírka oravého okraja okna"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Dolný okraj"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "Šírka oolného okraja okna"
+
+#~ msgid "Title border"
+#~ msgstr "Okraj okolo titulku"
+
+#~ msgid "Border around title area"
+#~ msgstr "Okraj okolo oblasti titulku"
+
+#~ msgid "Text border"
+#~ msgstr "Okraj okolo textu"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Okraj okolo textu titulku okna"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Medzera oddeľovača"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Medzery na každej strane oddeľovača"
+
+#~ msgid "Spacer width"
+#~ msgstr "Šírka oddeľovača"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Šírka oddeľovača"
+
+#~ msgid "Spacer height"
+#~ msgstr "Výška oddeľovača"
+
+#~ msgid "Height of spacer"
+#~ msgstr "Výška oddeľovača"
+
+#~ msgid "Right inset"
+#~ msgstr "Pravá vzdialenosť"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Vzdialenosť tlačidiel od pravého okraja rámu"
+
+#~ msgid "Left inset"
+#~ msgstr "Ľavá vzdialenosť"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Vzdialenosť tlačidiel od ľavého okraja rámu"
+
+#~ msgid "Button width"
+#~ msgstr "Šírka tlačidiel"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Šírka tlačidiel"
+
+#~ msgid "Button height"
+#~ msgstr "Výška tlačidiel"
+
+#~ msgid "Height of buttons"
+#~ msgstr "Výška tlačidiel"
+
+#~ msgid "Button border"
+#~ msgstr "Okraj tlačidiel"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Okraj okolo tlačidiel"
+
+#~ msgid "Inner button border"
+#~ msgstr "Vnútorný okraj tlačidiel"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Okraj okolo ikony na tlačidlách"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "Okno %s nastavuje maximálnu šírku %d menšiu ako je minimálna šírka %d, "
+#~ "vypínam zmenu veľkosťi\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "Okno %s nastavuje maximálnu výšku %d menšiu ako je minimálna výška %d, "
+#~ "vypínam zmenu veľkosťi\n"
diff --git a/po/sv.po b/po/sv.po
index 1eae8a9ba..2607ff4be 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-01-31 05:01+0100\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-01-31 05:01+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:158
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Misslyckades med att �ppna X Window System-displayen \"%s\"\n"
@@ -36,136 +36,23 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "�desdigert IO-fel %d (%s) p� display \"%s\".\n"
 
-#: src/frames.c:178
-msgid "Left edge"
-msgstr "V�nsterkant"
-
-#: src/frames.c:178
-msgid "Left window edge width"
-msgstr "Bredd p� v�nster f�nsterkant"
-
-#: src/frames.c:179
-msgid "Right edge"
-msgstr "H�gerkant"
-
-#: src/frames.c:179
-msgid "Right window edge width"
-msgstr "Bredd p� h�ger f�nsterkant"
-
-#: src/frames.c:180
-msgid "Bottom edge"
-msgstr "Nederkant"
-
-#: src/frames.c:180
-msgid "Bottom window edge height"
-msgstr "H�jd p� nedre f�nsterkant"
-
-#: src/frames.c:182
-msgid "Title border"
-msgstr "Titelkant"
-
-#: src/frames.c:182
-msgid "Border around title area"
-msgstr "Ram runt titelomr�det"
-
-#: src/frames.c:183
-msgid "Text border"
-msgstr "Textram"
-
-#: src/frames.c:183
-msgid "Border around window title text"
-msgstr "Ram runt f�nstertiteln"
-
-#: src/frames.c:185
-msgid "Spacer padding"
-msgstr "Utfyllnadsmellanrum"
-
-#: src/frames.c:185
-msgid "Padding on either side of spacer"
-msgstr "Utfyllnad p� varje sida om utfyllare"
-
-#: src/frames.c:186
-msgid "Spacer width"
-msgstr "Utfyllnadsbredd"
-
-#: src/frames.c:186
-msgid "Width of spacer"
-msgstr "Bredd p� utfyllnad"
-
-#: src/frames.c:187
-msgid "Spacer height"
-msgstr "Utfyllnadsh�jd"
-
-#: src/frames.c:187
-msgid "Height of spacer"
-msgstr "H�jd p� utfyllnad"
-
-#. same as right_width left_width by default
-#: src/frames.c:190
-msgid "Right inset"
-msgstr "H�ger inf�llning"
-
-#: src/frames.c:190
-msgid "Distance of buttons from right edge of frame"
-msgstr "Avst�nd p� knappar fr�n h�gerkanten p� ramen"
-
-#: src/frames.c:191
-msgid "Left inset"
-msgstr "V�nster inf�llning"
-
-#: src/frames.c:191
-msgid "Distance of menu button from left edge of frame"
-msgstr "Avst�nd p� menyknapp fr�n v�nsterkanten p� ramen"
-
-#: src/frames.c:193
-msgid "Button width"
-msgstr "Knappbredd"
-
-#: src/frames.c:193
-msgid "Width of buttons"
-msgstr "Bredd p� knappar"
-
-#: src/frames.c:194
-msgid "Button height"
-msgstr "Knapph�jd"
-
-#: src/frames.c:194
-msgid "Height of buttons"
-msgstr "H�jd p� knappar"
-
-#: src/frames.c:196
-msgid "Button border"
-msgstr "Knappram"
-
-#: src/frames.c:196
-msgid "Border around buttons"
-msgstr "Ram runt knappar"
-
-#: src/frames.c:197
-msgid "Inner button border"
-msgstr "Inre knappram"
-
-#: src/frames.c:197
-msgid "Border around the icon inside buttons"
-msgstr "Ram runt ikonen inuti knappar"
-
-#: src/frames.c:699
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "St�ng f�nster"
 
-#: src/frames.c:702
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "F�nstermeny"
 
-#: src/frames.c:705
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "Minimera f�nster"
 
-#: src/frames.c:708
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "Maximera f�nster"
 
-#: src/frames.c:711
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "Avmaximera f�nster"
 
@@ -178,84 +65,89 @@ msgstr ""
 "Ett annat program anv�nder redan tangenten %s med modifierarna %x som en "
 "bindning\n"
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Misslyckades med att starta om: %s\n"
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr "_St�ng"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "_Minimera"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Ma_ximera"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "_Avmaximera"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Skugga"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "A_vskugga"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Fl_ytta"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "_�ndra storlek"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Placera p� _alla arbetsytor"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Endast p� _denna arbetsyta"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Endast p� arbetsyta %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Flytta till arbetsyta %s%d"
 
-#: src/prefs.c:272 src/prefs.c:288 src/prefs.c:304 src/prefs.c:320
-#: src/prefs.c:340 src/prefs.c:356
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "GConf-nyckeln \"%s\" �r satt till en ogiltig typ\n"
 
-#: src/prefs.c:390
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "GConf-nyckeln \"%s\" �r satt till ogiltigt v�rde"
 
-#: src/prefs.c:424
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Kunde inte tolka typsnittsbeskrivningen \"%s\" fr�n GConf-nyckeln %s\n"
 
-#: src/prefs.c:461
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr "%d lagrad i GConf-nyckeln %s �r inte en giltig typsnittsstorlek\n"
 
-#: src/prefs.c:487
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -328,51 +220,134 @@ msgstr "Ok
 msgid "Unknown element %s"
 msgstr "Ok�nt element %s"
 
-#: src/theme.c:378
+#: src/theme.c:348
+msgid "top"
+msgstr ""
+
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
 #, c-format
-msgid "Coordinate expression contains character '%c' which is not allowed"
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
+#, c-format
+msgid ""
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "Kunde inte skapa katalogen \"%s\": %s\n"
+
+#: src/theme.c:1206
+#, fuzzy, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrycket inneh�ller tecknet \"%c\" vilket inte �r till�tet"
 
-#: src/theme.c:405
+#: src/theme.c:1233
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrycket inneh�ller flyttalet \"%s\" som inte kunde tolkas"
 
-#: src/theme.c:419
+#: src/theme.c:1247
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrycket inneh�ller heltalet \"%s\" som inte kunde tolkas"
 
-#: src/theme.c:524
+#: src/theme.c:1314
+#, fuzzy, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr "Koordinatuttrycket hade en ok�nd variabel \"%s\""
+
+#: src/theme.c:1371
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrycket var tomt eller f�rstods inte"
 
-#: src/theme.c:663 src/theme.c:673 src/theme.c:698
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrycket resulterar i division med noll"
 
-#: src/theme.c:706
+#: src/theme.c:1562
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrycket f�rs�ker anv�nda mod-operator p� ett flyttal"
 
-#: src/theme.c:754
-#, c-format
+#: src/theme.c:1619
+#, fuzzy, c-format
 msgid ""
-"Coordinate expression has an operator \"%c\" where an operand was expected"
+"Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrycket har en operator \"%c\" d�r en operand f�rv�ntades"
 
-#: src/theme.c:763
+#: src/theme.c:1628
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrycket hade en operand d�r en operator f�rv�ntades"
 
-#: src/theme.c:771
+#: src/theme.c:1636
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrycket slutade med en operator ist�llet f�r en operand"
 
-#: src/theme.c:781
+#: src/theme.c:1646
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -381,7 +356,7 @@ msgstr ""
 "Koordinatuttrycket har en operator \"%c\" som f�ljer p� operatorn \"%c\" "
 "utan n�gon operand imellan"
 
-#: src/theme.c:883
+#: src/theme.c:1765
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -389,46 +364,97 @@ msgstr ""
 "Koordinatuttryckstolken spillde �ver dess buffert, det h�r �r egentligen ett "
 "fel i Metacity, men �r du s�ker p� att du beh�ver ett s� stort uttryck?"
 
-#: src/theme.c:912
+#: src/theme.c:1794
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Koordinatuttrycket hade en st�ngningsparentes utan n�gon �ppningsparentes"
 
-#: src/theme.c:927
-#, c-format
-msgid "Coordinate expression had unknown variable \"%s\""
+#: src/theme.c:1857
+#, fuzzy, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrycket hade en ok�nd variabel \"%s\""
 
-#: src/theme.c:984
+#: src/theme.c:1914
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Koordinatuttrycket hade en �ppningsparentes utan n�gon st�ngningsparentes"
 
-#: src/theme.c:995
+#: src/theme.c:1925
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Koordinatuttrycket verkar inte ha n�gra operatorer eller operander"
 
-#: src/theme.c:1163 src/theme.c:1187 src/theme.c:1209
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Temat inneh�ll ett uttryck \"%s\" som resulterade i ett fel: %s\n"
 
-#. someone is on crack
-#: src/window.c:3411
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
-msgstr ""
-"F�nstret %s st�ller in st�rsta bredden %d mindre �n minsta bredden %d, "
-"st�nger av storleks�ndring\n"
-
-#. another cracksmoker
-#: src/window.c:3421
+#: src/theme.c:3376
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "Misslyckades med att l�sa sparad sessionsfil %s: %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
-"F�nstret %s st�ller in st�rsta h�jden %d mindre �n minsta h�jden %d, st�nger "
-"av storleks�ndring\n"
 
 #: src/xprops.c:53
 #, c-format
@@ -443,3 +469,99 @@ msgstr ""
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr "Egenskap %s p� f�nster 0x%lx inneh�ll ogiltig UTF-8\n"
+
+#~ msgid "Left edge"
+#~ msgstr "V�nsterkant"
+
+#~ msgid "Left window edge width"
+#~ msgstr "Bredd p� v�nster f�nsterkant"
+
+#~ msgid "Right edge"
+#~ msgstr "H�gerkant"
+
+#~ msgid "Right window edge width"
+#~ msgstr "Bredd p� h�ger f�nsterkant"
+
+#~ msgid "Bottom edge"
+#~ msgstr "Nederkant"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "H�jd p� nedre f�nsterkant"
+
+#~ msgid "Title border"
+#~ msgstr "Titelkant"
+
+#~ msgid "Border around title area"
+#~ msgstr "Ram runt titelomr�det"
+
+#~ msgid "Text border"
+#~ msgstr "Textram"
+
+#~ msgid "Border around window title text"
+#~ msgstr "Ram runt f�nstertiteln"
+
+#~ msgid "Spacer padding"
+#~ msgstr "Utfyllnadsmellanrum"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "Utfyllnad p� varje sida om utfyllare"
+
+#~ msgid "Spacer width"
+#~ msgstr "Utfyllnadsbredd"
+
+#~ msgid "Width of spacer"
+#~ msgstr "Bredd p� utfyllnad"
+
+#~ msgid "Spacer height"
+#~ msgstr "Utfyllnadsh�jd"
+
+#~ msgid "Height of spacer"
+#~ msgstr "H�jd p� utfyllnad"
+
+#~ msgid "Right inset"
+#~ msgstr "H�ger inf�llning"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "Avst�nd p� knappar fr�n h�gerkanten p� ramen"
+
+#~ msgid "Left inset"
+#~ msgstr "V�nster inf�llning"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "Avst�nd p� menyknapp fr�n v�nsterkanten p� ramen"
+
+#~ msgid "Button width"
+#~ msgstr "Knappbredd"
+
+#~ msgid "Width of buttons"
+#~ msgstr "Bredd p� knappar"
+
+#~ msgid "Button height"
+#~ msgstr "Knapph�jd"
+
+#~ msgid "Height of buttons"
+#~ msgstr "H�jd p� knappar"
+
+#~ msgid "Button border"
+#~ msgstr "Knappram"
+
+#~ msgid "Border around buttons"
+#~ msgstr "Ram runt knappar"
+
+#~ msgid "Inner button border"
+#~ msgstr "Inre knappram"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "Ram runt ikonen inuti knappar"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "F�nstret %s st�ller in st�rsta bredden %d mindre �n minsta bredden %d, "
+#~ "st�nger av storleks�ndring\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "F�nstret %s st�ller in st�rsta h�jden %d mindre �n minsta h�jden %d, "
+#~ "st�nger av storleks�ndring\n"
diff --git a/po/tr.po b/po/tr.po
index 3af1e4d0f..fb3203362 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-01-06 07:52-0500\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2002-01-06 07:52-0500\n"
 "Last-Translator: G�rkem �etin <gorkem@gelecek.com.tr>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:156
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X window ekran� a��lamad�: '%s'\n"
@@ -34,224 +34,116 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr ""
 
-#: src/frames.c:232
-msgid "Left edge"
-msgstr ""
-
-#: src/frames.c:232
-msgid "Left window edge width"
-msgstr ""
-
-#: src/frames.c:233
-msgid "Right edge"
-msgstr ""
-
-#: src/frames.c:233
-msgid "Right window edge width"
-msgstr ""
-
-#: src/frames.c:234
-msgid "Bottom edge"
-msgstr ""
-
-#: src/frames.c:234
-msgid "Bottom window edge height"
-msgstr ""
-
-#: src/frames.c:236
-msgid "Title border"
-msgstr ""
-
-#: src/frames.c:236
-msgid "Border around title area"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Text border"
-msgstr ""
-
-#: src/frames.c:237
-msgid "Border around window title text"
-msgstr ""
-
-#: src/frames.c:239
-msgid "Spacer padding"
-msgstr ""
-
-#: src/frames.c:239
-msgid "Padding on either side of spacer"
-msgstr ""
-
-#: src/frames.c:240
-msgid "Spacer width"
-msgstr ""
-
-#: src/frames.c:240
-msgid "Width of spacer"
-msgstr ""
-
-#: src/frames.c:241
-msgid "Spacer height"
-msgstr ""
-
-#: src/frames.c:241
-msgid "Height of spacer"
-msgstr ""
-
-#. same as right_width left_width by default
-#: src/frames.c:244
-msgid "Right inset"
-msgstr ""
-
-#: src/frames.c:244
-msgid "Distance of buttons from right edge of frame"
-msgstr ""
-
-#: src/frames.c:245
-msgid "Left inset"
-msgstr ""
-
-#: src/frames.c:245
-msgid "Distance of menu button from left edge of frame"
-msgstr ""
-
-#: src/frames.c:247
-msgid "Button width"
-msgstr ""
-
-#: src/frames.c:247
-msgid "Width of buttons"
-msgstr ""
-
-#: src/frames.c:248
-msgid "Button height"
-msgstr ""
-
-#: src/frames.c:248
-msgid "Height of buttons"
-msgstr ""
-
-#: src/frames.c:250
-msgid "Button border"
-msgstr ""
-
-#: src/frames.c:250
-msgid "Border around buttons"
-msgstr ""
-
-#: src/frames.c:251
-msgid "Inner button border"
-msgstr ""
-
-#: src/frames.c:251
-msgid "Border around the icon inside buttons"
-msgstr ""
-
-#: src/frames.c:892
+#: src/frames.c:555
 msgid "Close Window"
 msgstr ""
 
-#: src/frames.c:895
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr ""
 
-#: src/frames.c:898
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr ""
 
-#: src/frames.c:901
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr ""
 
-#: src/frames.c:904
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:215
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/main.c:252
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr ""
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "_Close"
 msgstr ""
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr ""
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr ""
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr ""
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr ""
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr ""
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr ""
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr ""
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr ""
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr ""
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr ""
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr ""
 
-#: src/prefs.c:264 src/prefs.c:280 src/prefs.c:296 src/prefs.c:312
-#: src/prefs.c:332
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr ""
 
-#: src/prefs.c:365
+#: src/prefs.c:415
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr ""
 
-#: src/prefs.c:399
+#: src/prefs.c:487
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr ""
 
-#: src/prefs.c:436
+#: src/prefs.c:524
 #, c-format
 msgid "%d stored in GConf key %s is not a valid font size\n"
 msgstr ""
 
-#: src/prefs.c:462
+#: src/prefs.c:550
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -322,17 +214,234 @@ msgstr ""
 msgid "Unknown element %s"
 msgstr ""
 
-#. someone is on crack
-#: src/window.c:3048
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
 
-#. another cracksmoker
-#: src/window.c:3058
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, c-format
+msgid "Could not parse color \"%s\""
+msgstr ""
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr ""
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
 #: src/xprops.c:53
diff --git a/po/uk.po b/po/uk.po
index 5c5dfab6a..af8f53927 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2001-12-18 11:51+0200\n"
+"POT-Creation-Date: 2002-02-08 01:59-0500\n"
 "PO-Revision-Date: 2001-10-14 16:24+0400\n"
 "Last-Translator: Yuriy Syrota <rasta@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/display.c:155
+#: src/display.c:160
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "�� ������� צ������ ������� X Window System \"%s\"\n"
@@ -33,140 +33,27 @@ msgstr ""
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "�������� ������� �����-������ %d (%s) �� �����ŧ \"%s\".\n"
 
-#: src/frames.c:231
-msgid "Left edge"
-msgstr "���� ����"
-
-#: src/frames.c:231
-msgid "Left window edge width"
-msgstr "������ ̦���� ���� צ���"
-
-#: src/frames.c:232
-msgid "Right edge"
-msgstr "������ ����"
-
-#: src/frames.c:232
-msgid "Right window edge width"
-msgstr "������ ������� ���� צ���"
-
-#: src/frames.c:233
-msgid "Bottom edge"
-msgstr "���� ����"
-
-#: src/frames.c:233
-msgid "Bottom window edge height"
-msgstr "������ �������� ���� צ���"
-
-#: src/frames.c:235
-msgid "Title border"
-msgstr "���� ���������"
-
-#: src/frames.c:235
-msgid "Border around title area"
-msgstr "���� ������� Ħ����� ���������"
-
-#: src/frames.c:236
-msgid "Text border"
-msgstr "���� ������"
-
-#: src/frames.c:236
-msgid "Border around window title text"
-msgstr "���� ������� ������ ��������� צ���"
-
-#: src/frames.c:238
-msgid "Spacer padding"
-msgstr "������ ��������"
-
-#: src/frames.c:238
-msgid "Padding on either side of spacer"
-msgstr "������� � ���� ���Ҧ� ��������"
-
-#: src/frames.c:239
-msgid "Spacer width"
-msgstr "������ ��������"
-
-#: src/frames.c:239
-msgid "Width of spacer"
-msgstr "������ ��������"
-
-#: src/frames.c:240
-msgid "Spacer height"
-msgstr "������ ��������"
-
-#: src/frames.c:240
-msgid "Height of spacer"
-msgstr "������ ��������"
-
-#. same as right_width left_width by default
-#: src/frames.c:243
-msgid "Right inset"
-msgstr "������ צ�����"
-
-#: src/frames.c:243
-msgid "Distance of buttons from right edge of frame"
-msgstr "������æ� �� ������ צ� ������� ���� צ���"
-
-#: src/frames.c:244
-msgid "Left inset"
-msgstr "���� צ�����"
-
-#: src/frames.c:244
-msgid "Distance of menu button from left edge of frame"
-msgstr "�������� �� ������ ���� צ� ̦���� ���� צ���"
-
-#: src/frames.c:246
-msgid "Button width"
-msgstr "������ ������"
-
-#: src/frames.c:246
-msgid "Width of buttons"
-msgstr "������ ������"
-
-#: src/frames.c:247
-msgid "Button height"
-msgstr "������ ������"
-
-#: src/frames.c:247
-msgid "Height of buttons"
-msgstr "������ ������"
-
-#: src/frames.c:249
-msgid "Button border"
-msgstr "���� ������"
-
-#: src/frames.c:249
-msgid "Border around buttons"
-msgstr "���� ������� ������"
-
-#: src/frames.c:250
-msgid "Inner button border"
-msgstr "����Ҧ�Τ ���� ������"
-
-#: src/frames.c:250
-msgid "Border around the icon inside buttons"
-msgstr "���� ������� Ц�������� � ����æ"
-
-#: src/frames.c:891
+#: src/frames.c:555
 msgid "Close Window"
 msgstr "������� צ���"
 
-#: src/frames.c:894
+#: src/frames.c:558
 msgid "Window Menu"
 msgstr "���� צ���"
 
-#: src/frames.c:897
+#: src/frames.c:561
 msgid "Minimize Window"
 msgstr "��Φͦ������ צ���"
 
-#: src/frames.c:900
+#: src/frames.c:564
 msgid "Maximize Window"
 msgstr "�����ͦ������ צ���"
 
-#: src/frames.c:903
+#: src/frames.c:567
 msgid "Unmaximize Window"
 msgstr "�������ͦ������ צ���"
 
-#: src/keybindings.c:215
+#: src/keybindings.c:228
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -175,67 +62,110 @@ msgstr ""
 "����� �������� ��� ����������դ ���צ�� %s � ����Ʀ������� %x � ����Ԧ "
 "����'����\n"
 
-#: src/menu.c:48
+#: src/main.c:227
+#, c-format
+msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
+msgstr ""
+
+#: src/main.c:273
+#, fuzzy, c-format
+msgid "Failed to restart: %s\n"
+msgstr "�¦� ���̦������� ����������� ����� ������: %s\n"
+
+#: src/menu.c:49
 msgid "_Close"
 msgstr "�������"
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "��Φͦ������"
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "�����ͦ������"
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "_Unmaximize"
 msgstr "�������ͦ������"
 
-#: src/menu.c:52
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "��������"
 
-#: src/menu.c:53
+#: src/menu.c:54
 msgid "U_nshade"
 msgstr "����������"
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "����ͦ�����"
 
-#: src/menu.c:55
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "�ͦ���� ���ͦ�"
 
 #. separator
-#: src/menu.c:57
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "��ͦ����� �� �Ӧ ����ަ ͦ���"
 
-#: src/menu.c:58
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "���� �� ����� �������� ͦ�æ"
 
-#: src/menu.c:261
+#: src/menu.c:298
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "���� �� �������� ͦ�æ %s%d"
 
-#: src/menu.c:264
+#: src/menu.c:301
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "����ͦ����� �� ������ ͦ��� %s%d"
 
+#: src/prefs.c:281 src/prefs.c:297 src/prefs.c:313 src/prefs.c:329
+#: src/prefs.c:345 src/prefs.c:365 src/prefs.c:381
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr ""
+
+#: src/prefs.c:415
+#, c-format
+msgid "GConf key '%s' is set to an invalid value"
+msgstr ""
+
+#: src/prefs.c:487
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr ""
+
+#: src/prefs.c:524
+#, c-format
+msgid "%d stored in GConf key %s is not a valid font size\n"
+msgstr ""
+
+#: src/prefs.c:550
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
+msgstr ""
+
 #: src/screen.c:174
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "����� %d �� �����ŧ \"%s\" �� צ����\n"
 
-#: src/screen.c:189
+#: src/screen.c:190
 #, c-format
 msgid "Screen %d on display '%s' already has a window manager\n"
 msgstr "����� %d �� �����ŧ \"%s\" ��� ��� צ������� ���������\n"
 
+#: src/screen.c:268
+#, fuzzy, c-format
+msgid "Could not release screen %d on display '%s'\n"
+msgstr "�� ������� �������� ������� \"%s\": %s\n"
+
 #: src/session.c:760 src/session.c:767
 #, c-format
 msgid "Could not create directory '%s': %s\n"
@@ -285,19 +215,340 @@ msgstr "
 msgid "Unknown element %s"
 msgstr "��צ����� ������� %s"
 
-#. someone is on crack
-#: src/window.c:2939
-#, c-format
-msgid "Window %s sets max width %d less than min width %d, disabling resize\n"
+#: src/theme.c:348
+msgid "top"
 msgstr ""
-"����� %s ���������� ����������� ������ %d, ����� ͦΦ�����ϧ ������ %d, "
-"���������� �ͦ���� ���ͦ�\n"
 
-#. another cracksmoker
-#: src/window.c:2949
+#: src/theme.c:350
+msgid "bottom"
+msgstr ""
+
+#: src/theme.c:352
+msgid "left"
+msgstr ""
+
+#: src/theme.c:354
+msgid "right"
+msgstr ""
+
+#: src/theme.c:368
+#, c-format
+msgid "frame geometry does not specify \"%s\" dimension"
+msgstr ""
+
+#: src/theme.c:387
+#, c-format
+msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
+msgstr ""
+
+#: src/theme.c:738
+msgid "Gradients should have at least two colors"
+msgstr ""
+
+#: src/theme.c:828
 #, c-format
 msgid ""
-"Window %s sets max height %d less than min height %d, disabling resize\n"
+"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
+"where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"����� %s ���������� ����������� ������ %d, ����� ͦΦ�����ϧ ������ %d, "
-"���������� �ͦ���� ���ͦ�\n"
+
+#: src/theme.c:842
+#, c-format
+msgid ""
+"GTK color specification must have a close bracket after the state, e.g. gtk:"
+"fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
+msgstr ""
+
+#: src/theme.c:853
+#, c-format
+msgid "Did not understand state \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:866
+#, c-format
+msgid "Did not understand color component \"%s\" in color specification"
+msgstr ""
+
+#: src/theme.c:896
+#, c-format
+msgid ""
+"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
+"format"
+msgstr ""
+
+#: src/theme.c:907
+#, c-format
+msgid "Could not parse alpha value \"%s\" in blended color"
+msgstr ""
+
+#: src/theme.c:917
+#, c-format
+msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
+msgstr ""
+
+#: src/theme.c:956
+#, fuzzy, c-format
+msgid "Could not parse color \"%s\""
+msgstr "�� ������� �������� ������� \"%s\": %s\n"
+
+#: src/theme.c:1206
+#, c-format
+msgid "Coordinate expression contains character '%s' which is not allowed"
+msgstr ""
+
+#: src/theme.c:1233
+#, c-format
+msgid ""
+"Coordinate expression contains floating point number '%s' which could not be "
+"parsed"
+msgstr ""
+
+#: src/theme.c:1247
+#, c-format
+msgid "Coordinate expression contains integer '%s' which could not be parsed"
+msgstr ""
+
+#: src/theme.c:1314
+#, c-format
+msgid ""
+"Coordinate expression contained unknown operator at the start of this text: "
+"\"%s\""
+msgstr ""
+
+#: src/theme.c:1371
+msgid "Coordinate expression was empty or not understood"
+msgstr ""
+
+#: src/theme.c:1510 src/theme.c:1520 src/theme.c:1554
+msgid "Coordinate expression results in division by zero"
+msgstr ""
+
+#: src/theme.c:1562
+msgid ""
+"Coordinate expression tries to use mod operator on a floating-point number"
+msgstr ""
+
+#: src/theme.c:1619
+#, c-format
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
+msgstr ""
+
+#: src/theme.c:1628
+msgid "Coordinate expression had an operand where an operator was expected"
+msgstr ""
+
+#: src/theme.c:1636
+msgid "Coordinate expression ended with an operator instead of an operand"
+msgstr ""
+
+#: src/theme.c:1646
+#, c-format
+msgid ""
+"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
+"operand in between"
+msgstr ""
+
+#: src/theme.c:1765
+msgid ""
+"Coordinate expression parser overflowed its buffer, this is really a "
+"Metacity bug, but are you sure you need a huge expression like that?"
+msgstr ""
+
+#: src/theme.c:1794
+msgid "Coordinate expression had a close parenthesis with no open parenthesis"
+msgstr ""
+
+#: src/theme.c:1857
+#, c-format
+msgid "Coordinate expression had unknown variable or constant \"%s\""
+msgstr ""
+
+#: src/theme.c:1914
+msgid "Coordinate expression had an open parenthesis with no close parenthesis"
+msgstr ""
+
+#: src/theme.c:1925
+msgid "Coordinate expression doesn't seem to have any operators or operands"
+msgstr ""
+
+#: src/theme.c:2169 src/theme.c:2191 src/theme.c:2212
+#, c-format
+msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
+msgstr ""
+
+#: src/theme.c:3376
+#, c-format
+msgid ""
+"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this frame style"
+msgstr ""
+
+#: src/theme.c:3785 src/theme.c:3817
+#, c-format
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+
+#: src/theme.c:3868
+#, fuzzy, c-format
+msgid "Failed to load theme \"%s\": %s"
+msgstr "�¦� Ц� ��� ���������� ����������� ����� ������ \"%s\": %s\n"
+
+#: src/theme.c:4013
+#, c-format
+msgid "No <name> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4020
+#, c-format
+msgid "No <author> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4027
+#, c-format
+msgid "No <date> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4034
+#, c-format
+msgid "No <description> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4041
+#, c-format
+msgid "No <copyright> set for theme \"%s\""
+msgstr ""
+
+#: src/theme.c:4051
+#, c-format
+msgid ""
+"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
+"type=\"%s\" style_set=\"whatever\"/> element"
+msgstr ""
+
+#: src/theme.c:4073
+#, c-format
+msgid ""
+"<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
+"specified for this theme"
+msgstr ""
+
+#: src/theme.c:4424 src/theme.c:4484
+#, c-format
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
+msgstr ""
+
+#: src/theme.c:4432 src/theme.c:4492
+#, c-format
+msgid "Constant \"%s\" has already been defined"
+msgstr ""
+
+#: src/xprops.c:53
+#, c-format
+msgid ""
+"Window 0x%lx has property %s that was expected to have type %s format %d and "
+"actually has type %s format %d n_items %d\n"
+msgstr ""
+
+#: src/xprops.c:281
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr ""
+
+#~ msgid "Left edge"
+#~ msgstr "���� ����"
+
+#~ msgid "Left window edge width"
+#~ msgstr "������ ̦���� ���� צ���"
+
+#~ msgid "Right edge"
+#~ msgstr "������ ����"
+
+#~ msgid "Right window edge width"
+#~ msgstr "������ ������� ���� צ���"
+
+#~ msgid "Bottom edge"
+#~ msgstr "���� ����"
+
+#~ msgid "Bottom window edge height"
+#~ msgstr "������ �������� ���� צ���"
+
+#~ msgid "Title border"
+#~ msgstr "���� ���������"
+
+#~ msgid "Border around title area"
+#~ msgstr "���� ������� Ħ����� ���������"
+
+#~ msgid "Text border"
+#~ msgstr "���� ������"
+
+#~ msgid "Border around window title text"
+#~ msgstr "���� ������� ������ ��������� צ���"
+
+#~ msgid "Spacer padding"
+#~ msgstr "������ ��������"
+
+#~ msgid "Padding on either side of spacer"
+#~ msgstr "������� � ���� ���Ҧ� ��������"
+
+#~ msgid "Spacer width"
+#~ msgstr "������ ��������"
+
+#~ msgid "Width of spacer"
+#~ msgstr "������ ��������"
+
+#~ msgid "Spacer height"
+#~ msgstr "������ ��������"
+
+#~ msgid "Height of spacer"
+#~ msgstr "������ ��������"
+
+#~ msgid "Right inset"
+#~ msgstr "������ צ�����"
+
+#~ msgid "Distance of buttons from right edge of frame"
+#~ msgstr "������æ� �� ������ צ� ������� ���� צ���"
+
+#~ msgid "Left inset"
+#~ msgstr "���� צ�����"
+
+#~ msgid "Distance of menu button from left edge of frame"
+#~ msgstr "�������� �� ������ ���� צ� ̦���� ���� צ���"
+
+#~ msgid "Button width"
+#~ msgstr "������ ������"
+
+#~ msgid "Width of buttons"
+#~ msgstr "������ ������"
+
+#~ msgid "Button height"
+#~ msgstr "������ ������"
+
+#~ msgid "Height of buttons"
+#~ msgstr "������ ������"
+
+#~ msgid "Button border"
+#~ msgstr "���� ������"
+
+#~ msgid "Border around buttons"
+#~ msgstr "���� ������� ������"
+
+#~ msgid "Inner button border"
+#~ msgstr "����Ҧ�Τ ���� ������"
+
+#~ msgid "Border around the icon inside buttons"
+#~ msgstr "���� ������� Ц�������� � ����æ"
+
+#~ msgid ""
+#~ "Window %s sets max width %d less than min width %d, disabling resize\n"
+#~ msgstr ""
+#~ "����� %s ���������� ����������� ������ %d, ����� ͦΦ�����ϧ ������ %d, "
+#~ "���������� �ͦ���� ���ͦ�\n"
+
+#~ msgid ""
+#~ "Window %s sets max height %d less than min height %d, disabling resize\n"
+#~ msgstr ""
+#~ "����� %s ���������� ����������� ������ %d, ����� ͦΦ�����ϧ ������ %d, "
+#~ "���������� �ͦ���� ���ͦ�\n"
diff --git a/src/display.c b/src/display.c
index 2d6f4b2a3..4d1a02ccb 100644
--- a/src/display.c
+++ b/src/display.c
@@ -735,24 +735,21 @@ event_callback (XEvent   *event,
         {
           gboolean begin_move = FALSE;
           guint grab_mask;
+          gboolean unmodified;
 
           grab_mask = Mod1Mask;
           if (g_getenv ("METACITY_DEBUG_BUTTON_GRABS"))
             grab_mask |= ControlMask;
+
+          /* Two possible sources of an unmodified event; one is a
+           * client that's letting button presses pass through to the
+           * frame, the other is our focus_window_grab on unmodified
+           * button 1.  So for all such events we focus the window.
+           */
+          unmodified = (event->xbutton.state & grab_mask) == 0;
           
-          if ((event->xbutton.state & grab_mask) == 0 &&
-              event->xbutton.button != 1)
-            {
-              /* Two possible sources of an unmodified event;
-               * one is a client that's letting button presses
-               * pass through to the frame, the other is
-               * our focus_window_grab on unmodified button 1.
-               * In this case, we are not button 1, so we just
-               * ignore the whole thing.
-               */
-              ;
-            }
-          else if (event->xbutton.button == 1)
+          if (unmodified ||
+              event->xbutton.button == 1)
             {
               /* We always raise in click-to-focus, and
                * raise only if Alt is down for sloppy/mouse 
@@ -760,16 +757,15 @@ event_callback (XEvent   *event,
                * I'm not sure I have a rationale for this.
                */
               if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK ||
-                  ((event->xbutton.state & grab_mask) != 0))
+                  !unmodified)
                 meta_window_raise (window);
 
               meta_topic (META_DEBUG_FOCUS,
-                          "Focusing %s due to button 1 press (display.c)\n",
-                          window->desc);
+                          "Focusing %s due to unmodified button %d press (display.c)\n",
+                          window->desc, event->xbutton.button);
               meta_window_focus (window, event->xbutton.time);
 
-              if (!frame_was_receiver && 
-                  (event->xbutton.state & grab_mask) == 0)
+              if (!frame_was_receiver && unmodified)
                 {
                   /* This is from our synchronous grab since
                    * it has no modifiers and was on the client window
@@ -799,7 +795,7 @@ event_callback (XEvent   *event,
               /* you can move on alt-click but not on
                * the click-to-focus
                */
-              if ((event->xbutton.state & grab_mask) != 0)
+              if (!unmodified)
                 begin_move = TRUE;
             }
           else if (event->xbutton.button == 2)
@@ -1958,6 +1954,7 @@ meta_display_ungrab_window_buttons  (MetaDisplay *display,
 }
 
 /* Grab buttons we only grab while unfocused in click-to-focus mode */
+#define MAX_FOCUS_BUTTON 4
 void
 meta_display_grab_focus_window_button (MetaDisplay *display,
                                        Window       xwindow)
@@ -1972,7 +1969,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
   
   {
     int i = 1;
-    while (i < 2)
+    while (i < MAX_FOCUS_BUTTON)
       {
         meta_change_button_grab (display,
                                  xwindow,
@@ -1991,7 +1988,7 @@ meta_display_ungrab_focus_window_button (MetaDisplay *display,
 
   {
     int i = 1;
-    while (i < 2)
+    while (i < MAX_FOCUS_BUTTON)
       {
         meta_change_button_grab (display, xwindow,
                                  FALSE, TRUE, i, 0);
diff --git a/src/window.c b/src/window.c
index 50cddc0e7..0eb70e149 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1418,6 +1418,9 @@ meta_window_activate (MetaWindow *window,
                                          window->screen->active_workspace))
     meta_window_change_workspace (window,
                                   window->screen->active_workspace);
+  
+  if (window->shaded)
+    meta_window_unshade (window);
 
   if (window->minimized)
     meta_window_unminimize (window);