From bab3f733700f83ee676f513b82d4fd72024f3b68 Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@pobox.com>
Date: Mon, 10 Jun 2002 04:25:05 +0000
Subject: [PATCH] 2.3.987

2002-06-09  Havoc Pennington  <hp@pobox.com>

	* configure.in: 2.3.987
---
 ChangeLog    |    4 +
 configure.in |    2 +-
 po/az.po     |  434 +++++-----
 po/ca.po     |  443 +++++-----
 po/da.po     |  443 +++++-----
 po/de.po     |  443 +++++-----
 po/gl.po     |  436 +++++-----
 po/it.po     |  441 +++++-----
 po/ja.po     |  439 +++++-----
 po/ko.po     |  466 ++++++-----
 po/lv.po     |  438 +++++-----
 po/ms.po     |  438 +++++-----
 po/no.po     |  434 +++++-----
 po/pl.po     | 1457 +++++++++++++++++----------------
 po/pt.po     |  443 +++++-----
 po/ru.po     |  434 +++++-----
 po/sk.po     | 2201 ++++++++++++++++++++++++++------------------------
 po/sv.po     |    2 +-
 po/tr.po     |  433 +++++-----
 po/uk.po     |  438 +++++-----
 po/zh_TW.po  |  436 +++++-----
 21 files changed, 5870 insertions(+), 4835 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a122362c1..bf7cba0af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-09  Havoc Pennington  <hp@pobox.com>
+
+	* configure.in: 2.3.987
+
 2002-06-09  Havoc Pennington  <hp@pobox.com>
 
 	* src/delete.c (delete_ping_timeout_func): add G_IO_NVAL to watch
diff --git a/configure.in b/configure.in
index e040d980e..db84d0dc4 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_INIT(src/display.c)
 AM_CONFIG_HEADER(config.h)
 
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987 
-AM_INIT_AUTOMAKE(metacity, 2.3.610)
+AM_INIT_AUTOMAKE(metacity, 2.3.987)
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/po/az.po b/po/az.po
index dfd76ad60..e11e2aedf 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity VERSION\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2001-12-26 18:59GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: KBabel 0.9.5\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr ""
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Qeyd edilmiş iclas faylı darana bilmədi: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Window System displeyi '%s' açıla bilmədi\n"
@@ -88,7 +88,7 @@ msgstr "Pəncərəni Böyüt"
 msgid "Unmaximize Window"
 msgstr "Pəncərəni Yenidən Kiçilt"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -97,12 +97,12 @@ msgstr ""
 "Bəzi başqa proqramlar hazırda %2$x modifayrlı %1$s açarını bağlayıcı olaraq "
 "işlədirlər\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, fuzzy, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Qeyd edilmiş iclas faylı darana bilmədi: %s\n"
@@ -996,833 +996,882 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' displeyindəki %1$d ekranı hökmsüzdür\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
+
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "'%s' cərgəsi yaradıla bilmir: %s\n"
+
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "'%2$s' displeyindəki %1$d ekranı onsuz da pəncərə idarəçisinə malikdir\n"
 
-#: src/screen.c:370
+#: src/screen.c:510
 #, fuzzy, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "'%s' cərgəsi yaradıla bilmir: %s\n"
 
-#: src/session.c:267
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "'%s' cərgəsi yaradıla bilmir: %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "'%s' iclas faylı yazmaq üçün açıla bilmir: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "'%s' iclas faylı yazma xətası: %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "'%s' iclas faylı qapatma xətası: %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "'%s' iclas faylı oxunması bacarılmadı: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Qeyd edilmiş iclas faylı darana bilmədi: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, fuzzy, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "<geometry> elementində naməlum %s atributu"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "yuvalanmış <window> teqi"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "<geometry> elementində naməlum %s atributu"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Naməlum %s elementi"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "'%s' cərgəsi yaradıla bilmir: %s\n"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, fuzzy, c-format
 msgid "Could not parse color \"%s\""
 msgstr "'%s' cərgəsi yaradıla bilmir: %s\n"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, fuzzy, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "'%s' iclas faylı oxunması bacarılmadı: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, fuzzy, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, fuzzy, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, fuzzy, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, fuzzy, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, fuzzy, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, fuzzy, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, fuzzy, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, fuzzy, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, fuzzy, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, fuzzy, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, fuzzy, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, fuzzy, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, fuzzy, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, fuzzy, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, fuzzy, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, fuzzy, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, fuzzy, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, fuzzy, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "<window> elementində naməlum %s atributu"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, fuzzy, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "'%s' iclas faylı oxunması bacarılmadı: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Qeyd edilmiş iclas faylı darana bilmədi: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "'%s' iclas faylı oxunması bacarılmadı: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1843,6 +1892,15 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Pəncərə Menüsü"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 32fd1705b..579b0bce4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-05-19 00:00-0400\n"
 "Last-Translator: Softcatal� <tradgnome@softcatala.org>\n"
 "Language-Team: Softcatal� <tradgnome@softcatala.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "No s'ha pogut analitzar \"%s\" com a enter"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "No s'entenen els car�cters de cua \"%s\" a la cadena \"%s\""
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "�s impossible d'obtenir el nom de l'ordinador central: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "�s impossible d'obrir la pantalla del Sistema de la Finestra X '%s'\n"
@@ -93,7 +93,7 @@ msgstr "Maximitza la finestra"
 msgid "Unmaximize Window"
 msgstr "Desmaximitza la finestra"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -102,14 +102,14 @@ msgstr ""
 "Ja hi ha algun altre programa utilitzant la clau %s amb els modificadors %x "
 "com a vinculaci�\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "No s'ha trobat cap tema! Assegureu-vos que %s existeix i cont� els temes "
 "habituals."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Es impossible de reiniciar: %s\n"
@@ -1012,89 +1012,102 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La pantalla %d en la visualitzaci� '%s' no �s v�lida\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "La pantalla %d en la visualitzaci� '%s' ja t� un gestor de finestres\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "No s'ha pogut llan�ar la pantalla %d en la visualitzaci� '%s'\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "La pantalla %d en la visualitzaci� '%s' ja t� un gestor de finestres\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "No s'ha pogut llan�ar la pantalla %d en la visualitzaci� '%s'\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "No s'ha pogut crear el directori '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "No s'ha pogut obrir el fitxer de sessi� '%s' per a l'escriptura: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "S'ha produ�t un error en escriure el fitxer de sessi� '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "S'ha produ�t un error en tancar el fitxer de sessi� '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "�s impossible de llegir el fitxer de sessi� '%s' desat: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "�s impossible d'analitzar el fitxer de sessi� desat: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 "S'ha vist l'atribut <metacity_session> per� encara hi ha l'identificador de "
 "sessi�"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Atribut %s desconegut a l'element <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "marcador <window> imbricat"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Atribut %s desconegut a l'element <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Atribut %s desconegut a l'element <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Element %s desconegut"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, fuzzy, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1104,38 +1117,48 @@ msgstr ""
 "la \n"
 "finalitzaci� d'una aplicaci�: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "superior"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "inferior"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "esquerra"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "dreta"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "la geometria del marc no especifica la dimensi� \"%s\""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "la geometria del marc no especifica la dimensi� \"%s\" per al contorn \"%s\""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "la geometria del marc no especifica la dimensi� \"%s\""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Els gradients haurien de tenir almenys dos colors"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1144,7 +1167,7 @@ msgstr ""
 "L'especificaci� de color GTK ha de tenir l'estat entre claud�tors, p.e. gtk:"
 "fg[NORMAL] on NORMAL �s l'estat; no s'ha pogut analitzar \"%s\""
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1154,17 +1177,17 @@ msgstr ""
 "de l'estat, p.e. gtk:fg[NORMAL] on NORMAL �s l'estat; no s'ha pogut "
 "analitzar \"%s\""
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "No s'ent�n l'estat \"%s\" en l'especificaci� del color"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "No s'ent�n l'element de color \"%s\" en l'especificaci� del color"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1173,27 +1196,45 @@ msgstr ""
 "El format de barreja �s \"blend/bg_color/fg_color/alpha\", \"%s\" no "
 "s'ajusta al format"
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "No s'ha pogut analitzar el valor alfa \"%s\" en el color barrejat"
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "El valor alfa \"%s\" en el color barrejat no est� entre 0,0 i 1,0"
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"El format de barreja �s \"blend/bg_color/fg_color/alpha\", \"%s\" no "
+"s'ajusta al format"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "No s'ha pogut analitzar el valor alfa \"%s\" en el color barrejat"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "No s'ha pogut analitzar el color \"%s\""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "L'expressi� coordinada cont� el car�cter '%s', el qual no �s perm�s"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1202,12 +1243,12 @@ msgstr ""
 "L'expressi� coordinada cont� el n�mero '%s' de punt flotant el qual no es "
 "pot analitzar"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "L'expressi� coordinada cont� l'enter '%s' el qual no es pot analitzar"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1216,38 +1257,38 @@ msgstr ""
 "L'expressi� coordinada cont� un operador desconegut a l'inici d'aquest text: "
 "\"%s\""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "L'expressi� coordinada estava buida o no s'ha ent�s"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "L'expressi� coordinada d�na una divisi� per zero"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "L'expressi� coordinada intenta utilitzar l'operador de mode en un n�mero de "
 "punt flotant"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "L'expressi� coordinada t� un operador \"%s\" on hi hauria d'anar un operand"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "L'expressi� coordinada t� un operand on hi hauria d'anar un operador"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "L'expressi� coordinada ha finalitzat amb un operador en lloc d'un operand"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1256,7 +1297,7 @@ msgstr ""
 "L'expressi� coordinada t� un operador \"%c\" seguit de l'operador \"%c\" "
 "sense cap operand enmig"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1265,29 +1306,29 @@ msgstr ""
 "interm�dia, aquest �s un error de Metacity, per� esteu segur que necessiteu "
 "una expressi� tan rotunda com aquesta?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "L'expressi� coordinada t� un par�ntesi de tancament i cap d'obertura"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "L'expressi� coordinada t� una variable o constant desconeguda \"%s\""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "L'expressi� coordinada t� un par�ntesi d'obertura i cap de tancament"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "L'expressi� coordinada no sembla tenir cap operador o operand"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "El tema cont� una expressi� \"%s\" que d�na un error: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1296,7 +1337,7 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"qualsevol\"/> s'ha "
 "d'especificar per a aquest estil de marc"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
@@ -1304,37 +1345,37 @@ msgstr ""
 "No s'ha trobat <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style="
 "\"qualsevol\"/>"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "�s impossible de carregar el tema \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "No s'ha definit <name> per al tema \"%s\""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "No s'ha definit <author> per al tema \"%s\""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "No s'ha definit <date> per al tema \"%s\""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "No s'ha definit <description> per al tema \"%s\""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "No s'ha definit <copyright> per al tema \"%s\""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1343,7 +1384,7 @@ msgstr ""
 "No s'ha definit cap estil de marc per al tipus de finestra \"%s\" en el tema "
 "\"%s\", afegiu un element <window type=\"%s\" style_set=\"qualsevol\"/>"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1352,7 +1393,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"qualsevol\"/> s'ha "
 "d'especificar per a aquest tema"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1360,58 +1401,58 @@ msgstr ""
 "Les constants de la definici� d'usuari han de comen�ar per una maj�scula; \"%"
 "s\" no ho �s"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "La constant \"%s\" ja s'ha definit"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "L�nia %d car�cter %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "S'ha repetit l'atribut \"%s\" dues vegades en el mateix element <%s>"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "L'atribut \"%s\" no �s v�lid en l'element <%s> en aquest context"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "L'enter %ld ha de ser positiu"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "L'enter %ld �s massa llarg, el m�xim actual �s %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "No s'ha pogut analitzar \"%s\" com a un n�mero de punt flotant"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Els valors boleans han de ser \"vertader\" o \"fals\", no \"%s\""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "L'angle ha d'estar entre 0,0 i 360,0, estava a %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "L'alfa ha d'estar entre 0,0 (invisible) i 1,0 (totalment opac), estava a %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1420,337 +1461,347 @@ msgstr ""
 "Escala de t�tol no v�lida \"%s\" (ha de ser una d'aquestes: xx-petit, x-"
 "petit, petit, mitj�, gran, x-gran, xx-gran)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Cap atribut \"%s\" en l'element <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Cap atribut \"%s\" en l'element <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> amb nom \"%s\" utilitzat un segon cop"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> matriu de \"%s\" no s'ha definit"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> geometria de \"%s\" no s'ha definit"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 "<%s> ha d'especificar tant una geometria com una matriu que tingui una "
 "geometria"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Tipus desconegut \"%s\" en l'element <%s>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "style_set \"%s\" desconegut en l'element <%s>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "El tipus de finestra \"%s\" ja ha assignat un joc d'estil"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Funci� \"%s\" desconeguda per a la icona de men�"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Estat \"%s\" desconegut per a la icona de men�"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "El tema ja t� una icona de men� per a l'estat %s de la funci� %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "No s'ha definit cap <draw_ops> amb el nom \"%s\""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "No es permet l'element <%s> sota <%s>"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"nom\" en l'element <%s>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"valor\" en l'element <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "La dist�ncia \"%s\" �s desconeguda"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "La dist�ncia \"%s\" �s desconeguda"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"superior\" en l'element <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"inferior\" en l'element <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"esquerra\" en l'element <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"dreta\" en l'element <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "El contorn \"%s\" �s desconegut"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"color\" en l'element <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"x1\" en l'element <%s>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"y1\" en l'element <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"x2\" en l'element <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"y2\" en l'element <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"x\" en l'element <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"y\" en l'element <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"amplada\" en l'element <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"al�ada\" en l'element <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"start_angle\" en l'element <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"extent_angle\" en l'element <%s>"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"alfa\" en l'element <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "No hi ha cap atribut de \"tipus\" en l'element <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "No s'ent�n el valor \"%s\" per al tipus de gradient"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "No hi ha cap element de \"nom de fitxer\" en l'element <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "No s'ent�n l'estat \"%s\" per a l'element <%s>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "No hi ha cap element de \"estat\" en l'element <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "No hi ha cap element de \"ombra\" en l'element <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "No hi ha cap element de \"fletxa\" en l'element <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "No s'ent�n l'estat \"%s\" per a l'element <%s>"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "No s'ent�n l'ombra \"%s\" per a l'element <%s>"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "No s'ent�n la flexta \"%s\" per a l'element <%s>"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "No s'ha definit cap <draw_ops> amb el nom \"%s\""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "La inclusi� de draw_ops \"%s\" aqu� crear� una refer�ncia circular"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"valor\" en l'element <%s>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"posici�\" en l'element <%s>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Posici� \"%s\" desconeguda per a la pe�a del marc"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "L'estil del marc ja t� una pe�a a posici� %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"funci�\" en l'element <%s>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"estat\" en l'element <%s>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Funci� \"%s\" desconeguda per al bot�"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Estat \"%s\" desconegut per al bot�"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "L'estil del marc ja t� un bot� per a l'estat %s de la funci� %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"focus\" en l'element <%s>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"estil\" en l'element <%s>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" no �s un valor v�lid per a l'atribut del focus"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" no �s un valor v�lid per a l'atribut de l'estat"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "No s'ha definit un estil amb el nom \"%s\""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "No hi ha cap atribut de \"redimensiona\" en l'element <%s>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" no �s un valor v�lid per a l'atribut de redimensiona"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1759,17 +1810,17 @@ msgstr ""
 "No hauria de tenir l'atribut \"redimensiona\" en l'element <%s> per als "
 "estats maximitzat/ombrejat"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "L'estil ja s'ha especificat per a l'estat %s redimensiona %s focus %s"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "L'estil ja s'ha especificat per a l'estat %s focus %s"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1778,7 +1829,7 @@ msgstr ""
 "especificat un atribut draw_ops i tamb� un element <draw_ops>, o ha "
 "especificat ambd�s elements) "
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1787,7 +1838,7 @@ msgstr ""
 "especificat un atribut draw_ops i tamb� un element <draw_ops>, o ha "
 "especificat ambd�s elements)"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1796,101 +1847,102 @@ msgstr ""
 "especificat un atribut draw_ops i tamb� un element <draw_ops>, o ha "
 "especificat ambd�s elements)"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "L'element m�s extern en el tema ha de ser <metacity_theme>, no <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 "L'element <%s> no �s perm�s dins d'un element nom/autor/data/descripci�"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "L'element <%s> no �s perm�s dins d'un element <constant>"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "L'element <%s> no �s perm�s dins d'un element dist�ncia/contorn"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "L'element <%s> no �s perm�s dins d'un element d'operaci� igual"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "L'element <%s> no �s perm�s dins d'un element <%s>"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "No s'ha prove�t cap draw_ops per a la pe�a del marc"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "No s'ha prove�t cap draw_ops per al bot�"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "No s'ha prove�t cap draw_ops per a la icona de men�"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "No es permet cap text dins de l'element <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "S'ha especificat <name> dues vegades per a aquest tema"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "S'ha especificat <author> dues vegades per a aquest tema"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "S'ha especificat <copyright> dues vegades per a aquest tema"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "S'ha especificat <date> dues vegades per a aquest tema"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "S'ha especificat <description> dues vegades per a aquest tema"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "�s impossible de llegir el tema del fitxer %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "El fitxer de tema %s no cont� un element arrel <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "�s impossible d'obrir el resgistre de depuraci�: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "�s impossible de fdobrir() el fitxer del registre %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "S'ha obert el fitxer de registre %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "L'aplicaci� ha definit un _NET_WM_PID %ld fals\n"
@@ -1913,6 +1965,15 @@ msgstr "La propietat %s en la finestra 0x%lx contenia un UTF-8 inv
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Men� de la finestra"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 47f617986..4e3000293 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 0.1\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-06-01 15:46+0200\n"
 "Last-Translator: Ole Laursen <olau@hardworking.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Kunne ikke fortolke '%s' som et heltal"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Forstod ikke de afsluttende tegn \"%s\" i strengen \"%s\""
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Kunne ikke skaffe værtsnavn: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Kunne ikke åbne X Window System-terminalen '%s'\n"
@@ -89,7 +89,7 @@ msgstr "Maksimér vindue"
 msgid "Unmaximize Window"
 msgstr "Gendan vindue"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -97,14 +97,14 @@ msgid ""
 msgstr ""
 "Et andet program bruger allerede nøglen %s med modifikatorer %x som binding\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Kunne ikke finde et tema! Sikr dig at %s eksisterer og indeholder de "
 "sædvanlige temaer."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Kunne ikke genstarte: %s\n"
@@ -1301,22 +1301,35 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skærm %d på terminal '%s' er ugyldig\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Skærm %d på terminal '%s' har allerede en vindueshåndtering\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Kunne ikke frigive skærm %d på terminal '%s'\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Skærm %d på terminal '%s' har allerede en vindueshåndtering\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Kunne ikke frigive skærm %d på terminal '%s'\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
@@ -1325,65 +1338,65 @@ msgstr ""
 "Kunne ikke åbne en forbindelse til sessionshåndteringen, så "
 "vinduespositioner vil ikke blive gemt: %s\n"
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Kunne ikke oprette mappen '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Kunne ikke åbne sessionsfilen '%s' til skrivning: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Fejl under skrivning af sessionsfilen '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Fejl under lukning af sessionsfilen '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Kunne ikke læse den lagrede sessionsfil %s: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Kunne ikke fortolke den lagrede sessionsfil: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session>-egenskaben set, men vi har allerede sessions-id'en"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Ukendt egenskab %s for <metacity_session>-element"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "indlejret <window>-mærke"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Ukendt egenskab %s for <window>-element"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Ukendt egenskab %s for <geometry>-element"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Ukendt element %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1392,37 +1405,47 @@ msgstr ""
 "Fejl ved start af metacity-dialog for at advare om programmer der ikke "
 "understøtter sessionshåndtering: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "top"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "bund"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "venstre"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "højre"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometri angiver ikke dimensionen \"%s\""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri angiver ikke dimensionen \"%s\" for kanten \"%s\""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "rammegeometri angiver ikke dimensionen \"%s\""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Farveovergange skal mindst have to farver"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1431,7 +1454,7 @@ msgstr ""
 "GTK-farvespecifikation skal have tilstanden i firkantede klammer, f.eks. gtk:"
 "fg[NORMAL] hvor NORMAL er tilstanden; kunne ikke fortolke \"%s\""
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1440,17 +1463,17 @@ msgstr ""
 "GTK-farvespecifikation skal have en afsluttende klamme efter tilstanden, f."
 "eks. gtk:fg[NORMAL] hvor NORMAL er tilstanden; kunne ikke fortolke \"%s\""
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forstod ikke tilstanden \"%s\" i farvespecifikationen"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forstod ikke farvekomponenten \"%s\" i farvespecifikationen"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1459,39 +1482,57 @@ msgstr ""
 "Blandingsformat er \"blend/bg_color/fg_color/alpha\", \"%s\" passer ikke med "
 "formatet"
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke fortolke alfaværdien \"%s\" i blandet farve"
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alfaværdien \"%s\" i blandet farve er ikke mellem 0,0 og 1,0"
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"Blandingsformat er \"blend/bg_color/fg_color/alpha\", \"%s\" passer ikke med "
+"formatet"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Kunne ikke fortolke alfaværdien \"%s\" i blandet farve"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke fortolke farven \"%s\""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatudtryk indeholder tegnet '%s' som ikke er tilladt"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatudtryk indeholder kommatallet '%s' som ikke kunne tolkes"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatudtryk indeholder heltallet '%s' som ikke kunne tolkes"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1499,34 +1540,34 @@ msgid ""
 msgstr ""
 "Koordinatudtryk indeholdt en ukendt operator i begyndelsen af teksten: \"%s\""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatudtrykket var tomt eller blev ikke forstået"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatudtrykket resulterer i division med nul"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatudtrykket prøver at bruge modulo-operator på et kommatal"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatudtrykket har en operator '%s' hvor en operand var ventet"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatudtrykket havde en operand hvor en operator var ventet"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatudtrykket sluttede med en operator i stedet for en operand"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1535,7 +1576,7 @@ msgstr ""
 "Koordinatudtrykket har en operator '%c' efter en operator '%c' og ingen "
 "operand mellem dem"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1544,30 +1585,30 @@ msgstr ""
 "egentlig en fejl i Metacity, men er du sikker på at du behøver så store "
 "udtryk?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatudtrykket havde en slutparantes uden startparantes"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatudtrykket havde en ukendt variabel eller konstant '%s'"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatudtrykket havde en startparantes uden en slutparantes"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatudtrykket ser ikke ud til at have nogen operatorer eller operander"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Tema indeholdt et udtryk '%s', som resulterede i en fejl: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1576,7 +1617,7 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"et-eller-andet\"/> skal "
 "angives for denne rammestil"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
@@ -1584,37 +1625,37 @@ msgstr ""
 "Manglende <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"et-eller-"
 "andet\"/>"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Kunne ikke indlæse temaet \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Ingen <name> angivet for temaet \"%s\""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Ingen <author> angivet for temaet \"%s\""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Ingen <date> angivet for temaet \"%s\""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Ingen <description> angivet for temaet \"%s\""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Ingen <copyright> angivet for temaet \"%s\""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1623,7 +1664,7 @@ msgstr ""
 "Ingen rammestil angivet for vinduestypen \"%s\" i temaet \"%s\", tilføj et "
 "<window type=\"%s\" style_set=\"et-eller-andet\"/>-element"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1632,7 +1673,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"et-eller-andet\"/> skal "
 "angives for dette tema"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1640,58 +1681,58 @@ msgstr ""
 "Brugerdefinerede konstanter skal begynde med et stort bogstav; det gør \"%s"
 "\" ikke"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstanten \"%s\" er allerede defineret"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d tegn %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Egenskaben \"%s\" er gentaget to gange i det samme <%s>-element"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Egenskaben \"%s\" er ugyldig i <%s>-elementet i denne sammenhæng"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Heltallet %ld skal være positivt"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Heltallet %ld er for stort, det nuværende maksimum er %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Kunne ikke fortolke \"%s\" som et kommatal"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Booleske værdier skal være \"true\" eller \"false\" ikke \"%s\""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Vinkel skal være mellem 0.0 og 360.0, var %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alfa skal være mellem 0.0 (usynlig) og 1.0 (helt ugennemsigtig), var %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1700,335 +1741,345 @@ msgstr ""
 "Ugyldig titelskalering \"%s\" (skal være en af xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Ingen \"%s\"-egenskab i elementet <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Ingen \"%s\"-egenskab i elementet <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s>-navnet \"%s\" brugt to gange"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s>-ophavet \"%s\" er ikke blevet defineret"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s>-geometrien \"%s\" er ikke blevet defineret"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> skal enten angive en geometri eller et ophav der har en geometri"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Ukendt type \"%s\" i <%s>-element"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Ukendt style_set \"%s\" i <%s>-element"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Vinduestypen \"%s\" er allerede blevet tildelt et stilsæt"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Ukendt funktion \"%s\" til menuikon"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Ukendt tilstand \"%s\" for menuikon"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "Temaet har allerede en menuikon til funktion %s tilstand %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Ingen <draw_ops> med navnet \"%s\" er blevet defineret"
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elementet <%s> er ikke tilladt under <%s>"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Ingen \"name\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Ingen \"value\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Afstanden \"%s\" er ukendt"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "Afstanden \"%s\" er ukendt"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Ingen \"top\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Ingen \"bottom\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Ingen \"left\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Ingen \"right\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Kanten \"%s\" er ukendt"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Ingen \"color\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Ingen \"x1\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Ingen \"y1\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Ingen \"x2\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Ingen \"y2\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Ingen \"x\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Ingen \"y\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Ingen \"width\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Ingen \"height\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Ingen \"start_angle\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Ingen \"extent_angle\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Ingen \"alpha\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Ingen \"type\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Forstod ikke værdien \"%s\" for farveovergangstypen"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Ingen \"filename\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Forstod ikke fyldtypen \"%s\" for <%s>-elementet"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Ingen \"state\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Ingen \"shadow\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Ingen \"arrow\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Forstod ikke tilstanden \"%s\" for <%s>-elementet"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Forstod ikke skyggen \"%s\" for <%s>-elementet"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Forstod ikke pilen \"%s\" for <%s>-elementet"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Ingen <draw_ops> med navnet \"%s\" er blevet defineret"
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Medtagelse af draw_ops \"%s\" ville skabe en cirkulær reference"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Ingen \"value\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Ingen \"position\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Ukendt position \"%s\" for rammestykke"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Rammestil har allerede et stykke på position %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Ingen \"function\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Ingen \"state\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Ukendt funktion \"%s\" for knap"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Ukendt tilstand \"%s\" for knap"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Rammestil har allerede en knap for funktion %s tilstand %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Ingen \"focus\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Ingen \"style\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" er ikke en gyldig værdi for fokusegenskaben"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" er ikke en gyldig værdi for tilstandsegenskaben"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "En stil ved navn \"%s\" er ikke blevet defineret"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Ingen \"resize\"-egenskab i <%s>-element"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" er ikke en gyldig værdi for størrelsesændringsegenskaben"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -2037,19 +2088,19 @@ msgstr ""
 "Skal ikke have en \"resize\"-egenskab i <%s>-elementet for maksimerede/"
 "oprullede tilstande"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 "Stilen er allerede blevet angivet for tilstand %s størrelsesændring %s fokus "
 "%s"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Stilen er allerede blevet angivet for tilstand %s fokus %s"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -2057,7 +2108,7 @@ msgstr ""
 "Kan ikke have to draw_ops for et <piece>-element (tema angav en draw_ops "
 "egenskab og også et <draw_ops>-element, eller angav to elementer)"
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -2065,7 +2116,7 @@ msgstr ""
 "Kan ikke have to draw_ops for et <button>-element (tema angav en draw_ops "
 "egenskab og også et <draw_ops>-element, eller angav to elementer)"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -2073,12 +2124,12 @@ msgstr ""
 "Kan ikke have to draw_ops for et <menu_icon>-element (tema angav en draw_ops "
 "egenskab og også et <draw_ops>-element, eller angav to elementer)"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Det yderste element i temaet skal være <metacity_theme> ikke <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
@@ -2086,89 +2137,90 @@ msgstr ""
 "Elementet <%s> er ikke tilladt inde i et navne-/forfatter-/dato-/"
 "beskrivelseselement"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Elementet <%s> er ikke tilladt inde i et <constant>-element"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Elementet <%s> er ikke tilladt inde i et afstands/kantelement"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Elementet <%s> er ikke tilladt inde i et tegneoperationselement"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elementet <%s> er ikke tilladt inde i et <%s>-element"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Ingen draw_ops angivet for rammestykke"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Ingen draw_ops angivet for knap"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Ingen draw_ops angivet for menuikon"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Tekst er ikke tilladt inden i elementet <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> angivet to gange for dette tema"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> angivet to gange for dette tema"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> angivet to gange for dette tema"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> angivet to gange for dette tema"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> angivet to gange for dette tema"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Kunne ikke læse tema fra filen %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Temafilen %s indeholdt ikke et rodelement <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Kunne ikke åbne fejlinformationslog: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Kunne ikke udføre fdopen() på logfilen %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Åbnede logfilen %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Program angav en ugyldig _NET_WM_PID %ld\n"
@@ -2191,6 +2243,15 @@ msgstr "Egenskaben %s for vinduet 0x%lx indeholdt ugyldig UTF-8\n"
 msgid "Metacity"
 msgstr "Metacity"
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Vinduesfokuseringstilstand"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr "Kli_k for at give fokus"
diff --git a/po/de.po b/po/de.po
index e0d007832..e38f9e72c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.3.377\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-05-26 15:00+0200\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "»%s« konnte nicht als Ganzzahl interpretiert werden"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Schließende Zeichen »%s« in Zeichenkette »%s« sind unverständlich"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Rechnername konnte nicht ermittelt werden: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-System-Display »%s« konnte nicht geöffnet werden\n"
@@ -89,7 +89,7 @@ msgstr "Fenster maximieren"
 msgid "Unmaximize Window"
 msgstr "Fenster wiederherstellen"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -98,14 +98,14 @@ msgstr ""
 "Irgend ein anderes Programm benutzt bereits die Taste %s mit den "
 "Umschalttasten %x als Tastaturkürzel\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Es konnte kein Thema gefunden werden! Stellen Sie sicher, dass %s existiert "
 "und die üblichen Themen enthält."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Neustart fehlgeschlagen: %s\n"
@@ -1009,89 +1009,102 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Bildschirm %d auf Display »%s« ist ungültig\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Bildschirm %d auf Display »%s« hat bereits einen Fenstermanager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Bildschirm %d auf Display »%s« konnte nicht freigegeben werden\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Bildschirm %d auf Display »%s« hat bereits einen Fenstermanager\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Bildschirm %d auf Display »%s« konnte nicht freigegeben werden\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Sitzungsdatei »%s« konnte nicht zum Schreiben geöffnet werden: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Fehler beim Schreiben der Sitzungsdatei »%s«: %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Fehler beim Schließen der Sitzungsdatei »%s«: %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Gespeicherte Sitzungsdatei %s konnte nicht gelesen werden: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Gespeicherte Sitzungsdatei konnte nicht interpretiert werden: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 "Attribut <metacity_session> ist aufgetaucht, obwohl die Sitzungskennung "
 "bereits feststeht"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Unbekanntes Attribut %s im Element <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "verschachteltes <window>-Element"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Unbekanntes Attribut %s im Element <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Unbekanntes Attribut %s im Element <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Unbekanntes Element %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, fuzzy, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1100,37 +1113,47 @@ msgstr ""
 "Fehler beim Starten von metacity-dialog, um wegen des Abwürgens einer "
 "Anwendung nachzufragen: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "oben"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "unten"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "links"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "rechts"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "Rahmengeometrie gibt die Abmessung »%s« nicht an"
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "Rahmengeometrie gibt die Abmessung »%s« für den Rand »%s« nicht an"
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "Rahmengeometrie gibt die Abmessung »%s« nicht an"
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Verläufe sollten mindestens zwei Farben enthalten"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1139,7 +1162,7 @@ msgstr ""
 "Bei GTK-Farbangaben muss der Zustand in eckigen Klammern stehen, z.B. gtk:fg"
 "[NORMAL], wobei NORMAL der Zustand ist; »%s« konnte nicht verarbeitet werden."
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1149,17 +1172,17 @@ msgstr ""
 "haben, z.B. gtk:fg[NORMAL], wobei NORMAL der Zustand ist; »%s« konnte nicht "
 "verarbeitet werden"
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Zustand »%s« in Farbangabe ist unverständlich"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Farbkomponente »%s« in Farbangabe ist unverständlich"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1168,27 +1191,45 @@ msgstr ""
 "Das Mischformat ist »blend/hg_farbe/fg_farbe/alpha«, »%s« passt nicht auf "
 "dieses Format"
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Alphawert »%s« in gemischter Farbe konnte nicht verarbeitet werden"
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alphawert »%s« in gemischter Farbe ist nicht zwischen 0,0 und 1,0"
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"Das Mischformat ist »blend/hg_farbe/fg_farbe/alpha«, »%s« passt nicht auf "
+"dieses Format"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Alphawert »%s« in gemischter Farbe konnte nicht verarbeitet werden"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Farbe »%s« war nicht zu verstehen"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatenausdruck enthält das unerlaubte Zeichen `%s'"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1197,14 +1238,14 @@ msgstr ""
 "Koordinatenausdruck enthält die Gleitkommazahl `%s', die nicht verarbeitet "
 "werden konnte"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Koordinatenausdruck enthält die Ganzzahl `%s', die nicht verarbeitet werden "
 "konnte"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1213,38 +1254,38 @@ msgstr ""
 "Koordinatenausdruck enthält einen unbekannten Operator am Anfang dieses "
 "Texts: »%s«"
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatenausdruck war leer oder unverständlich"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatenausdruck führt zu einer Division durch Null"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Koordinatenausdruck versucht, den Modulo-Operator auf eine Gleitkommazahl "
 "anzuwenden"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "Koordinatenausdruck enthält den Operator »%s«, wo ein Operand stehen müsste"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "Koordinatenausdruck enthält einen Operanden, wo ein Operator stehen müsste"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatenausdruck endet mit einem Operator statt mit einem Operanden"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1253,7 +1294,7 @@ msgstr ""
 "Koordinatenausdruck enthält den Operator »%c« nach dem Operator »%c« und "
 "dazwischen keinen Operanden"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1262,32 +1303,32 @@ msgstr ""
 "eigentlich ein Fehler in Metacity, aber sind Sie sicher, dass sie so einen "
 "riesigen Ausdruck benötigen?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatenausdruck hatte eine schließende Klammer ohne eine öffnende"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Koordinatenausdruck enthält die unbekannte Variable oder Konstante »%s«"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Koordinatenausdruck enthält eine offene Klammer ohne schließende Klammer"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatenausdruck scheint keine Operatoren oder Operanden zu enthalten"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Thema enthält den Ausdruck »%s«, der zu folgendem Fehler führte: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1296,44 +1337,44 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"irgendwas\"/> muss für "
 "diesen Rahmenstil angegeben werden"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"irgendwas\"/> fehlt"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Thema »%s« konnte nicht geladen werden: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Kein <name> für Thema »%s« angegeben"
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Kein <author> für Thema »%s« angegeben"
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Kein <date> für Thema »%s« angegeben"
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Keine <description> für Thema »%s« angegeben"
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Kein <copyright> für Thema »%s« angegeben"
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1342,7 +1383,7 @@ msgstr ""
 "Kein Rahmenstil für Fenstertyp »%s« in Thema »%s« angegeben; fügen Sie ein "
 "Element <window type=\"%s\" style_set=\"irgendwas\"/> hinzu"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1351,7 +1392,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"irgendwas\"/> muss für "
 "dieses Thema angegeben werden"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1359,59 +1400,59 @@ msgstr ""
 "Benutzerdefinierte Konstanten müssen mit einem Großbuchstaben beginnen; »%s« "
 "tut das nicht"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstante »%s« war bereits definiert"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Zeile %d Zeichen %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribut »%s« wiederholt sich im selben <%s>-Element"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribut »%s« ist in einem <%s>-Element in diesem Kontext ungültig"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Ganzzahl %ld muss positiv sein"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Ganzzahl %ld ist zu groß, aktuelles Maximum ist %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "»%s« konnte nicht als Gleitkommazahl interpretiert werden"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Wahrheitswerte müssen »true« oder »false« sein, nicht »%s«"
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Winkel muss zwischen 0.0 und 360.0 sein, war aber %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alpha muss zwischen 0.0 (unsichtbar) und 1.0 (vollständig deckend) sein, war "
 "aber %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1420,337 +1461,347 @@ msgstr ""
 "Ungültiger Titelmaßstab »%s« (muss xx-small, x-small, small, medium, large, "
 "x-large oder xx-large sein)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Kein »%s«-Attribut im Element <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Kein »%s«-Attribut im Element <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> Name »%s« ein zweites Mal verwendet"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> Elter »%s« wurde nicht definiert"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> Geometrie »%s« wurde nicht definiert"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 "<%s> muss entweder eine Geometrie oder einen Elter mit einer Geometrie "
 "angeben"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Unbekannter Typ »%s« in <%s>-Element"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Unbekanntes style_set »%s« in <%s>-Element"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Fenstertyp »%s« wurde bereits ein Stilsatz zugeordnet"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Unbekannte Funktion »%s« für Menüicon"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Unbekannter Zustand »%s« für Menüicon"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "Thema hat bereits ein Menüicon für Funktion %s Zustand %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Es wurde kein <draw_ops> mit dem Namen »%s« definiert"
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> ist nicht unter <%s> erlaubt"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Kein Attribut »name« in Element <%s>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Kein Attribut »value« in Element <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Abstand »%s« ist unbekannt"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "Abstand »%s« ist unbekannt"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Kein Attribut »top« in Element <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Kein Attribut »bottom« in Element <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Kein Attribut »left« in Element <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Kein Attribut »right« in Element <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Rand »%s« ist unbekannt"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Kein Attribut »color« in Element <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Kein Attribut »x1« in Element <%s>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Kein Attribut »y1« in Element <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Kein Attribut »x2« in Element <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Kein Attribut »y2« in Element <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Kein Attribut »x« in Element <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Kein Attribut »y« in Element <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Kein Attribut »width« in Element <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Kein Attribut »height« in Element <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Kein Attribut »start_angle« in Element <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Kein Attribut »extent_angle« in Element <%s>"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Kein Attribut »alpha« in Element <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Kein Attribut »type« in Element <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Wert »%s« für Typ des Verlaufs war unverständlich"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Kein Attribut »filename« in Element <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Zustand »%s« für Element <%s> ist unverständlich"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Kein Attribut »state« in Element <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Kein Attribut »shadow« in Element <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Kein Attribut »arrow« in Element <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Zustand »%s« für Element <%s> ist unverständlich"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Schatten »%s« für Element <%s> ist unverständlich"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Pfeil »%s« für Element <%s> ist unverständlich"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Es wurde kein <draw_ops> namens »%s« definiert"
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Hier draw_ops »%s« einzufügen würde einen Ringschluss erzeugen"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Kein Attribut »value« in Element <%s>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Kein Attribut »position« in Element <%s>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Unbekannte Position »%s« für Rahmenteil"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Rahmenstil hat bereits ein Teil an Position %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Kein Attribut »function« in Element <%s>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Kein Attribut »state« in Element <%s>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Unbekannte Funktion »%s« für Knopf"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Unbekannter Zustand »%s« für Knopf"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Rahmenstil hat bereits einen Knopf für Funktion %s, Zustand %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Kein Attribut »focus« in Element <%s>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Kein Attribut »style« in Element <%s>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "»%s« ist kein gültiger Wert für das Attribut focus"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "»%s« ist kein gültiger Wert für das Attribut state"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Es wurde kein Stil namens »%s« definiert"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Kein Attribut »resize« in Element <%s>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "»%s« ist kein gültiger Wert für das Attribut resize"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1759,17 +1810,17 @@ msgstr ""
 "Für die Zustände maximiert/eingerollt sollte es im Element <%s> kein "
 "Attribut »resize« geben"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "Stil wurde bereits für state %s, resize %s, focus %s angegeben"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Stil wurde bereits für state %s, focus %s angegeben"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1777,7 +1828,7 @@ msgstr ""
 "Es kann keine zwei draw_ops für ein <piece>-Element geben (das Thema gab ein "
 "draw_ops-Attribut und ein <draw_ops>-Element an, oder zwei Elemente)"
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1785,7 +1836,7 @@ msgstr ""
 "Es kann keine zwei draw_ops für ein <button>-Element geben (das Thema gab "
 "ein draw_ops-Attribut und ein <draw_ops>-Element an, oder zwei Elemente)<"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1793,100 +1844,101 @@ msgstr ""
 "Es kann keine zwei draw_ops für ein <menu_icon>-Element geben (das Thema gab "
 "ein draw_ops-Attribut und ein <draw_ops>-Element an, oder zwei Elemente)<"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Äußerstes Element im Thema muss <metacity_theme> sein, nicht <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr "Element <%s> ist in Element name/author/date/description nicht erlaubt"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Element <%s> ist in einem <constant>-Element nicht erlaubt"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Element <%s> ist in einem distance/border-Element nicht erlaubt"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Element <%s> ist in einem draw_ops-Element nicht erlaubt"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> ist in einem <%s>-Element nicht erlaubt"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Keine draw_ops für Rahmenteil angegeben"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Keine draw_ops für Knopf angegeben"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Keine draw_ops für Menüicon angegeben"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "In Element <%s> ist kein Text erlaubt"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> wurde für dieses Thema zweimal angegeben"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> wurde für dieses Thema zweimal angegeben"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> wurde für dieses Thema zweimal angegeben"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> wurde für dieses Thema zweimal angegeben"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> wurde für dieses Thema zweimal angegeben"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Thema konnte nicht aus Datei %s gelesen werden: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Themendatei %s enthielt kein Wurzelelement <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Diagnoseprotokoll konnte nicht geöffnet werden: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Protokolldatei %s konnte nicht mit fdopen() geöffnet werden: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Protokolldatei %s geöffnet\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Application hat eine unsinnige _NET_WM_PID %ld angegeben\n"
@@ -1909,6 +1961,15 @@ msgstr "Eigenschaft %s von Fenster 0x%lx enthielt ungültiges UTF-8\n"
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Fenstermenü"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 5f3882ffe..125311fc4 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: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\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"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, fuzzy, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Non se puido crear o directorio '%s': %s\n"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Fallo ao interpretar o ficheiro de sesi�n gardada: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Fallo ao abrir o sistema X Window, display '%s'\n"
@@ -87,7 +87,7 @@ msgstr "Maximizar Fiestra"
 msgid "Unmaximize Window"
 msgstr "Restaurar Fiestra"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -96,12 +96,12 @@ msgstr ""
 "Alg�n outro programa est� usando xa a tecla %s cos modificadores %x como "
 "asignaci�n (binding)\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, fuzzy, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Fallo ao interpretar o ficheiro de sesi�n gardada: %s\n"
@@ -995,832 +995,881 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, 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:212
+#: src/screen.c:211
 #, 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"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, fuzzy, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Non se puido crear o directorio '%s': %s\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, 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:510
+#, 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:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Non se puido crear o directorio '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Non se puido abrir o ficheiro de sesi�n '%s' para escritura: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Erro escribindo o ficheiro de sesi�n '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Erro pechando o ficheiro de sesi�n '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Fallo ao ler o ficheiro de sesi�n gardada '%s': %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Fallo ao interpretar o ficheiro de sesi�n gardada: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, fuzzy, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Atributo %s desco�ecido no elemento <geometry>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "etiqueta <window> ani�ada"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Atributo %s desco�ecido no elemento <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Elemento %s desco�ecido"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Non se puido crear o directorio '%s': %s\n"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, fuzzy, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Non se puido crear o directorio '%s': %s\n"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, fuzzy, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Fallo ao ler o ficheiro de sesi�n gardada '%s': %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, fuzzy, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, fuzzy, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, fuzzy, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, fuzzy, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, fuzzy, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, fuzzy, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, fuzzy, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, fuzzy, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, fuzzy, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, fuzzy, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, fuzzy, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, fuzzy, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, fuzzy, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, fuzzy, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, fuzzy, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, fuzzy, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, fuzzy, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, fuzzy, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Atributo %s desco�ecido no elemento <window>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, fuzzy, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Fallo ao ler o ficheiro de sesi�n gardada '%s': %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Fallo ao interpretar o ficheiro de sesi�n gardada: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Fallo ao ler o ficheiro de sesi�n gardada '%s': %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1841,6 +1890,15 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Men� da Fiestra"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 7052cccd6..fd44e0b7f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.3.55\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-05-02 20:31+0200\n"
 "Last-Translator: Pier Luigi Fiorini <plfiorini@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Impossibile analizzare \"%s\" come un intero"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "I caratteri \"%s\" non vengono compresi nella stringa \"%s\""
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Riavvio fallito: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Apertura del display \"%s\" di X Window System fallita\n"
@@ -87,7 +87,7 @@ msgstr "Massimizza la finestra"
 msgid "Unmaximize Window"
 msgstr "Demassimizza la finestra"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -96,14 +96,14 @@ msgstr ""
 "Qualche altro programma sta usando il tasto %s con il modificatore %x come "
 "associazione\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Impossibile trovare un tema! Assicurarsi che %s esista e contenga i temi "
 "usuali."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Riavvio fallito: %s\n"
@@ -1003,127 +1003,150 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Lo schermo %d nel display \"%s\" non � valido\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Lo schermo %d nel display \"%s\" ha gi� un window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Impossibile rilasciare lo schermo %d nel display \"%s\"\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Lo schermo %d nel display \"%s\" ha gi� un window manager\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Impossibile rilasciare lo schermo %d nel display \"%s\"\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Impossibile creare la directory \"%s\": %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Impossibile aprire il file della sessione \"%s\" in scrittura: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Errore scrivendo il file della sessione \"%s\": %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Errore chiudendo il file della sessione \"%s\": %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Lettura del file della sessione %s fallita: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Analisi del file della sessione salvato fallita: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 "� stato visto un'attributo in <metacity_session> ma vi � gi� un ID della "
 "sessione"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Attributo %s sconosciuto nell'elemento <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "marchatore <window> innestato"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Attributo %s sconosciuto nell'elemento <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Attributo %s sconosciuto nell'elemento <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Elemento %s sconosciuto"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "alto"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "basso"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "sinistra"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "destra"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "la geometria del frame non specifica la dimensione \"%s\""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "la geometria del frame non specifica la dimensione \"%s\" per il bordo \"%s\""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "la geometria del frame non specifica la dimensione \"%s\""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Le sfumature dovrebbero avere almeno due colori"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1132,7 +1155,7 @@ msgstr ""
 "La specificazione di colore GTK deve avere lo stato fra parentesi, per es. "
 "gtk:fg[NORMAL] dove NORMAL � lo stato, impossibile analizzare \"%s\""
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1142,45 +1165,61 @@ msgstr ""
 "stato, per es. gtk:fg[NORMAL] dove NORMAL � lo stato, impossibile analizzare "
 "\"%s\""
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "State \"%s\" incomprensibile nella specificazione di colore"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 "Componente di colore \"%s\" incomprensibile nella specificazione del colore"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Impossibile analizzare il colore \"%s\""
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Impossibile analizzare il colore \"%s\""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "La coordinata contiene il carattere \"%s\" che non � consentito"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1189,12 +1228,12 @@ msgstr ""
 "La coordinata contiene il numero in virgola mobile \"%s\" che non pu� essere "
 "analizzato"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "La coordinata contiene l'intero \"%s\" che non pu� essere analizzato"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1203,35 +1242,35 @@ msgstr ""
 "La coordinata contiene un operatore sconosciuto all'inizione di questo "
 "testo: \"%s\""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "La coordinata � vuota o non compresa"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "La coordinata risulta una divisione per zero"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "La coordinata tenta di usare un operatore in un numero in virgola mobile"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "La coordinata ha un operatore \"%s\" dove � atteso un operando"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "La coordinata ha un operando dove � atteso un operatore"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "La coordinata finisce con un operatore invece che un operando"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1240,7 +1279,7 @@ msgstr ""
 "La coordinata ha l'operatore \"%c\" seguito dall'operatore \"%c\" senza un "
 "operando fra i due"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1248,29 +1287,29 @@ msgstr ""
 "L'analizzatore della coordinata ha superato il proprio buffer, questo � un "
 "bug di Metacity, ma si � sicuri di necessitare di un'espressione come quella?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "La coordinata ha una parentesi chiusa senza quella aperta"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "La coordinata ha la variabile o la costante \"%s\" sconosciuta"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "La coordinata ha una parentesi aperta senza nessuna chiusa"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "La coordinata non sembra avere nessun operatore o operando"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Il tema contiene un'espressione \"%s\" che provoca errore: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1279,44 +1318,44 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> deve essere "
 "specificato per questo stile di frame"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> mancante"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Caricamento fallito del tema \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Nessun <name> impostato per il tema \"%s\""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Nessun <author> impostato per il tema \"%s\""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Nessun <date> impostato per il tema \"%s\""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Nessun <description> impostato per il tema \"%s\""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Nessun <copyright> impostato per il tema \"%s\""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1325,7 +1364,7 @@ msgstr ""
 "Nessun stile del frame impostato per il tipo di finestra \"%s\" nel tema \"%s"
 "\", aggiungere un elemento <window type=\"%s\" style_set=\"whatever\"/>"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1334,7 +1373,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"wahtever\"/> deve essere "
 "specificato per questo tema"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1342,58 +1381,58 @@ msgstr ""
 "Le costanti definite dall'utente devono iniziare con una lettera maiuscola, "
 "\"%s\" non lo fa"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "La costante \"%s\" � gi� definita"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Riga %d carattere %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "L'attributo \"%s\" � ripetuto due volte nello stesso elemento <%s>"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "L'attributo \"%s\" non � valido nell'elemento <%s> in questo contesto"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "L'intero %ld deve essere positivo"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "L'intero %ld � troppo grande, il massimo corrente � %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Impossibile analizzare \"%s\" come numero in virgola mobile"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "I valori booleani devono essere \"true\" o \"false\" non \"%s\""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "L'angolo deve essere tra 0.0 e 360.0, non %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alpha deve essere tra 0.0 (invisibile) e 1.0 (completamente opaco), non %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1402,335 +1441,345 @@ msgstr ""
 "Scala del titolo \"%s\" non valida (deve essere xx-small, x-small, small, "
 "medium,large, x-large, o xx-large)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nessun attributo \"%s\" nell'elemento <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Nessun attributo \"%s\" nell'elemento <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> di nome \"%s\" usato una seconda volta"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "L'elemento padre \"%s\" di <%s> non � definito"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "La geometria <%s> \"%s\" non � stata definita"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> deve specificare una geometria o un padre che ha una geometria"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Tipo \"%s\" sconosciuto nell'elemento <%s>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Style_set \"%s\" sconosciuto nell'elemento <%s>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Al tipo di finestra \"%s\" � gi� stato assegnato uno stile"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Funzione \"%s\" sconosciuta per l'icona del menu"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Stato \"%s\" sconosciuto per l'icona del menu"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "Il tema ha gi� un'icona del menu per la funzione %s e lo stato %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Non � stato definito nessun <draw_ops> con il nome \"%s\""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "L'elemento <%s> non � consentito sotto <%s>"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Nessun attributo \"name\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Nessun attributo \"value\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "La distanza \"%s\" � sconosciuta"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "La distanza \"%s\" � sconosciuta"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Nessun attributo \"top\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Nessun attributo \"bottom\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Nessun attributo \"left\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Nessun attributo \"right\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Bordo \"%s\" sconosciuto"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Nessun attributo \"color\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Nessun attributo \"x1\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Nessun attributo \"y1\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Nessun attributo \"x2\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Nessun attributo \"y2\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Nessun attributo \"x\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Nessun attributo \"y\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Nessun attributo \"width\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Nessun attributo \"height\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Nessun attributo \"start_angle\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Nessun attributo \"extent_andle\" nell'elemento <%s>"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Nessun attributo \"alpha\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Nessun attributo \"type\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Valore \"%s\" incomprensibile per il tipo di gradiente"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Nessun attributo \"filename\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Stato \"%s\" incomprensibile per l'elemento <%s>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Nessun attributo \"state\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Nessun attributo \"shadow\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Nessun attributo \"arrow\" nell'elemento <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Stato \"%s\" incomprensibile per l'elemento <%s>"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Ombra \"%s\" incomprensibile per l'elemento <%s>"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Freccia \"%s\" incomprensibile per l'elemento <%s>"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Nessun <draw_ops> chiamato \"%s\" � stato definito"
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Includere draw_ops \"%s\" qui provocher� un riferimento circolare"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Nessun attributo \"value\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Nessun attributo \"position\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Posizione \"%s\" sconosciuta per il pezzo di frame"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Lo stile del frame ha gi� un pezzo alla posizione %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Nessun attributo \"function\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Nessun attributo \"state\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Funzione \"%s\" sconosciuta per il bottone"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Stato \"%s\" sconosciuto per il bottone"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Lo stile di frame ha gi� un bottone per la funzione %s stato %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Nessun attributo \"focus\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Nessun attributo \"style\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" non � un valore valido per l'attributo focus"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" non � un valore valido per l'attributo state"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Uno stile chiamato \"%s\" non � stato definito"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Nessun attributo \"resize\" nell'elemento <%s>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" non � un valore valido per l'attributo resize"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1739,17 +1788,17 @@ msgstr ""
 "Non si dovrebbe avere l'attributo \"resize\" nell'elemento <%s> per gli "
 "stati maximized/shaded"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "Stile gi� specificato per state %s resize %s focus %s"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Lo stile � stato gi� specificato per lo stato %s focus %s"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1758,7 +1807,7 @@ msgstr ""
 "specificato un attributo draw_ops e anche un elemento <draw_ops>, o ha "
 "specificato due elmenti)"
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1767,7 +1816,7 @@ msgstr ""
 "specificato un attributo draw_ops e anche un elemento <draw_ops>, o ha "
 "specificato due elementi)"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1776,12 +1825,12 @@ msgstr ""
 "specificato un attributo draw_ops e anche un elemento <draw_ops>, o ha "
 "specificato due elementi)"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "L'elemento esterno nel tema deve essere <metacity_theme> not <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
@@ -1789,92 +1838,93 @@ msgstr ""
 "L'elemento <%s> non � consentito denstro gli elementi name/author/date/"
 "description"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "L'elemento <%s> non � consentito dentro l'elemento <constant>"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "L'elemento <%s> non � consentito dentro l'elemento distance/border"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 "L'elemento <%s> non � consentito dentro un elemento relativo un'operazione "
 "di disegno"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "L'elemento <%s> non � consentito dentro un elemento <%s>"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Nessun draw_ops viene fornito per un pezzo di frame"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Nessun draw_ops viene fornito per un bottone"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Nessun draw_ops viene fornito per l'icona del menu"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Il testo non � consentito dentro l'elemento <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> specificato due volte"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> specificato due volte"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> specificato due volte"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> specificato due volte"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> specificato due volte"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Lettura fallita del tema dal file %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 "Il file del tema \"%s\" non contiene l'elemento radice <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Analisi del file della sessione salvato fallita: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Lettura fallita del tema dal file %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1897,6 +1947,15 @@ msgstr "Propriet
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Menu della finestra"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 9d7a0b8e8..04e978e3e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity CVS-20020416\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-04-16 21:15+0900\n"
 "Last-Translator: Akira TAGOH <tagoh@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "\"%s\"を整数としてパースできませんでした"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "文字列 \"%s\" 内の文字 \"%s\" に引きずられて理解できませんでした"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "ホスト名の取得に失敗しました: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Xウィンドウシステムのディスプレイ '%s' のオープンに失敗しました\n"
@@ -89,7 +89,7 @@ msgstr "ウィンドウを最大化"
 msgid "Unmaximize Window"
 msgstr "ウィンドウを元の大きさに戻す"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -97,14 +97,14 @@ msgid ""
 msgstr ""
 "別のプログラムですでにバインディングにキー %s と修飾キー %x を使っています\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "テーマが見つかりませんでした! %s が存在して普通のテーマが含まれていることを確"
 "認してください"
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "リスタートに失敗しました: %s\n"
@@ -1004,89 +1004,102 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "スクリーン %d(ディスプレイ '%s')は無効です\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
+
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "スクリーン %d(ディスプレイ '%s')を解放できませんでした\n"
+
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "スクリーン %d(ディスプレイ '%s')はすでにウィンドウマネージャを持っています\n"
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "スクリーン %d(ディスプレイ '%s')を解放できませんでした\n"
 
-#: src/session.c:267
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "ディレクトリ '%s' を作成できませんでした : %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr ""
 "書き込みのためのセッションファイル '%s' をオープンできませんでした: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "セッションファイル '%s' を書き込み中にエラーが発生しました: %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "セッションファイル '%s' のクローズ中にエラーが発生しました: %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "保存されたセッションファイル %s の読み込みに失敗しました: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "保存されたセッションファイルのパースに失敗しました: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session>属性は見られますが，すでにセッションIDを持っています"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "<metacity_session>エレメントに不明な属性 %s があります"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "<window>タグがネストされています"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "<window>エレメントに不明な属性 %s があります"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "<geometry>エレメントに不明な属性 %s があります"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "不明なエレメント %s があります"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, fuzzy, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1095,283 +1108,309 @@ msgstr ""
 "アプリケーションの終了について尋ねるためのmetacityダイアログの起動中にエラー"
 "が発生しました: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "上"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "下"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "左"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "右"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "フレームジオメトリは \"%s\" の大きさを指定しません"
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "フレームジオメトリは \"%s\" の大きさを指定しません"
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "階調度は少なくとも2つの色をもつべきです"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "色 \"%s\" をパースできませんでした"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "色 \"%s\" をパースできませんでした"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "テーマ \"%s\" の読み込みに失敗しました: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "テーマ \"%s\" の<name>が設定されていません"
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "テーマ \"%s\" の<author>が設定されていません"
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "テーマ \"%s\" の<date>が設定されていません"
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "テーマ \"%s\" の<description>が設定されていません"
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "テーマ \"%s\" の<copyright>が設定されていません"
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "定数 \"%s\" はすでに定義されています"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d行目 %d文字目: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "整数 %ld は正数でなければなりません"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "整数 %ld は大きすぎます，現在の最大は %d です"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "浮動小数点のような \"%s\" をパースできませんでした"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 "ブーリアン値は \"true\" か \"false\" でなければならず \"%s\" ではありません"
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1380,377 +1419,387 @@ msgstr ""
 "無効なタイトルスケール \"%s\" です (xx-small,x-small,small,medium,large,x-"
 "large,xx-largeのひとつでなければなりません)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "\"%s\" 属性がエレメント <%s> にありません"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "\"%s\" 属性がエレメント <%s> にありません"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "不明なタイプ \"%s\" がエレメント <%s> にあります"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "不明な style_set \"%s\" がエレメント <%s> にあります"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"name\" 属性がありません"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"value\" 属性がありません"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "間隔 \"%s\" は不明です"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "間隔 \"%s\" は不明です"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"top\" 属性がありません"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"bottom\" 属性がありません"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"left\" 属性がありません"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"right\" 属性がありません"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "境界 \"%s\" は不明です"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"color\" 属性がありません"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"x1\" 属性がありません"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"y1\" 属性がありません"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"x2\" 属性がありません"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"y2\" 属性がありません"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"x\" 属性がありません"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"y\" 属性がありません"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"width\" 属性がありません"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"height\" 属性がありません"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"start_angle\" 属性がありません"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"extent_angle\" 属性がありません"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"alpha\" 属性がありません"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"type\" 属性がありません"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"filename\" 属性がありません"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "不明なタイプ \"%s\" がエレメント <%s> にあります"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"state\" 属性がありません"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"shadow\" 属性がありません"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "エレメント <%s> に \"arrow\" 属性がありません"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"value\" 属性がありません"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"position\" 属性がありません"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"function\" 属性がありません"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"state\" 属性がありません"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"focus\" 属性がありません"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"style\" 属性がありません"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "エレメント <%s> に \"resize\" 属性がありません"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 "テーマの最も外側のエレメントは<metacity_theme>でなければならず，<%s>ではあり"
 "ません"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
@@ -1758,90 +1807,91 @@ msgstr ""
 "エレメント <%s> は name/author/date/description エレメントの内側に許可されて"
 "いません"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "エレメント <%s> は <constant> エレメントの内側に許可されていません"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "エレメント <%s> はdistance/borderエレメントの内側に許可されていません"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "エレメント <%s> は描画処理エレメントの内側に許可されていません"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "エレメント <%s> は <%s> エレメントの内側に許可されていません"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "フレームのためのdraw_opsは提供されていません"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "ボタンのためのdraw_opsは提供されていません"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "メニューアイコンのためのdraw_opsは提供されていません"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "エレメント <%s> の内側にテキストは許可されません"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "このテーマで<name>は二回指定しました"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "このテーマで<author>は二回指定しました"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "このテーマで<copyright>は二回指定しました"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "このテーマで<date>は二回指定しました"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "このテーマで<description>は二回指定しました"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "ファイル %s からテーマの読み込みに失敗しました: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 "テーマファイル %s はルートに<metacity_theme>エレメントを含んでいませんでした"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "デバッグログのオープンに失敗しました: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "ログファイル %s の fdopen() に失敗しました: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "ログファイル %s をオープンしました\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "アプリケーションは偽物の_NET_WM_PID %ld を設定しました\n"
@@ -1862,6 +1912,15 @@ msgstr "プロパティ %s(ウィンドウ 0x%lx) は無効なUTF-8を含んで
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "ウィンドウメニュー"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index f6e0ab440..245f45567 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.3.377\n"
-"POT-Creation-Date: 2002-05-31 13:01+0900\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-04-17 09:50+0900\n"
 "Last-Translator: Young-Ho Cha <ganadist@chollian.net>\n"
 "Language-Team: korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "정수값 \"%s\"을 분석할 수 없습니다"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "문자열 \"%2$s\"에서 이어진 문자 \"%1$s\"를 이해할 수 없습니다"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "호스트 이름 얻기 실패: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X 윈도 시스템 디스플레이 '%s'를 여는데 실패하였습니다\n"
@@ -89,7 +89,7 @@ msgstr "창 최대화"
 msgid "Unmaximize Window"
 msgstr "창 최대화 취소"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -98,13 +98,13 @@ msgstr ""
 "몇몇 다른 프로그램에서 이미 단축 글쇠로 변경키 %2$x와 글쇠 %1$s를 사용하고 있"
 "습니다\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "테마를 찾을 수 없습니다! %s에 사용할 수 있는 테마가 있는지 확인하십시오."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "재시작 실패: %s\n"
@@ -174,10 +174,10 @@ msgid ""
 "titlebar_uses_desktop_font is false."
 msgstr ""
 "창 제목 막대에 대한 글꼴 설명을 기술합니다. titlebar_font_size 옵션이 0으로 "
-"설정될 때만 기술된 크기가 적용됩니다. 또한 이 옵션은 titlebar_uses_desktop_font "
-"옵션이 true로 설정되어 있으면 사용할 수 없습니다. titlebar_uses_desktop_font"
-"가 false 이어도 바탕화면 설정을 사용하도록 하기 위해, 기본값으로 "
-"titlebar_font는 설정되어 있지 않습니다."
+"설정될 때만 기술된 크기가 적용됩니다. 또한 이 옵션은 "
+"titlebar_uses_desktop_font 옵션이 true로 설정되어 있으면 사용할 수 없습니다. "
+"titlebar_uses_desktop_font가 false 이어도 바탕화면 설정을 사용하도록 하기 위"
+"해, 기본값으로 titlebar_font는 설정되어 있지 않습니다."
 
 #: src/metacity.schemas.in.h:3
 msgid "Activate window menu"
@@ -922,8 +922,8 @@ msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"이 창은 \"현재 설정 저장\"을 지원하지 않기 때문에 다음 번에 로그인 할 때"
-"수동으로 재시작 하여야 합니다."
+"이 창은 \"현재 설정 저장\"을 지원하지 않기 때문에 다음 번에 로그인 할 때수동"
+"으로 재시작 하여야 합니다."
 
 #: src/prefs.c:335 src/prefs.c:351 src/prefs.c:367 src/prefs.c:383
 #: src/prefs.c:403 src/prefs.c:419 src/prefs.c:435 src/prefs.c:451
@@ -948,8 +948,8 @@ msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
 "maximum is %d\n"
 msgstr ""
-"Gconf 키 %2$s에 저장된 %1$d 는 사용할 수 없는 작업 공간 번호 입니다, 현재 최대"
-"값은 %3$d 입니다\n"
+"Gconf 키 %2$s에 저장된 %1$d 는 사용할 수 없는 작업 공간 번호 입니다, 현재 최"
+"대값은 %3$d 입니다\n"
 
 #: src/prefs.c:693
 msgid ""
@@ -983,19 +983,32 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d는 잘못되었습니다\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
+
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "디스플레이 '%2$s'의 화면 %1$d를 떼어 놓을수 없습니다\n"
+
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d는 이미 창 관리자가 실행되고 있습니다\n"
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "디스플레이 '%2$s'의 화면 %1$d를 떼어 놓을수 없습니다\n"
 
 #: src/session.c:273
@@ -1004,109 +1017,119 @@ msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
-"세션 관리자에 연결 열기를 실패했습니다, 따라서 창 위치가 저장되지 않을 "
-"것입니다: %s\n"
+"세션 관리자에 연결 열기를 실패했습니다, 따라서 창 위치가 저장되지 않을 것입니"
+"다: %s\n"
 
-#: src/session.c:805 src/session.c:812
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "디렉토리 '%s'를 만들수 없습니다: %s\n"
 
-#: src/session.c:822
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "세션 파일 '%s'를 쓰기위해 열 수 없습니다: %s\n"
 
-#: src/session.c:954
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "세션 파일 '%s'를 쓰는 중 오류: %s\n"
 
-#: src/session.c:959
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "세션 파일 '%s'를 닫는 중 오류: %s\n"
 
-#: src/session.c:1032
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "저장된 세션 파일 %s를 읽기 실패: %s\n"
 
-#: src/session.c:1067
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "저장된 세션파일을 분석하기 실패: %s\n"
 
-#: src/session.c:1116
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session> 속성이 보이지만 이미 session ID를 가지고 있습니다"
 
-#: src/session.c:1129
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "<metacity_session> 요소에 알수 없는 속성 %s"
 
-#: src/session.c:1146
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "포함된 <window> 태그"
 
-#: src/session.c:1196 src/session.c:1228
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "<window> 요소에 알수 없는 속성 %s"
 
-#: src/session.c:1288
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "<geometry> 요소에 알수 없는 속성 %s"
 
-#: src/session.c:1308
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "알수 없는 속성 %s"
 
-#: src/session.c:1681
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
-"세션 관리를 지원하지 않는 응용프로그램을 경고하기 위해 metacity-dialog를"
-"실행하는 중 오류가 발생했습니다: %s\n"
+"세션 관리를 지원하지 않는 응용프로그램을 경고하기 위해 metacity-dialog를실행"
+"하는 중 오류가 발생했습니다: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "맨 위"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "맨 아래"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "왼쪽"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "오른쪽"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "프레임 위치가 \"%s\"차원으로 지정되지 않았습니다"
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "프레임 위치가 가장자리 \"%2$s\" 가장자리의 \"%1$s\"차원으로 지정되지 않았습니"
 "다."
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "프레임 위치가 \"%s\"차원으로 지정되지 않았습니다"
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "서서히 변하는 색으로 지정하려면 최소 2색이 필요합니다"
 
-#: src/theme.c:839
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1115,7 +1138,7 @@ msgstr ""
 "GTK 색상 지정은 중괄호안에 있어야 합니다, 예: gtk:fg[NORMAL] NORMAL은 값; \"%"
 "s\"를 분석할 수 없습니다"
 
-#: src/theme.c:853
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1124,17 +1147,17 @@ msgstr ""
 "GTK 색상 지정은 값 뒤에 중괄호로 닫혀 있어야 합니다, 예: gtk:fg[NORMAL]NORMAL"
 "은 값; \"%s\"를 분석할 수 없습니다"
 
-#: src/theme.c:864
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "색상 지정의 \"%s\" 값을 이해할 수 없습니다"
 
-#: src/theme.c:877
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "색상 지정의 색상 구성요소 \"%s\"를 이해할 수 없습니다"
 
-#: src/theme.c:907
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1143,39 +1166,57 @@ msgstr ""
 "섞기 형식은 \"blend/bg_color/fg_color/alpha\"입니다, \"%s\"는 형식에 맞지 않"
 "습니다"
 
-#: src/theme.c:918
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "색상 섞기에서 알파 값 \"%s\"를 분석할 수 없습니다"
 
-#: src/theme.c:928
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "색상 섞기에서 알파 값 \"%s\"는 0.0 과 1.0사이의 값이 아닙니다"
 
-#: src/theme.c:967
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"섞기 형식은 \"blend/bg_color/fg_color/alpha\"입니다, \"%s\"는 형식에 맞지 않"
+"습니다"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "색상 섞기에서 알파 값 \"%s\"를 분석할 수 없습니다"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "색상 \"%s\"을 분석할 수 없습니다"
 
-#: src/theme.c:1217
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "좌표식에 허용되지 않는 문자 '%s'가 포함되어 있습니다"
 
-#: src/theme.c:1244
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "좌표식에 분석할 수 없는 부동소수점 숫자 '%s'가 포함되어 있습니다"
 
-#: src/theme.c:1258
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "좌표식에 분석할 수 없는 정수 '%s'가 포함되어 있습니다"
 
-#: src/theme.c:1325
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1183,34 +1224,34 @@ msgid ""
 msgstr ""
 "좌표식에 이 글자 시작부분에 알수없는 연산자가 포함되어 있습니다: \"%s\""
 
-#: src/theme.c:1382
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "좌표식이 비어있거나 이해할 수 없습니다"
 
-#: src/theme.c:1521 src/theme.c:1531 src/theme.c:1565
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "좌표식의 결과 값이 0로 나누었습니다"
 
-#: src/theme.c:1573
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "좌표식에서 부동소수점 수에 나머지 연산을 하려 합니다"
 
-#: src/theme.c:1630
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "좌표식에서 피연산자가 들어갈 곳에 연산자 \"%s\"가 있습니다"
 
-#: src/theme.c:1639
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "좌표식에서 연산자가 들어갈 곳에 피연산자가 있습니다"
 
-#: src/theme.c:1647
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "좌표식에서 피연산자 대신에 연산자로 끝나있습니다"
 
-#: src/theme.c:1657
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1218,7 +1259,7 @@ msgid ""
 msgstr ""
 "좌표식에서 피연산자가 없는 연산자 \"%2$c\"다음에 연산자 \"%1$c\"가 있습니다"
 
-#: src/theme.c:1776
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1226,29 +1267,29 @@ msgstr ""
 "좌표식 분석기의 버퍼가 넘쳤습니다. 이것은 Metacity의 벌레입니다, 하지만 혹시 "
 "그와 같은 아주 큰 표현식이 필요합니까?"
 
-#: src/theme.c:1805
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "좌표식에 닫는 괄호는 있지만 여는 괄호가 없습니다"
 
-#: src/theme.c:1868
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "좌표식에 알 수 없는 변수나 상수 \"%s\"가 있습니다"
 
-#: src/theme.c:1925
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "좌표식에 여는 괄호는 있지만 닫는 괄호가 없습니다"
 
-#: src/theme.c:1936
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "좌표식에 어떠한 연산자나 피연산자가 없습니다"
 
-#: src/theme.c:2180 src/theme.c:2202 src/theme.c:2223
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "테마가 오류 값을 내는 표현 \"%s\"을 포함하고 있습니다: %s\n"
 
-#: src/theme.c:3490
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1257,7 +1298,7 @@ msgstr ""
 "이 프레임 스타일에는 <button function=\"%s\" style=\"%s\" draw_ops=\"whatever"
 "\"/>가 지정되어야 합니다"
 
-#: src/theme.c:3899 src/theme.c:3931
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
@@ -1265,37 +1306,37 @@ msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" state=\"whatever\"/> 가 없습니"
 "다"
 
-#: src/theme.c:3982
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "테마 \"%s\"를 읽을 수 없습니다: %s\n"
 
-#: src/theme.c:4128
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "테마 \"%s\"의 이름이 없습니다"
 
-#: src/theme.c:4135
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "테마 \"%s\"에 저작자가 표시되어 있지 않습니다"
 
-#: src/theme.c:4142
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "테마 \"%s\"에 만든 날짜가 표시되어 있지 않습니다"
 
-#: src/theme.c:4149
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "테마 \"%s\" 에 설명이 없습니다"
 
-#: src/theme.c:4156
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "테마 \"%s\"에 저작권이 없습니다"
 
-#: src/theme.c:4166
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1304,7 +1345,7 @@ msgstr ""
 "테마 \"%2$s\"의 창 형식 \"%1$s\"에 대한 프레임 스타일이 없습니다,<window "
 "type=\"%3$s\" style_set=\"whatever\"/> 요소를 추가하십시오"
 
-#: src/theme.c:4188
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1313,66 +1354,66 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops\"whatever\"/> 가 이 테마에 "
 "지정되어 있어야 합니다"
 
-#: src/theme.c:4571 src/theme.c:4631
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "사용자 정의 상수는 대문자로 시작되어야 합니다; \"%s\"는 그렇지 않습니다"
 
-#: src/theme.c:4579 src/theme.c:4639
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "상수 \"%s\" 는 이미 지정되어 있습니다"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "%d 줄 %d 문자: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "같은 요소 <%2$s>에 \"%1$s\"속성이 두번 겹쳐져 있습니다"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "이 문맥의 <%2$s> 요소에 속성 \"%1$s\"는 올바르지 않습니다"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "정수 %ld는 양수여야 합니다"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "정수 %ld가 너무 큽니다, 현재 최대값은 %d 입니다"
 
-#: src/theme-parser.c:520
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "부동소수점 수 \"%s\"로 분석할 수 없습니다"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Boolean 값은 \"true\"이거나 \"false\"만 됩니다 \"%s\"는 안됩니다"
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "각도 값은 0.0과 360.0 사이여야 합니다, %g 로 되어 있습니다\n"
 
-#: src/theme-parser.c:591
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "알파 값은 0.0(보이지 않음)과 1.0(완전 불투명)사이여야 합니다, %g로 되어있습니"
 "다\n"
 
-#: src/theme-parser.c:624
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1381,330 +1422,345 @@ msgstr ""
 "잘못된 제목 확대 \"%s\" (xx-small, x-small, small, medium, large, x-large, "
 "xx-large중에 하나여야 합니다)\n"
 
-#: src/theme-parser.c:669 src/theme-parser.c:677 src/theme-parser.c:2679
-#: src/theme-parser.c:2768 src/theme-parser.c:2775 src/theme-parser.c:2782
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "요소 <%2$s> 에 \"%1$s\" 속성 없음"
 
-#: src/theme-parser.c:747 src/theme-parser.c:837 src/theme-parser.c:875
-#: src/theme-parser.c:952 src/theme-parser.c:1002 src/theme-parser.c:1010
-#: src/theme-parser.c:1066 src/theme-parser.c:1074
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "<%2$s> 요소에 \"%1$s\" 속성 없음"
 
-#: src/theme-parser.c:777 src/theme-parser.c:845 src/theme-parser.c:883
-#: src/theme-parser.c:960
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> 이름 \"%s\" 가 두번 사용되었습니다"
 
-#: src/theme-parser.c:789 src/theme-parser.c:895 src/theme-parser.c:972
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> 부모 \"%s\" 는 이미 지정되어 있습니다"
 
-#: src/theme-parser.c:908
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> 위치 \"%s\" 는 이미 지정되어 있습니다"
 
-#: src/theme-parser.c:921
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> 는 위치나 위치를 가지는 부모를 지정하여야 합니다"
 
-#: src/theme-parser.c:1020
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "<%2$s> 요소에 알수 없는 형식 \"%1$s\""
 
-#: src/theme-parser.c:1031
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "<%2$s> 요소에 알수 없는 스티일 셋 \"%1$s\""
 
-#: src/theme-parser.c:1039
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "창 형식 \"%s\" 는 이미 스타일 셋으로 지정되어 있습니다"
 
-#: src/theme-parser.c:1083
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "메뉴 아이콘의 알수 없는 기능 \"%s\""
 
-#: src/theme-parser.c:1092
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "메뉴 아이콘의 알수 없는 상태 \"%s\""
 
-#: src/theme-parser.c:1100
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "테마에 기능 %s 상태 %s에 대한 메뉴아이콘이 있습니다"
 
-#: src/theme-parser.c:1117 src/theme-parser.c:2987 src/theme-parser.c:3066
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "이름 \"%s\"를 가지는 <draw_ops>가 지정되지 않았습니다"
 
-#: src/theme-parser.c:1132 src/theme-parser.c:1196 src/theme-parser.c:1394
-#: src/theme-parser.c:2867 src/theme-parser.c:2921 src/theme-parser.c:3081
-#: src/theme-parser.c:3258 src/theme-parser.c:3296 src/theme-parser.c:3334
-#: src/theme-parser.c:3372
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "요소 <%s>가 <%s>아래에 허용되지 않습니다"
 
-#: src/theme-parser.c:1222 src/theme-parser.c:1296
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "<%s>요소에 \"name\" 속성이 없습니다"
 
-#: src/theme-parser.c:1229
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"value\" 속성이 없습니다"
 
-#: src/theme-parser.c:1259
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "거리 \"%s\"를 알수 없습니다"
 
-#: src/theme-parser.c:1303
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "거리 \"%s\"를 알수 없습니다"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"top\"속성이 없습니다"
 
-#: src/theme-parser.c:1310
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"bottom\"속성이 없습니다"
 
-#: src/theme-parser.c:1317
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"left\"속성이 없습니다"
 
-#: src/theme-parser.c:1324
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"right\"속성이 없습니다"
 
-#: src/theme-parser.c:1356
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "가장자리 \"%s\"를 알수 없습니다"
 
-#: src/theme-parser.c:1504 src/theme-parser.c:1614 src/theme-parser.c:1717
-#: src/theme-parser.c:1904 src/theme-parser.c:2612
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"color\"속성이 없습니다"
 
-#: src/theme-parser.c:1511
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"x1\"속성이 없습니다"
 
-#: src/theme-parser.c:1518 src/theme-parser.c:2475
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"y1\"속성이 없습니다"
 
-#: src/theme-parser.c:1525
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"x2\"속성이 없습니다"
 
-#: src/theme-parser.c:1532 src/theme-parser.c:2482
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"y2\"속성이 없습니다"
 
-#: src/theme-parser.c:1621 src/theme-parser.c:1724 src/theme-parser.c:1830
-#: src/theme-parser.c:1911 src/theme-parser.c:2013 src/theme-parser.c:2106
-#: src/theme-parser.c:2244 src/theme-parser.c:2370 src/theme-parser.c:2468
-#: src/theme-parser.c:2539 src/theme-parser.c:2619
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"x\"속성이 없습니다"
 
-#: src/theme-parser.c:1628 src/theme-parser.c:1731 src/theme-parser.c:1837
-#: src/theme-parser.c:1918 src/theme-parser.c:2020 src/theme-parser.c:2113
-#: src/theme-parser.c:2251 src/theme-parser.c:2377 src/theme-parser.c:2546
-#: src/theme-parser.c:2626
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"y\"속성이 없습니다"
 
-#: src/theme-parser.c:1635 src/theme-parser.c:1738 src/theme-parser.c:1844
-#: src/theme-parser.c:1925 src/theme-parser.c:2027 src/theme-parser.c:2120
-#: src/theme-parser.c:2258 src/theme-parser.c:2384 src/theme-parser.c:2553
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"width\"속성이 없습니다"
 
-#: src/theme-parser.c:1642 src/theme-parser.c:1745 src/theme-parser.c:1851
-#: src/theme-parser.c:1932 src/theme-parser.c:2034 src/theme-parser.c:2127
-#: src/theme-parser.c:2265 src/theme-parser.c:2391 src/theme-parser.c:2560
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"height\"속성이 없습니다"
 
-#: src/theme-parser.c:1752
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"start_angle\"속성이 없습니다"
 
-#: src/theme-parser.c:1759
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"extent_angle\"속성이 없습니다"
 
-#: src/theme-parser.c:1939
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"alpha\"속성이 없습니다"
 
-#: src/theme-parser.c:2006
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"type\"속성이 없습니다"
 
-#: src/theme-parser.c:2058
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "서서히 변하는 색 형식 값 \"%s\"를 이해할 수 없습니다"
 
-#: src/theme-parser.c:2134
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"filename\"속성이 없습니다"
 
-#: src/theme-parser.c:2223 src/theme-parser.c:2356 src/theme-parser.c:2461
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
+#, fuzzy, c-format
+msgid "Did not understand fill type \"%s\" for <%s> element"
+msgstr "<%2$s>요소의 state \"%1$s\"를 이해할 수 없습니다"
+
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"state\"속성이 없습니다"
 
-#: src/theme-parser.c:2230 src/theme-parser.c:2363
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"shadow\"속성이 없습니다"
 
-#: src/theme-parser.c:2237
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "요소 <%s>에 \"arrow\"속성이 없습니다"
 
-#: src/theme-parser.c:2290 src/theme-parser.c:2412 src/theme-parser.c:2500
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "<%2$s>요소의 state \"%1$s\"를 이해할 수 없습니다"
 
-#: src/theme-parser.c:2300 src/theme-parser.c:2422
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "<%2$s>요소의 shadow \"%1$s\"를 이해할 수 없습니다"
 
-#: src/theme-parser.c:2310
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "<%2$s>요소의 arrow \"%1$s\"를 이해할 수 없습니다"
 
-#: src/theme-parser.c:2705 src/theme-parser.c:2821
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "\"%s\"라 불리는 <draw_ops>는 정의되지 않았습니다"
 
-#: src/theme-parser.c:2717 src/theme-parser.c:2833
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "draw_ops 를 포함하는 \"%s\"가 자기 자신을 참조하고 있습니다"
 
-#: src/theme-parser.c:2896
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"value\"속성이 없습니다"
 
-#: src/theme-parser.c:2953
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"position\"속성이 없습니다"
 
-#: src/theme-parser.c:2962
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "프레임 조각에 대한 알수 없는 위치 \"%s\""
 
-#: src/theme-parser.c:2970
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "프레임 스타일은 이미 %s 위치에 조각이 있습니다"
 
-#: src/theme-parser.c:3015
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"function\"속성이 없습니다"
 
-#: src/theme-parser.c:3023 src/theme-parser.c:3127
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"state\"속성이 없습니다"
 
-#: src/theme-parser.c:3032
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "버튼에 알수없는 기능 \"%s\""
 
-#: src/theme-parser.c:3041
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "버튼에 알수없는 상태 \"%s\""
 
-#: src/theme-parser.c:3049
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "프레임 스타일에 버튼의 기능 %s 상태 %s가 이미 있습니다"
 
-#: src/theme-parser.c:3119
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"focus\"속성이 없습니다"
 
-#: src/theme-parser.c:3135
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "<%s> 요소에 \"style\"속성이 없습니다"
 
-#: src/theme-parser.c:3144
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" 는 focus 속성에 대한 올바른 값이 아닙니다"
 
-#: src/theme-parser.c:3153
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\"는 state 속성에 대한 올바른 값이 아닙니다"
 
-#: src/theme-parser.c:3163
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "\"%s\"라는 스타일은 정의되지 않았습니다"
 
-#: src/theme-parser.c:3173
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "<%s>요소에 \"resize\"속성이 없습니다"
 
-#: src/theme-parser.c:3183
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "resize 속성에 \"%s\"는 올바른 값이 아닙니다"
 
-#: src/theme-parser.c:3193
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1712,17 +1768,17 @@ msgid ""
 msgstr ""
 "maximized/shaded 상태에서 <%s> 요소는 \"resize\" 속성을 가지지 않습니다"
 
-#: src/theme-parser.c:3207
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "스타일에 상태 %s 크기 조절 %s 초점 %s에 대해 이미 지정되어 있습니다"
 
-#: src/theme-parser.c:3218 src/theme-parser.c:3229 src/theme-parser.c:3240
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "스타일에 상태 %s 초점 %s에 대해 이미 지정되어 있습니다"
 
-#: src/theme-parser.c:3279
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1730,7 +1786,7 @@ msgstr ""
 "<piece> 요소에 두개의 draw_ops를 가질수 없습니다 (테마에 draw_ops 속성과 "
 "<draw_ops>요소를 지정했거나 두 요소를 지정했습니다"
 
-#: src/theme-parser.c:3317
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1738,7 +1794,7 @@ msgstr ""
 "<button> 요소에 두개의 draw_ops를 가질수 없습니다 (테마에 draw_ops 속성과 "
 "<draw_ops>요소를 지정했거나 두 요소를 지정했습니다"
 
-#: src/theme-parser.c:3355
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1746,100 +1802,101 @@ msgstr ""
 "<menu_icon> 요소에 두개의 draw_ops를 가질수 없습니다 (테마에 draw_ops 속성과 "
 "<draw_ops>요소를 지정했거나 두 요소를 지정했습니다"
 
-#: src/theme-parser.c:3402
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "테마의 Outermost 요소는 <%s>가 아니라 <metacity_theme>여야 합니다"
 
-#: src/theme-parser.c:3422
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr "name/author/date/description 요소 안에서 요소 <%s>가 허용되지 않습니다"
 
-#: src/theme-parser.c:3427
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "<constant> 요소 안에서 요소 <%s>가 허용되지 않습니다"
 
-#: src/theme-parser.c:3438
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "distance/border 요소 안에서 요소 <%s>가 허용되지 않습니다"
 
-#: src/theme-parser.c:3460
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "draw operation 요소 안에서 요소 <%s>가 허용되지 않습니다"
 
-#: src/theme-parser.c:3470 src/theme-parser.c:3500 src/theme-parser.c:3505
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%2$s>요소 안에서 요소 <%1$s>가 허용되지 않습니다"
 
-#: src/theme-parser.c:3722
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "프레임 조각에 draw_ops가 제공하지 않습니다"
 
-#: src/theme-parser.c:3737
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "버튼에 draw_ops가 제공되지 않습니다"
 
-#: src/theme-parser.c:3752
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "메뉴 아이콘에 draw_ops가 제공되지 않습니다"
 
-#: src/theme-parser.c:3792
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "요소 <%s>안에 텍스트가 허용되지 않습니다"
 
-#: src/theme-parser.c:3847
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "이 테마에서 <name>이 두번 지정되었습니다"
 
-#: src/theme-parser.c:3858
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "이 테마에서 <author>가 두번 지정되었습니다"
 
-#: src/theme-parser.c:3869
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "이 테마에서 <copyright>가 두번 지정되었습니다"
 
-#: src/theme-parser.c:3880
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "이 테마에서 <date>가 두번 지정되었습니다"
 
-#: src/theme-parser.c:3891
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "이 테마에서 <description>가 두번 지정되었습니다"
 
-#: src/theme-parser.c:4093
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "파일 %s에서 테마 읽기 실패: %s\n"
 
-#: src/theme-parser.c:4148
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "테마 파일 %s가 root <metacity_theme> 요소를 포함하지 않습니다"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "디버그 로그 열기 실패: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "로그 파일 %s를 fdopen()하기 실패: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "로그 파일 %s를 엽니다\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "응용 프로그램이 가짜 _NET_WM_PID %ld를 설정하였습니다\n"
@@ -1862,6 +1919,15 @@ msgstr "창 0x%2$lx 의 등록 정보 %1$s는 잘못된 UTF-8을 포함하고 
 msgid "Metacity"
 msgstr "메타시티"
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "창 초점 모드"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr "마우스를 누르면 초점 주기(_K)"
diff --git a/po/lv.po b/po/lv.po
index 7486479f0..a81c1948f 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-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\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"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, fuzzy, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Nevarēja pārstartēt: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nevarēja atvērt X Logu Sistēmas displeju '%s'\n"
@@ -87,7 +87,7 @@ msgstr "Palielināt Logu"
 msgid "Unmaximize Window"
 msgstr "Atjaunot Logu"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -95,12 +95,12 @@ msgid ""
 msgstr ""
 "Kāda cita programma jau lieto taustiņu %s ar modifcētājiem %x kā sasaisti\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Nevarēja pārstartēt: %s\n"
@@ -996,832 +996,881 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, fuzzy, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Displeja '%s' ekrāns %d  ir nepareizs\n"
 
-#: src/screen.c:212
-#, fuzzy, 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"
+#: src/screen.c:211
+#, c-format
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, fuzzy, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Nevarēja izlaist displeja '%s' ekrānu %d\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, 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"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Nevarēja izlaist displeja '%s' ekrānu %d\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, 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"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Kļūda ierakstot sesijas failu '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Kļūda aizverot sesijas failu '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 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:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Kļūda parsējot saglabāto sesijas failu: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, fuzzy, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Nezināms atribūts %s <ģeogrāfijas> elementam"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "ligzdots <loga> tags"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Nezināms atribūts %s <ģeogrāfijas> elementam"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Nezināms elements %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, fuzzy, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nevarēja izveidot direktoriju '%s': %s\n"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, fuzzy, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, fuzzy, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, fuzzy, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, fuzzy, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, fuzzy, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, fuzzy, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, fuzzy, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, fuzzy, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, fuzzy, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, fuzzy, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, fuzzy, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, fuzzy, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, fuzzy, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, fuzzy, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, fuzzy, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, fuzzy, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, fuzzy, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, fuzzy, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, fuzzy, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Nezināms atribūts %s <loga> elementam"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, fuzzy, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Kļūda parsējot saglabāto sesijas failu: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Nevarēja nolasīt saglabāto sesijas failu %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1844,6 +1893,15 @@ msgstr "Loga 0x%lx Rekvizīts %s saturēja nepareizu UTF-8\n"
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Loga Izvēlne"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 613f013fb..d9c6c331e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Metacity 2.3.x\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-02-11 01:01+0800\n"
 "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n"
 "Language-Team: Projek Gabai (Bahasa Melayu) <gabai-penyumbang@lists."
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, fuzzy, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Tak dapat mencipta direktori %s: %s\n"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -47,7 +47,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Gagal mengulanghidupkan: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gagal membuka paparan %s Sistem X Window\n"
@@ -89,7 +89,7 @@ msgid "Unmaximize Window"
 msgstr "Nyah Maksima Tetingkap"
 
 # modifier=? binding=?
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -98,12 +98,12 @@ msgstr ""
 "Terdapat program lain yang sudah menggunakan kekukci %s dengan modifier %x "
 "sebagai binding\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Gagal mengulanghidupkan: %s\n"
@@ -999,175 +999,213 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skrin %d pada paparan '%s' adalah tidak sah\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Skrin %d pada paparan '%s' sudah mempunyai pengurus tetingkap\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Tak dapat melepaskan skrin %d pada paparan '%s'\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Skrin %d pada paparan '%s' sudah mempunyai pengurus tetingkap\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Tak dapat melepaskan skrin %d pada paparan '%s'\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Tak dapat mencipta direktori %s: %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "tak dapat membuka fail sessi '%s' untuk ditulis: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Ralat ketika menulis fail sessi '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Ralat menutup fail sessi '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Gagal dapat baca fail sessi yang disimpan %s: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Gagal menghantar fail sessi yang disimpan: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, fuzzy, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Atirbut tidak dikenali pada unsur <geometry>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "tag <window> bersarang"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, fuzzy, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Atirbut tidak dikenali pada unsur <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Unsur yang tidak dikenali %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Tak dapat mencipta direktori %s: %s\n"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, fuzzy, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Tak dapat mencipta direktori %s: %s\n"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, fuzzy, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Penyataan kordinat mengandungi aksara '%c' yang tidak diizinkan"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1176,47 +1214,47 @@ msgstr ""
 "Penyataan koordinat mengandungi nombor titik apungan '%s' yang tak dpaat "
 "dihantar"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Penyataan kordinat mengandungi integer '%s' yang tak boleh dihantar"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, fuzzy, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "Penyataan kordinat mempunyai pembolehubah tidak diketahui \"%s\""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Penyataan kordinat kosong dan tidak difahami"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Penyataan kordinat dibahagi sifar"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Penyatana kordinat cuba menggunakan operator mod pada nombor titik apungan"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, fuzzy, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Penyataan kordinat mempunyai operator \"%c\" dimana operand diperlukan"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Penyataan kordinat mempunyai operand dimana operator diperlukan"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Penyataan kordinat ditamatkan dengan operator selain daripada operand"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1225,7 +1263,7 @@ msgstr ""
 "Penyataan kordinat mempunyai operator \"%c\" selepas operator \"%c\" tanpa "
 "operand diantaranya"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1233,606 +1271,617 @@ msgstr ""
 "Penghantar penyataan kordinat telah overflow buffernya, ini memang pepijat "
 "metacity, tetapi anda pasti memerlukan penyataan yang besar sebegitu?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Penyataan kordinat mempunyai penutup kurungan tanpa pembuka kurungan"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, fuzzy, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Penyataan kordinat mempunyai pembolehubah tidak diketahui \"%s\""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "\"Penyataan kordinat mempunyai membuka kurungan tanpa penutup kurungan"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Penyataan kordinat tidak mempunyai operator atau operand"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Tema mengandungi penyataan \"%s\" yang menyebabkan ralat: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, fuzzy, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Gagal dapat baca fail sessi yang disimpan %s: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, fuzzy, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 "Penyatana kordinat cuba menggunakan operator mod pada nombor titik apungan"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, fuzzy, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, fuzzy, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, fuzzy, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, fuzzy, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, fuzzy, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, fuzzy, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, fuzzy, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, fuzzy, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, fuzzy, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, fuzzy, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, fuzzy, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, fuzzy, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, fuzzy, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, fuzzy, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, fuzzy, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, fuzzy, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, fuzzy, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, fuzzy, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, fuzzy, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Atirbut tidak dikenali pada unsur <window>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, fuzzy, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Gagal dapat baca fail sessi yang disimpan %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Gagal menghantar fail sessi yang disimpan: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Gagal dapat baca fail sessi yang disimpan %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1855,6 +1904,15 @@ msgstr "Ciri-ciri %s pada tetingkap 0x%lx mengandungi  UTF-8 yang tidak sah\n"
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Menu Tetingkap"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index c9458544b..6ae369ed1 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-06-03 21:53+0200\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-06-03 22:04+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (bokmål) <i18n-no@lister.ping.uio.no>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Kunne ikke lese «%s» som et heltall"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Forsto ikke etterslepende tegn «%s» i streng «%s»"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Feil under henting av vertsnavn: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"
@@ -89,7 +89,7 @@ msgstr "Maksimer vindu"
 msgid "Unmaximize Window"
 msgstr "Gjenopprett vindu"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -98,14 +98,14 @@ msgstr ""
 "Et annet program bruker allerede nøkkelen %s med modifikatorer %x som "
 "binding\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Kunne ikke finne et tema! Sjekk at %s eksisterer og inneholder de vanlige "
 "temaene."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Feil under omstart: %s\n"
@@ -990,87 +990,100 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Skjerm %d på display «%s» har allerede en vindushåndterer\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Skjerm %d på display «%s» har allerede en vindushåndterer\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Kunne ikke opprette katalog «%s»: %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Kunne ikke åpne sesjonsfil «%s» for skriving: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Feil under skriving av sesjonsfil «%s»: %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Feil under lukking av sesjonsfil «%s»: %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Feil under lesing av lagret sesjonsfil %s: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Feil under tolking av lagret sesjonsfil: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "<metacity_session>-attributt sett men vi har allerede sesjons-ID"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Ukjent attributt %s på <metacity_session>-element"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "<window> tag med flere nivåer"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Ukjent attributt %s på <window>-element"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Ukjent attributt %s på <geometry>-element"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Ukjent element %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1079,37 +1092,47 @@ msgstr ""
 "Feil under oppstart av metacity-dialog for å advare om applikasjoner som "
 "ikke støtter sesjonshåndtering: %s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "topp"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "bunn"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "venstre"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "høyre"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri spesifiserer ikke dimensjon «%s» for kant «%s»"
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Gradienter må ha minst to farger"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1118,7 +1141,7 @@ msgstr ""
 "GTK-fargespesifikasjon må ha tilstand i klammer, f.eks. gtk:fg[NORMAL], hvor "
 "NORMAL er tilstanden; kunne ikke lese «%s»"
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1127,17 +1150,17 @@ msgstr ""
 "GTK-fargespesifikasjon må ha en avsluttende klamme etter tilstanden, f.eks. "
 "gtk:fg[NORMAL], hvor NORMAL er tilstanden; kunne ikke lese «%s»"
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forsto ikke tilstand «%s» i fargespesifikasjonen"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forsto ikke fargekomponent «%s» i fargespesifikasjonen"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1146,39 +1169,57 @@ msgstr ""
 "Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
 "formatet"
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha-verdi «%s» i blandet farge er ikke mellom 0.0 og 1.0"
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
+"formatet"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke lese farge «%s»"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn «%s» som ikke er tillatt"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, 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:1284
+#: src/theme.c:1269
 #, 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:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1187,34 +1228,34 @@ msgstr ""
 "Koordinatuttrykket inneholdt en ukjent operator ved begynnelsen av denne "
 "teksten: «%s»"
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forstått"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 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:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator «%s» hvor en operand var ventet"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 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:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1223,7 +1264,7 @@ msgstr ""
 "Koordinatuttrykket har en operator «%c» etter en operator «%c» og ingen "
 "operand mellom dem."
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1231,30 +1272,30 @@ 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel eller konstant «%s»"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en åpen parantes uten en avsluttende parantes"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatuttrykket ser ikke ut til å ha noen operatorer eller operander"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, 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"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1263,44 +1304,44 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må "
 "spesifiseres for denne rammestilen"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Mangler <frame state=«%s» resize=«%s» focus=«%s» stil=«ett-eller-annet»/>"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Klarte ikke å laste tema «%s»: %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "<name> er ikke satt for tema «%s»"
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "<author> er ikke satt for tema «%s»"
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "<date> er ikke satt for tema «%s»"
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "<description> er ikks satt for tema «%s»"
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "<copyright> er ikke satt for tema «%s»"
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1309,7 +1350,7 @@ msgstr ""
 "Ingen rammestil satt for vindustype «%s» i tema «%s», legg til et <window "
 "type=«%s» style_set=«ett-eller-annet»/>-element"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1318,65 +1359,65 @@ msgstr ""
 "<menu_icon function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må være "
 "spesifisert for dette temaet"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Brukerdefinerte konstanter må begynne med stor bokstav; «%s» gjør ikke det"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstant «%s» er allerede definert"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linje %d tegn %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attributt «%s» gjentatt to ganger på samme <%s>-element"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attributt «%s» er ugyldig på <%s>-element i denne konteksten"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Heltall %ld må være positivt"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Heltall %ld er for stort, maksimalverdien er %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Kunne ikke lese «%s» som et flyttall"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Bolske verdier må være «sann» eller «usann» ikke «%s»"
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Vinkelen må være mellom 0.0 og 360.0, var %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alpha må være mellom 0.0 (usynlig) og 1.0 (helt ugjennomsiktig), var %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1385,335 +1426,345 @@ msgstr ""
 "Ugyldig skalering av tittel «%s» (må være en av xx-small,x-small,small,"
 "medium,large,x-large,xx-large)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Ingen attributt «%s» på element <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Ingen attributt «%s» på <%s>-element"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> navn «%s» brukt på nytt"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> opphav «%s» er ikke definert"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> geometri «%s» er ikke definert"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> må spesifisere enten en geometri eller et opphav som har geometri"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Ukjent type «%s» på <%s>-element"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Ukjent style_set «%s» på <%s>-element"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Vindutype «%s» er allerede tildelt et stilsett"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Ukjent funksjon for «%s» for menyikon"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Ukjent tilstand «%s» for menyikon"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "Tema har allerede et menyikon for funksjon %s tilstand %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Ingen <draw_ops> med navn «%s» er definert"
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> er ikke tillatt under <%s>"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Ingen «name»-attributt <%s>-element"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Ingen «value»-attributt på element <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Avstand «%s» er ukjent"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "Avstand «%s» er ukjent"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Ingen «top»-attributt på element <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Ingen «bottom»-attributt på element <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Ingen «left»-attributt på element <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Ingen «right»-attributt på element <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Grense «%s» er ukjent"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Ingen «color»-attributt på element <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Ingen «x1»-attributt på <%s>-element"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Ingen «y1»-attributt på element <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Ingen «x2»-attributt på element <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Ingen «y2»-attributt på element <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Ingen «x»-attributt på element <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Ingen «y»-attributt på element <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Ingen «width»-attributt på element <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Ingen «height»-attributt på element <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Ingen «start_angle»-attributt på element <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Ingen «extent_angle»-attributt <%s>-element"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Ingen «alpha»-attributt på element <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Ingen «type»-attributt på element <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Forsto ikke verdi «%s» for gradienttype"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Ingen «filname»-attributt på element <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Forsto ikke fyll-type «%s» for <%s>-element"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Ingen «state»-attributt på element <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Ingen «shadow»-attributt på element <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Ingen «arrow»-attributt på element <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Forsto ikke tilstand «%s» for element <%s>"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Forsto ikke skygge «%s» for element <%s>"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Forsto ikke pil «%s» for element <%s>"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Ingen <draw_ops> kalt «%s» er definert"
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Hvis du tar med draw_ops «%s» her vil dette lage en sirkulær referanse"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Ingen «value»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Ingen «position»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Ukjent posisjon «%s» for rammesdel"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Rammestil har allerede en del i posisjon %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Ingen «function»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Ingen «state»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Ukjent funksjon «%s» for knapp"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Ukjent tilstand «%s» for knapp"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Rammestil har allerede en knapp for funksjon %s tilstand %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Ingen «focus»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Ingen «style»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "«%s» er ikke en gyldig verdi for fokusattributt"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "«%s» er ikke en gyldig verdi for tilstandsattributt"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "En stil med navn «%s» er ikke definert"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Ingen «resize»-attributt på <%s>-element"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "«%s» er ikke en gyldig verdi for attributt for endring av størrelse"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1722,18 +1773,18 @@ msgstr ""
 "Skal ikke være noen «resize»-attributt på <%s>-element for maksimert/"
 "skyggelagt tilstand"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 "Stil er allerede spesifisert for tilstand %s størrelsesendring %s fokus %s"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Stil er allerede spesifisert for tilstand %s fokus %s"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1742,7 +1793,7 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller så "
 "spesifiserte det to elementer)"
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1751,7 +1802,7 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller det "
 "spesifiserte to elementer)"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1760,101 +1811,102 @@ msgstr ""
 "draw_ops-attributt i tillegg til et <draw_ops>-element, eller det "
 "spesifiserte to elementer)"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Ytterste element i temaet må være <metacity_theme> ikke <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 "Element <%s> er ikke tillatt inne i et name/author/date/description element"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Element <%s> er ikke tillatt inne i et <constand> element"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Element <%s> er ikke tillatt inne i et avstands/kant element"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Element <%s> er ikke tillatt inne i et element for tegneoperasjon"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> er ikke tillatt inne i et <%s>-element"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Ingen draw_ops tilbys for rammedelen"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Ingen draw_ops tilbys for knappen"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Ingen draw_ops tilbys for menyikonet"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Ingen tekst er tillatt inne i element <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> spesifisert to ganger for dette tema"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> spesifisert to ganger for dette tema"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> spesifisert to ganger for dette tema"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> spesifisert to ganger for dette tema"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> spesifisert to ganger for dette tema"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Feil under lesing av tema fra fil %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Temafil %s inneholdt ikke et rotelement <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Feil under åpning av feilsøkingslogg: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Feil under fdopen() av loggfil %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Åpnet loggfil %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Applikasjonen satte en feil _NET_WM_PID %ld\n"
diff --git a/po/pl.po b/po/pl.po
index 7d491bbc6..ef168d767 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-07 22:11+0200\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-06-07 22:35+0200\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -17,29 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/delete.c:1 src/delete.c:1 src/metacity-dialog.c:1
-#: src/theme-parser.c:1
+#: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Nie można przetworzyć \"%s\" jako liczby całkowitej (int)"
 
-#: src/delete.c:1 src/delete.c:1 src/metacity-dialog.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Nie można rozpoznać końcowych znaków \"%s\" w napisie \"%s\""
 
-#: src/delete.c:1
+#: src/delete.c:127
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "Nie można przetworzyć komunikatu \"%s\" od procesu okna\n"
 
-#: src/delete.c:1
+#: src/delete.c:262
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "Błąd przy odczycie z procesu obsługującego okno: %s\n"
 
-#: src/delete.c:1
+#: src/delete.c:333
 #, c-format
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
@@ -47,17 +47,17 @@ msgstr ""
 "Przy uruchamianiu metacity-dialog (pytającego o zniszczenie okna) wystąpił "
 "błąd: %s\n"
 
-#: src/delete.c:1
+#: src/delete.c:431
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Nie można uzyskać nazwy komputera: %s\n"
 
-#: src/display.c:1
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nie można otworzyć połączenia z ekranem \"%s\" systemu X Window\n"
 
-#: src/errors.c:1
+#: src/errors.c:154
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -68,32 +68,32 @@ msgstr ""
 "Prawdopodobnie przestał funkcjonować serwer X lub przerwano działanie "
 "menedżera okien.\n"
 
-#: src/errors.c:1
+#: src/errors.c:161
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Poważny błąd we/wy %d (%s) na ekranie \"%s\".\n"
 
-#: src/frames.c:1
+#: src/frames.c:862
 msgid "Close Window"
 msgstr "Zamyka okno"
 
-#: src/frames.c:1
+#: src/frames.c:865
 msgid "Window Menu"
 msgstr "Menu okna"
 
-#: src/frames.c:1
+#: src/frames.c:868
 msgid "Minimize Window"
 msgstr "Minimalizuje okno"
 
-#: src/frames.c:1
+#: src/frames.c:871
 msgid "Maximize Window"
 msgstr "Maksymalizuje okno"
 
-#: src/frames.c:1
+#: src/frames.c:874
 msgid "Unmaximize Window"
 msgstr "Przywraca zmaksymalizowane okno"
 
-#: src/keybindings.c:1
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -102,65 +102,65 @@ msgstr ""
 "Skrótu klawiszowego z klawiszem %s i modyfikatorami %x używa już inny "
 "program\n"
 
-#: src/main.c:1
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Nie można odnaleźć żadnego motywu! Upewnij się, że istnieje katalog \"%s\" i "
 "zawiera standardowe motywy."
 
-#: src/main.c:1
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Ponowne uruchomienie nie powiodło się: %s\n"
 
-#: src/menu.c:1
+#: src/menu.c:49
 msgid "_Close"
 msgstr "Za_mknij"
 
-#: src/menu.c:1
+#: src/menu.c:50
 msgid "_Minimize"
 msgstr "Zm_inimalizuj"
 
-#: src/menu.c:1
+#: src/menu.c:51
 msgid "Ma_ximize"
 msgstr "Zm_aksymalizuj"
 
-#: src/menu.c:1
+#: src/menu.c:52
 msgid "Unma_ximize"
 msgstr "Przywróć zm_aksymalizowane"
 
-#: src/menu.c:1
+#: src/menu.c:53
 msgid "_Shade"
 msgstr "_Zwiń"
 
-#: src/menu.c:1
+#: src/menu.c:54
 msgid "Un_shade"
 msgstr "Ro_zwiń"
 
-#: src/menu.c:1
+#: src/menu.c:55
 msgid "Mo_ve"
 msgstr "Prz_esuń"
 
-#: src/menu.c:1
+#: src/menu.c:56
 msgid "_Resize"
 msgstr "Zmień _rozmiar"
 
 #. separator
-#: src/menu.c:1
+#: src/menu.c:58
 msgid "Put on _All Workspaces"
 msgstr "Na _wszystkich obszarach roboczych"
 
-#: src/menu.c:1
+#: src/menu.c:59
 msgid "Only on _This Workspace"
 msgstr "Tylko na _tym obszarze roboczym"
 
-#: src/menu.c:1
+#: src/menu.c:301
 #, c-format
 msgid "Only on workspace %s%d"
 msgstr "Tylko na obszarze %s%d"
 
-#: src/menu.c:1
+#: src/menu.c:304
 #, c-format
 msgid "Move to workspace %s%d"
 msgstr "Przenieś na obszar roboczy %s%d"
@@ -170,7 +170,7 @@ msgid "(Not implemented) Navigation works in terms of applications not windows"
 msgstr ""
 "(Nie zaimplementowane) Oparcie nawigacji na aplikacjach, zamiast na oknach"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:2
 msgid ""
 "A font description string describing a font for window titlebars. The size "
 "from the description will only be used if the titlebar_font_size option is "
@@ -180,45 +180,45 @@ msgid ""
 "titlebar_uses_desktop_font is false."
 msgstr ""
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:3
 msgid "Activate window menu"
 msgstr "Otwarcie menu okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:4
 msgid "Automatically raises the focused window"
 msgstr "Automatyczne wysuwanie okien otrzymujących skupienie"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:5
 msgid "Close a window"
 msgstr "Zamknięcie okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:6
 msgid "Current theme"
 msgstr "Bieżący motyw"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:7
 msgid "Delay in milliseconds for the auto raise option"
 msgstr ""
 "Opóźnienie w milisekundach używane przez opcję automatycznego wysuwania"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:8
 msgid "Disable misfeatures that are required by old or broken applications"
 msgstr ""
 "Wyłącza własności, które wymagane są przez stare i niewłaściwie "
 "zaimplementowane aplikacje."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:9
 msgid "Hide all windows and focus desktop"
 msgstr "Ukrycie wszystkich okien i przekazanie skupienia do biurka"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:10
 msgid ""
 "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
 "focused window will be automatically raised after a delay (the delay is "
 "specified by the auto_raise_delay key)."
 msgstr ""
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:11
 msgid ""
 "If true, ignore the titlebar_font option, and use the standard application "
 "font for window titles."
@@ -227,7 +227,7 @@ msgstr ""
 "tego na paskach tytułowych standardowej czcionki systemowej używanej przez "
 "aplikacje."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:12
 msgid ""
 "If true, then Metacity works in terms of applications rather than windows. "
 "The concept is a bit abstract, but in general an application-based setup is "
@@ -240,95 +240,95 @@ msgid ""
 "clicks. Also, application-based mode is largely unimplemented at the moment."
 msgstr ""
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:13
 msgid "Minimize a window"
 msgstr "Minimalizacja okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:14
 msgid "Move a window"
 msgstr "Przeniesienie okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:15
 msgid "Move focus between panels and the desktop"
 msgstr "Przeniesienie skupienia pomiędzy oknami a panelem"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:16
 msgid "Move focus between windows"
 msgstr "Przeniesienie skupienia pomiędzy oknami"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:17
 msgid "Move focus to the previously-focused window"
 msgstr "Przekazanie skupienia do poprzedniego okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:18
 msgid "Move window one workspace down"
 msgstr "Przeniesienie okna o obszar roboczy w dół"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:19
 msgid "Move window one workspace to the left"
 msgstr "Przeniesienie okna o obszar roboczy w lewo"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:20
 msgid "Move window one workspace to the right"
 msgstr "Przeniesienie okna o obszar roboczy w prawo"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:21
 msgid "Move window one workspace up"
 msgstr "Przeniesienie okna o obszar roboczy w górę"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:22
 msgid "Move window to workspace 1"
 msgstr "Przeniesienie okna na 1. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:23
 msgid "Move window to workspace 10"
 msgstr "Przeniesienie okna na 10. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:24
 msgid "Move window to workspace 11"
 msgstr "Przeniesienie okna na 11. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:25
 msgid "Move window to workspace 12"
 msgstr "Przeniesienie okna na 12. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:26
 msgid "Move window to workspace 2"
 msgstr "Przeniesienie okna na 2. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:27
 msgid "Move window to workspace 3"
 msgstr "Przeniesienie okna na 3. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:28
 msgid "Move window to workspace 4"
 msgstr "Przeniesienie okna na 4. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:29
 msgid "Move window to workspace 5"
 msgstr "Przeniesienie okna na 5. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:30
 msgid "Move window to workspace 6"
 msgstr "Przeniesienie okna na 6. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:31
 msgid "Move window to workspace 7"
 msgstr "Przeniesienie okna na 7. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:32
 msgid "Move window to workspace 8"
 msgstr "Przeniesienie okna na 8. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:33
 msgid "Move window to workspace 9"
 msgstr "Przeniesienie okna na 9. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:34
 msgid "Number of workspaces"
 msgstr "Liczba obszarów roboczych"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:35
 msgid ""
 "Number of workspaces. Must be more than zero, and has a fixed maximum (to "
 "prevent accidentally destroying your desktop by asking for 34 million "
@@ -338,12 +338,12 @@ msgstr ""
 "(aby zapobiec przypadkowemu zatkaniu środowiska przez zażądanie 34 milionów "
 "obszarów roboczych)."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:36
 msgid "Raise window if obscured, lowers it otherwise"
 msgstr ""
 "Wysunięcie okna, jeśli jest zasłonięte, obniżenie w przeciwnym wypadku."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:37
 msgid ""
 "Some applications break specifications in ways that result in window manager "
 "misfeatures. For example, ideally Metacity would place all dialogs in a "
@@ -355,75 +355,75 @@ msgid ""
 "Correct mode, which perhaps gives a moderately nicer UI if you don't need to "
 "run any broken apps. Sadly, workarounds must be enabled by default; the real "
 "world is an ugly place. Some of the workarounds are workarounds for "
-"limitations in the specifications themselves, so sometimes a bug in "
-"no-workarounds mode won't be fixable without amending a spec."
+"limitations in the specifications themselves, so sometimes a bug in no-"
+"workarounds mode won't be fixable without amending a spec."
 msgstr ""
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:38
 msgid "Switch to workspace 1"
 msgstr "Przełączenie na 1. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:39
 msgid "Switch to workspace 10"
 msgstr "Przełączenie na 10. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:40
 msgid "Switch to workspace 11"
 msgstr "Przełączenie na 11. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:41
 msgid "Switch to workspace 12"
 msgstr "Przełączenie na 12. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:42
 msgid "Switch to workspace 2"
 msgstr "Przełączenie na 2. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:43
 msgid "Switch to workspace 3"
 msgstr "Przełączenie na 3. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:44
 msgid "Switch to workspace 4"
 msgstr "Przełączenie na 4. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:45
 msgid "Switch to workspace 5"
 msgstr "Przełączenie na 5. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:46
 msgid "Switch to workspace 6"
 msgstr "Przełączenie na 6. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:47
 msgid "Switch to workspace 7"
 msgstr "Przełączenie na 7. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:48
 msgid "Switch to workspace 8"
 msgstr "Przełączenie na 8. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:49
 msgid "Switch to workspace 9"
 msgstr "Przełączenie na 9. obszar roboczy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:50
 msgid "Switch to workspace above the current space"
 msgstr "Przełączenie na obszar roboczy powyżej"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:51
 msgid "Switch to workspace below the current space"
 msgstr "Przełączenie na obszar roboczy poniżej"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:52
 msgid "Switch to workspace on the left"
 msgstr "Przełączenie na obszar roboczy po lewej"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:53
 msgid "Switch to workspace on the right"
 msgstr "Przełączenie na obszar roboczy po prawej"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:54
 msgid ""
 "The keybinding that switches to the workspace above the current workspace. "
 "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
@@ -433,14 +433,14 @@ msgid ""
 "for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na obszar roboczy powyżej bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:55
 msgid ""
 "The keybinding that switches to the workspace below the current workspace. "
 "The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
@@ -450,262 +450,249 @@ msgid ""
 "for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na obszar roboczy poniżej bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:56
 msgid ""
 "The keybinding that switches to the workspace on the left of the current "
-"workspace. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na obszar roboczy na lewo od bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:57
 msgid ""
 "The keybinding that switches to the workspace on the right of the current "
-"workspace. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na obszar roboczy na prawo od bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:58
 msgid ""
-"The keybinding that switches to workspace 1. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 1. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 1. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:59
 msgid ""
-"The keybinding that switches to workspace 10. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 10. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 10. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:60
 msgid ""
-"The keybinding that switches to workspace 11. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 11. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 11. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:61
 msgid ""
-"The keybinding that switches to workspace 12. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 12. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 12. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:62
 msgid ""
-"The keybinding that switches to workspace 2. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 2. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 2. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:63
 msgid ""
-"The keybinding that switches to workspace 3. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 3. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 3. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:64
 msgid ""
-"The keybinding that switches to workspace 4. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 4. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 4. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:65
 msgid ""
-"The keybinding that switches to workspace 5. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 5. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 5. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:66
 msgid ""
-"The keybinding that switches to workspace 6. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 6. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 6. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:67
 msgid ""
-"The keybinding that switches to workspace 7. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 7. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 7. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:68
 msgid ""
-"The keybinding that switches to workspace 8. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 8. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 8. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:69
 msgid ""
-"The keybinding that switches to workspace 9. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding that switches to workspace 9. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza na 9. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:70
 msgid ""
-"The keybinding used to activate the window menu. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding used to activate the window menu. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który otwiera menu okna. Przykładowy zapis skrótu ma "
 "postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza "
 "składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych i "
-"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:71
 msgid ""
-"The keybinding used to close a window. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding used to close a window. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który zamyka okno. Przykładowy zapis skrótu ma postać "
 "\"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa "
@@ -714,50 +701,49 @@ msgstr ""
 "zostanie przypisany specjalny napis \"disabled\" (ang. nieaktywne), wówczas "
 "z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:72
 msgid ""
 "The keybinding used to enter \"move mode\" and begin moving a window using "
-"the keyboard. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, "
+"and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
+"set the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który powoduje przejście w \"tryb przenoszenia\", "
 "pozwalający na przenoszenie okna przy użyciu klawiatury. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:73
 msgid ""
 "The keybinding used to enter \"resize mode\" and begin resizing a window "
-"using the keyboard. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"using the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
+"upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
+"\". If you set the option to the special string \"disabled\", then there "
+"will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który powoduje przejście w \"tryb zmiany rozmiaru\", "
 "pozwalający na zmianę rozmiaru okna przy użyciu klawiatury. Przykładowy "
-"zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;"
+"F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie "
+"małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;"
+"Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis \"disabled"
+"\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót "
+"klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:74
 msgid ""
 "The keybinding used to hide all normal windows and set the focus to the "
-"desktop background. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"desktop background. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
+"upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
+"\". If you set the option to the special string \"disabled\", then there "
+"will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który ukrywa wszystkie zwykłe okna i przekazuje skupienie "
 "na tło biurka. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
@@ -767,23 +753,22 @@ msgstr ""
 "specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
 "powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:75
 msgid ""
-"The keybinding used to minimize a window. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding used to minimize a window. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który minimalizuje okno. Przykładowy zapis skrótu ma "
 "postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza "
 "składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych i "
-"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:76
 msgid ""
 "The keybinding used to move a window one workspace down. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
@@ -793,14 +778,14 @@ msgid ""
 "action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno na obszar roboczy poniżej bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:77
 msgid ""
 "The keybinding used to move a window one workspace to the left. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
@@ -810,14 +795,14 @@ msgid ""
 "action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno na obszar roboczy na lewo od "
-"bieżącego. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
+"bieżącego. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
 "pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
 "\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
 "specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
 "powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:78
 msgid ""
 "The keybinding used to move a window one workspace to the right. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
@@ -827,239 +812,227 @@ msgid ""
 "action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno na obszar roboczy na prawo od "
-"bieżącego. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
+"bieżącego. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
 "pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
 "\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
 "specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
 "powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:79
 msgid ""
 "The keybinding used to move a window one workspace up. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno na obszar roboczy powyżej bieżącego. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:80
 msgid ""
 "The keybinding used to move a window to workspace 1. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 1. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:81
 msgid ""
 "The keybinding used to move a window to workspace 10. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 10. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:82
 msgid ""
 "The keybinding used to move a window to workspace 11. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 11. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:83
 msgid ""
 "The keybinding used to move a window to workspace 12. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 12. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:84
 msgid ""
 "The keybinding used to move a window to workspace 2. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 2. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:85
 msgid ""
 "The keybinding used to move a window to workspace 3. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 3. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:86
 msgid ""
 "The keybinding used to move a window to workspace 4. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 4. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:87
 msgid ""
 "The keybinding used to move a window to workspace 5. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 5. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:88
 msgid ""
 "The keybinding used to move a window to workspace 6. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 6. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:89
 msgid ""
 "The keybinding used to move a window to workspace 7. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 7. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:90
 msgid ""
 "The keybinding used to move a window to workspace 8. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 8. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:91
 msgid ""
 "The keybinding used to move a window to workspace 9. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przenosi okno 9. obszar roboczy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
+
+#: src/metacity.schemas.in.h:92
+msgid ""
+"The keybinding used to move focus back to the window which last had the "
+"focus. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Skrót klawiszowy, który przekazuje skupienie na powrót do poprzedniego okna. "
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
 "\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
 "skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
-msgid ""
-"The keybinding used to move focus back to the window which last had the "
-"focus. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
-msgstr ""
-"Skrót klawiszowy, który przekazuje skupienie na powrót do poprzedniego okna. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
-
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:93
 msgid ""
 "The keybinding used to move focus between panels and the desktop. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
@@ -1069,102 +1042,99 @@ msgid ""
 "action."
 msgstr ""
 "Skrót klawiszowy, który przekazuje skupienie pomiędzy panelami i biurkiem. "
-"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
-"pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
-"\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
-"specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
-"powiązany żaden skrót klawiszowy."
+"Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - pozwala to na "
+"używanie małych i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" "
+"oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
+"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
+"skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:94
 msgid ""
-"The keybinding used to move focus between windows. (Traditionally "
-"&lt;Alt&gt;Tab) The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"The keybinding used to move focus between windows. (Traditionally &lt;Alt&gt;"
+"Tab) The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;"
+"F1. The parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
 msgstr ""
 "Skrót klawiszowy, który przekazuje skupienie pomiędzy oknami (tradycyjnie "
-"jest to &lt;Alt&gt;Tab). Przykładowy zapis skrótu ma postać "
-"\"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa "
-"jest niezbyt restrykcyjna - pozwala to na używanie małych i wielkich liter "
-"oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji "
-"zostanie przypisany specjalny napis \"disabled\" (ang. nieaktywne), wówczas "
-"z akcją nie będzie powiązany żaden skrót klawiszowy."
+"jest to &lt;Alt&gt;Tab). Przykładowy zapis skrótu ma postać \"&lt;Control&gt;"
+"a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt "
+"restrykcyjna - pozwala to na używanie małych i wielkich liter oraz skrótów, "
+"takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie "
+"przypisany specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją "
+"nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:95
 msgid ""
-"The keybinding used to toggle fullscreen mode. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding used to toggle fullscreen mode. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza w tryb pełnoekranowy. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:96
 msgid ""
-"The keybinding used to toggle maximization. The format looks like "
-"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"The keybinding used to toggle maximization. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza tryb maksymalizacji. Przykładowy zapis "
 "skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. "
 "Analiza składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych "
-"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"i wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:97
 msgid ""
 "The keybinding used to toggle shaded/unshaded state. The format looks like "
 "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-"liberal and allows lower or upper case, and also abbreviations such as "
-"\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special "
-"string \"disabled\", then there will be no keybinding for this action."
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który zwija lub rozwija okno. Przykładowy zapis skrótu ma "
 "postać \"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza "
 "składniowa jest niezbyt restrykcyjna - pozwala to na używanie małych i "
-"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz "
-"\"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany specjalny napis "
-"\"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie powiązany żaden "
-"skrót klawiszowy."
+"wielkich liter oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;"
+"\". Jeśli opcji zostanie przypisany specjalny napis \"disabled\" (ang. "
+"nieaktywne), wówczas z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:98
 msgid ""
 "The keybinding used to toggle whether the window is on all workspaces or "
-"just one. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"just one. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza pomiędzy zajmowaniem przez okno jednego "
-"lub wielu obszarów roboczych. Przykładowy zapis skrótu ma postać "
-"\"&lt;Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa "
-"jest niezbyt restrykcyjna - pozwala to na używanie małych i wielkich liter "
-"oraz skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji "
+"lub wielu obszarów roboczych. Przykładowy zapis skrótu ma postać \"&lt;"
+"Control&gt;a\" lub \"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest "
+"niezbyt restrykcyjna - pozwala to na używanie małych i wielkich liter oraz "
+"skrótów, takich jak \"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji "
 "zostanie przypisany specjalny napis \"disabled\" (ang. nieaktywne), wówczas "
 "z akcją nie będzie powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:99
 msgid ""
 "The theme determines the appearance of window borders, titlebar, and so "
 "forth."
 msgstr "Motyw określa wygląd krawędzi okien, pasków tytułowych, itp."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:100
 msgid ""
 "The time delay before raising a window if auto_raise is set to true. The "
 "delay is given in thousandths of a second."
@@ -1173,7 +1143,7 @@ msgstr ""
 "wysuwania (auto_rise) jest ustawiona. Opóźnienie jest podane w tysięcznych "
 "częściach sekundy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:101
 msgid ""
 "The window focus mode indicates how windows are activated. It has three "
 "possible values; \"click\" means windows must be clicked in order to focus "
@@ -1182,56 +1152,56 @@ msgid ""
 "unfocused when the mouse leaves the window."
 msgstr ""
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:102
 msgid ""
 "This keybinding changes whether a window is above or below other windows. If "
 "the window is covered by another window, it raises the window above other "
 "windows. If the window is already fully visible, it lowers the window below "
-"other windows. The format looks like \"&lt;Control&gt;a\" or "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower "
-"or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-"\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-"then there will be no keybinding for this action."
+"other windows. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, "
+"and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
+"set the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
 msgstr ""
 "Skrót klawiszowy, który przełącza pomiędzy wyświetlaniem okna ponad innymi "
 "oknami lub poniżej ich. Jeśli okno jest przykryte przez inne, zostaje "
 "wysunięte na wierzch. Jeśli okno jest w pełni widoczne, jest przesuwane pod "
-"inne okna. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub "
-"\"&lt;Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
+"inne okna. Przykładowy zapis skrótu ma postać \"&lt;Control&gt;a\" lub \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. Analiza składniowa jest niezbyt restrykcyjna - "
 "pozwala to na używanie małych i wielkich liter oraz skrótów, takich jak "
 "\"&lt;Ctl&gt;\" oraz \"&lt;Ctrl&gt;\". Jeśli opcji zostanie przypisany "
 "specjalny napis \"disabled\" (ang. nieaktywne), wówczas z akcją nie będzie "
 "powiązany żaden skrót klawiszowy."
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:103
 msgid "Toggle fullscreen mode"
 msgstr "Przełącza tryb pełnoekranowy"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:104
 msgid "Toggle maximization state"
 msgstr "Przełącza tryb maksymalizacji"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:105
 msgid "Toggle shaded state"
 msgstr "Przełącza tryb zwinięcia"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:106
 msgid "Toggle whether the window is on all workspaces"
 msgstr "Przełącza obecność okna na wszystkich obszarach roboczych"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:107
 msgid "Use standard system font in window titles"
 msgstr "Użycie w paskach tytułowych okien standardowej czcionki systemowej"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:108
 msgid "Window focus mode"
 msgstr "Tryb skupienia okna"
 
-#: src/metacity.schemas.in.h:1
+#: src/metacity.schemas.in.h:109
 msgid "Window title font"
 msgstr "Czcionka tytułu okna"
 
-#: src/metacity-dialog.c:1
+#: src/metacity-dialog.c:86
 #, c-format
 msgid ""
 "The window \"%s\" is not responding.\n"
@@ -1242,45 +1212,44 @@ msgstr ""
 "Czy wymusić zniszczenie tego okna?\n"
 "(wszystkie niezapisane zmiany zostaną utracone)"
 
-#: src/metacity-dialog.c:1
+#: src/metacity-dialog.c:94
 msgid "Kill application"
 msgstr "Zniszcz okno"
 
-#: src/metacity-dialog.c:1
+#: src/metacity-dialog.c:188
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/metacity-dialog.c:1
+#: src/metacity-dialog.c:200
 msgid "Class"
 msgstr "Klasa"
 
-#: src/metacity-dialog.c:1
+#: src/metacity-dialog.c:224
 msgid ""
 "These windows do not support \"save current setup\" and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"Te okna nie obsługują opcji zapisu aktualnego stanu (\"save current "
-"setup\"), więc przy następnym zalogowniu będą musiały być uruchomione "
-"ręcznie."
+"Te okna nie obsługują opcji zapisu aktualnego stanu (\"save current setup"
+"\"), więc przy następnym zalogowniu będą musiały być uruchomione ręcznie."
 
-#: src/prefs.c:1 src/prefs.c:1 src/prefs.c:1 src/prefs.c:1
-#: src/prefs.c:1 src/prefs.c:1 src/prefs.c:1 src/prefs.c:1
-#: src/prefs.c:1 src/prefs.c:1 src/prefs.c:1
+#: src/prefs.c:335 src/prefs.c:351 src/prefs.c:367 src/prefs.c:383
+#: src/prefs.c:403 src/prefs.c:419 src/prefs.c:435 src/prefs.c:451
+#: src/prefs.c:467 src/prefs.c:483 src/prefs.c:499
 #, c-format
 msgid "GConf key \"%s\" is set to an invalid type\n"
 msgstr "Klucz GConfa \"%s\" jest niewłaściwego typu\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:533
 #, c-format
 msgid "GConf key '%s' is set to an invalid value"
 msgstr "Kluczowi GConfa \"%s\" jest przypisana niepoprawna wartość"
 
-#: src/prefs.c:1
+#: src/prefs.c:605
 #, c-format
 msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgstr "Nie można przetworzyć opisu \"%s\", powiązanego z kluczem GConfa %s\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:644
 #, c-format
 msgid ""
 "%d stored in GConf key %s is not a reasonable number of workspaces, current "
@@ -1289,7 +1258,7 @@ msgstr ""
 "Wartość %d zapisana w kluczu GConfa %s nie jest poprawną liczbą biurek; "
 "aktualne maksimum wynosi %d\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:693
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -1297,17 +1266,17 @@ msgstr ""
 "Obejścia dla niepoprawnie działających aplikacji są nieaktywne. Niektóre z "
 "nich mogą się więc zachowywać niezgodnie z oczekiwaniami.\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:725
 #, c-format
 msgid "%d stored in GConf key %s is out of range 0 to %d\n"
 msgstr "Wartość %d zapisana w kluczu GConfa %s jest poza zakresem od 0 do %d\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:796
 #, c-format
 msgid "Error setting number of workspaces to %d: %s\n"
 msgstr "Przy ustawianiu liczby obszarów roboczych na %d wystąpił błąd: %s\n"
 
-#: src/prefs.c:1
+#: src/prefs.c:926
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -1316,27 +1285,40 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "poprawnie skrótu klawiszowego \"%s\"."
 
-#: src/resizepopup.c:1
+#: src/resizepopup.c:168
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:1
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu \"%s\" jest niepoprawny\n"
 
-#: src/screen.c:1
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Na podekranie %d ekranu \"%s\" działa już menedżer okien\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:1
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Nie można zwolnić podekranu %d ekranu \"%s\"\n"
 
-#: src/session.c:1
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Na podekranie %d ekranu \"%s\" działa już menedżer okien\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Nie można zwolnić podekranu %d ekranu \"%s\"\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
@@ -1345,66 +1327,66 @@ msgstr ""
 "Nie można nawiązać połączenia z menedżerem sesji, w związku z czym nie "
 "zostaną zapisane położenia okien: %s\n"
 
-#: src/session.c:1 src/session.c:1
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Nie można stworzyć katalogu \"%s\": %s\n"
 
-#: src/session.c:1
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Nie można otworzyć pliku sesji \"%s\" do zapisu: %s\n"
 
-#: src/session.c:1
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Błąd przy zapisie do pliku sesji \"%s\": %s\n"
 
-#: src/session.c:1
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Błąd przy zamykaniu pliku sesji \"%s\": %s\n"
 
-#: src/session.c:1
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Nie można odczytać zapisanego pliku sesji \"%s\": %s\n"
 
-#: src/session.c:1
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Nie można przetworzyć zapisanego pliku sesji: %s\n"
 
-#: src/session.c:1
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 "Odnaleziono atrybut <metacity_session>, kiedy ID sesji został już ustawiony"
 
-#: src/session.c:1
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Nieznany atrybut %s wewnątrz elementu <metacity_session>"
 
-#: src/session.c:1
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "zagnieżdżony znacznik <window>"
 
-#: src/session.c:1 src/session.c:1
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Nieznany atrybut %s wewnątrz elementu <window>"
 
-#: src/session.c:1
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Nieznany atrybut %s elementu <geometry>"
 
-#: src/session.c:1
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Nieznany element %s"
 
-#: src/session.c:1
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1413,77 +1395,76 @@ msgstr ""
 "Przy uruchamianiu metacity-dialog (z ostrzeżeniem na temat aplikacji bez "
 "obsługi sesji) wystąpił błąd: %s\n"
 
-#: src/theme.c:1
+#: src/theme.c:202
 msgid "top"
 msgstr "góra"
 
-#: src/theme.c:1
+#: src/theme.c:204
 msgid "bottom"
 msgstr "dół"
 
-#: src/theme.c:1
+#: src/theme.c:206
 msgid "left"
 msgstr "lewa"
 
-#: src/theme.c:1
+#: src/theme.c:208
 msgid "right"
 msgstr "prawa"
 
-#: src/theme.c:1
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\" dla krawędzi \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:278
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr ""
 "Współczynnik proporcji przycisku %g nie mieści się w rozsądnych granicach"
 
-#: src/theme.c:1
+#: src/theme.c:290
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rozmiar ramki nie określa liczby przycisków"
 
-#: src/theme.c:1
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Gradienty powinny się składać co najmniej z dwóch kolorów"
 
-#: src/theme.c:1
+#: src/theme.c:780
 #, 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 ""
-"Specyfikacja koloru GTK musi zawierać stan w nawiasach kwadratowych, np. "
-"gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie można przeanalizować "
-"\"%s\""
+"Specyfikacja koloru GTK musi zawierać stan w nawiasach kwadratowych, np. gtk:"
+"fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie można przeanalizować \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:794
 #, 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\""
+"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 ""
 "Specyfikacja koloru GTK musi po nazwie stanu zawierać zamykający nawias "
 "kwadratowy, np. gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie można "
 "przeanalizować \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Niezrozumiały stan \"%s\" w specyfikacji koloru"
 
-#: src/theme.c:1
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Niezrozumiała definicja koloru \"%s\" w specyfikacji koloru"
 
-#: src/theme.c:1
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1492,19 +1473,19 @@ msgstr ""
 "Formatem przenikania jest \"blend/bg_color/fg_color/alpha\", \"%s\" nie "
 "pasuje do formatu"
 
-#: src/theme.c:1
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Nie można przetworzyć wartości alfa \"%s\" w przenikającym kolorze"
 
-#: src/theme.c:1
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "Wartość alfa \"%s\" w przenikającym kolorze nie zawiera się pomiędzy 0,0 i "
 "1,0"
 
-#: src/theme.c:1
+#: src/theme.c:916
 #, fuzzy, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -1512,29 +1493,29 @@ msgstr ""
 "Formatem przenikania jest \"blend/bg_color/fg_color/alpha\", \"%s\" nie "
 "pasuje do formatu"
 
-#: src/theme.c:1
+#: src/theme.c:927
 #, fuzzy, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr ""
 "Nie można współczynnika przenikania wartości alfa \"%s\" w przenikającym "
 "kolorze"
 
-#: src/theme.c:1
+#: src/theme.c:937
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr ""
 
-#: src/theme.c:1
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nie można przetworzyć koloru \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Wyrażenie określające współrzędne zawiera niedozwolony znak \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1543,14 +1524,14 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę zmiennoprzecinkową \"%s\", "
 "która nie może zostać przetworzona"
 
-#: src/theme.c:1
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę całkowitą \"%s\", która nie "
 "może zostać przetworzona"
 
-#: src/theme.c:1
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1559,23 +1540,23 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera nieznany operator na początku "
 "tekstu: \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 "Wyrażenie określające współrzędne jest puste lub nie można go rozpoznać"
 
-#: src/theme.c:1 src/theme.c:1 src/theme.c:1
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Wyrażenie opisujące położenie zawiera dzielenie przez zero"
 
-#: src/theme.c:1
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Wyrażenie opisujące położenie używa operatora dzielenia modulo z argumentem "
 "zmiennoprzecinkowym"
 
-#: src/theme.c:1
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
@@ -1583,17 +1564,17 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera operator \"%s\" w miejscu, w którym "
 "oczekiwano argumentu"
 
-#: src/theme.c:1
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera argument w miejscu, w którym "
 "oczekiwano operatora"
 
-#: src/theme.c:1
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Wyrażenie opisujące położenie kończy się operatorem zamiast argumentem"
 
-#: src/theme.c:1
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1602,7 +1583,7 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera argument \"%c\" bezpośrednio po "
 "argumencie \"%c\" bez rozdzielającego ich operatora"
 
-#: src/theme.c:1
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1611,36 +1592,36 @@ msgstr ""
 "przepełnienie bufora. Jest to błąd w Metacity, ale czy na pewno potrzebujesz "
 "tak wielkiego wyrażenia?"
 
-#: src/theme.c:1
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias zamykający bez odpowiadającego "
 "mu nawiasu otwierającego"
 
-#: src/theme.c:1
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nieznaną zmienną lub stałą \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias otwierający bez odpowiadającego "
 "mu nawiasu zamykającego"
 
-#: src/theme.c:1
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Wyrażenie opisujące położenie nie zawiera żadnych operatorów ani argumentów"
 
-#: src/theme.c:1 src/theme.c:1 src/theme.c:1
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 "Motyw zawiera wyrażenie \"%s\", przy którego obliczaniu wystąpił błąd: %s\n"
 
-#: src/theme.c:1
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1649,44 +1630,44 @@ msgstr ""
 "Przy tym stylu ramki należy podać <button function=\"%s\" state=\"%s\" "
 "draw_ops=\"cokolwiek\"/>"
 
-#: src/theme.c:1 src/theme.c:1
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Brak <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"cokolwiek\"/>"
 
-#: src/theme.c:1
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nie można odczytać motywu \"%s\": %s\n"
 
-#: src/theme.c:1
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Nie określono elementu <name> dla motywu \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Nie określono elementu <author> dla motywu \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Nie określono elementu <date> dla motywu \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Nie określono elementu <description> dla motywu \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Nie określono elementu <copyright> dla motywu \"%s\""
 
-#: src/theme.c:1
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1695,16 +1676,16 @@ msgstr ""
 "Przy typie okna \"%s\" w motywie \"%s\" nie ustawiono stylu ramki. Dodaj "
 "element <window type=\"%s\" style_set=\"cokolwiek\"/>"
 
-#: src/theme.c:1
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
-"Motyw musi zawierać <menu_icon function=\"%s\" state=\"%s\" "
-"draw_ops=\"cokolwiek\"/>"
+"Motyw musi zawierać <menu_icon function=\"%s\" state=\"%s\" draw_ops="
+"\"cokolwiek\"/>"
 
-#: src/theme.c:1 src/theme.c:1
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1712,410 +1693,410 @@ msgstr ""
 "Stałe definiowane przez użytkownika powinny rozpoczynać się wielką literą, "
 "natomiast \"%s\" nie spełnia tego warunku"
 
-#: src/theme.c:1 src/theme.c:1
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Stała \"%s\" została już zdefiniowana"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Wiersz %d, znak %d: %s"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atrybut \"%s\" wystąpił dwukrotnie wewnątrz jednego elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 "Atrybut \"%s\" jest niepoprawny wewnątrz elementu <%s> w tym kontekście"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Liczba całkowita %ld musi być dodatnia"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Liczba całkowita %ld jest zbyt duża, obecne maksimum to %d"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Napis \"%s\" nie jest zapisem liczby zmiennoprzecinkowej"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Wartościami logicznymi są \"true\" i \"false\", a nie \"%s\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Wartość kąta musi się mieścić pomiędzy 0,0 i 360,0, odczytano %g\n"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Wartość alfa musi się mieścić pomiędzy 0,0 (niewidoczne) i 1,0 (w pełni "
 "przezroczyste), odczytano %g\n"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
-"Invalid title scale \"%s\" (must be one of "
-"xx-small,x-small,small,medium,large,x-large,xx-large)\n"
+"Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
+"large,x-large,xx-large)\n"
 msgstr ""
-"Niewłaściwy rozmiar tytułu \"%s\" (musi on być jedną z wartości: xx-small, "
-"x-small, small, medium, large, x-large, xx-large)\n"
+"Niewłaściwy rozmiar tytułu \"%s\" (musi on być jedną z wartości: xx-small, x-"
+"small, small, medium, large, x-large, xx-large)\n"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Brak atrybutu \"%s\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Brak atrybutu \"%s\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s>: użyto nazwy \"%s\" po raz drugi"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s>: nie zdefiniowano elementu nadrzędnego o nazwie \"%s\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s>: nie zdefiniowano geometrii o nazwie \"%s\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> musi albo określać geometrię albo element nadrzędny z geometrią"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Nieznany typ \"%s\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Nieznana wartość atrybutu \"style_set\" (%s) wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Z typem okna \"%s\" powiązano już zbiór stylów"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Nieznana funkcja \"%s\" związana z ikoną menu"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Nieznany stan \"%s\" związany z ikoną menu"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "W temacie określono już ikonę menu, związaną z funkcją %s i stanem %s"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Nie zdefiniowano elementu <draw_ops> o nazwie \"%s\""
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> nie jest dopuszczlny poniżej <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Brak atrybutu \"name\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Brak atrybutu \"value\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
 msgid ""
 "Cannot specify both button_width/button_height and aspect ratio for buttons"
 msgstr ""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Odległość \"%s\" jest nieznana"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1402
 #, c-format
 msgid "Aspect ratio \"%s\" is unknown"
 msgstr "Współczynnik proporcji \"%s\" jest nieznany"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Brak atrybutu \"top\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Brak atrybutu \"bottom\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Brak atrybutu \"left\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Brak atrybutu \"right\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Krawędź \"%s\" jest nieznana"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Brak atrybutu \"color\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Brak atrybutu \"x1\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Brak atrybutu \"y1\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Brak atrybutu \"x2\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Brak atrybutu \"y2\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Brak atrybutu \"x\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Brak atrybutu \"y\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Brak atrybutu \"width\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Brak atrybutu \"height\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Brak atrybutu \"start_angle\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Brak atrybutu \"extent_angle\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Brak atrybutu \"alpha\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Brak atrybutu \"type\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Niezrozumiała wartość \"%s\" typu gradientu"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Brak atrybutu \"filename\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Niezrozumiały typ wypełnienia \"%s\" elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Brak atrybutu \"state\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Brak atrybutu \"shadow\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Brak atrybutu \"array\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Niezrozumiały stan \"%s\" (atrybut state) elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Niezrozumiały cień \"%s\" (atrybut shadow) elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Niezrozumiała strzałka \"%s\" (atrybut arrow) elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Nie zdefiniowano elementu <draw_ops> o nazwie \"%s\""
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 "Włączenie tutaj elementu draw_ops o nazwie \"%s\" spowodowałoby zapętlone "
 "odwołanie"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Brak atrybutu \"value\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Brak atrybutu \"position\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Nieznane położenie \"%s\" elementu ramki"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Styl ramki zawiera już element o położeniu %s"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Brak atrybutu \"function\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Brak atrybutu \"state\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Nieznana funkcja \"%s\" powiązana z przyciskiem"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Nieznany stan \"%s\" powiązany z przyciskiem"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 "Dla stylu ramki określono już przycisk, związany z funkcją %s i stanem %s"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Brak atrybutu \"focus\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Brak atrybutu \"style\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" nie jest poprawną wartością atrybutu \"focus\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" nie jest poprawną wartością atrybutu \"state\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Nie zdefiniowano stylu o nazwie \"%s\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Brak atrybutu \"rewize\" wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" nie jest poprawną wartością atrybutu \"resize\""
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -2124,17 +2105,17 @@ msgstr ""
 "Element <%s> nie powinien zawierać atrybutu \"resize\" przy stanie "
 "zmaksymalizowanym lub zwiniętym"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "Zdefiniowano już styl dla stanu %s, rozmiaru %s i skupienia %s"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Zdefiniowano już styl dla stanu %s i skupienia %s"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -2142,7 +2123,7 @@ msgstr ""
 "Element <piece> nie może zawierać dwóch draw_ops (motyw zawiera atrybut "
 "draw_ops i element <draw_ops> lub dwa elementy)"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -2150,7 +2131,7 @@ msgstr ""
 "Element <button> nie może zawierać dwóch draw_ops (motyw zawiera atrybut "
 "draw_ops i element <draw_ops> lub dwa elementy)"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -2158,111 +2139,111 @@ msgstr ""
 "Element <menu_icon> nie może zawierać dwóch draw_ops (motyw zawiera atrybut "
 "draw_ops i element <draw_ops> lub dwa elementy)"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Głównym elementem motywu musi być <metacity_theme>, nie <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
-"Element <%s> nie jest dopuszczalny wewnątrz elementu "
-"name/author/date/description"
+"Element <%s> nie jest dopuszczalny wewnątrz elementu name/author/date/"
+"description"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Element <%s> nie jest dopuszczalny wewnątrz elementu <constant>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3632
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
-"Element <%s> nie jest dopuszczalny wewnątrz elementu "
-"distance/border/aspect_ratio"
+"Element <%s> nie jest dopuszczalny wewnątrz elementu distance/border/"
+"aspect_ratio"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 "Element <%s> nie jest dopuszczalny wewnątrz elementu operacji rysowania"
 
-#: src/theme-parser.c:1 src/theme-parser.c:1 src/theme-parser.c:1
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> nie jest dopuszczalny wewnątrz elementu <%s>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Z elementem ramki nie jest powiązany element <draw_ops>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Z przyciskiem nie jest powiązany element <draw_ops>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Z ikoną menu nie jest powiązany element <draw_ops>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Wewnątrz elementu <%s> nie jest dopuszczalny tekst"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "Dwukrotnie określono dla tego motywu element <name>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "Dwukrotnie określono dla tego motywu element <author>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "Dwukrotnie określono dla tego motywu element <copyright>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "Dwukrotnie określono dla tego motywu element <date>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "Dwukrotnie określono dla tego motywu element <description>"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Nie można odczytać motywu z pliku %s: %s\n"
 
-#: src/theme-parser.c:1
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Plik tematu %s nie zawiera głównego elementu <metacity_theme>"
 
-#: src/util.c:1
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Nie można otworzyć dziennika z zapisem wykonania: %s\n"
 
-#: src/util.c:1
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Nie można wykonać fdopen() na pliku dziennika %s: %s\n"
 
-#: src/util.c:1
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Otwarty plik dziennika %s\n"
 
-#: src/window.c:1
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikacja ustawiła błędną wartość _NET_WM_PID %ld\n"
 
-#: src/xprops.c:1
+#: src/xprops.c:53
 #, c-format
 msgid ""
 "Window 0x%lx has property %s that was expected to have type %s format %d and "
@@ -2271,7 +2252,7 @@ msgstr ""
 "Okno 0x%lx ma własność %s, której oczekiwanym typem jest %s z formatem %d, a "
 "w rzeczywistości ma typ %s z formatem %d przy n_items %d\n"
 
-#: src/xprops.c:1
+#: src/xprops.c:281
 #, c-format
 msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
 msgstr ""
@@ -2285,7 +2266,7 @@ msgstr "Metacity"
 msgid "Change how focus is moved from one window to another"
 msgstr "Określa sposób przenoszenia skupienia pomiędzy oknami"
 
-#: src/tools/metacity-properties.desktop.in.h:1
+#: src/tools/metacity-properties.desktop.in.h:2
 msgid "Window Focus"
 msgstr "Skupienie okna"
 
@@ -2293,18 +2274,18 @@ msgstr "Skupienie okna"
 msgid "Clic_k to give focus"
 msgstr "Przekazanie skupienia po _kliknięciu"
 
-#: src/tools/metacity-properties.glade.h:1
+#: src/tools/metacity-properties.glade.h:2
 msgid "Focus behavior:"
 msgstr "Zachowanie skupienia:"
 
-#: src/tools/metacity-properties.glade.h:1
+#: src/tools/metacity-properties.glade.h:3
 msgid "Window Focus Preferences"
 msgstr "Ustawienia zachowania się skupienia okna"
 
-#: src/tools/metacity-properties.glade.h:1
+#: src/tools/metacity-properties.glade.h:4
 msgid "_Point to give focus"
 msgstr "Przekazanie skupienia po _wskazaniu"
 
-#: src/tools/metacity-properties.glade.h:1
+#: src/tools/metacity-properties.glade.h:5
 msgid "_Raise window on focus"
 msgstr "Wysuwanie _okna po otrzymaniu skupienia"
diff --git a/po/pt.po b/po/pt.po
index 0800d34c9..4a3f41633 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-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-05-06 23:50+0000\n"
 "Last-Translator: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Incapaz de parsear \"%s\" como um inteiro"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "Incapaz de compreender últimos caracteres \"%s\" na expressão \"%s\""
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Falha ao obter nome máquina: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir ecrã Sistema Janelas X '%s'\n"
@@ -89,7 +89,7 @@ msgstr "Maximizar Janela"
 msgid "Unmaximize Window"
 msgstr "Restaurar Janela"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -98,14 +98,14 @@ msgstr ""
 "Outra aplicação está já a utilizar a chave %s com modificadores %x como "
 "binding\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 "Incapaz de encontrar um tema! Certifique-se que %s sai e contém os temas "
 "normais."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Falha ao reiniciar: %s\n"
@@ -1006,87 +1006,100 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Ecrã %d no monitor '%s' é inválido\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Ecrã %d no monitor '%s' já tem um gestor de janelas\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Incapaz libertar ecrã %d no monitor '%s'\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Ecrã %d no monitor '%s' já tem um gestor de janelas\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Incapaz libertar ecrã %d no monitor '%s'\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Incapaz de criar directório '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Incapaz de abrir ficheiro de sessão '%s' para escrita: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Erro ao escrever ficheiro de sessão '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Erro ao fechar ficheiro de sessão '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Falha ao ler ficheiro de sessão gravado %s: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Falha ao parsear ficheiro de sessão gravado: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "Atributo <metacity_session> enviado mas o ID de sessão já é conhecido"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Atributo %s desconhecido no elemento <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "etiqueta de <window> encadeada"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Atributo %s desconhecido no elemento de <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Atributo %s desconhecido no elemento de <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Elemento %s desconhecido"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, fuzzy, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -1095,37 +1108,47 @@ msgstr ""
 "Erro ao lançar diálogo-metacity para questionar sobre o matar uma aplicação: "
 "%s\n"
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr "topo"
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr "base"
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr "esquerda"
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr "direita"
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "geometria de moldura não especifica dimensão \"%s\""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "geometria de moldura não especifica dimensão \"%s\" para margem \"%s\""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+#, fuzzy
+msgid "Frame geometry does not specify size of buttons"
+msgstr "geometria de moldura não especifica dimensão \"%s\""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Gradientes deverão ter pelo menos duas cores"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -1134,7 +1157,7 @@ msgstr ""
 "Especificação de cor GTK tem de ter o estado em parentesis rectos, por ex. "
 "gtk:fg[NORMAL] em que NORMAL é o estado; incapaz de parsear \"%s\""
 
-#: src/theme.c:879
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -1144,18 +1167,18 @@ msgstr ""
 "estado, por ex. gtk:fg[NORMAL] em que NORMAL é o estado; incapaz de parsear "
 "\"%s\""
 
-#: src/theme.c:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Incapaz de compreender o estado \"%s\" na especificação de cor"
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 "Incapaz de compreender componente de cor \"%s\" na especificação de cor"
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -1164,27 +1187,45 @@ msgstr ""
 "Formato de mistura é \"blend/bg_color/fg_color/alpha\", \"%s\" não cumpre o "
 "formato"
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Incapaz de parsear o valor alfa \"%s\" na mistura de cor"
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Valor alfa \"%s\" na mistura de cor não está entre 0.0 e 1.0"
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"Formato de mistura é \"blend/bg_color/fg_color/alpha\", \"%s\" não cumpre o "
+"formato"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Incapaz de parsear o valor alfa \"%s\" na mistura de cor"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Incapaz de parsear cor \"%s\""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Expressão de coordenada contém caracter '%s' que não é permitido"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -1192,13 +1233,13 @@ msgid ""
 msgstr ""
 "Expressão de coordenada contém número decimal '%s' que não pode ser parseado"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Expressão de coordenada contém número inteiro '%s' que não pode ser parseado"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -1207,35 +1248,35 @@ msgstr ""
 "Expressão de coordenada contém operador desconhecido no início deste texto: "
 "\"%s\""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Expressão de coordenada está vazia ou não foi compreendida"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Expressão de coordenada resulta em divisão por zero"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Expressão de coordenada tenta utilizar operador mod num númeor decimal"
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "Expressão de coordenada tem um operador \"%s\" onde era esperado um operando"
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Expressão de coordenada tem um operando onde era esperado um operador"
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Expressão de coordenada terminou com um operador em vez de um operando"
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -1244,7 +1285,7 @@ msgstr ""
 "Expressão de coordenada tem o operador \"%c\" seguido do operador \"%c\" sem "
 "um operando entre os dois"
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -1252,32 +1293,32 @@ msgstr ""
 "Parseador de expressão de coordenada transbordou o buffer, o que é um bug do "
 "Metacity, mas tem a certeza de que precisa de uma expressão tão grande?"
 
-#: src/theme.c:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Expressão de coordenada tem um fecho de parentesis sem a respectiva abertura"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Expressão de coordenada tem uma variável ou constante \"%s\" desconhecida"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Expressão de coordenada tem uma abertura de parentesis sem o respectivo fecho"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Expressão de coordenada não aparenta ter operadores nem operandos"
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "Tema contém uma expressão \"%s\" que resultou num erro: %s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1286,7 +1327,7 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"qualquercoisa\"/> tem de ser "
 "especificado para este estilo de moldura"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
@@ -1294,37 +1335,37 @@ msgstr ""
 "Falta <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"qualquercoisa\"/"
 ">"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Falha ao ler tema \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Nenhum <name> definido para o tema \"%s\""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Nenhum <author> definido para o tema \"%s\""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Nenhum <date> definido para o tema \"%s\""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Nenhum <description> definido para o tema \"%s\""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Nenhum <copyright> definido para o tema \"%s\""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -1333,7 +1374,7 @@ msgstr ""
 "Nenhum estilo de moldura definido para tipo de janela \"%s\" no tema \"%s\", "
 "adicione um elemento <window type=\"%s\" style_set=\"qualquer\"/>"
 
-#: src/theme.c:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1342,7 +1383,7 @@ msgstr ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"qualquer\"/> tem de ser "
 "especificado para este tema"
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@@ -1350,58 +1391,58 @@ msgstr ""
 "Constante definida pelo utilizador tem de começar com uma maiúscula; \"%s\" "
 "não começa"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Constante \"%s\" já foi definida"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Linha %d caracter %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Atributo \"%s\" repetido duas vezes no mesmo elemento <%s>"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Atributo \"%s\" é inválido no elemento <%s> neste contexto"
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Inteiro %ld tem de ser positivo"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Inteiro %ld é demasiado grande, máx actual é %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Incapaz de parsear \"%s\" como um númerico decimal"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Valores boleanos têm de ser \"true\" ou \"false\" não \"%s\""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Ângulo tem de ser entre 0.0 e 360.0, era %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 "Alfa tem de ser entre 0.0 (invisível) e 1.0 (completamente opaco), era %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -1410,335 +1451,345 @@ msgstr ""
 "Título de escala \"%s\" inválido (tem de ser um de xx-pequeno, x-pequeno, "
 "pequeno, médio, grande, x-grande, xx-grande)\n"
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Nenhum atributo \"%s\" no elemento <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Nenhum atributo \"%s\" no elemento <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "Nome \"%s\" de <%s> utilizado uma segunda vez"
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "Pai \"%s\" de <%s> não foi definido"
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "Geometria \"%s\" de <%s> não foi definida"
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> tem de especificar ou uma geometria ou um pai que tenha geometria"
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Tipo \"%s\" desconhecido no elemento <%s>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Style_set \"%s\" desconhecido no elemento <%s>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Tipo de janela \"%s\" já tem um tipo de estilo atribuido"
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr "Função \"%s\" desconhecida para ícone de menu"
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr "Estado \"%s\" desconhecido para ícone de menu"
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr "Tema já tem um ícone de menu para a função %s estado %s"
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "Nenhum <draw_ops> com o nome \"%s\" foi definido"
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Elemento <%s> no é permitido abaixo de <%s>"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Nenhum atributo \"name\" no elemento <%s>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Nenhum atributo \"value\" no elemento <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Distância \"%s\" é desconhecida"
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "Distância \"%s\" é desconhecida"
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Nenhum atributo \"top\" no elemento <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Nenhum atributo \"bottom\" no elemento <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Nenhum atributo \"left\" no elemento <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Nenhum atributo \"right\" no elemento <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Margem \"%s\" é desconhecida"
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Nenhum atributo \"color\" no elemento <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Nenhum atributo \"x1\" no elemento <%s>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Nenhum atributo \"y1\" no elemento <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Nenhum atributo \"x2\" no elemento <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Nenhum atributo \"y2\" no elemento <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Nenhum atributo \"x\" no elemento <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Nenhum atributo \"y\" no elemento <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Nenhum atributo \"width\" no elemento <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Nenhum atributo \"height\" no elemento <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Nenhum atributo \"start_angle\" no elemento <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Nenhum atributo \"extent_angle\" no elemento <%s>"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Nenhum atributo \"alpha\" no elemento <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Nenhum atributo \"type\" no elemento <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Incapaz de compreender valor \"%s\" para tipo de gradiente"
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Nenhum atributo \"filename\" no elemento <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Incapaz de compreender estado \"%s\" para elemento <%s>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Nenhum atributo \"state\" no elemento <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Nenhum atributo \"shadow\" no elemento <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Nenhum atributo \"arrow\" no elemento <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Incapaz de compreender estado \"%s\" para elemento <%s>"
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Incapaz de compreender sombra \"%s\" para elemento <%s>"
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Incapaz de compreender seta \"%s\" para elemento <%s>"
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "Nenhum <draw_ops> chamado \"%s\" foi definido"
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Incluir aqui draw_ops \"%s\" iria criar uma referência circular"
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Nenhum atributo \"value\" no elemento <%s>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Nenhum atributo \"position\" no elemento <%s>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Posição \"%s\" desconhecida para peça de moldura"
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Estilo de moldura já tem uma peça na posição %s"
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Nenhum atributo \"function\" no elemento <%s>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Nenhum atributo \"state\" no elemento <%s>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Função \"%s\" desconhecida para botão"
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Estado \"%s\" desconhecido para botão"
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Estilo de moldura já tem um botão para função %s estado %s"
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Nenhum atributo \"focus\" no elemento <%s>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Nenhum atributo \"style\" no elemento <%s>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" não é um valor válido para o atributo focus"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" não é um valor válido para o atributo estado"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Um estilo chamado \"%s\" não foi definido"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Nenhum atributo \"resize\" no elemento <%s>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" não é um valor válido para o atributo redimensionar"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -1747,18 +1798,18 @@ msgstr ""
 "Não deveria ter atributo \"resize\" no elemento <%s> para os estados "
 "maximizado/sombreado"
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 "Estilo já foi especificado para o estado %s redimensionamento %s focus %s"
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Estilo já foi especificado para o estado %s focus %s"
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1767,7 +1818,7 @@ msgstr ""
 "atributo draw_ops e também um elemento <draw_ops>, ou especificou dois "
 "elementos)"
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
@@ -1776,7 +1827,7 @@ msgstr ""
 "atributo draw_ops e também um elemento <draw_ops>, ou especificou dois "
 "elementos)"
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
@@ -1785,101 +1836,102 @@ msgstr ""
 "atributo draw_ops e também um elemento <draw_ops>, ou especificou dois "
 "elementos)"
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Elemento mais externo tem de ser <metacity_theme> não <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 "Elemento <%s> não é permitido dentro de um elemento nome/autor/data/descrição"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Elemento <%s> não é permitido dentro de um elemento <constant>"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Elemento <%s> não é permitido dentro de um elemento distância/margem"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Elemento <%s> não é permitido dentro de um elemento operação desenho"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Elemento <%s> não é permitido dentro de um elemento <%s>"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr "Nenhum draw_ops indicado para peça de moldura"
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr "Nenhum draw_ops indicado para botão"
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr "Nenhum draw_ops indicado para ícone menu"
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Não é permitido texto dentro do elemento <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> especificado duas vezes para este tema"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> especificado duas vezes para este tema"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> especificado duas vezes para este tema"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> especificado duas vezes para este tema"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> especificado duas vezes para este tema"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Falha ao ler tema de ficheiro %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Ficheiro de tema %s não continha um elemento raiz <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Falha ao abrir log de depuração: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Falha ao executar fdopen() do ficheiro de log %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Ficheiro de log aberto %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplicação definiu um _NET_WM_PID fictício %ld\n"
@@ -1902,6 +1954,15 @@ msgstr "Propriedade %s na janela 0x%lx continha UTF-8 inválido\n"
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Menu Janela"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 51d605ceb..07ab23cc1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\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"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, fuzzy, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "�� ������� ������� ������� \"%s\": %s\n"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
@@ -83,19 +83,19 @@ msgstr "
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, fuzzy, c-format
 msgid "Failed to restart: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
@@ -988,832 +988,881 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr ""
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
 msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, fuzzy, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "�� ������� ������� ������� \"%s\": %s\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr ""
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "�� ������� ������� ������� \"%s\": %s\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "�� ������� ������� ������� \"%s\": %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "�� ������� ������� ��� ������ ���� ������ \"%s\": %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "������ ������ ����� ������ \"%s\": %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "������ �������� ����� ������ \"%s\": %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr ""
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr ""
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr ""
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr ""
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "����������� ������� %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "�� ������� ������� ������� \"%s\": %s\n"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, fuzzy, c-format
 msgid "Could not parse color \"%s\""
 msgstr "�� ������� ������� ������� \"%s\": %s\n"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, fuzzy, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, fuzzy, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "���� ��� ������ ���������� ����� ������ \"%s\": %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1834,6 +1883,15 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "���� ����"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index d861dbab7..0a1540b66 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sk\n"
-"POT-Creation-Date: 2002-06-04 10:30+0200\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-06-04 10:32+0200\n"
 "Last-Translator: Stanislav Višňovský <visnovsky@nenya.ms.mff.cuni.cz>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -40,7 +40,8 @@ msgstr "Chyba pri čítaní z procesu pre zobrazenie dialógu: %s\n"
 
 #: src/delete.c:333
 #, c-format
-msgid "Error launching metacity-dialog to ask about killing an application: %s\n"
+msgid ""
+"Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr "Chyba pri spustení dialógu metacity pre zabitie aplikácie: %s\n"
 
 #: src/delete.c:431
@@ -48,7 +49,7 @@ msgstr "Chyba pri spustení dialógu metacity pre zabitie aplikácie: %s\n"
 msgid "Failed to get hostname: %s\n"
 msgstr "Nepodarilo sa získať meno hostiteľa: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Nepodarilo sa otvoriť displej X Window '%s'\n"
@@ -88,19 +89,21 @@ msgstr "Maximalizovať okno"
 msgid "Unmaximize Window"
 msgstr "Odmaximalizovať okno"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 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:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
-msgstr "Nepodarilo sa nájsť tému. Overte, že %s existuje a obrazuje obvyklé témy."
+msgstr ""
+"Nepodarilo sa nájsť tému. Overte, že %s existuje a obrazuje obvyklé témy."
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Nepodarilo znovu spustiť: %s\n"
@@ -156,6 +159,1018 @@ msgstr "Len na ploche %s%d"
 msgid "Move to workspace %s%d"
 msgstr "Presunúť na plochu %s%d"
 
+#: src/metacity.schemas.in.h:1
+msgid "(Not implemented) Navigation works in terms of applications not windows"
+msgstr "(Neimplementované) Navigácia vzhľadom k aplikáciám, nie oknám"
+
+#: src/metacity.schemas.in.h:2
+msgid ""
+"A font description string describing a font for window titlebars. The size "
+"from the description will only be used if the titlebar_font_size option is "
+"set to 0, however. Also, this option is disabled if the "
+"titlebar_uses_desktop_font option is set to true. By default, titlebar_font "
+"is unset, causing Metacity to fall back to the desktop font even if "
+"titlebar_uses_desktop_font is false."
+msgstr ""
+"Reťazec popisu písma pre titulky okien. Veľkosť sa použije iba v prípade, že "
+"voľba titlebar_font_size je 0. Táto voľba je vypnutá v prípade, že je na "
+"true nastavené titlebar_uses_desktop. Štandardne je titlebar_font "
+"nenastavené, takže Metacity použije písmo plochy aj v prípade, že "
+"titlebar_uses_desktop_font je false."
+
+#: src/metacity.schemas.in.h:3
+msgid "Activate window menu"
+msgstr "Aktivovať menu okna"
+
+#: src/metacity.schemas.in.h:4
+msgid "Automatically raises the focused window"
+msgstr "Automaticky presunúť aktívne okno dopredu"
+
+#: src/metacity.schemas.in.h:5
+msgid "Close a window"
+msgstr "Zavrieť okno"
+
+#: src/metacity.schemas.in.h:6
+msgid "Current theme"
+msgstr "Aktuálna téma"
+
+#: src/metacity.schemas.in.h:7
+msgid "Delay in milliseconds for the auto raise option"
+msgstr "Čakanie v milisekundách pred automatickým presunom dopredu"
+
+#: src/metacity.schemas.in.h:8
+msgid "Disable misfeatures that are required by old or broken applications"
+msgstr ""
+"Vypnúť chybné funkcie, ktoré sú vyžadované starými alebo nefunkčnými "
+"aplikáciami"
+
+#: src/metacity.schemas.in.h:9
+msgid "Hide all windows and focus desktop"
+msgstr "Skryť všetky okná a aktivovať plochu"
+
+#: src/metacity.schemas.in.h:10
+msgid ""
+"If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
+"focused window will be automatically raised after a delay (the delay is "
+"specified by the auto_raise_delay key)."
+msgstr ""
+"Ak je true a režim aktivácie je buď \"sloppy\" alebo \"mouse\", aktívne okno "
+"sa automaticky po danej dobe posunie dopredu (čakanie je nastavené v kľúči "
+"auto_raise_delay)."
+
+#: src/metacity.schemas.in.h:11
+msgid ""
+"If true, ignore the titlebar_font option, and use the standard application "
+"font for window titles."
+msgstr ""
+"Ak je true, ignoruje sa titlebar_font a použije sa štandardné písmo "
+"aplikácie pre titulky okien."
+
+#: src/metacity.schemas.in.h:12
+msgid ""
+"If true, then Metacity works in terms of applications rather than windows. "
+"The concept is a bit abstract, but in general an application-based setup is "
+"more like the Mac and less like Windows. When you focus a window in "
+"application-based mode, all the windows in the application will be raised. "
+"Also, in application-based mode, focus clicks are not passed through to "
+"windows in other applications. The existence of this setting is somewhat "
+"questionable. But it's better than having settings for all the specific "
+"details of application-based vs. window-based, e.g. whether to pass through "
+"clicks. Also, application-based mode is largely unimplemented at the moment."
+msgstr ""
+"Ak je true, Metacity funguje v rámci aplikácií a nie okien. Je to trochu "
+"abstraktnejšie, ale všeobecne sa dá povedať, že nastavenie vzhľadom k "
+"aplikáciám sa podobá viac systému Mac a menej systému Windows. Ak urobíte "
+"okno aktívnym v móde aplikácií, všetky okná tejto aplikácie sa presunú "
+"dopredu. Kliknutie na aktiváciu sa nepredáva oknám iných aplikácií. Je "
+"otázka, či má táto voľba zmysel. Ale je lepšie, aby bola a zahŕňala všetky "
+"detaily týchto prístupov. Na druhú stranu, máloktorá aplikácia je napísaná "
+"pre mód založený na aplikáciách."
+
+#: src/metacity.schemas.in.h:13
+msgid "Minimize a window"
+msgstr "Minimalizovať okno"
+
+#: src/metacity.schemas.in.h:14
+msgid "Move a window"
+msgstr "Presunúť okno"
+
+#: src/metacity.schemas.in.h:15
+msgid "Move focus between panels and the desktop"
+msgstr "Prepnúť aktívne okno medzi panelmi a plochou"
+
+#: src/metacity.schemas.in.h:16
+msgid "Move focus between windows"
+msgstr "Prepnúť aktívne okno medzi oknami"
+
+#: src/metacity.schemas.in.h:17
+msgid "Move focus to the previously-focused window"
+msgstr "Prepnúť aktívne okno na predchádzajúce aktívne okno"
+
+#: src/metacity.schemas.in.h:18
+msgid "Move window one workspace down"
+msgstr "Presunúť okno o jednu plochu dolu"
+
+#: src/metacity.schemas.in.h:19
+msgid "Move window one workspace to the left"
+msgstr "Presunúť okno o jednu plochu vľavo"
+
+#: src/metacity.schemas.in.h:20
+msgid "Move window one workspace to the right"
+msgstr "Presunúť okno o jednu plochu vpravo"
+
+#: src/metacity.schemas.in.h:21
+msgid "Move window one workspace up"
+msgstr "Presunúť okno o jednu plochu hore"
+
+#: src/metacity.schemas.in.h:22
+msgid "Move window to workspace 1"
+msgstr "Presunúť okno na plochu 1"
+
+#: src/metacity.schemas.in.h:23
+msgid "Move window to workspace 10"
+msgstr "Presunúť okno na plochu 10"
+
+#: src/metacity.schemas.in.h:24
+msgid "Move window to workspace 11"
+msgstr "Presunúť okno na plochu 11"
+
+#: src/metacity.schemas.in.h:25
+msgid "Move window to workspace 12"
+msgstr "Presunúť okno na plochu 12"
+
+#: src/metacity.schemas.in.h:26
+msgid "Move window to workspace 2"
+msgstr "Presunúť okno na plochu 2"
+
+#: src/metacity.schemas.in.h:27
+msgid "Move window to workspace 3"
+msgstr "Presunúť okno na plochu 3"
+
+#: src/metacity.schemas.in.h:28
+msgid "Move window to workspace 4"
+msgstr "Presunúť okno na plochu 4"
+
+#: src/metacity.schemas.in.h:29
+msgid "Move window to workspace 5"
+msgstr "Presunúť okno na plochu 5"
+
+#: src/metacity.schemas.in.h:30
+msgid "Move window to workspace 6"
+msgstr "Presunúť okno na plochu 6"
+
+#: src/metacity.schemas.in.h:31
+msgid "Move window to workspace 7"
+msgstr "Presunúť okno na plochu 7"
+
+#: src/metacity.schemas.in.h:32
+msgid "Move window to workspace 8"
+msgstr "Presunúť okno na plochu 8"
+
+#: src/metacity.schemas.in.h:33
+msgid "Move window to workspace 9"
+msgstr "Presunúť okno na plochu 9"
+
+#: src/metacity.schemas.in.h:34
+msgid "Number of workspaces"
+msgstr "Počet pracovných plôch"
+
+#: src/metacity.schemas.in.h:35
+msgid ""
+"Number of workspaces. Must be more than zero, and has a fixed maximum (to "
+"prevent accidentally destroying your desktop by asking for 34 million "
+"workspaces)."
+msgstr ""
+"Počet pracovných plôch. Musí byť viac ako 0 a má pevné maximum (aby sa "
+"zabránilo zničenou pracovného prostredia požadovaním 34 miliónov pracovných "
+"plôch)."
+
+#: src/metacity.schemas.in.h:36
+msgid "Raise window if obscured, lowers it otherwise"
+msgstr "Presunúť okno dopredu ak je \"obscured\", inak posunúť dozadu"
+
+#: src/metacity.schemas.in.h:37
+msgid ""
+"Some applications break specifications in ways that result in window manager "
+"misfeatures. For example, ideally Metacity would place all dialogs in a "
+"consistent position with respect to their parent window. This requires "
+"ignoring application-specified positions for dialogs. But some versions of "
+"Java/Swing mark their popup menus as dialogs, so Metacity has to disable "
+"dialog positioning to allow menus to work in broken Java applications. There "
+"are several other examples like this. This option puts Metacity in full-on "
+"Correct mode, which perhaps gives a moderately nicer UI if you don't need to "
+"run any broken apps. Sadly, workarounds must be enabled by default; the real "
+"world is an ugly place. Some of the workarounds are workarounds for "
+"limitations in the specifications themselves, so sometimes a bug in no-"
+"workarounds mode won't be fixable without amending a spec."
+msgstr ""
+"Niektoré aplikácie nedodržujú špecifikácie, takže je možné, že správca okien "
+"nefunguje správne. Napríklad, v ideálnom prípade by Metacity umiestnilo "
+"všetky dialógy rovnako vzhľadom k rodičovskému oknu. To vyžaduje ignorovanie "
+"pozície dialógu zadané aplikáciou. Ale niektoré verzie Java/Swing označujú "
+"kontextové menu ako dialógy, takže Metacity musí vypnúť umiesťňovanie "
+"dialógov, aby menu fungovali v nefunkčných aplikáciách Java správne. A "
+"takýchto príkladov je viac. Táto voľba vynúti, aby Metacity fungoval iba v "
+"správcom režime, čo môže vytvoriť lepšie chovanie, ak nepotrebujete používať "
+"už zmienené nefunkčné aplikácie. Bohužiaľ, štandardne toto nie je možné "
+"zapnúť, pretože v reálnom svete nie je nič tak jednoduché. Niektoré opravy "
+"navyše opravujú obmedzenia špecifikácie, takže niekedy oprava pre chybu nie "
+"je možná bez nedodržania špecifikácie."
+
+#: src/metacity.schemas.in.h:38
+msgid "Switch to workspace 1"
+msgstr "Prepnúť na plochu 1"
+
+#: src/metacity.schemas.in.h:39
+msgid "Switch to workspace 10"
+msgstr "Prepnúť na plochu 10"
+
+#: src/metacity.schemas.in.h:40
+msgid "Switch to workspace 11"
+msgstr "Prepnúť na plochu 11"
+
+#: src/metacity.schemas.in.h:41
+msgid "Switch to workspace 12"
+msgstr "Prepnúť na plochu 12"
+
+#: src/metacity.schemas.in.h:42
+msgid "Switch to workspace 2"
+msgstr "Prepnúť na plochu 2"
+
+#: src/metacity.schemas.in.h:43
+msgid "Switch to workspace 3"
+msgstr "Prepnúť na plochu 3"
+
+#: src/metacity.schemas.in.h:44
+msgid "Switch to workspace 4"
+msgstr "Prepnúť na plochu 4"
+
+#: src/metacity.schemas.in.h:45
+msgid "Switch to workspace 5"
+msgstr "Prepnúť na plochu 5"
+
+#: src/metacity.schemas.in.h:46
+msgid "Switch to workspace 6"
+msgstr "Prepnúť na plochu 6"
+
+#: src/metacity.schemas.in.h:47
+msgid "Switch to workspace 7"
+msgstr "Prepnúť na plochu 7"
+
+#: src/metacity.schemas.in.h:48
+msgid "Switch to workspace 8"
+msgstr "Prepnúť na plochu 8"
+
+#: src/metacity.schemas.in.h:49
+msgid "Switch to workspace 9"
+msgstr "Prepnúť na plochu 9"
+
+#: src/metacity.schemas.in.h:50
+msgid "Switch to workspace above the current space"
+msgstr "Prepnúť na plochu nad aktuálnou plochou"
+
+#: src/metacity.schemas.in.h:51
+msgid "Switch to workspace below the current space"
+msgstr "Prepnúť na plochu pod aktuálnou plochou"
+
+#: src/metacity.schemas.in.h:52
+msgid "Switch to workspace on the left"
+msgstr "Prepnúť na plochu vľavo"
+
+#: src/metacity.schemas.in.h:53
+msgid "Switch to workspace on the right"
+msgstr "Prepnúť na plochu vpravo"
+
+#: src/metacity.schemas.in.h:54
+msgid ""
+"The keybinding that switches to the workspace above the current workspace. "
+"The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"The parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vyššie. "
+"Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:55
+msgid ""
+"The keybinding that switches to the workspace below the current workspace. "
+"The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"The parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"Táto klávesová skratka pre prepnutie pracovnej plochy na plochu nižšie. "
+"Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:56
+msgid ""
+"The keybinding that switches to the workspace on the left of the current "
+"workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vľavo. "
+"Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:57
+msgid ""
+"The keybinding that switches to the workspace on the right of the current "
+"workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vpravo. "
+"Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:58
+msgid ""
+"The keybinding that switches to workspace 1. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 1. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:59
+msgid ""
+"The keybinding that switches to workspace 10. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 10. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:60
+msgid ""
+"The keybinding that switches to workspace 11. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 11. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:61
+msgid ""
+"The keybinding that switches to workspace 12. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 12. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:62
+msgid ""
+"The keybinding that switches to workspace 2. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 2. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:63
+msgid ""
+"The keybinding that switches to workspace 3. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 3. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:64
+msgid ""
+"The keybinding that switches to workspace 4. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 4. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:65
+msgid ""
+"The keybinding that switches to workspace 5. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 5. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:66
+msgid ""
+"The keybinding that switches to workspace 6. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 6. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:67
+msgid ""
+"The keybinding that switches to workspace 7. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 7. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:68
+msgid ""
+"The keybinding that switches to workspace 8. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 8. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:69
+msgid ""
+"The keybinding that switches to workspace 9. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne na pracovnú plochu 9. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:70
+msgid ""
+"The keybinding used to activate the window menu. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre aktiváciu menu okna. Formát je \"&lt;Control&gt;a"
+"\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
+"umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
+"Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre "
+"túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:71
+msgid ""
+"The keybinding used to close a window. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre zatvorenie okna Formát je \"&lt;Control&gt;a\" "
+"alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje "
+"malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". "
+"Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu "
+"nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:72
+msgid ""
+"The keybinding used to enter \"move mode\" and begin moving a window using "
+"the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, "
+"and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
+"set the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre zapnutie \"režimu presunu\" pomocou klávesnice. "
+"Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:73
+msgid ""
+"The keybinding used to enter \"resize mode\" and begin resizing a window "
+"using the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
+"upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
+"\". If you set the option to the special string \"disabled\", then there "
+"will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre zapnutie \"režimu zmeny veľkosti\" pomocou "
+"klávesnice. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;"
+"F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
+"ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:74
+msgid ""
+"The keybinding used to hide all normal windows and set the focus to the "
+"desktop background. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
+"upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
+"\". If you set the option to the special string \"disabled\", then there "
+"will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre skrytie všetkých normálnych okien a nastavenie "
+"ako aktívne pozadie plochy. Formát je \"&lt;Control&gt;a\" alebo \"&lt;"
+"Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj "
+"veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak "
+"nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu "
+"nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:75
+msgid ""
+"The keybinding used to minimize a window. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka pre minimalizáciu okna. Formát je \"&lt;Control&gt;a"
+"\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
+"umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
+"Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre "
+"túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:76
+msgid ""
+"The keybinding used to move a window one workspace down. The format looks "
+"like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
+"fairly liberal and allows lower or upper case, and also abbreviations such "
+"as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Táto klávesová skratka presunie okno o jednu pracovnú plochu dolu. Formát je "
+"\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:77
+msgid ""
+"The keybinding used to move a window one workspace to the left. The format "
+"looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
+"is fairly liberal and allows lower or upper case, and also abbreviations "
+"such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Táto klávesová skratka presunie okno o jednu pracovnú plochu vľavo. Formát "
+"je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
+"dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
+"Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
+"\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:78
+msgid ""
+"The keybinding used to move a window one workspace to the right. The format "
+"looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
+"is fairly liberal and allows lower or upper case, and also abbreviations "
+"such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Táto klávesová skratka presunie okno o jednu pracovnú plochu vpravo. Formát "
+"je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
+"dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
+"Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
+"\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:79
+msgid ""
+"The keybinding used to move a window one workspace up. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno o jednu pracovnú plochu hore. Formát je "
+"\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:80
+msgid ""
+"The keybinding used to move a window to workspace 1. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 1. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:81
+msgid ""
+"The keybinding used to move a window to workspace 10. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 10. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:82
+msgid ""
+"The keybinding used to move a window to workspace 11. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 11. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:83
+msgid ""
+"The keybinding used to move a window to workspace 12. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 12. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:84
+msgid ""
+"The keybinding used to move a window to workspace 2. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 2. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:85
+msgid ""
+"The keybinding used to move a window to workspace 3. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 3. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:86
+msgid ""
+"The keybinding used to move a window to workspace 4. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 4. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:87
+msgid ""
+"The keybinding used to move a window to workspace 5. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 5. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:88
+msgid ""
+"The keybinding used to move a window to workspace 6. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 6. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:89
+msgid ""
+"The keybinding used to move a window to workspace 7. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 7. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:90
+msgid ""
+"The keybinding used to move a window to workspace 8. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 8. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:91
+msgid ""
+"The keybinding used to move a window to workspace 9. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka presunie okno na pracovnú plochu 9. Formát je \"&lt;"
+"Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
+"liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" "
+"a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled"
+"\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:92
+msgid ""
+"The keybinding used to move focus back to the window which last had the "
+"focus. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka nastaví ako aktívne okno, ktoré bolo aktívne "
+"naposledy. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;"
+"F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
+"ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:93
+msgid ""
+"The keybinding used to move focus between panels and the desktop. The format "
+"looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser "
+"is fairly liberal and allows lower or upper case, and also abbreviations "
+"such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
+"special string \"disabled\", then there will be no keybinding for this "
+"action."
+msgstr ""
+"Táto klávesová skratka prepne aktívne okno medzi panelmi a plochou. Formát "
+"je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
+"dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
+"Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
+"\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:94
+msgid ""
+"The keybinding used to move focus between windows. (Traditionally &lt;Alt&gt;"
+"Tab) The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;"
+"F1. The parser is fairly liberal and allows lower or upper case, and also "
+"abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the "
+"option to the special string \"disabled\", then there will be no keybinding "
+"for this action."
+msgstr ""
+"Táto klávesová skratka prepne aktívne okno na iné okno (tradične &lt;Alt&gt;"
+"Tab). Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
+"Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako "
+"je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
+"špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:95
+msgid ""
+"The keybinding used to toggle fullscreen mode. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne zobrazenie do celoobrazovkového módu. Formát "
+"je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
+"dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
+"Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
+"\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:96
+msgid ""
+"The keybinding used to toggle maximization. The format looks like \"&lt;"
+"Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal "
+"and allows lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;"
+"\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne maximalizáciu okna. Formát je \"&lt;Control&gt;"
+"a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
+"umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
+"Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre "
+"túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:97
+msgid ""
+"The keybinding used to toggle shaded/unshaded state. The format looks like "
+"\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
+"liberal and allows lower or upper case, and also abbreviations such as \"&lt;"
+"Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the special string "
+"\"disabled\", then there will be no keybinding for this action."
+msgstr ""
+"Táto klávesová skratka prepne zabalenie okna. Formát je \"&lt;Control&gt;a\" "
+"alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje "
+"malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". "
+"Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu "
+"nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:98
+msgid ""
+"The keybinding used to toggle whether the window is on all workspaces or "
+"just one. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, and "
+"also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
+"the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka mení, či je okno na všetkých pracovných plochách "
+"alebo iba na jednej. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;"
+"Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a "
+"skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť "
+"na špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
+"klávesová skratka."
+
+#: src/metacity.schemas.in.h:99
+msgid ""
+"The theme determines the appearance of window borders, titlebar, and so "
+"forth."
+msgstr "Téma určuje vzhľad rámu okna, titulku apod."
+
+#: src/metacity.schemas.in.h:100
+msgid ""
+"The time delay before raising a window if auto_raise is set to true. The "
+"delay is given in thousandths of a second."
+msgstr ""
+"Čas čakania pred presunom okna dopredu, ak je auto_raise true. Hodnota je v "
+"tisícinách sekundy."
+
+#: src/metacity.schemas.in.h:101
+msgid ""
+"The window focus mode indicates how windows are activated. It has three "
+"possible values; \"click\" means windows must be clicked in order to focus "
+"them, \"sloppy\" means windows are focused when the mouse enters the window, "
+"and \"mouse\" means windows are focused when the mouse enters the window and "
+"unfocused when the mouse leaves the window."
+msgstr ""
+"Chovanie fokusu určuje, ako sa okná aktivujú. Má tri možné hodnoty: \"click"
+"\" znamená, že na okno sa musí kliknúť, \"sloppy\" znamená, že okno sa stane "
+"aktívnym, ak sa kurzor myši nastaví nad okno, a \"mouse\" znamená, že sa "
+"okno stane aktívnym pri ukázaní kurzorom myši a pri presune kurzoru myši "
+"mimo okno prestane byť okno aktívne."
+
+#: src/metacity.schemas.in.h:102
+msgid ""
+"This keybinding changes whether a window is above or below other windows. If "
+"the window is covered by another window, it raises the window above other "
+"windows. If the window is already fully visible, it lowers the window below "
+"other windows. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
+"&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, "
+"and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you "
+"set the option to the special string \"disabled\", then there will be no "
+"keybinding for this action."
+msgstr ""
+"Táto klávesová skratka mení, či je okno nad alebo pod ostatnými oknami. Ak "
+"je okno zakryté iným oknom, posunie ho dopredu na ostatné okná. Ak už je "
+"okno vpredu, posunie ho dozadu za ostatné okná. Formát je \"&lt;Control&gt;a"
+"\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
+"umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
+"Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre "
+"túto akciu nebude definovaná žiadna klávesová skratka."
+
+#: src/metacity.schemas.in.h:103
+msgid "Toggle fullscreen mode"
+msgstr "Prepnúť celoobrazovkový mód"
+
+#: src/metacity.schemas.in.h:104
+msgid "Toggle maximization state"
+msgstr "Prepnúť maximalizáciu"
+
+#: src/metacity.schemas.in.h:105
+msgid "Toggle shaded state"
+msgstr "Prepnúť zabalenie okna"
+
+#: src/metacity.schemas.in.h:106
+msgid "Toggle whether the window is on all workspaces"
+msgstr "Prepnúť, či je okno na všetkých pracovných plochách"
+
+#: src/metacity.schemas.in.h:107
+msgid "Use standard system font in window titles"
+msgstr "Použiť štandardné systémové písmo v titulkoch okna"
+
+#: src/metacity.schemas.in.h:108
+#, fuzzy
+msgid "Window focus mode"
+msgstr "Aktivácia okna"
+
+#: src/metacity.schemas.in.h:109
+msgid "Window title font"
+msgstr "Písmo titulku okna"
+
 #: src/metacity-dialog.c:86
 #, c-format
 msgid ""
@@ -245,22 +1260,35 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Obrazovka %d na displeji '%s' nie je platná\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Obrazovka %d na displeji '%s' už má správcu okien\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
-#, c-format
-msgid "Could not release screen %d on display '%s'\n"
+#: src/screen.c:252
+#, fuzzy, c-format
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Nepodarilo sa uvoľniť obrazovku %d na displeji '%s'\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Obrazovka %d na displeji '%s' už má správcu okien\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Nepodarilo sa uvoľniť obrazovku %d na displeji '%s'\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
@@ -269,65 +1297,65 @@ msgstr ""
 "Nepodarilo sa otvoriť spojenie so správcom sedenia, takže pozície okien "
 "nebudú uložené: %s\n"
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Nepodarilo sa vytvoriť priečinok '%s': %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Nepodarilo sa otvoriť súbor sedenia '%s' pre zápis: %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Chyba pri zápise súboru sedenia '%s': %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Chyba pri zatváraní súboru sedenia '%s': %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Nepodarilo sa prečítať uložený súbor sedenia %s: %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Nepodarilo sa spracovať uložený súbor sedenia: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr "Nájdený atribút <metacity_session>, ale ID sedenia už je nastavené"
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Neznámy atribút %s v elemente <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "vnorená značka <window>"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Neznámy atribúť %s v elemente <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Neznámy atribúť %s v elemente <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Neznámy element %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
@@ -336,46 +1364,46 @@ msgstr ""
 "Chyba pri spustení dialógu metacity pre varovanie o aplikácii, ktorá "
 "nepodporuje správu sedení: %s\n"
 
-#: src/theme.c:353
+#: src/theme.c:202
 msgid "top"
 msgstr "hore"
 
-#: src/theme.c:355
+#: src/theme.c:204
 msgid "bottom"
 msgstr "dole"
 
-#: src/theme.c:357
+#: src/theme.c:206
 msgid "left"
 msgstr "vľavo"
 
-#: src/theme.c:359
+#: src/theme.c:208
 msgid "right"
 msgstr "vpravo"
 
-#: src/theme.c:373
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "geometria rámca neučuje rozmer \"%s\""
 
-#: src/theme.c:392
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "geometria rámca neučuje rozmer \"%s\" pre okraj \"%s\""
 
-#: src/theme.c:429
+#: src/theme.c:278
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Pomer stránk tlačidla %g nie je použiteľný."
 
-#: src/theme.c:441
+#: src/theme.c:290
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Geometria rámca neučuje rozmer tlačidiel"
 
-#: src/theme.c:792
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "Prechody by mali mať aspoň dve farby"
 
-#: src/theme.c:908
+#: src/theme.c:780
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -384,7 +1412,7 @@ msgstr ""
 "Špecifikácia farby GTK musí mať stav v hranatých zátvorkách, napr. gtk:fg"
 "[NORMAL], kde NORMAL je stav. Nepodarilo sa spracovať \"%s\""
 
-#: src/theme.c:922
+#: src/theme.c:794
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -393,88 +1421,111 @@ msgstr ""
 "Špecifikácia farby GTK musí mať stav uzavretý v hranatých zátvorkách, napr. "
 "gtk:fg[NORMAL], kde NORMAL je stav. Nepodarilo sa spracovať \"%s\""
 
-#: src/theme.c:933
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "V špecifikácii farby nerozpoznaný stav \"%s\""
 
-#: src/theme.c:946
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "V špecifikácii farby nerozpoznaný komponent \"%s\""
 
-#: src/theme.c:976
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
-msgstr "Formát miešania he \"blend/bg_color/fg_color/alpha\", \"%s\" tomu neodpovedá"
+msgstr ""
+"Formát miešania he \"blend/bg_color/fg_color/alpha\", \"%s\" tomu neodpovedá"
 
-#: src/theme.c:987
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Nepodarilo sa spracovať hodnotu alfa \"%s\" v miešanej farbe"
 
-#: src/theme.c:997
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Hodnota alfa \"%s\" v miešanej farbe nie je medzi 0.0 a 1.0"
 
-#: src/theme.c:1036
+#: src/theme.c:916
+#, fuzzy, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+"Formát miešania he \"blend/bg_color/fg_color/alpha\", \"%s\" tomu neodpovedá"
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Nepodarilo sa spracovať hodnotu alfa \"%s\" v miešanej farbe"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nepodarilo sa spracovať farbu \"%s\""
 
-#: src/theme.c:1286
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Výraz umiestnenia obsahuje znak '%s', ktorý nie je povolený"
 
-#: src/theme.c:1313
+#: src/theme.c:1255
 #, 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:1327
+#: src/theme.c:1269
 #, 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:1394
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
-msgstr "Výraz umiestnenia obsahuje neznámy operátor na začiatku tohto textu: \"%s\""
+msgstr ""
+"Výraz umiestnenia obsahuje neznámy operátor na začiatku tohto textu: \"%s\""
 
-#: src/theme.c:1451
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "Výraz umiestnenia je prázdny alebo nerozpoznaný"
 
-#: src/theme.c:1590 src/theme.c:1600 src/theme.c:1634
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "Výsledok výrazu umiestnenia je delenie nulou"
 
-#: src/theme.c:1642
-msgid "Coordinate expression tries to use mod operator on a floating-point number"
+#: src/theme.c:1584
+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:1699
+#: src/theme.c:1641
 #, c-format
-msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
+msgid ""
+"Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Výraz umiestnenia obsahuje operátor \"%s\" tam, kde sa očakáva operand"
 
-#: src/theme.c:1708
+#: src/theme.c:1650
 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:1716
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Výraz umiestnenie skončil operátorom namiesto operandom"
 
-#: src/theme.c:1726
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -483,7 +1534,7 @@ msgstr ""
 "Výraz umiestnenie obsahuje operátor \"%c\" za operátorom \"%c\" bez "
 "operandov medzi nimi."
 
-#: src/theme.c:1845
+#: src/theme.c:1787
 msgid ""
 "Coordinate expression parser overflowed its buffer, this is really a "
 "Metacity bug, but are you sure you need a huge expression like that?"
@@ -491,29 +1542,29 @@ msgstr ""
 "Pri spracovaní výrazu umiestnenia bola pretečená pamäť. Toto je chyba "
 "Metacity, ale naozaj potrebujete taký veľký výraz?"
 
-#: src/theme.c:1874
+#: src/theme.c:1816
 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:1937
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Výraz umiestnenia obsahuje neznámu premennú alebo konštantu \"%s\""
 
-#: src/theme.c:1994
+#: src/theme.c:1936
 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:2005
+#: src/theme.c:1947
 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:2249 src/theme.c:2271 src/theme.c:2292
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, 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"
 
-#: src/theme.c:3622
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -522,42 +1573,44 @@ msgstr ""
 "Pre tento štýl rámca musí byť uvedené <button function=\"%s\" state=\"%s\" "
 "draw_ops=\"whatever\"/>"
 
-#: src/theme.c:4031 src/theme.c:4063
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
-msgid "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
-msgstr "Chýbajúce <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgid ""
+"Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
+msgstr ""
+"Chýbajúce <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: src/theme.c:4114
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nepodarilo sa prečítať tému \"%s\": %s\n"
 
-#: src/theme.c:4260
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Pre tému \"%s\" nie je nastavené <name>"
 
-#: src/theme.c:4267
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Pre tému \"%s\" nie je nastavené <author>"
 
-#: src/theme.c:4274
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Pre tému \"%s\" nie je nastavené <date>"
 
-#: src/theme.c:4281
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Pre tému \"%s\" nie je nastavené <description>"
 
-#: src/theme.c:4288
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Pre tému \"%s\" nie je nastavené <copyright>"
 
-#: src/theme.c:4298
+#: src/theme.c:4240
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -566,7 +1619,7 @@ msgstr ""
 "Pre typ okna \"%s\" nie je sada štýlov v téme \"%s\", pridajte element "
 "<window type=\"%s\" style_set=\"whatever\"/>"
 
-#: src/theme.c:4320
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -575,12 +1628,13 @@ msgstr ""
 "<menu_icon funstate=\"%s\" stav=\"%s\" draw_ops=\"whatever\"/> musí byť pre "
 "túto tému uvedený"
 
-#: src/theme.c:4703 src/theme.c:4763
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
-msgid "User-defined constants must begin with a capital letter; \"%s\" does not"
+msgid ""
+"User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "Používateľské konštanty musia začítať veľkým písmenom, \"%s\" nezačína"
 
-#: src/theme.c:4711 src/theme.c:4771
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konštanta \"%s\" už je definovaná"
@@ -628,7 +1682,8 @@ msgstr "Uhol musí byť medzi 0.0 a 360.0, a je %g\n"
 #: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
-msgstr "Alfa musí byť medzi 0.0 (neviditeľné) a 1.0 (úplne nakreslené), a je %g\n"
+msgstr ""
+"Alfa musí byť medzi 0.0 (neviditeľné) a 1.0 (úplne nakreslené), a je %g\n"
 
 #: src/theme-parser.c:684
 #, c-format
@@ -727,8 +1782,10 @@ msgid "No \"value\" attribute on element <%s>"
 msgstr "Chýbajúci atribút \"value\" v elemente <%s>"
 
 #: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
-msgid "Cannot specify both button_width/button_height and aspect ratio for buttons"
-msgstr "Nie je možné zadať aj button_width/button_height a aj pomer strán tlačidiel"
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+"Nie je možné zadať aj button_width/button_height a aj pomer strán tlačidiel"
 
 #: src/theme-parser.c:1343
 #, c-format
@@ -1026,7 +2083,8 @@ msgstr "Najvyšším elementovm témy musí byť <metacity_theme>, nie <%s>"
 
 #: src/theme-parser.c:3615
 #, c-format
-msgid "Element <%s> is not allowed inside a name/author/date/description element"
+msgid ""
+"Element <%s> is not allowed inside a name/author/date/description element"
 msgstr "Element <%s> nie je povolený v elemente name/author/date/description"
 
 #: src/theme-parser.c:3620
@@ -1036,8 +2094,10 @@ msgstr "Element <%s> nie je povolený v elemente <constant>"
 
 #: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
-msgstr "Element <%s> nie je povolený v elemente vzdialenosti/okrajov/pomeru strán"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
+msgstr ""
+"Element <%s> nie je povolený v elemente vzdialenosti/okrajov/pomeru strán"
 
 #: src/theme-parser.c:3654
 #, c-format
@@ -1096,22 +2156,22 @@ msgstr "Nepodarilo sa prečítať tému zo súboru %s: %s\n"
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Súbor témy %s neobsahuje koreňový element <metacity_theme>"
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Nepodarilo sa otvoriť záznam pre ladenie: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Nepodarilo sa otvoriť súbor so záznamom pomocou fdopen() %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Otvorený súbor so záznamom %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr "Aplikácia nastavila neplatné _NET_WM_PID %ld\n"
@@ -1162,958 +2222,6 @@ msgstr "_Ukázať kurzorom"
 msgid "_Raise window on focus"
 msgstr "Presunúť okno _dopredu pri jeho aktivácii"
 
-#~ msgid ""
-#~ "(Not implemented) Navigation works in terms of applications not windows"
-#~ msgstr "(Neimplementované) Navigácia vzhľadom k aplikáciám, nie oknám"
-
-#~ msgid ""
-#~ "A font description string describing a font for window titlebars. The "
-#~ "size from the description will only be used if the titlebar_font_size "
-#~ "option is set to 0, however. Also, this option is disabled if the "
-#~ "titlebar_uses_desktop_font option is set to true. By default, "
-#~ "titlebar_font is unset, causing Metacity to fall back to the desktop font "
-#~ "even if titlebar_uses_desktop_font is false."
-#~ msgstr ""
-#~ "Reťazec popisu písma pre titulky okien. Veľkosť sa použije iba v prípade, "
-#~ "že voľba titlebar_font_size je 0. Táto voľba je vypnutá v prípade, že je "
-#~ "na true nastavené titlebar_uses_desktop. Štandardne je titlebar_font "
-#~ "nenastavené, takže Metacity použije písmo plochy aj v prípade, že "
-#~ "titlebar_uses_desktop_font je false."
-
-#~ msgid "Activate window menu"
-#~ msgstr "Aktivovať menu okna"
-
-#~ msgid "Automatically raises the focused window"
-#~ msgstr "Automaticky presunúť aktívne okno dopredu"
-
-#~ msgid "Close a window"
-#~ msgstr "Zavrieť okno"
-
-#~ msgid "Current theme"
-#~ msgstr "Aktuálna téma"
-
-#~ msgid "Delay in milliseconds for the auto raise option"
-#~ msgstr "Čakanie v milisekundách pred automatickým presunom dopredu"
-
-#~ msgid "Disable misfeatures that are required by old or broken applications"
-#~ msgstr ""
-#~ "Vypnúť chybné funkcie, ktoré sú vyžadované starými alebo nefunkčnými "
-#~ "aplikáciami"
-
-#~ msgid "Hide all windows and focus desktop"
-#~ msgstr "Skryť všetky okná a aktivovať plochu"
-
-#~ msgid ""
-#~ "If true, and the focus mode is either \"sloppy\" or \"mouse\" then the "
-#~ "focused window will be automatically raised after a delay (the delay is "
-#~ "specified by the auto_raise_delay key)."
-#~ msgstr ""
-#~ "Ak je true a režim aktivácie je buď \"sloppy\" alebo \"mouse\", aktívne "
-#~ "okno sa automaticky po danej dobe posunie dopredu (čakanie je nastavené v "
-#~ "kľúči auto_raise_delay)."
-
-#~ msgid ""
-#~ "If true, ignore the titlebar_font option, and use the standard "
-#~ "application font for window titles."
-#~ msgstr ""
-#~ "Ak je true, ignoruje sa titlebar_font a použije sa štandardné písmo "
-#~ "aplikácie pre titulky okien."
-
-#~ msgid ""
-#~ "If true, then Metacity works in terms of applications rather than "
-#~ "windows. The concept is a bit abstract, but in general an application-"
-#~ "based setup is more like the Mac and less like Windows. When you focus a "
-#~ "window in application-based mode, all the windows in the application will "
-#~ "be raised. Also, in application-based mode, focus clicks are not passed "
-#~ "through to windows in other applications. The existence of this setting "
-#~ "is somewhat questionable. But it's better than having settings for all "
-#~ "the specific details of application-based vs. window-based, e.g. whether "
-#~ "to pass through clicks. Also, application-based mode is largely "
-#~ "unimplemented at the moment."
-#~ msgstr ""
-#~ "Ak je true, Metacity funguje v rámci aplikácií a nie okien. Je to trochu "
-#~ "abstraktnejšie, ale všeobecne sa dá povedať, že nastavenie vzhľadom k "
-#~ "aplikáciám sa podobá viac systému Mac a menej systému Windows. Ak urobíte "
-#~ "okno aktívnym v móde aplikácií, všetky okná tejto aplikácie sa presunú "
-#~ "dopredu. Kliknutie na aktiváciu sa nepredáva oknám iných aplikácií. Je "
-#~ "otázka, či má táto voľba zmysel. Ale je lepšie, aby bola a zahŕňala "
-#~ "všetky detaily týchto prístupov. Na druhú stranu, máloktorá aplikácia je "
-#~ "napísaná pre mód založený na aplikáciách."
-
-#~ msgid "Minimize a window"
-#~ msgstr "Minimalizovať okno"
-
-#~ msgid "Move a window"
-#~ msgstr "Presunúť okno"
-
-#~ msgid "Move focus between panels and the desktop"
-#~ msgstr "Prepnúť aktívne okno medzi panelmi a plochou"
-
-#~ msgid "Move focus between windows"
-#~ msgstr "Prepnúť aktívne okno medzi oknami"
-
-#~ msgid "Move focus to the previously-focused window"
-#~ msgstr "Prepnúť aktívne okno na predchádzajúce aktívne okno"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "Presunúť okno o jednu plochu dolu"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Presunúť okno o jednu plochu vľavo"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Presunúť okno o jednu plochu vpravo"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "Presunúť okno o jednu plochu hore"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Presunúť okno na plochu 1"
-
-#~ msgid "Move window to workspace 10"
-#~ msgstr "Presunúť okno na plochu 10"
-
-#~ msgid "Move window to workspace 11"
-#~ msgstr "Presunúť okno na plochu 11"
-
-#~ msgid "Move window to workspace 12"
-#~ msgstr "Presunúť okno na plochu 12"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Presunúť okno na plochu 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Presunúť okno na plochu 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Presunúť okno na plochu 4"
-
-#~ msgid "Move window to workspace 5"
-#~ msgstr "Presunúť okno na plochu 5"
-
-#~ msgid "Move window to workspace 6"
-#~ msgstr "Presunúť okno na plochu 6"
-
-#~ msgid "Move window to workspace 7"
-#~ msgstr "Presunúť okno na plochu 7"
-
-#~ msgid "Move window to workspace 8"
-#~ msgstr "Presunúť okno na plochu 8"
-
-#~ msgid "Move window to workspace 9"
-#~ msgstr "Presunúť okno na plochu 9"
-
-#~ msgid "Number of workspaces"
-#~ msgstr "Počet pracovných plôch"
-
-#~ msgid ""
-#~ "Number of workspaces. Must be more than zero, and has a fixed maximum (to "
-#~ "prevent accidentally destroying your desktop by asking for 34 million "
-#~ "workspaces)."
-#~ msgstr ""
-#~ "Počet pracovných plôch. Musí byť viac ako 0 a má pevné maximum (aby sa "
-#~ "zabránilo zničenou pracovného prostredia požadovaním 34 miliónov "
-#~ "pracovných plôch)."
-
-#~ msgid "Raise window if obscured, lowers it otherwise"
-#~ msgstr "Presunúť okno dopredu ak je \"obscured\", inak posunúť dozadu"
-
-#~ msgid ""
-#~ "Some applications break specifications in ways that result in window "
-#~ "manager misfeatures. For example, ideally Metacity would place all "
-#~ "dialogs in a consistent position with respect to their parent window. "
-#~ "This requires ignoring application-specified positions for dialogs. But "
-#~ "some versions of Java/Swing mark their popup menus as dialogs, so "
-#~ "Metacity has to disable dialog positioning to allow menus to work in "
-#~ "broken Java applications. There are several other examples like this. "
-#~ "This option puts Metacity in full-on Correct mode, which perhaps gives a "
-#~ "moderately nicer UI if you don't need to run any broken apps. Sadly, "
-#~ "workarounds must be enabled by default; the real world is an ugly place. "
-#~ "Some of the workarounds are workarounds for limitations in the "
-#~ "specifications themselves, so sometimes a bug in no-workarounds mode "
-#~ "won't be fixable without amending a spec."
-#~ msgstr ""
-#~ "Niektoré aplikácie nedodržujú špecifikácie, takže je možné, že správca "
-#~ "okien nefunguje správne. Napríklad, v ideálnom prípade by Metacity "
-#~ "umiestnilo všetky dialógy rovnako vzhľadom k rodičovskému oknu. To "
-#~ "vyžaduje ignorovanie pozície dialógu zadané aplikáciou. Ale niektoré "
-#~ "verzie Java/Swing označujú kontextové menu ako dialógy, takže Metacity "
-#~ "musí vypnúť umiesťňovanie dialógov, aby menu fungovali v nefunkčných "
-#~ "aplikáciách Java správne. A takýchto príkladov je viac. Táto voľba "
-#~ "vynúti, aby Metacity fungoval iba v správcom režime, čo môže vytvoriť "
-#~ "lepšie chovanie, ak nepotrebujete používať už zmienené nefunkčné "
-#~ "aplikácie. Bohužiaľ, štandardne toto nie je možné zapnúť, pretože v "
-#~ "reálnom svete nie je nič tak jednoduché. Niektoré opravy navyše opravujú "
-#~ "obmedzenia špecifikácie, takže niekedy oprava pre chybu nie je možná bez "
-#~ "nedodržania špecifikácie."
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "Prepnúť na plochu 1"
-
-#~ msgid "Switch to workspace 10"
-#~ msgstr "Prepnúť na plochu 10"
-
-#~ msgid "Switch to workspace 11"
-#~ msgstr "Prepnúť na plochu 11"
-
-#~ msgid "Switch to workspace 12"
-#~ msgstr "Prepnúť na plochu 12"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "Prepnúť na plochu 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "Prepnúť na plochu 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "Prepnúť na plochu 4"
-
-#~ msgid "Switch to workspace 5"
-#~ msgstr "Prepnúť na plochu 5"
-
-#~ msgid "Switch to workspace 6"
-#~ msgstr "Prepnúť na plochu 6"
-
-#~ msgid "Switch to workspace 7"
-#~ msgstr "Prepnúť na plochu 7"
-
-#~ msgid "Switch to workspace 8"
-#~ msgstr "Prepnúť na plochu 8"
-
-#~ msgid "Switch to workspace 9"
-#~ msgstr "Prepnúť na plochu 9"
-
-#~ msgid "Switch to workspace above the current space"
-#~ msgstr "Prepnúť na plochu nad aktuálnou plochou"
-
-#~ msgid "Switch to workspace below the current space"
-#~ msgstr "Prepnúť na plochu pod aktuálnou plochou"
-
-#~ msgid "Switch to workspace on the left"
-#~ msgstr "Prepnúť na plochu vľavo"
-
-#~ msgid "Switch to workspace on the right"
-#~ msgstr "Prepnúť na plochu vpravo"
-
-#~ msgid ""
-#~ "The keybinding that switches to the workspace above the current "
-#~ "workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vyššie. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to the workspace below the current "
-#~ "workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre prepnutie pracovnej plochy na plochu nižšie. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to the workspace on the left of the current "
-#~ "workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vľavo. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to the workspace on the right of the current "
-#~ "workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre prepnutie pracovnej plochy na plochu vpravo. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 1. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 1. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 10. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 10. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 11. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 11. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 12. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 12. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 2. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 2. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 3. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 3. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 4. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 4. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 5. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 5. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 6. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 6. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 7. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 7. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 8. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 8. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding that switches to workspace 9. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne na pracovnú plochu 9. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to activate the window menu. The format looks like "
-#~ "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre aktiváciu menu okna. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to close a window. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre zatvorenie okna Formát je \"&lt;Control&gt;a\" "
-#~ "alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
-#~ "umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
-#~ "Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", "
-#~ "pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to enter \"move mode\" and begin moving a window "
-#~ "using the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
-#~ "upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;"
-#~ "Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-#~ "then there will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre zapnutie \"režimu presunu\" pomocou "
-#~ "klávesnice. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;"
-#~ "Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená "
-#~ "a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto "
-#~ "možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu nebude "
-#~ "definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to enter \"resize mode\" and begin resizing a window "
-#~ "using the keyboard. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
-#~ "upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;"
-#~ "Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-#~ "then there will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre zapnutie \"režimu zmeny veľkosti\" pomocou "
-#~ "klávesnice. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;"
-#~ "Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená "
-#~ "a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto "
-#~ "možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu nebude "
-#~ "definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to hide all normal windows and set the focus to the "
-#~ "desktop background. The format looks like \"&lt;Control&gt;a\" or \"&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or "
-#~ "upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;"
-#~ "Ctrl&gt;\". If you set the option to the special string \"disabled\", "
-#~ "then there will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre skrytie všetkých normálnych okien a nastavenie "
-#~ "ako aktívne pozadie plochy. Formát je \"&lt;Control&gt;a\" alebo \"&lt;"
-#~ "Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj "
-#~ "veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak "
-#~ "nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu "
-#~ "nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to minimize a window. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka pre minimalizáciu okna. Formát je \"&lt;Control&gt;"
-#~ "a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
-#~ "umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
-#~ "Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", "
-#~ "pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window one workspace down. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno o jednu pracovnú plochu dolu. Formát "
-#~ "je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie "
-#~ "je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window one workspace to the left. The "
-#~ "format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "The parser is fairly liberal and allows lower or upper case, and also "
-#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
-#~ "the option to the special string \"disabled\", then there will be no "
-#~ "keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno o jednu pracovnú plochu vľavo. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window one workspace to the right. The "
-#~ "format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "The parser is fairly liberal and allows lower or upper case, and also "
-#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
-#~ "the option to the special string \"disabled\", then there will be no "
-#~ "keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno o jednu pracovnú plochu vpravo. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window one workspace up. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno o jednu pracovnú plochu hore. Formát "
-#~ "je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie "
-#~ "je dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 1. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 1. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 10. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 10. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 11. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 11. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 12. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 12. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 2. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 2. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 3. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 3. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 4. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 4. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 5. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 5. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 6. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 6. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 7. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 7. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 8. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 8. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move a window to workspace 9. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka presunie okno na pracovnú plochu 9. Formát je "
-#~ "\"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je "
-#~ "dosť liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;"
-#~ "Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu "
-#~ "hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna klávesová "
-#~ "skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move focus back to the window which last had the "
-#~ "focus. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;"
-#~ "Alt&gt;F1. The parser is fairly liberal and allows lower or upper case, "
-#~ "and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If "
-#~ "you set the option to the special string \"disabled\", then there will be "
-#~ "no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka nastaví ako aktívne okno, ktoré bolo aktívne "
-#~ "naposledy. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;"
-#~ "F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a "
-#~ "skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto "
-#~ "možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu nebude "
-#~ "definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move focus between panels and the desktop. The "
-#~ "format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "The parser is fairly liberal and allows lower or upper case, and also "
-#~ "abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set "
-#~ "the option to the special string \"disabled\", then there will be no "
-#~ "keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne aktívne okno medzi panelmi a plochou. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to move focus between windows. (Traditionally &lt;"
-#~ "Alt&gt;Tab) The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne aktívne okno na iné okno (tradične &lt;"
-#~ "Alt&gt;Tab). Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;"
-#~ "Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená "
-#~ "a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto "
-#~ "možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu nebude "
-#~ "definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to toggle fullscreen mode. The format looks like "
-#~ "\"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne zobrazenie do celoobrazovkového módu. "
-#~ "Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. "
-#~ "Spracovanie je dosť liberálne a umožňuje malé aj veľké písmená a skratky "
-#~ "ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na "
-#~ "špeciálnu hodnotu \"disabled\", pre túto akciu nebude definovaná žiadna "
-#~ "klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to toggle maximization. The format looks like \"&lt;"
-#~ "Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly "
-#~ "liberal and allows lower or upper case, and also abbreviations such as "
-#~ "\"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to the "
-#~ "special string \"disabled\", then there will be no keybinding for this "
-#~ "action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne maximalizáciu okna. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to toggle shaded/unshaded state. The format looks "
-#~ "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is "
-#~ "fairly liberal and allows lower or upper case, and also abbreviations "
-#~ "such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;\". If you set the option to "
-#~ "the special string \"disabled\", then there will be no keybinding for "
-#~ "this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka prepne zabalenie okna. Formát je \"&lt;Control&gt;a"
-#~ "\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť liberálne a "
-#~ "umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;"
-#~ "Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu \"disabled\", "
-#~ "pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The keybinding used to toggle whether the window is on all workspaces or "
-#~ "just one. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. The parser is fairly liberal and allows lower or upper "
-#~ "case, and also abbreviations such as \"&lt;Ctl&gt;\" and \"&lt;Ctrl&gt;"
-#~ "\". If you set the option to the special string \"disabled\", then there "
-#~ "will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka mení, či je okno na všetkých pracovných plochách "
-#~ "alebo iba na jednej. Formát je \"&lt;Control&gt;a\" alebo \"&lt;Shift&gt;"
-#~ "&lt;Alt&gt;F1. Spracovanie je dosť liberálne a umožňuje malé aj veľké "
-#~ "písmená a skratky ako je \"&lt;Ctl&gt;\" a \"&lt;Ctrl&gt;\". Ak nastavíte "
-#~ "túto možnosť na špeciálnu hodnotu \"disabled\", pre túto akciu nebude "
-#~ "definovaná žiadna klávesová skratka."
-
-#~ msgid ""
-#~ "The theme determines the appearance of window borders, titlebar, and so "
-#~ "forth."
-#~ msgstr "Téma určuje vzhľad rámu okna, titulku apod."
-
-#~ msgid ""
-#~ "The time delay before raising a window if auto_raise is set to true. The "
-#~ "delay is given in thousandths of a second."
-#~ msgstr ""
-#~ "Čas čakania pred presunom okna dopredu, ak je auto_raise true. Hodnota je "
-#~ "v tisícinách sekundy."
-
-#~ msgid ""
-#~ "The window focus mode indicates how windows are activated. It has three "
-#~ "possible values; \"click\" means windows must be clicked in order to "
-#~ "focus them, \"sloppy\" means windows are focused when the mouse enters "
-#~ "the window, and \"mouse\" means windows are focused when the mouse enters "
-#~ "the window and unfocused when the mouse leaves the window."
-#~ msgstr ""
-#~ "Chovanie fokusu určuje, ako sa okná aktivujú. Má tri možné hodnoty: "
-#~ "\"click\" znamená, že na okno sa musí kliknúť, \"sloppy\" znamená, že "
-#~ "okno sa stane aktívnym, ak sa kurzor myši nastaví nad okno, a \"mouse\" "
-#~ "znamená, že sa okno stane aktívnym pri ukázaní kurzorom myši a pri "
-#~ "presune kurzoru myši mimo okno prestane byť okno aktívne."
-
-#~ msgid ""
-#~ "This keybinding changes whether a window is above or below other windows. "
-#~ "If the window is covered by another window, it raises the window above "
-#~ "other windows. If the window is already fully visible, it lowers the "
-#~ "window below other windows. The format looks like \"&lt;Control&gt;a\" or "
-#~ "\"&lt;Shift&gt;&lt;Alt&gt;F1. The parser is fairly liberal and allows "
-#~ "lower or upper case, and also abbreviations such as \"&lt;Ctl&gt;\" and "
-#~ "\"&lt;Ctrl&gt;\". If you set the option to the special string \"disabled"
-#~ "\", then there will be no keybinding for this action."
-#~ msgstr ""
-#~ "Táto klávesová skratka mení, či je okno nad alebo pod ostatnými oknami. "
-#~ "Ak je okno zakryté iným oknom, posunie ho dopredu na ostatné okná. Ak už "
-#~ "je okno vpredu, posunie ho dozadu za ostatné okná. Formát je \"&lt;"
-#~ "Control&gt;a\" alebo \"&lt;Shift&gt;&lt;Alt&gt;F1. Spracovanie je dosť "
-#~ "liberálne a umožňuje malé aj veľké písmená a skratky ako je \"&lt;Ctl&gt;"
-#~ "\" a \"&lt;Ctrl&gt;\". Ak nastavíte túto možnosť na špeciálnu hodnotu "
-#~ "\"disabled\", pre túto akciu nebude definovaná žiadna klávesová skratka."
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "Prepnúť celoobrazovkový mód"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "Prepnúť maximalizáciu"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Prepnúť zabalenie okna"
-
-#~ msgid "Toggle whether the window is on all workspaces"
-#~ msgstr "Prepnúť, či je okno na všetkých pracovných plochách"
-
-#~ msgid "Use standard system font in window titles"
-#~ msgstr "Použiť štandardné systémové písmo v titulkoch okna"
-
-#~ msgid "Window title font"
-#~ msgstr "Písmo titulku okna"
-
 #~ msgid "Left edge"
 #~ msgstr "Ľavý okraj"
 
@@ -2209,4 +2317,3 @@ msgstr "Presunúť okno _dopredu pri jeho aktivácii"
 #~ 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 a6e78c43d..8321aacd2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-09 14:21+0200\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-06-09 14:21+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index a73f60595..85eee3e04 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\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"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr ""
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr ""
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X window ekran� a��lamad�: '%s'\n"
@@ -87,19 +87,19 @@ msgstr ""
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr ""
@@ -960,832 +960,881 @@ msgstr ""
 msgid "%d x %d"
 msgstr ""
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr ""
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
 msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 
-#: src/session.c:267
+#: src/screen.c:307
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr ""
+
+#: src/screen.c:510
+#, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr ""
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr ""
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr ""
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr ""
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr ""
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr ""
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr ""
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr ""
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr ""
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr ""
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr ""
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr ""
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr ""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr ""
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr ""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr ""
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr ""
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr ""
 
-#: src/theme-parser.c:3539
+#: src/theme-parser.c:3632
 #, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr ""
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr ""
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr ""
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, fuzzy, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "X window ekran� a��lamad�: '%s'\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, fuzzy, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "X window ekran� a��lamad�: '%s'\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr ""
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1806,6 +1855,14 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+msgid "Window Focus"
+msgstr ""
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index bf8383540..61a22d498 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-04-24 09:39+0200\n"
 "Last-Translator: Yuriy Syrota <yuri@renome.rovno.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "Не вдалось проаналізувати як ціле \"%s\""
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "Збій аналізування збереженого файлу сеансу: %s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не вдалося відкрити дисплей X Window System \"%s\"\n"
@@ -86,7 +86,7 @@ msgstr "Максимізувати вікно"
 msgid "Unmaximize Window"
 msgstr "Демаксимізувати вікно"
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -95,12 +95,12 @@ msgstr ""
 "Якась програма вже використовує клавішу %s з модифікатором %x в якості "
 "прив'язки\n"
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Збій перезапуску: %s\n"
@@ -994,744 +994,792 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Екран %d на дисплеї \"%s\" не вірний\n"
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
-msgstr "Екран %d на дисплеї \"%s\" вже має віконного менеджера\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
+msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, fuzzy, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Не вдалось створити каталог \"%s\": %s\n"
 
-#: src/session.c:267
+#: src/screen.c:307
+#, fuzzy, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Екран %d на дисплеї \"%s\" вже має віконного менеджера\n"
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Не вдалось створити каталог \"%s\": %s\n"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "Не вдалось створити каталог \"%s\": %s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr "Не вдалось відкрити для запису файл сеансу \"%s\": %s\n"
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "Помилка запису файлу сеансу \"%s\": %s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "Помилка закриття файлу сеансу \"%s\": %s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "Збій під час зчитування збереженого файлу сеансу \"%s\": %s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "Збій аналізування збереженого файлу сеансу: %s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "Невідома ознака %s у елементі <metacity_session>"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr "вкладена бирка <window>"
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "Невідома ознака %s у елементі <window>"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "Невідома ознака %s у елементі <geometry>"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "Невідомий елемент %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr ""
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "Не вдалось проаналізувати колір \"%s\""
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Не вдалось проаналізувати колір \"%s\""
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr ""
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr ""
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr ""
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr ""
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Збій завантаження схеми \"%s\": %s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "Не встановлено <name> для теми \"%s\""
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "Не встановлено <author> для теми \"%s\""
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "Не встановлено <date> для теми \"%s\""
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "Не встановлено <description> для теми \"%s\""
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "Не встановлено <copyrigth> для теми \"%s\""
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr ""
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Рядок %d, символ %d: %s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Ціле %ld має бути додатнім"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr ""
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr ""
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr ""
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr ""
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "Немає ознаки \"%s\" елементі <%s>"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "Немає ознаки \"%s\" елементі <%s>"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Невідомий тип \"%s\" у елементі <%s>"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, fuzzy, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Невідома ознака %s у елементі <window>"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr ""
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "Немає ознаки \"name\" елементі <%s>"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "Немає ознаки \"value\" у елементі <%s>"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Не відома відстань \"%s\""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, fuzzy, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr "Не відома відстань \"%s\""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Немає ознаки \"top\" у елементі <%s>"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Немає ознаки \"bottom\" у елементі <%s>"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Немає ознаки \"left\" у елементі <%s>"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Немає ознаки \"rigth\" у елементі <%s>"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "Немає ознаки \"color\" у елементі <%s>"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Немає ознаки \"x1\" елементі <%s>"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "Немає ознаки \"y1\" елементі <%s>"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Немає ознаки \"x2\" елементі <%s>"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "Немає ознаки \"y2\" елементі <%s>"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "Немає ознаки \"x\" елементі <%s>"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "Немає ознаки \"y\" елементі <%s>"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "Немає ознаки \"width\" елементі <%s>"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "Немає ознаки \"height\" у елементі <%s>"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Немає ознаки \"start_angle\" у елементі <%s>"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Немає ознаки \"extent_angle\" у елементі <%s>"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Немає ознаки \"alpha\" у елементі <%s>"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Немає ознаки \"type\" у елементі <%s>"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Немає ознаки \"filename\" у елементі <%s>"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Невідомий тип \"%s\" у елементі <%s>"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "Немає ознаки \"state\" у елементі <%s>"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "Немає ознаки \"shadow\" у елементі <%s>"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Немає ознаки \"arrow\" елементі <%s>"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Немає ознаки \"value\" елементі <%s>"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Немає ознаки \"position\" елементі <%s>"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Немає ознаки \"function\" елементі <%s>"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "Немає ознаки \"state\" елементі <%s>"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Невідома функція кнопки – \"%s\""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Невідомий стан кнопки – \"%s\""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Немає ознаки \"focus\" елементі <%s>"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Немає ознаки \"style\" елементі <%s>"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr ""
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr ""
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Стилю \"%s\" не визначено"
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Немає ознаки \"resize\" у елементі <%s>"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr ""
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Найвищим елементом в темі має бути  <metacity_theme>, не <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
@@ -1739,89 +1787,90 @@ msgstr ""
 "Елемент <%s> не дозволяється у елементах <name>, <author>, <date> і "
 "<description>"
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Елемент <%s> не дозволяється у елементі <constant>"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "Елемент <%s> не дозволяється у елементах <distance> і border"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Елемент <%s> не дозволяється у елементі операції малювання"
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Елемент <%s> не дозволяється у елементі <%s>"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, fuzzy, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Елемент <%s> не дозволяється у елементі <%s>"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "<name> в цій темі вказано двічі"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "<author> в цій темі вказано двічі"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyrigth> в цій темі вказано двічі"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "<date> в цій темі вказано двічі"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "<description> в цій темі вказано двічі"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr "Збій зчитування теми з файлу %s: %s\n"
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Збій відкриття налагоджувального журналу: %s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Збій виконання fdopen() для журналу %s: %s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Відкрито журнал %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1842,6 +1891,15 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "Меню вікна"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 354133ec8..c7211c958 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.3.377\n"
-"POT-Creation-Date: 2002-06-02 23:01-0400\n"
+"POT-Creation-Date: 2002-06-09 23:42-0400\n"
 "PO-Revision-Date: 2002-05-28 19:42+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: traditioanl Chinese <zh-l10n@linux.org.tw>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/delete.c:62 src/delete.c:89 src/metacity-dialog.c:46
-#: src/theme-parser.c:466
+#: src/theme-parser.c:467
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "無法以整數的方式分析“%s”"
 
 #: src/delete.c:69 src/delete.c:96 src/metacity-dialog.c:53
-#: src/theme-parser.c:475 src/theme-parser.c:529
+#: src/theme-parser.c:476 src/theme-parser.c:530
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
 msgid "Failed to get hostname: %s\n"
 msgstr "無法獲取主機名稱：%s\n"
 
-#: src/display.c:231
+#: src/display.c:243
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "無法開啟 X Window 系統畫面‘%s’\n"
@@ -84,19 +84,19 @@ msgstr "視窗最大化"
 msgid "Unmaximize Window"
 msgstr ""
 
-#: src/keybindings.c:630
+#: src/keybindings.c:639
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr ""
 
-#: src/main.c:288
+#: src/main.c:290
 #, c-format
 msgid "Could not find a theme! Be sure %s exits and contains the usual themes."
 msgstr ""
 
-#: src/main.c:334
+#: src/main.c:338
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr ""
@@ -988,256 +988,294 @@ msgstr ""
 msgid "%d x %d"
 msgstr "%d×%d"
 
-#: src/screen.c:191
+#: src/screen.c:195
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr ""
 
-#: src/screen.c:212
+#: src/screen.c:211
 #, c-format
-msgid "Screen %d on display '%s' already has a window manager\n"
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to override the current window manager.\n"
 msgstr ""
 
-#: src/screen.c:370
+#: src/screen.c:252
 #, c-format
-msgid "Could not release screen %d on display '%s'\n"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 
-#: src/session.c:267
+#: src/screen.c:307
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr ""
+
+#: src/screen.c:510
+#, fuzzy, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "無法分析顏色“%s”"
+
+#: src/session.c:273
 #, c-format
 msgid ""
 "Failed to a open connection to a session manager, so window positions will "
 "not be saved: %s\n"
 msgstr ""
 
-#: src/session.c:820 src/session.c:827
+#: src/session.c:851 src/session.c:858
 #, c-format
 msgid "Could not create directory '%s': %s\n"
 msgstr "無法建立目錄‘%s’：%s\n"
 
-#: src/session.c:837
+#: src/session.c:868
 #, c-format
 msgid "Could not open session file '%s' for writing: %s\n"
 msgstr ""
 
-#: src/session.c:969
+#: src/session.c:1000
 #, c-format
 msgid "Error writing session file '%s': %s\n"
 msgstr "無法寫入作業階段檔案‘%s’：%s\n"
 
-#: src/session.c:974
+#: src/session.c:1005
 #, c-format
 msgid "Error closing session file '%s': %s\n"
 msgstr "無法關閉作業階段檔案‘%s’：%s\n"
 
-#: src/session.c:1047
+#: src/session.c:1078
 #, c-format
 msgid "Failed to read saved session file %s: %s\n"
 msgstr "無法讀入已儲存的作業階段檔案 %s：%s\n"
 
-#: src/session.c:1082
+#: src/session.c:1113
 #, c-format
 msgid "Failed to parse saved session file: %s\n"
 msgstr "無法分析已儲存的作業階段檔案：%s\n"
 
-#: src/session.c:1131
+#: src/session.c:1162
 msgid "<metacity_session> attribute seen but we already have the session ID"
 msgstr ""
 
-#: src/session.c:1144
+#: src/session.c:1175
 #, c-format
 msgid "Unknown attribute %s on <metacity_session> element"
 msgstr "<metacity_session> 元素中出現不明的屬性 %s"
 
-#: src/session.c:1161
+#: src/session.c:1192
 msgid "nested <window> tag"
 msgstr ""
 
-#: src/session.c:1211 src/session.c:1243
+#: src/session.c:1242 src/session.c:1274
 #, c-format
 msgid "Unknown attribute %s on <window> element"
 msgstr "<window> 元素中出現不明的屬性 %s"
 
-#: src/session.c:1303
+#: src/session.c:1334
 #, c-format
 msgid "Unknown attribute %s on <geometry> element"
 msgstr "<geometry> 元素中出現不明的屬性 %s"
 
-#: src/session.c:1323
+#: src/session.c:1354
 #, c-format
 msgid "Unknown element %s"
 msgstr "不明的元素 %s"
 
-#: src/session.c:1696
+#: src/session.c:1727
 #, c-format
 msgid ""
 "Error launching metacity-dialog to warn about apps that don't support "
 "session management: %s\n"
 msgstr ""
 
-#: src/theme.c:351
+#: src/theme.c:202
 msgid "top"
 msgstr ""
 
-#: src/theme.c:353
+#: src/theme.c:204
 msgid "bottom"
 msgstr ""
 
-#: src/theme.c:355
+#: src/theme.c:206
 msgid "left"
 msgstr ""
 
-#: src/theme.c:357
+#: src/theme.c:208
 msgid "right"
 msgstr ""
 
-#: src/theme.c:371
+#: src/theme.c:222
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr ""
 
-#: src/theme.c:390
+#: src/theme.c:241
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 
-#: src/theme.c:749
+#: src/theme.c:278
+#, c-format
+msgid "Button aspect ratio %g is not reasonable"
+msgstr ""
+
+#: src/theme.c:290
+msgid "Frame geometry does not specify size of buttons"
+msgstr ""
+
+#: src/theme.c:654
 msgid "Gradients should have at least two colors"
 msgstr "漸層應該最少有兩種顏色"
 
-#: src/theme.c:865
+#: src/theme.c:780
 #, 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:879
+#: src/theme.c:794
 #, 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:890
+#: src/theme.c:805
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:903
+#: src/theme.c:818
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr ""
 
-#: src/theme.c:933
+#: src/theme.c:848
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr ""
 
-#: src/theme.c:944
+#: src/theme.c:859
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr ""
 
-#: src/theme.c:954
+#: src/theme.c:869
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 
-#: src/theme.c:993
+#: src/theme.c:916
+#, c-format
+msgid ""
+"Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
+msgstr ""
+
+#: src/theme.c:927
+#, fuzzy, c-format
+msgid "Could not parse shade factor \"%s\" in shaded color"
+msgstr "無法分析顏色“%s”"
+
+#: src/theme.c:937
+#, c-format
+msgid "Shade factor \"%s\" in shaded color is negative"
+msgstr ""
+
+#: src/theme.c:966
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "無法分析顏色“%s”"
 
-#: src/theme.c:1243
+#: src/theme.c:1228
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "座標表達式中出現不可接受的字元‘%s’"
 
-#: src/theme.c:1270
+#: src/theme.c:1255
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "座標表達式中出現無法分析的浮點小數‘%s’"
 
-#: src/theme.c:1284
+#: src/theme.c:1269
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "座標表達式中出現無法分析的整數‘%s’"
 
-#: src/theme.c:1351
+#: src/theme.c:1336
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr ""
 
-#: src/theme.c:1408
+#: src/theme.c:1393
 msgid "Coordinate expression was empty or not understood"
 msgstr "座標表達式是空白的或是無法分析"
 
-#: src/theme.c:1547 src/theme.c:1557 src/theme.c:1591
+#: src/theme.c:1532 src/theme.c:1542 src/theme.c:1576
 msgid "Coordinate expression results in division by zero"
 msgstr "座標表達式出現被 0 整除的錯誤"
 
-#: src/theme.c:1599
+#: src/theme.c:1584
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 
-#: src/theme.c:1656
+#: src/theme.c:1641
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 
-#: src/theme.c:1665
+#: src/theme.c:1650
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 
-#: src/theme.c:1673
+#: src/theme.c:1658
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 
-#: src/theme.c:1683
+#: src/theme.c:1668
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr ""
 
-#: src/theme.c:1802
+#: src/theme.c:1787
 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:1831
+#: src/theme.c:1816
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "座標表達式中的閉括號沒有相應的開括號"
 
-#: src/theme.c:1894
+#: src/theme.c:1879
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "座標表達式中出現不明的變數或常數“%s”"
 
-#: src/theme.c:1951
+#: src/theme.c:1936
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "座標表達式中的開括號沒有相應的閉括號"
 
-#: src/theme.c:1962
+#: src/theme.c:1947
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 
-#: src/theme.c:2206 src/theme.c:2228 src/theme.c:2249
+#: src/theme.c:2191 src/theme.c:2213 src/theme.c:2234
 #, c-format
 msgid "Theme contained an expression \"%s\" that resulted in an error: %s\n"
 msgstr "佈景主題中含有引致錯誤的表達式“%s”：%s\n"
 
-#: src/theme.c:3579
+#: src/theme.c:3564
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -1246,577 +1284,588 @@ msgstr ""
 "此邊框款式必須指定 <button function=\"%s\" state=\"%s\" draw_ops=\"whatever"
 "\"/>"
 
-#: src/theme.c:3988 src/theme.c:4020
+#: src/theme.c:3973 src/theme.c:4005
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "缺少了 <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: src/theme.c:4071
+#: src/theme.c:4056
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "無法載入佈景主題“%s”：%s\n"
 
-#: src/theme.c:4217
+#: src/theme.c:4202
 #, c-format
 msgid "No <name> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <name>"
 
-#: src/theme.c:4224
+#: src/theme.c:4209
 #, c-format
 msgid "No <author> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <author>"
 
-#: src/theme.c:4231
+#: src/theme.c:4216
 #, c-format
 msgid "No <date> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <date>"
 
-#: src/theme.c:4238
+#: src/theme.c:4223
 #, c-format
 msgid "No <description> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <description>"
 
-#: src/theme.c:4245
+#: src/theme.c:4230
 #, c-format
 msgid "No <copyright> set for theme \"%s\""
 msgstr "佈景主題“%s”未指定 <copyright>"
 
-#: src/theme.c:4255
+#: src/theme.c:4240
 #, 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:4277
+#: src/theme.c:4262
 #, c-format
 msgid ""
 "<menu_icon function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this theme"
 msgstr ""
 
-#: src/theme.c:4660 src/theme.c:4720
+#: src/theme.c:4645 src/theme.c:4705
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "使用者定義的常數必須以大寫字母開始；但“%s”不是"
 
-#: src/theme.c:4668 src/theme.c:4728
+#: src/theme.c:4653 src/theme.c:4713
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "已定義了“%s”常數"
 
-#: src/theme-parser.c:223 src/theme-parser.c:241
+#: src/theme-parser.c:224 src/theme-parser.c:242
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "第 %d 行第 %d 個字元：%s"
 
-#: src/theme-parser.c:395
+#: src/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "屬性“%s”在 <%s> 元素中出現了兩次"
 
-#: src/theme-parser.c:413 src/theme-parser.c:438
+#: src/theme-parser.c:414 src/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr ""
 
-#: src/theme-parser.c:484
+#: src/theme-parser.c:485
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "整數 %ld 必須為正數"
 
-#: src/theme-parser.c:492
+#: src/theme-parser.c:493
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "整數 %ld 太大，目前可接受的最大值為 %d"
 
-#: src/theme-parser.c:520 src/theme-parser.c:601 src/theme-parser.c:625
+#: src/theme-parser.c:521 src/theme-parser.c:602 src/theme-parser.c:626
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "無法以浮點小數的方式分析“%s”"
 
-#: src/theme-parser.c:551
+#: src/theme-parser.c:552
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "布林值必須為“true”或“false”，不是“%s”"
 
-#: src/theme-parser.c:571
+#: src/theme-parser.c:572
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "角度必須在 0.0 至 360.0 之間，此處的值為 %g\n"
 
-#: src/theme-parser.c:637
+#: src/theme-parser.c:638
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr "透明度必須在 0.0（完全透明）至 1.0（完全不透明），此處的值為 %g\n"
 
-#: src/theme-parser.c:683
+#: src/theme-parser.c:684
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 msgstr ""
 
-#: src/theme-parser.c:728 src/theme-parser.c:736 src/theme-parser.c:2780
-#: src/theme-parser.c:2869 src/theme-parser.c:2876 src/theme-parser.c:2883
+#: src/theme-parser.c:729 src/theme-parser.c:737 src/theme-parser.c:2872
+#: src/theme-parser.c:2961 src/theme-parser.c:2968 src/theme-parser.c:2975
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "沒有任何“%s”屬性出現在 <%s> 元素內"
 
-#: src/theme-parser.c:806 src/theme-parser.c:896 src/theme-parser.c:934
-#: src/theme-parser.c:1011 src/theme-parser.c:1061 src/theme-parser.c:1069
-#: src/theme-parser.c:1125 src/theme-parser.c:1133
+#: src/theme-parser.c:807 src/theme-parser.c:897 src/theme-parser.c:935
+#: src/theme-parser.c:1012 src/theme-parser.c:1062 src/theme-parser.c:1070
+#: src/theme-parser.c:1126 src/theme-parser.c:1134
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "沒有任何“%s”屬性出現在 <%s> 元素內"
 
-#: src/theme-parser.c:836 src/theme-parser.c:904 src/theme-parser.c:942
-#: src/theme-parser.c:1019
+#: src/theme-parser.c:837 src/theme-parser.c:905 src/theme-parser.c:943
+#: src/theme-parser.c:1020
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr ""
 
-#: src/theme-parser.c:848 src/theme-parser.c:954 src/theme-parser.c:1031
+#: src/theme-parser.c:849 src/theme-parser.c:955 src/theme-parser.c:1032
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:967
+#: src/theme-parser.c:968
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:980
+#: src/theme-parser.c:981
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr ""
 
-#: src/theme-parser.c:1079
+#: src/theme-parser.c:1080
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "不明的類型“%s”出現於<%s> 元素 之內"
 
-#: src/theme-parser.c:1090
+#: src/theme-parser.c:1091
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "不明的 style_set“%s”出現於<%s> 元素 之內"
 
-#: src/theme-parser.c:1098
+#: src/theme-parser.c:1099
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr ""
 
-#: src/theme-parser.c:1142
+#: src/theme-parser.c:1143
 #, c-format
 msgid "Unknown function \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1151
+#: src/theme-parser.c:1152
 #, c-format
 msgid "Unknown state \"%s\" for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:1159
+#: src/theme-parser.c:1160
 #, c-format
 msgid "Theme already has a menu icon for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:1176 src/theme-parser.c:3088 src/theme-parser.c:3167
+#: src/theme-parser.c:1177 src/theme-parser.c:3180 src/theme-parser.c:3259
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:1191 src/theme-parser.c:1255 src/theme-parser.c:1453
-#: src/theme-parser.c:2968 src/theme-parser.c:3022 src/theme-parser.c:3182
-#: src/theme-parser.c:3359 src/theme-parser.c:3397 src/theme-parser.c:3435
-#: src/theme-parser.c:3473
+#: src/theme-parser.c:1192 src/theme-parser.c:1256 src/theme-parser.c:1545
+#: src/theme-parser.c:3060 src/theme-parser.c:3114 src/theme-parser.c:3274
+#: src/theme-parser.c:3451 src/theme-parser.c:3489 src/theme-parser.c:3527
+#: src/theme-parser.c:3565
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "<%s> 元素 不可出現在 <%s> 之下"
 
-#: src/theme-parser.c:1281 src/theme-parser.c:1355
+#: src/theme-parser.c:1282 src/theme-parser.c:1369 src/theme-parser.c:1439
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“name”屬性"
 
-#: src/theme-parser.c:1288
+#: src/theme-parser.c:1289 src/theme-parser.c:1376
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“value”屬性"
 
-#: src/theme-parser.c:1318
+#: src/theme-parser.c:1320 src/theme-parser.c:1334 src/theme-parser.c:1393
+msgid ""
+"Cannot specify both button_width/button_height and aspect ratio for buttons"
+msgstr ""
+
+#: src/theme-parser.c:1343
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1362
+#: src/theme-parser.c:1402
+#, c-format
+msgid "Aspect ratio \"%s\" is unknown"
+msgstr ""
+
+#: src/theme-parser.c:1446
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“top”屬性"
 
-#: src/theme-parser.c:1369
+#: src/theme-parser.c:1453
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“bottom”屬性"
 
-#: src/theme-parser.c:1376
+#: src/theme-parser.c:1460
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“left”屬性"
 
-#: src/theme-parser.c:1383
+#: src/theme-parser.c:1467
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“right”屬性"
 
-#: src/theme-parser.c:1415
+#: src/theme-parser.c:1499
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr ""
 
-#: src/theme-parser.c:1563 src/theme-parser.c:1673 src/theme-parser.c:1776
-#: src/theme-parser.c:1963 src/theme-parser.c:2713
+#: src/theme-parser.c:1655 src/theme-parser.c:1765 src/theme-parser.c:1868
+#: src/theme-parser.c:2055 src/theme-parser.c:2805
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“color”屬性"
 
-#: src/theme-parser.c:1570
+#: src/theme-parser.c:1662
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“x1”屬性"
 
-#: src/theme-parser.c:1577 src/theme-parser.c:2558
+#: src/theme-parser.c:1669 src/theme-parser.c:2650
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“y1”屬性"
 
-#: src/theme-parser.c:1584
+#: src/theme-parser.c:1676
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“x2”屬性"
 
-#: src/theme-parser.c:1591 src/theme-parser.c:2565
+#: src/theme-parser.c:1683 src/theme-parser.c:2657
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“y2”屬性"
 
-#: src/theme-parser.c:1680 src/theme-parser.c:1783 src/theme-parser.c:1889
-#: src/theme-parser.c:1970 src/theme-parser.c:2076 src/theme-parser.c:2171
-#: src/theme-parser.c:2327 src/theme-parser.c:2453 src/theme-parser.c:2551
-#: src/theme-parser.c:2625 src/theme-parser.c:2720
+#: src/theme-parser.c:1772 src/theme-parser.c:1875 src/theme-parser.c:1981
+#: src/theme-parser.c:2062 src/theme-parser.c:2168 src/theme-parser.c:2263
+#: src/theme-parser.c:2419 src/theme-parser.c:2545 src/theme-parser.c:2643
+#: src/theme-parser.c:2717 src/theme-parser.c:2812
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“x”屬性"
 
-#: src/theme-parser.c:1687 src/theme-parser.c:1790 src/theme-parser.c:1896
-#: src/theme-parser.c:1977 src/theme-parser.c:2083 src/theme-parser.c:2178
-#: src/theme-parser.c:2334 src/theme-parser.c:2460 src/theme-parser.c:2632
-#: src/theme-parser.c:2727
+#: src/theme-parser.c:1779 src/theme-parser.c:1882 src/theme-parser.c:1988
+#: src/theme-parser.c:2069 src/theme-parser.c:2175 src/theme-parser.c:2270
+#: src/theme-parser.c:2426 src/theme-parser.c:2552 src/theme-parser.c:2724
+#: src/theme-parser.c:2819
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“y”屬性"
 
-#: src/theme-parser.c:1694 src/theme-parser.c:1797 src/theme-parser.c:1903
-#: src/theme-parser.c:1984 src/theme-parser.c:2090 src/theme-parser.c:2185
-#: src/theme-parser.c:2341 src/theme-parser.c:2467 src/theme-parser.c:2639
+#: src/theme-parser.c:1786 src/theme-parser.c:1889 src/theme-parser.c:1995
+#: src/theme-parser.c:2076 src/theme-parser.c:2182 src/theme-parser.c:2277
+#: src/theme-parser.c:2433 src/theme-parser.c:2559 src/theme-parser.c:2731
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“width”屬性"
 
-#: src/theme-parser.c:1701 src/theme-parser.c:1804 src/theme-parser.c:1910
-#: src/theme-parser.c:1991 src/theme-parser.c:2097 src/theme-parser.c:2192
-#: src/theme-parser.c:2348 src/theme-parser.c:2474 src/theme-parser.c:2646
+#: src/theme-parser.c:1793 src/theme-parser.c:1896 src/theme-parser.c:2002
+#: src/theme-parser.c:2083 src/theme-parser.c:2189 src/theme-parser.c:2284
+#: src/theme-parser.c:2440 src/theme-parser.c:2566 src/theme-parser.c:2738
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“height”屬性"
 
-#: src/theme-parser.c:1811
+#: src/theme-parser.c:1903
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“start_angle”屬性"
 
-#: src/theme-parser.c:1818
+#: src/theme-parser.c:1910
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“extent_angle”屬性"
 
-#: src/theme-parser.c:1998
+#: src/theme-parser.c:2090
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“alpha”屬性"
 
-#: src/theme-parser.c:2069
+#: src/theme-parser.c:2161
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“type”屬性"
 
-#: src/theme-parser.c:2117
+#: src/theme-parser.c:2209
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr ""
 
-#: src/theme-parser.c:2199
+#: src/theme-parser.c:2291
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“filename”屬性"
 
-#: src/theme-parser.c:2224 src/theme-parser.c:2671
+#: src/theme-parser.c:2316 src/theme-parser.c:2763
 #, fuzzy, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "不明的類型“%s”出現於<%s> 元素 之內"
 
-#: src/theme-parser.c:2306 src/theme-parser.c:2439 src/theme-parser.c:2544
+#: src/theme-parser.c:2398 src/theme-parser.c:2531 src/theme-parser.c:2636
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“state”屬性"
 
-#: src/theme-parser.c:2313 src/theme-parser.c:2446
+#: src/theme-parser.c:2405 src/theme-parser.c:2538
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“shadow”屬性"
 
-#: src/theme-parser.c:2320
+#: src/theme-parser.c:2412
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "<%s> 元素中沒有任何“arrow”屬性"
 
-#: src/theme-parser.c:2373 src/theme-parser.c:2495 src/theme-parser.c:2583
+#: src/theme-parser.c:2465 src/theme-parser.c:2587 src/theme-parser.c:2675
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2383 src/theme-parser.c:2505
+#: src/theme-parser.c:2475 src/theme-parser.c:2597
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2393
+#: src/theme-parser.c:2485
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr ""
 
-#: src/theme-parser.c:2806 src/theme-parser.c:2922
+#: src/theme-parser.c:2898 src/theme-parser.c:3014
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr ""
 
-#: src/theme-parser.c:2818 src/theme-parser.c:2934
+#: src/theme-parser.c:2910 src/theme-parser.c:3026
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr ""
 
-#: src/theme-parser.c:2997
+#: src/theme-parser.c:3089
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“value”屬性"
 
-#: src/theme-parser.c:3054
+#: src/theme-parser.c:3146
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“position”屬性"
 
-#: src/theme-parser.c:3063
+#: src/theme-parser.c:3155
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3071
+#: src/theme-parser.c:3163
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr ""
 
-#: src/theme-parser.c:3116
+#: src/theme-parser.c:3208
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“function”屬性"
 
-#: src/theme-parser.c:3124 src/theme-parser.c:3228
+#: src/theme-parser.c:3216 src/theme-parser.c:3320
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“state”屬性"
 
-#: src/theme-parser.c:3133
+#: src/theme-parser.c:3225
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3142
+#: src/theme-parser.c:3234
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr ""
 
-#: src/theme-parser.c:3150
+#: src/theme-parser.c:3242
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr ""
 
-#: src/theme-parser.c:3220
+#: src/theme-parser.c:3312
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“focus”屬性"
 
-#: src/theme-parser.c:3236
+#: src/theme-parser.c:3328
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“style”屬性"
 
-#: src/theme-parser.c:3245
+#: src/theme-parser.c:3337
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "“%s”不是 focus 屬性的有效設定值"
 
-#: src/theme-parser.c:3254
+#: src/theme-parser.c:3346
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "“%s”不是 state 屬性的有效設定值"
 
-#: src/theme-parser.c:3264
+#: src/theme-parser.c:3356
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr ""
 
-#: src/theme-parser.c:3274
+#: src/theme-parser.c:3366
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "<%s> 元素中沒有任何“resize”屬性"
 
-#: src/theme-parser.c:3284
+#: src/theme-parser.c:3376
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "“%s”不是 resize 屬性的有效設定值"
 
-#: src/theme-parser.c:3294
+#: src/theme-parser.c:3386
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 msgstr ""
 
-#: src/theme-parser.c:3308
+#: src/theme-parser.c:3400
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3319 src/theme-parser.c:3330 src/theme-parser.c:3341
+#: src/theme-parser.c:3411 src/theme-parser.c:3422 src/theme-parser.c:3433
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr ""
 
-#: src/theme-parser.c:3380
+#: src/theme-parser.c:3472
 msgid ""
 "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3418
+#: src/theme-parser.c:3510
 msgid ""
 "Can't have a two draw_ops for a <button> element (theme specified a draw_ops "
 "attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3456
+#: src/theme-parser.c:3548
 msgid ""
 "Can't have a two draw_ops for a <menu_icon> element (theme specified a "
 "draw_ops attribute and also a <draw_ops> element, or specified two elements)"
 msgstr ""
 
-#: src/theme-parser.c:3503
+#: src/theme-parser.c:3595
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "佈景主題中最外層的元素必須為 <metacity_theme> 而不是 <%s>"
 
-#: src/theme-parser.c:3523
+#: src/theme-parser.c:3615
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 
-#: src/theme-parser.c:3528
+#: src/theme-parser.c:3620
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "<%s> 元素不可出現在 <constant> 元素內"
 
-#: src/theme-parser.c:3539
-#, c-format
-msgid "Element <%s> is not allowed inside a distance/border element"
+#: src/theme-parser.c:3632
+#, fuzzy, c-format
+msgid ""
+"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr "<%s> 元素不可出現在 distance/border 元素內"
 
-#: src/theme-parser.c:3561
+#: src/theme-parser.c:3654
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr ""
 
-#: src/theme-parser.c:3571 src/theme-parser.c:3601 src/theme-parser.c:3606
+#: src/theme-parser.c:3664 src/theme-parser.c:3694 src/theme-parser.c:3699
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "<%s> 元素不可出現在 <%s> 元素內"
 
-#: src/theme-parser.c:3823
+#: src/theme-parser.c:3920
 msgid "No draw_ops provided for frame piece"
 msgstr ""
 
-#: src/theme-parser.c:3838
+#: src/theme-parser.c:3935
 msgid "No draw_ops provided for button"
 msgstr ""
 
-#: src/theme-parser.c:3853
+#: src/theme-parser.c:3950
 msgid "No draw_ops provided for menu icon"
 msgstr ""
 
-#: src/theme-parser.c:3893
+#: src/theme-parser.c:3990
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "<%s> 元素內不可出現任何文字"
 
-#: src/theme-parser.c:3948
+#: src/theme-parser.c:4045
 msgid "<name> specified twice for this theme"
 msgstr "此佈景主題指定了兩次 <name>"
 
-#: src/theme-parser.c:3959
+#: src/theme-parser.c:4056
 msgid "<author> specified twice for this theme"
 msgstr "此佈景主題指定了兩次 <author>"
 
-#: src/theme-parser.c:3970
+#: src/theme-parser.c:4067
 msgid "<copyright> specified twice for this theme"
 msgstr "此佈景主題指定了兩次 <copyright>"
 
-#: src/theme-parser.c:3981
+#: src/theme-parser.c:4078
 msgid "<date> specified twice for this theme"
 msgstr "此佈景主題指定了兩次 <date>"
 
-#: src/theme-parser.c:3992
+#: src/theme-parser.c:4089
 msgid "<description> specified twice for this theme"
 msgstr "此佈景主題指定了兩次 <description>"
 
-#: src/theme-parser.c:4194
+#: src/theme-parser.c:4294
 #, c-format
 msgid "Failed to read theme from file %s: %s\n"
 msgstr ""
 
-#: src/theme-parser.c:4249
+#: src/theme-parser.c:4349
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr ""
 
-#: src/util.c:59
+#: src/util.c:60
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "無法開啟偵錯紀錄檔：%s\n"
 
-#: src/util.c:69
+#: src/util.c:70
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "無法 fdopen() 紀錄檔 %s：%s\n"
 
-#: src/util.c:75
+#: src/util.c:76
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "已開啟紀錄檔 %s\n"
 
-#: src/window.c:429
+#: src/window.c:430
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %ld\n"
 msgstr ""
@@ -1837,6 +1886,15 @@ msgstr ""
 msgid "Metacity"
 msgstr ""
 
+#: src/tools/metacity-properties.desktop.in.h:1
+msgid "Change how focus is moved from one window to another"
+msgstr ""
+
+#: src/tools/metacity-properties.desktop.in.h:2
+#, fuzzy
+msgid "Window Focus"
+msgstr "視窗選單"
+
 #: src/tools/metacity-properties.glade.h:1
 msgid "Clic_k to give focus"
 msgstr ""