updated hebrew translation

svn path=/trunk/; revision=3680

2 files changed, 801 insertions, 790 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 8e4b7f58..01ca6f29 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-10  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po: Updated Hebrew translation.
+
 2008-04-04  Eskild Hustvedt  <eskildh@gnome.org>
 
 	* nn.po: Updated Norwegian Nynorsk translation
diff --git a/po/he.po b/po/he.po
index ad5e3c06..1906d7dd 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-19 03:52+0000\n"
+"POT-Creation-Date: 2008-02-13 04:00+0000\n"
 "PO-Revision-Date: 2005-07-31 01:18+0300\n"
 "Last-Translator: Yuval Tanny\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -26,64 +26,56 @@ msgstr "שולחן עבודה"
 msgid "Window Management"
 msgstr "ניהול חלונות"
 
-#: ../src/tools/metacity-message.c:150
-#, c-format
-msgid "Usage: %s\n"
-msgstr "שימוש: %s\n"
-
-#: ../src/tools/metacity-message.c:176 ../src/util.c:133
-msgid "Metacity was compiled without support for verbose mode\n"
-msgstr "Metacity was compiled without support for verbose mode\n"
-
-#: ../src/core.c:206
+#: ../src/core/core.c:206
 #, c-format
 msgid "Unknown window information request: %d"
 msgstr "Unknown window information request: %d"
 
-#: ../src/delete.c:67 ../src/delete.c:94 ../src/metacity-dialog.c:50
-#: ../src/theme-parser.c:481
+#: ../src/core/delete.c:67 ../src/core/delete.c:94
+#: ../src/ui/metacity-dialog.c:50 ../src/ui/theme-parser.c:481
 #, c-format
 msgid "Could not parse \"%s\" as an integer"
 msgstr "לא ניתן להעביר את \"%s\" כמספר שלם"
 
-#: ../src/delete.c:74 ../src/delete.c:101 ../src/metacity-dialog.c:57
-#: ../src/theme-parser.c:490 ../src/theme-parser.c:545
+#: ../src/core/delete.c:74 ../src/core/delete.c:101
+#: ../src/ui/metacity-dialog.c:57 ../src/ui/theme-parser.c:490
+#: ../src/ui/theme-parser.c:545
 #, c-format
 msgid "Did not understand trailing characters \"%s\" in string \"%s\""
 msgstr "לא ניתן להבין את התוים \"%s\" במחרוזת \"%s\""
 
-#: ../src/delete.c:132
+#: ../src/core/delete.c:132
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "נכשל בהעברת ההודעה \"%s\" מתהליך תיבת דו-השיח\n"
 
-#: ../src/delete.c:267
+#: ../src/core/delete.c:267
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "שגיאה בקריאה מתהליך הצגת תיבת דו-שיח: %s\n"
 
-#: ../src/delete.c:350
+#: ../src/core/delete.c:350
 #, c-format
 msgid ""
 "Error launching metacity-dialog to ask about killing an application: %s\n"
 msgstr "שגיאה בהפעלת תיבת דו-שיח של מטאסיטי השואלת אם להרוג יישום: %s\n"
 
-#: ../src/delete.c:459
+#: ../src/core/delete.c:459
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "נכשל בקבלת שם המארח: %s\n"
 
-#: ../src/display.c:204
+#: ../src/core/display.c:256
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"
 
-#: ../src/display.c:368
+#: ../src/core/display.c:438
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"
 
-#: ../src/errors.c:271
+#: ../src/core/errors.c:271
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -94,369 +86,390 @@ msgstr ""
 "כנראה ושרת X נסגר או שהרגת/הרסת\n"
 "את מנהל החלונות.\n"
 
-#: ../src/errors.c:278
+#: ../src/core/errors.c:278
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "שגיאת קלט/פלט חמורה %d (%s) בתצוגה '%s'.\n"
 
-#: ../src/frames.c:1078
-msgid "Close Window"
-msgstr "סגור חלון"
-
-#: ../src/frames.c:1081
-msgid "Window Menu"
-msgstr "תפריט חלון"
-
-#: ../src/frames.c:1084
-msgid "Minimize Window"
-msgstr "מזער חלון"
-
-#: ../src/frames.c:1087
-msgid "Maximize Window"
-msgstr "הגדל חלון"
-
-#: ../src/frames.c:1090
-msgid "Unmaximize Window"
-msgstr "שחזר חלון"
-
-#: ../src/frames.c:1093
-msgid "Roll Up Window"
-msgstr "גלול חלון מעלה"
-
-#: ../src/frames.c:1096
-msgid "Unroll Window"
-msgstr "בטל גלילה"
-
-#: ../src/frames.c:1099
-msgid "Keep Window On Top"
-msgstr "שמור על החלון גלוי"
-
-#: ../src/frames.c:1102
-msgid "Remove Window From Top"
-msgstr "בטל שמירת החלון גלוי"
-
-#: ../src/frames.c:1105
-msgid "Always On Visible Workspace"
-msgstr "הראה בכל סביבות העבודה"
-
-#: ../src/frames.c:1108
-msgid "Put Window On Only One Workspace"
-msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
-
-#: ../src/keybindings.c:1087
+#: ../src/core/keybindings.c:1087
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "תוכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"
 
-#: ../src/keybindings.c:2733
+#: ../src/core/keybindings.c:2733
 #, c-format
 msgid "Error launching metacity-dialog to print an error about a command: %s\n"
 msgstr "שגיאה בהפעלת תיבת דו-שיח של מטאסיטי כדי להדפיס שגיאה על הפקודה: %s\n"
 
-#: ../src/keybindings.c:2838
+#: ../src/core/keybindings.c:2838
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "אף פקודה %d לא הוגדרה.\n"
 
-#: ../src/keybindings.c:3866
+#: ../src/core/keybindings.c:3866
 msgid "No terminal command has been defined.\n"
 msgstr "אף פקודת מסוף לא הוגדרה.\n"
 
-#: ../src/main.c:67
+#: ../src/core/main.c:112
 #, c-format
 msgid ""
 "metacity %s\n"
-"Copyright (C) 2001-2007 Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-2008 Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "metacity %s\n"
-"Copyright (C) 2001-2007 Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-2008 Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 
-#: ../src/main.c:172
+#: ../src/core/main.c:239
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"
 
-#: ../src/main.c:178
+#: ../src/core/main.c:245
 msgid "Replace the running window manager with Metacity"
 msgstr "Replace the running window manager with Metacity"
 
-#: ../src/main.c:184
+#: ../src/core/main.c:251
 msgid "Specify session management ID"
 msgstr "Specify session management ID"
 
-#: ../src/main.c:189
+#: ../src/core/main.c:256
 msgid "X Display to use"
 msgstr "X Display to use"
 
-#: ../src/main.c:195
+#: ../src/core/main.c:262
 msgid "Initialize session from savefile"
 msgstr "Initialize session from savefile"
 
-#: ../src/main.c:201
+#: ../src/core/main.c:268
 msgid "Print version"
 msgstr "Print version"
 
-#: ../src/main.c:207
+#: ../src/core/main.c:274
 msgid "Make X calls synchronous"
 msgstr "Make X calls synchronous"
 
-#: ../src/main.c:361
+#: ../src/core/main.c:425
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Failed to scan themes directory: %s\n"
 
-#: ../src/main.c:377
+#: ../src/core/main.c:441
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 
-#: ../src/main.c:452
+#: ../src/core/main.c:513
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Failed to restart: %s\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:70
-msgid "Mi_nimize"
-msgstr "_מזער"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:72
-msgid "Ma_ximize"
-msgstr "ה_גדל"
+#: ../src/core/prefs.c:434
+#, c-format
+msgid "Type of %s was not integer"
+msgstr "Type of %s was not integer"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:74
-msgid "Unma_ximize"
-msgstr "_שחזר"
+#: ../src/core/prefs.c:572 ../src/core/prefs.c:600 ../src/core/prefs.c:616
+#: ../src/core/prefs.c:632 ../src/core/prefs.c:648 ../src/core/prefs.c:664
+#: ../src/core/prefs.c:680 ../src/core/prefs.c:696 ../src/core/prefs.c:716
+#: ../src/core/prefs.c:732 ../src/core/prefs.c:748 ../src/core/prefs.c:766
+#: ../src/core/prefs.c:782 ../src/core/prefs.c:801 ../src/core/prefs.c:817
+#: ../src/core/prefs.c:852 ../src/core/prefs.c:868 ../src/core/prefs.c:885
+#: ../src/core/prefs.c:901 ../src/core/prefs.c:917 ../src/core/prefs.c:933
+#: ../src/core/prefs.c:949 ../src/core/prefs.c:964 ../src/core/prefs.c:979
+#: ../src/core/prefs.c:994 ../src/core/prefs.c:1010 ../src/core/prefs.c:1026
+#: ../src/core/prefs.c:1042 ../src/core/prefs.c:1058
+#, c-format
+msgid "GConf key \"%s\" is set to an invalid type\n"
+msgstr "GConf key \"%s\" is set to an invalid type\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:76
-msgid "Roll _Up"
-msgstr "גלול _מעלה"
+#: ../src/core/prefs.c:1103
+#, c-format
+msgid ""
+"\"%s\" found in configuration database is not a valid value for mouse button "
+"modifier\n"
+msgstr ""
+"\"%s\" found in configuration database is not a valid value for mouse button "
+"modifier\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:78
-msgid "_Unroll"
-msgstr "גלול _חזרה"
+#: ../src/core/prefs.c:1127 ../src/core/prefs.c:1148 ../src/core/prefs.c:1705
+#, c-format
+msgid "GConf key '%s' is set to an invalid value\n"
+msgstr "GConf key '%s' is set to an invalid value\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:80
-msgid "_Move"
-msgstr "_הזז"
+#: ../src/core/prefs.c:1277
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable cursor_size; must be in the "
+"range 1..128\n"
+msgstr ""
+"%d stored in GConf key %s is not a reasonable cursor_size; must be in the "
+"range 1..128\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:82
-msgid "_Resize"
-msgstr "_שנה גודל"
+#: ../src/core/prefs.c:1357
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr "Could not parse font description \"%s\" from GConf key %s\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:84
-msgid "Move Titlebar On_screen"
+#: ../src/core/prefs.c:1599
+#, c-format
+msgid ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
 msgstr ""
+"%d stored in GConf key %s is not a reasonable number of workspaces, current "
+"maximum is %d\n"
 
-#. separator
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:87 ../src/menu.c:89
-msgid "Always on _Top"
+#: ../src/core/prefs.c:1659
+msgid ""
+"Workarounds for broken applications disabled. Some applications may not "
+"behave properly.\n"
 msgstr ""
+"Workarounds for broken applications disabled. Some applications may not "
+"behave properly.\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:91
-msgid "_Always on Visible Workspace"
-msgstr "_הראה בכל סביבות העבודה"
+#: ../src/core/prefs.c:1732
+#, c-format
+msgid "%d stored in GConf key %s is out of range 0 to %d\n"
+msgstr "%d stored in GConf key %s is out of range 0 to %d\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:93
-msgid "_Only on This Workspace"
-msgstr "רק בסביבת עבודה _זו"
+#: ../src/core/prefs.c:1881
+#, c-format
+msgid "Error setting number of workspaces to %d: %s\n"
+msgstr "Error setting number of workspaces to %d: %s\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:95
-msgid "Move to Workspace _Left"
-msgstr "הזז חלון לסביבת העבודה ה_שמאלית"
+#: ../src/core/prefs.c:2246 ../src/core/prefs.c:2780 ../src/ui/menu.c:199
+#, c-format
+msgid "Workspace %d"
+msgstr "סביבת עבודה %d"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:97
-msgid "Move to Workspace R_ight"
-msgstr "הזז חלון לסביבת העבודה ה_ימנית"
+#: ../src/core/prefs.c:2276 ../src/core/prefs.c:2446
+#, c-format
+msgid ""
+"\"%s\" found in configuration database is not a valid value for keybinding "
+"\"%s\"\n"
+msgstr ""
+"\"%s\" found in configuration database is not a valid value for keybinding "
+"\"%s\"\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:99
-msgid "Move to Workspace _Up"
-msgstr "הזז חלון לסביבת העבודה למעלה"
+#: ../src/core/prefs.c:2861
+#, c-format
+msgid "Error setting name for workspace %d to \"%s\": %s\n"
+msgstr "Error setting name for workspace %d to \"%s\": %s\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:101
-msgid "Move to Workspace _Down"
-msgstr "הזז חלון לסביבת העבודה למטה"
+#: ../src/core/screen.c:410
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Screen %d on display '%s' is invalid\n"
 
-#. separator
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:105
-msgid "_Close"
-msgstr "_סגור"
+#: ../src/core/screen.c:426
+#, c-format
+msgid ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to replace the current window manager.\n"
+msgstr ""
+"Screen %d on display \"%s\" already has a window manager; try using the --"
+"replace option to replace the current window manager.\n"
 
-#: ../src/menu.c:199 ../src/prefs.c:2246 ../src/prefs.c:2780
+#: ../src/core/screen.c:453
 #, c-format
-msgid "Workspace %d"
-msgstr "סביבת עבודה %d"
+msgid ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr ""
+"Could not acquire window manager selection on screen %d display \"%s\"\n"
 
-#: ../src/menu.c:208
-msgid "Workspace 1_0"
-msgstr "סביבת עבודה 1_0"
+#: ../src/core/screen.c:511
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Screen %d on display \"%s\" already has a window manager\n"
 
-#: ../src/menu.c:210
+#: ../src/core/screen.c:721
 #, c-format
-msgid "Workspace %s%d"
-msgstr "סביבת עבודה %s%d"
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Could not release screen %d on display \"%s\"\n"
 
-#: ../src/menu.c:390
-msgid "Move to Another _Workspace"
-msgstr "הזז חלון לסביבת עבודה אחרת"
+#: ../src/core/session.c:826 ../src/core/session.c:833
+#, c-format
+msgid "Could not create directory '%s': %s\n"
+msgstr "Could not create directory '%s': %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the shift key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:105
-msgid "Shift"
-msgstr "Shift"
+#: ../src/core/session.c:843
+#, c-format
+msgid "Could not open session file '%s' for writing: %s\n"
+msgstr "Could not open session file '%s' for writing: %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the control key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:111
-msgid "Ctrl"
-msgstr "Ctrl"
+#: ../src/core/session.c:995
+#, c-format
+msgid "Error writing session file '%s': %s\n"
+msgstr "Error writing session file '%s': %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the alt key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:117
-msgid "Alt"
-msgstr "Alt"
+#: ../src/core/session.c:1000
+#, c-format
+msgid "Error closing session file '%s': %s\n"
+msgstr "Error closing session file '%s': %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the meta key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:123
-msgid "Meta"
-msgstr "מטה"
+#: ../src/core/session.c:1075
+#, c-format
+msgid "Failed to read saved session file %s: %s\n"
+msgstr "Failed to read saved session file %s: %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the super key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:129
-msgid "Super"
-msgstr "Super"
+#: ../src/core/session.c:1110
+#, c-format
+msgid "Failed to parse saved session file: %s\n"
+msgstr "Failed to parse saved session file: %s\n"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the hyper key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:135
-msgid "Hyper"
-msgstr "Hyper"
+#: ../src/core/session.c:1159
+msgid "<metacity_session> attribute seen but we already have the session ID"
+msgstr "<metacity_session> attribute seen but we already have the session ID"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod2 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:141
-msgid "Mod2"
-msgstr "Mod2"
+#: ../src/core/session.c:1172
+#, c-format
+msgid "Unknown attribute %s on <metacity_session> element"
+msgstr "Unknown attribute %s on <metacity_session> element"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod3 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:147
-msgid "Mod3"
-msgstr "Mod3"
+#: ../src/core/session.c:1189
+msgid "nested <window> tag"
+msgstr "nested <window> tag"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod4 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:153
-msgid "Mod4"
-msgstr "Mod4"
+#: ../src/core/session.c:1247 ../src/core/session.c:1279
+#, c-format
+msgid "Unknown attribute %s on <window> element"
+msgstr "Unknown attribute %s on <window> element"
 
-#. This is the text that should appear next to menu accelerators
-#. * that use the mod5 key. If the text on this key isn't typically
-#. * translated on keyboards used for your language, don't translate
-#. * this.
-#.
-#: ../src/metaaccellabel.c:159
-msgid "Mod5"
-msgstr "Mod5"
+#: ../src/core/session.c:1351
+#, c-format
+msgid "Unknown attribute %s on <maximized> element"
+msgstr "Unknown attribute %s on <maximized> element"
 
-#: ../src/metacity-dialog.c:90
+#: ../src/core/session.c:1411
 #, c-format
-msgid "\"%s\" is not responding."
-msgstr "\"%s\" אינו מגיב"
+msgid "Unknown attribute %s on <geometry> element"
+msgstr "Unknown attribute %s on <geometry> element"
+
+#: ../src/core/session.c:1431
+#, c-format
+msgid "Unknown element %s"
+msgstr "Unknown element %s"
 
-#: ../src/metacity-dialog.c:97
+#: ../src/core/session.c:1868
+#, c-format
 msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
+"Error launching metacity-dialog to warn about apps that don't support "
+"session management: %s\n"
 msgstr ""
+"Error launching metacity-dialog to warn about apps that don't support "
+"session management: %s\n"
 
-#: ../src/metacity-dialog.c:107
-msgid "_Wait"
-msgstr "_המתן"
+#: ../src/core/util.c:98
+#, c-format
+msgid "Failed to open debug log: %s\n"
+msgstr "Failed to open debug log: %s\n"
 
-#: ../src/metacity-dialog.c:109
-msgid "_Force Quit"
-msgstr "_הכרח יציאה"
+#: ../src/core/util.c:108
+#, c-format
+msgid "Failed to fdopen() log file %s: %s\n"
+msgstr "Failed to fdopen() log file %s: %s\n"
 
-#: ../src/metacity-dialog.c:206
-msgid "Title"
-msgstr "כותרת"
+#: ../src/core/util.c:114
+#, c-format
+msgid "Opened log file %s\n"
+msgstr "Opened log file %s\n"
 
-#: ../src/metacity-dialog.c:218
-msgid "Class"
-msgstr "מחלקה"
+#: ../src/core/util.c:133 ../src/tools/metacity-message.c:176
+msgid "Metacity was compiled without support for verbose mode\n"
+msgstr "Metacity was compiled without support for verbose mode\n"
 
-#: ../src/metacity-dialog.c:244
+#: ../src/core/util.c:231
+msgid "Window manager: "
+msgstr "Window manager: "
+
+#: ../src/core/util.c:379
+msgid "Bug in window manager: "
+msgstr "Bug in window manager: "
+
+#: ../src/core/util.c:408
+msgid "Window manager warning: "
+msgstr "Window manager warning: "
+
+#: ../src/core/util.c:432
+msgid "Window manager error: "
+msgstr "Window manager error: "
+
+#: ../src/core/window-props.c:192
+#, c-format
+msgid "Application set a bogus _NET_WM_PID %lu\n"
+msgstr "Application set a bogus _NET_WM_PID %lu\n"
+
+#: ../src/core/window-props.c:324
+#, c-format
+msgid "%s (on %s)"
+msgstr "%s (מעל %s)"
+
+#: ../src/core/window-props.c:1406
+#, c-format
+msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
+msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
+
+#. first time through
+#: ../src/core/window.c:5650
+#, c-format
 msgid ""
-"These windows do not support \"save current setup\" and will have to be "
-"restarted manually next time you log in."
+"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
+"window as specified in the ICCCM.\n"
 msgstr ""
-"חלון זה אינו תומך ב\"שמירת ההגדרות הנוכחיות\", ויהיה צורך באתחול ידני בכניסה "
-"הבאה שלך."
+"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
+"window as specified in the ICCCM.\n"
 
-#: ../src/metacity-dialog.c:310
+#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
+#. * authoritative source for that info. Some apps such as mplayer or
+#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
+#. * leads to e.g. us not fullscreening their windows.  Apps that set
+#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
+#. * about these apps but make them work.
+#.
+#: ../src/core/window.c:6215
 #, c-format
 msgid ""
-"There was an error running \"%s\":\n"
-"%s."
+"Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
+"d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr ""
-"ארעה שגיאה בהפעלת \"%s\":\n"
-"%s."
+"Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
+"d x %d and max size %d x %d; this doesn't make much sense.\n"
+
+#: ../src/core/xprops.c:155
+#, c-format
+msgid ""
+"Window 0x%lx has property %s\n"
+"that was expected to have type %s format %d\n"
+"and actually has type %s format %d n_items %d.\n"
+"This is most likely an application bug, not a window manager bug.\n"
+"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
+msgstr ""
+"Window 0x%lx has property %s\n"
+"that was expected to have type %s format %d\n"
+"and actually has type %s format %d n_items %d.\n"
+"This is most likely an application bug, not a window manager bug.\n"
+"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
+
+#: ../src/core/xprops.c:401
+#, c-format
+msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
+msgstr "Property %s on window 0x%lx contained invalid UTF-8\n"
+
+#: ../src/core/xprops.c:484
+#, c-format
+msgid ""
+"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
+msgstr ""
+"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
 
 #: ../src/metacity.desktop.in.h:1
 msgid "Metacity"
@@ -2313,246 +2326,331 @@ msgstr "Window focus mode"
 msgid "Window title font"
 msgstr "Window title font"
 
-#: ../src/prefs.c:434
-#, c-format
-msgid "Type of %s was not integer"
-msgstr "Type of %s was not integer"
+#: ../src/ui/frames.c:1077
+msgid "Close Window"
+msgstr "סגור חלון"
 
-#: ../src/prefs.c:572 ../src/prefs.c:600 ../src/prefs.c:616 ../src/prefs.c:632
-#: ../src/prefs.c:648 ../src/prefs.c:664 ../src/prefs.c:680 ../src/prefs.c:696
-#: ../src/prefs.c:716 ../src/prefs.c:732 ../src/prefs.c:748 ../src/prefs.c:766
-#: ../src/prefs.c:782 ../src/prefs.c:801 ../src/prefs.c:817 ../src/prefs.c:852
-#: ../src/prefs.c:868 ../src/prefs.c:885 ../src/prefs.c:901 ../src/prefs.c:917
-#: ../src/prefs.c:933 ../src/prefs.c:949 ../src/prefs.c:964 ../src/prefs.c:979
-#: ../src/prefs.c:994 ../src/prefs.c:1010 ../src/prefs.c:1026
-#: ../src/prefs.c:1042 ../src/prefs.c:1058
-#, c-format
-msgid "GConf key \"%s\" is set to an invalid type\n"
-msgstr "GConf key \"%s\" is set to an invalid type\n"
+#: ../src/ui/frames.c:1080
+msgid "Window Menu"
+msgstr "תפריט חלון"
 
-#: ../src/prefs.c:1103
-#, c-format
-msgid ""
-"\"%s\" found in configuration database is not a valid value for mouse button "
-"modifier\n"
-msgstr ""
-"\"%s\" found in configuration database is not a valid value for mouse button "
-"modifier\n"
+#: ../src/ui/frames.c:1083
+msgid "Minimize Window"
+msgstr "מזער חלון"
 
-#: ../src/prefs.c:1127 ../src/prefs.c:1148 ../src/prefs.c:1705
-#, c-format
-msgid "GConf key '%s' is set to an invalid value\n"
-msgstr "GConf key '%s' is set to an invalid value\n"
+#: ../src/ui/frames.c:1086
+msgid "Maximize Window"
+msgstr "הגדל חלון"
 
-#: ../src/prefs.c:1277
-#, c-format
-msgid ""
-"%d stored in GConf key %s is not a reasonable cursor_size; must be in the "
-"range 1..128\n"
-msgstr ""
-"%d stored in GConf key %s is not a reasonable cursor_size; must be in the "
-"range 1..128\n"
+#: ../src/ui/frames.c:1089
+msgid "Unmaximize Window"
+msgstr "שחזר חלון"
 
-#: ../src/prefs.c:1357
-#, c-format
-msgid "Could not parse font description \"%s\" from GConf key %s\n"
-msgstr "Could not parse font description \"%s\" from GConf key %s\n"
+#: ../src/ui/frames.c:1092
+msgid "Roll Up Window"
+msgstr "גלול חלון מעלה"
 
-#: ../src/prefs.c:1599
-#, c-format
-msgid ""
-"%d stored in GConf key %s is not a reasonable number of workspaces, current "
-"maximum is %d\n"
-msgstr ""
-"%d stored in GConf key %s is not a reasonable number of workspaces, current "
-"maximum is %d\n"
+#: ../src/ui/frames.c:1095
+msgid "Unroll Window"
+msgstr "בטל גלילה"
 
-#: ../src/prefs.c:1659
-msgid ""
-"Workarounds for broken applications disabled. Some applications may not "
-"behave properly.\n"
-msgstr ""
-"Workarounds for broken applications disabled. Some applications may not "
-"behave properly.\n"
+#: ../src/ui/frames.c:1098
+msgid "Keep Window On Top"
+msgstr "שמור על החלון גלוי"
 
-#: ../src/prefs.c:1732
-#, c-format
-msgid "%d stored in GConf key %s is out of range 0 to %d\n"
-msgstr "%d stored in GConf key %s is out of range 0 to %d\n"
+#: ../src/ui/frames.c:1101
+msgid "Remove Window From Top"
+msgstr "בטל שמירת החלון גלוי"
 
-#: ../src/prefs.c:1881
-#, c-format
-msgid "Error setting number of workspaces to %d: %s\n"
-msgstr "Error setting number of workspaces to %d: %s\n"
+#: ../src/ui/frames.c:1104
+msgid "Always On Visible Workspace"
+msgstr "הראה בכל סביבות העבודה"
 
-#: ../src/prefs.c:2276 ../src/prefs.c:2446
-#, c-format
-msgid ""
-"\"%s\" found in configuration database is not a valid value for keybinding "
-"\"%s\"\n"
-msgstr ""
-"\"%s\" found in configuration database is not a valid value for keybinding "
-"\"%s\"\n"
+#: ../src/ui/frames.c:1107
+msgid "Put Window On Only One Workspace"
+msgstr "הראה את החלון על סביבת עבודה אחת בלבד"
 
-#: ../src/prefs.c:2861
-#, c-format
-msgid "Error setting name for workspace %d to \"%s\": %s\n"
-msgstr "Error setting name for workspace %d to \"%s\": %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:70
+msgid "Mi_nimize"
+msgstr "_מזער"
 
-#: ../src/resizepopup.c:113
-#, c-format
-msgid "%d x %d"
-msgstr "%d x %d"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:72
+msgid "Ma_ximize"
+msgstr "ה_גדל"
 
-#: ../src/screen.c:410
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Screen %d on display '%s' is invalid\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:74
+msgid "Unma_ximize"
+msgstr "_שחזר"
 
-#: ../src/screen.c:426
-#, c-format
-msgid ""
-"Screen %d on display \"%s\" already has a window manager; try using the --"
-"replace option to replace the current window manager.\n"
-msgstr ""
-"Screen %d on display \"%s\" already has a window manager; try using the --"
-"replace option to replace the current window manager.\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:76
+msgid "Roll _Up"
+msgstr "גלול _מעלה"
 
-#: ../src/screen.c:453
-#, c-format
-msgid ""
-"Could not acquire window manager selection on screen %d display \"%s\"\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:78
+msgid "_Unroll"
+msgstr "גלול _חזרה"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:80
+msgid "_Move"
+msgstr "_הזז"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:82
+msgid "_Resize"
+msgstr "_שנה גודל"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:84
+msgid "Move Titlebar On_screen"
 msgstr ""
-"Could not acquire window manager selection on screen %d display \"%s\"\n"
 
-#: ../src/screen.c:511
-#, c-format
-msgid "Screen %d on display \"%s\" already has a window manager\n"
-msgstr "Screen %d on display \"%s\" already has a window manager\n"
+#. separator
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:87 ../src/ui/menu.c:89
+msgid "Always on _Top"
+msgstr "תמיד מ_למעלה"
 
-#: ../src/screen.c:721
-#, c-format
-msgid "Could not release screen %d on display \"%s\"\n"
-msgstr "Could not release screen %d on display \"%s\"\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:91
+msgid "_Always on Visible Workspace"
+msgstr "_הראה בכל סביבות העבודה"
 
-#: ../src/session.c:826 ../src/session.c:833
-#, c-format
-msgid "Could not create directory '%s': %s\n"
-msgstr "Could not create directory '%s': %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:93
+msgid "_Only on This Workspace"
+msgstr "רק בסביבת עבודה _זו"
 
-#: ../src/session.c:843
-#, c-format
-msgid "Could not open session file '%s' for writing: %s\n"
-msgstr "Could not open session file '%s' for writing: %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:95
+msgid "Move to Workspace _Left"
+msgstr "הזז חלון לסביבת העבודה ה_שמאלית"
 
-#: ../src/session.c:995
-#, c-format
-msgid "Error writing session file '%s': %s\n"
-msgstr "Error writing session file '%s': %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:97
+msgid "Move to Workspace R_ight"
+msgstr "הזז חלון לסביבת העבודה ה_ימנית"
 
-#: ../src/session.c:1000
-#, c-format
-msgid "Error closing session file '%s': %s\n"
-msgstr "Error closing session file '%s': %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:99
+msgid "Move to Workspace _Up"
+msgstr "הזז חלון לסביבת העבודה למעלה"
 
-#: ../src/session.c:1075
-#, c-format
-msgid "Failed to read saved session file %s: %s\n"
-msgstr "Failed to read saved session file %s: %s\n"
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:101
+msgid "Move to Workspace _Down"
+msgstr "הזז חלון לסביבת העבודה למטה"
 
-#: ../src/session.c:1110
-#, c-format
-msgid "Failed to parse saved session file: %s\n"
-msgstr "Failed to parse saved session file: %s\n"
+#. separator
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:105
+msgid "_Close"
+msgstr "_סגור"
 
-#: ../src/session.c:1159
-msgid "<metacity_session> attribute seen but we already have the session ID"
-msgstr "<metacity_session> attribute seen but we already have the session ID"
+#: ../src/ui/menu.c:208
+msgid "Workspace 1_0"
+msgstr "סביבת עבודה 1_0"
 
-#: ../src/session.c:1172
+#: ../src/ui/menu.c:210
 #, c-format
-msgid "Unknown attribute %s on <metacity_session> element"
-msgstr "Unknown attribute %s on <metacity_session> element"
+msgid "Workspace %s%d"
+msgstr "סביבת עבודה %s%d"
 
-#: ../src/session.c:1189
-msgid "nested <window> tag"
-msgstr "nested <window> tag"
+#: ../src/ui/menu.c:390
+msgid "Move to Another _Workspace"
+msgstr "הזז חלון לסביבת עבודה אחרת"
 
-#: ../src/session.c:1247 ../src/session.c:1279
-#, c-format
-msgid "Unknown attribute %s on <window> element"
-msgstr "Unknown attribute %s on <window> element"
+#. This is the text that should appear next to menu accelerators
+#. * that use the shift key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:105
+msgid "Shift"
+msgstr "Shift"
 
-#: ../src/session.c:1351
-#, c-format
-msgid "Unknown attribute %s on <maximized> element"
-msgstr "Unknown attribute %s on <maximized> element"
+#. This is the text that should appear next to menu accelerators
+#. * that use the control key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:111
+msgid "Ctrl"
+msgstr "Ctrl"
 
-#: ../src/session.c:1411
-#, c-format
-msgid "Unknown attribute %s on <geometry> element"
-msgstr "Unknown attribute %s on <geometry> element"
+#. This is the text that should appear next to menu accelerators
+#. * that use the alt key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:117
+msgid "Alt"
+msgstr "Alt"
 
-#: ../src/session.c:1431
+#. This is the text that should appear next to menu accelerators
+#. * that use the meta key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:123
+msgid "Meta"
+msgstr "מטה"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the super key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:129
+msgid "Super"
+msgstr "Super"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the hyper key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:135
+msgid "Hyper"
+msgstr "Hyper"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod2 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:141
+msgid "Mod2"
+msgstr "Mod2"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod3 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:147
+msgid "Mod3"
+msgstr "Mod3"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod4 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:153
+msgid "Mod4"
+msgstr "Mod4"
+
+#. This is the text that should appear next to menu accelerators
+#. * that use the mod5 key. If the text on this key isn't typically
+#. * translated on keyboards used for your language, don't translate
+#. * this.
+#.
+#: ../src/ui/metaaccellabel.c:159
+msgid "Mod5"
+msgstr "Mod5"
+
+#: ../src/ui/metacity-dialog.c:90
 #, c-format
-msgid "Unknown element %s"
-msgstr "Unknown element %s"
+msgid "\"%s\" is not responding."
+msgstr "\"%s\" אינו מגיב"
+
+#: ../src/ui/metacity-dialog.c:97
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"באפשרותך להמתין זמן קצר ולתת ליישום להמשיך או להכריח את היישום להסתיים."
+
+#: ../src/ui/metacity-dialog.c:107
+msgid "_Wait"
+msgstr "_המתן"
+
+#: ../src/ui/metacity-dialog.c:109
+msgid "_Force Quit"
+msgstr "_הכרח יציאה"
+
+#: ../src/ui/metacity-dialog.c:206
+msgid "Title"
+msgstr "כותרת"
 
-#: ../src/session.c:1868
+#: ../src/ui/metacity-dialog.c:218
+msgid "Class"
+msgstr "מחלקה"
+
+#: ../src/ui/metacity-dialog.c:244
+msgid ""
+"These windows do not support \"save current setup\" and will have to be "
+"restarted manually next time you log in."
+msgstr ""
+"חלון זה אינו תומך ב\"שמירת ההגדרות הנוכחיות\", ויהיה צורך באתחול ידני בכניסה "
+"הבאה שלך."
+
+#: ../src/ui/metacity-dialog.c:310
 #, c-format
 msgid ""
-"Error launching metacity-dialog to warn about apps that don't support "
-"session management: %s\n"
+"There was an error running \"%s\":\n"
+"%s."
 msgstr ""
-"Error launching metacity-dialog to warn about apps that don't support "
-"session management: %s\n"
+"ארעה שגיאה בהפעלת \"%s\":\n"
+"%s."
 
-#: ../src/theme-parser.c:227 ../src/theme-parser.c:245
+#: ../src/ui/resizepopup.c:113
+#, c-format
+msgid "%d x %d"
+msgstr "%d x %d"
+
+#: ../src/ui/theme-parser.c:227 ../src/ui/theme-parser.c:245
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Line %d character %d: %s"
 
-#: ../src/theme-parser.c:396
+#: ../src/ui/theme-parser.c:396
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
 
-#: ../src/theme-parser.c:414 ../src/theme-parser.c:439
+#: ../src/ui/theme-parser.c:414 ../src/ui/theme-parser.c:439
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
 
-#: ../src/theme-parser.c:500
+#: ../src/ui/theme-parser.c:500
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Integer %ld must be positive"
 
-#: ../src/theme-parser.c:508
+#: ../src/ui/theme-parser.c:508
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Integer %ld is too large, current max is %d"
 
-#: ../src/theme-parser.c:536 ../src/theme-parser.c:652
+#: ../src/ui/theme-parser.c:536 ../src/ui/theme-parser.c:652
 #, c-format
 msgid "Could not parse \"%s\" as a floating point number"
 msgstr "Could not parse \"%s\" as a floating point number"
 
-#: ../src/theme-parser.c:567 ../src/theme-parser.c:595
+#: ../src/ui/theme-parser.c:567 ../src/ui/theme-parser.c:595
 #, c-format
 msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
 msgstr "Boolean values must be \"true\" or \"false\" not \"%s\""
 
-#: ../src/theme-parser.c:622
+#: ../src/ui/theme-parser.c:622
 #, c-format
 msgid "Angle must be between 0.0 and 360.0, was %g\n"
 msgstr "Angle must be between 0.0 and 360.0, was %g\n"
 
-#: ../src/theme-parser.c:685
+#: ../src/ui/theme-parser.c:685
 #, c-format
 msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 msgstr "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
 
-#: ../src/theme-parser.c:750
+#: ../src/ui/theme-parser.c:750
 #, c-format
 msgid ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
@@ -2561,369 +2659,369 @@ msgstr ""
 "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,"
 "large,x-large,xx-large)\n"
 
-#: ../src/theme-parser.c:795 ../src/theme-parser.c:803
-#: ../src/theme-parser.c:885 ../src/theme-parser.c:982
-#: ../src/theme-parser.c:1024 ../src/theme-parser.c:1135
-#: ../src/theme-parser.c:1185 ../src/theme-parser.c:1193
-#: ../src/theme-parser.c:3093 ../src/theme-parser.c:3184
-#: ../src/theme-parser.c:3191 ../src/theme-parser.c:3198
+#: ../src/ui/theme-parser.c:795 ../src/ui/theme-parser.c:803
+#: ../src/ui/theme-parser.c:885 ../src/ui/theme-parser.c:982
+#: ../src/ui/theme-parser.c:1024 ../src/ui/theme-parser.c:1135
+#: ../src/ui/theme-parser.c:1185 ../src/ui/theme-parser.c:1193
+#: ../src/ui/theme-parser.c:3093 ../src/ui/theme-parser.c:3184
+#: ../src/ui/theme-parser.c:3191 ../src/ui/theme-parser.c:3198
 #, c-format
 msgid "No \"%s\" attribute on <%s> element"
 msgstr "No \"%s\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:919 ../src/theme-parser.c:990
-#: ../src/theme-parser.c:1032 ../src/theme-parser.c:1143
+#: ../src/ui/theme-parser.c:919 ../src/ui/theme-parser.c:990
+#: ../src/ui/theme-parser.c:1032 ../src/ui/theme-parser.c:1143
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
 msgstr "<%s> name \"%s\" used a second time"
 
-#: ../src/theme-parser.c:931 ../src/theme-parser.c:1044
-#: ../src/theme-parser.c:1155
+#: ../src/ui/theme-parser.c:931 ../src/ui/theme-parser.c:1044
+#: ../src/ui/theme-parser.c:1155
 #, c-format
 msgid "<%s> parent \"%s\" has not been defined"
 msgstr "<%s> parent \"%s\" has not been defined"
 
-#: ../src/theme-parser.c:1057
+#: ../src/ui/theme-parser.c:1057
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "<%s> geometry \"%s\" has not been defined"
 
-#: ../src/theme-parser.c:1070
+#: ../src/ui/theme-parser.c:1070
 #, c-format
 msgid "<%s> must specify either a geometry or a parent that has a geometry"
 msgstr "<%s> must specify either a geometry or a parent that has a geometry"
 
-#: ../src/theme-parser.c:1112
+#: ../src/ui/theme-parser.c:1112
 msgid "You must specify a background for an alpha value to be meaningful"
 msgstr "You must specify a background for an alpha value to be meaningful"
 
-#: ../src/theme-parser.c:1203
+#: ../src/ui/theme-parser.c:1203
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Unknown type \"%s\" on <%s> element"
 
-#: ../src/theme-parser.c:1214
+#: ../src/ui/theme-parser.c:1214
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Unknown style_set \"%s\" on <%s> element"
 
-#: ../src/theme-parser.c:1222
+#: ../src/ui/theme-parser.c:1222
 #, c-format
 msgid "Window type \"%s\" has already been assigned a style set"
 msgstr "Window type \"%s\" has already been assigned a style set"
 
-#: ../src/theme-parser.c:1258
+#: ../src/ui/theme-parser.c:1258
 msgid "Theme already has a fallback icon"
 msgstr "Theme already has a fallback icon"
 
-#: ../src/theme-parser.c:1270
+#: ../src/ui/theme-parser.c:1270
 msgid "Theme already has a fallback mini_icon"
 msgstr "Theme already has a fallback mini_icon"
 
-#: ../src/theme-parser.c:1283 ../src/theme-parser.c:1347
-#: ../src/theme-parser.c:1636 ../src/theme-parser.c:3285
-#: ../src/theme-parser.c:3339 ../src/theme-parser.c:3511
-#: ../src/theme-parser.c:3727 ../src/theme-parser.c:3765
-#: ../src/theme-parser.c:3803 ../src/theme-parser.c:3841
+#: ../src/ui/theme-parser.c:1283 ../src/ui/theme-parser.c:1347
+#: ../src/ui/theme-parser.c:1636 ../src/ui/theme-parser.c:3285
+#: ../src/ui/theme-parser.c:3339 ../src/ui/theme-parser.c:3511
+#: ../src/ui/theme-parser.c:3727 ../src/ui/theme-parser.c:3765
+#: ../src/ui/theme-parser.c:3803 ../src/ui/theme-parser.c:3841
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "Element <%s> is not allowed below <%s>"
 
-#: ../src/theme-parser.c:1373 ../src/theme-parser.c:1460
-#: ../src/theme-parser.c:1530
+#: ../src/ui/theme-parser.c:1373 ../src/ui/theme-parser.c:1460
+#: ../src/ui/theme-parser.c:1530
 #, c-format
 msgid "No \"name\" attribute on element <%s>"
 msgstr "No \"name\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1380 ../src/theme-parser.c:1467
+#: ../src/ui/theme-parser.c:1380 ../src/ui/theme-parser.c:1467
 #, c-format
 msgid "No \"value\" attribute on element <%s>"
 msgstr "No \"value\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1411 ../src/theme-parser.c:1425
-#: ../src/theme-parser.c:1484
+#: ../src/ui/theme-parser.c:1411 ../src/ui/theme-parser.c:1425
+#: ../src/ui/theme-parser.c:1484
 msgid ""
 "Cannot specify both button_width/button_height and aspect ratio for buttons"
 msgstr ""
 "Cannot specify both button_width/button_height and aspect ratio for buttons"
 
-#: ../src/theme-parser.c:1434
+#: ../src/ui/theme-parser.c:1434
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Distance \"%s\" is unknown"
 
-#: ../src/theme-parser.c:1493
+#: ../src/ui/theme-parser.c:1493
 #, c-format
 msgid "Aspect ratio \"%s\" is unknown"
 msgstr "Aspect ratio \"%s\" is unknown"
 
-#: ../src/theme-parser.c:1537
+#: ../src/ui/theme-parser.c:1537
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "No \"top\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1544
+#: ../src/ui/theme-parser.c:1544
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "No \"bottom\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1551
+#: ../src/ui/theme-parser.c:1551
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "No \"left\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1558
+#: ../src/ui/theme-parser.c:1558
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "No \"right\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1590
+#: ../src/ui/theme-parser.c:1590
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Border \"%s\" is unknown"
 
-#: ../src/theme-parser.c:1736 ../src/theme-parser.c:1850
-#: ../src/theme-parser.c:1961 ../src/theme-parser.c:2192
-#: ../src/theme-parser.c:3023
+#: ../src/ui/theme-parser.c:1736 ../src/ui/theme-parser.c:1850
+#: ../src/ui/theme-parser.c:1961 ../src/ui/theme-parser.c:2192
+#: ../src/ui/theme-parser.c:3023
 #, c-format
 msgid "No \"color\" attribute on element <%s>"
 msgstr "No \"color\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1743
+#: ../src/ui/theme-parser.c:1743
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "No \"x1\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1750 ../src/theme-parser.c:2864
+#: ../src/ui/theme-parser.c:1750 ../src/ui/theme-parser.c:2864
 #, c-format
 msgid "No \"y1\" attribute on element <%s>"
 msgstr "No \"y1\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1757
+#: ../src/ui/theme-parser.c:1757
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "No \"x2\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1764 ../src/theme-parser.c:2871
+#: ../src/ui/theme-parser.c:1764 ../src/ui/theme-parser.c:2871
 #, c-format
 msgid "No \"y2\" attribute on element <%s>"
 msgstr "No \"y2\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1857 ../src/theme-parser.c:1968
-#: ../src/theme-parser.c:2117 ../src/theme-parser.c:2199
-#: ../src/theme-parser.c:2306 ../src/theme-parser.c:2408
-#: ../src/theme-parser.c:2630 ../src/theme-parser.c:2758
-#: ../src/theme-parser.c:2857 ../src/theme-parser.c:2934
-#: ../src/theme-parser.c:3030
+#: ../src/ui/theme-parser.c:1857 ../src/ui/theme-parser.c:1968
+#: ../src/ui/theme-parser.c:2117 ../src/ui/theme-parser.c:2199
+#: ../src/ui/theme-parser.c:2306 ../src/ui/theme-parser.c:2408
+#: ../src/ui/theme-parser.c:2630 ../src/ui/theme-parser.c:2758
+#: ../src/ui/theme-parser.c:2857 ../src/ui/theme-parser.c:2934
+#: ../src/ui/theme-parser.c:3030
 #, c-format
 msgid "No \"x\" attribute on element <%s>"
 msgstr "No \"x\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1864 ../src/theme-parser.c:1975
-#: ../src/theme-parser.c:2124 ../src/theme-parser.c:2206
-#: ../src/theme-parser.c:2313 ../src/theme-parser.c:2415
-#: ../src/theme-parser.c:2637 ../src/theme-parser.c:2765
-#: ../src/theme-parser.c:2941 ../src/theme-parser.c:3037
+#: ../src/ui/theme-parser.c:1864 ../src/ui/theme-parser.c:1975
+#: ../src/ui/theme-parser.c:2124 ../src/ui/theme-parser.c:2206
+#: ../src/ui/theme-parser.c:2313 ../src/ui/theme-parser.c:2415
+#: ../src/ui/theme-parser.c:2637 ../src/ui/theme-parser.c:2765
+#: ../src/ui/theme-parser.c:2941 ../src/ui/theme-parser.c:3037
 #, c-format
 msgid "No \"y\" attribute on element <%s>"
 msgstr "No \"y\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1871 ../src/theme-parser.c:1982
-#: ../src/theme-parser.c:2131 ../src/theme-parser.c:2213
-#: ../src/theme-parser.c:2320 ../src/theme-parser.c:2422
-#: ../src/theme-parser.c:2644 ../src/theme-parser.c:2772
-#: ../src/theme-parser.c:2948
+#: ../src/ui/theme-parser.c:1871 ../src/ui/theme-parser.c:1982
+#: ../src/ui/theme-parser.c:2131 ../src/ui/theme-parser.c:2213
+#: ../src/ui/theme-parser.c:2320 ../src/ui/theme-parser.c:2422
+#: ../src/ui/theme-parser.c:2644 ../src/ui/theme-parser.c:2772
+#: ../src/ui/theme-parser.c:2948
 #, c-format
 msgid "No \"width\" attribute on element <%s>"
 msgstr "No \"width\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1878 ../src/theme-parser.c:1989
-#: ../src/theme-parser.c:2138 ../src/theme-parser.c:2220
-#: ../src/theme-parser.c:2327 ../src/theme-parser.c:2429
-#: ../src/theme-parser.c:2651 ../src/theme-parser.c:2779
-#: ../src/theme-parser.c:2955
+#: ../src/ui/theme-parser.c:1878 ../src/ui/theme-parser.c:1989
+#: ../src/ui/theme-parser.c:2138 ../src/ui/theme-parser.c:2220
+#: ../src/ui/theme-parser.c:2327 ../src/ui/theme-parser.c:2429
+#: ../src/ui/theme-parser.c:2651 ../src/ui/theme-parser.c:2779
+#: ../src/ui/theme-parser.c:2955
 #, c-format
 msgid "No \"height\" attribute on element <%s>"
 msgstr "No \"height\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:1998
+#: ../src/ui/theme-parser.c:1998
 #, c-format
 msgid "No \"start_angle\" or \"from\" attribute on element <%s>"
 msgstr "No \"start_angle\" or \"from\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2005
+#: ../src/ui/theme-parser.c:2005
 #, c-format
 msgid "No \"extent_angle\" or \"to\" attribute on element <%s>"
 msgstr "No \"extent_angle\" or \"to\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2014
+#: ../src/ui/theme-parser.c:2014
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "No \"start_angle\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2021
+#: ../src/ui/theme-parser.c:2021
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "No \"extent_angle\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2227
+#: ../src/ui/theme-parser.c:2227
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "No \"alpha\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2299
+#: ../src/ui/theme-parser.c:2299
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "No \"type\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2349
+#: ../src/ui/theme-parser.c:2349
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Did not understand value \"%s\" for type of gradient"
 
-#: ../src/theme-parser.c:2436
+#: ../src/ui/theme-parser.c:2436
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "No \"filename\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2461 ../src/theme-parser.c:2980
+#: ../src/ui/theme-parser.c:2461 ../src/ui/theme-parser.c:2980
 #, c-format
 msgid "Did not understand fill type \"%s\" for <%s> element"
 msgstr "Did not understand fill type \"%s\" for <%s> element"
 
-#: ../src/theme-parser.c:2609 ../src/theme-parser.c:2744
-#: ../src/theme-parser.c:2850
+#: ../src/ui/theme-parser.c:2609 ../src/ui/theme-parser.c:2744
+#: ../src/ui/theme-parser.c:2850
 #, c-format
 msgid "No \"state\" attribute on element <%s>"
 msgstr "No \"state\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2616 ../src/theme-parser.c:2751
+#: ../src/ui/theme-parser.c:2616 ../src/ui/theme-parser.c:2751
 #, c-format
 msgid "No \"shadow\" attribute on element <%s>"
 msgstr "No \"shadow\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2623
+#: ../src/ui/theme-parser.c:2623
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "No \"arrow\" attribute on element <%s>"
 
-#: ../src/theme-parser.c:2676 ../src/theme-parser.c:2800
-#: ../src/theme-parser.c:2891
+#: ../src/ui/theme-parser.c:2676 ../src/ui/theme-parser.c:2800
+#: ../src/ui/theme-parser.c:2891
 #, c-format
 msgid "Did not understand state \"%s\" for <%s> element"
 msgstr "Did not understand state \"%s\" for <%s> element"
 
-#: ../src/theme-parser.c:2686 ../src/theme-parser.c:2810
+#: ../src/ui/theme-parser.c:2686 ../src/ui/theme-parser.c:2810
 #, c-format
 msgid "Did not understand shadow \"%s\" for <%s> element"
 msgstr "Did not understand shadow \"%s\" for <%s> element"
 
-#: ../src/theme-parser.c:2696
+#: ../src/ui/theme-parser.c:2696
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Did not understand arrow \"%s\" for <%s> element"
 
-#: ../src/theme-parser.c:3120 ../src/theme-parser.c:3237
+#: ../src/ui/theme-parser.c:3120 ../src/ui/theme-parser.c:3237
 #, c-format
 msgid "No <draw_ops> called \"%s\" has been defined"
 msgstr "No <draw_ops> called \"%s\" has been defined"
 
-#: ../src/theme-parser.c:3132 ../src/theme-parser.c:3249
+#: ../src/ui/theme-parser.c:3132 ../src/ui/theme-parser.c:3249
 #, c-format
 msgid "Including draw_ops \"%s\" here would create a circular reference"
 msgstr "Including draw_ops \"%s\" here would create a circular reference"
 
-#: ../src/theme-parser.c:3314
+#: ../src/ui/theme-parser.c:3314
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "No \"value\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3371
+#: ../src/ui/theme-parser.c:3371
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "No \"position\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3380
+#: ../src/ui/theme-parser.c:3380
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Unknown position \"%s\" for frame piece"
 
-#: ../src/theme-parser.c:3388
+#: ../src/ui/theme-parser.c:3388
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Frame style already has a piece at position %s"
 
-#: ../src/theme-parser.c:3405 ../src/theme-parser.c:3496
+#: ../src/ui/theme-parser.c:3405 ../src/ui/theme-parser.c:3496
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
 msgstr "No <draw_ops> with the name \"%s\" has been defined"
 
-#: ../src/theme-parser.c:3433
+#: ../src/ui/theme-parser.c:3433
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "No \"function\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3441 ../src/theme-parser.c:3557
+#: ../src/ui/theme-parser.c:3441 ../src/ui/theme-parser.c:3557
 #, c-format
 msgid "No \"state\" attribute on <%s> element"
 msgstr "No \"state\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3450
+#: ../src/ui/theme-parser.c:3450
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Unknown function \"%s\" for button"
 
-#: ../src/theme-parser.c:3459
+#: ../src/ui/theme-parser.c:3459
 #, c-format
 msgid "Button function \"%s\" does not exist in this version (%d, need %d)"
 msgstr "Button function \"%s\" does not exist in this version (%d, need %d)"
 
-#: ../src/theme-parser.c:3471
+#: ../src/ui/theme-parser.c:3471
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Unknown state \"%s\" for button"
 
-#: ../src/theme-parser.c:3479
+#: ../src/ui/theme-parser.c:3479
 #, c-format
 msgid "Frame style already has a button for function %s state %s"
 msgstr "Frame style already has a button for function %s state %s"
 
-#: ../src/theme-parser.c:3549
+#: ../src/ui/theme-parser.c:3549
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "No \"focus\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3565
+#: ../src/ui/theme-parser.c:3565
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "No \"style\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3574
+#: ../src/ui/theme-parser.c:3574
 #, c-format
 msgid "\"%s\" is not a valid value for focus attribute"
 msgstr "\"%s\" is not a valid value for focus attribute"
 
-#: ../src/theme-parser.c:3583
+#: ../src/ui/theme-parser.c:3583
 #, c-format
 msgid "\"%s\" is not a valid value for state attribute"
 msgstr "\"%s\" is not a valid value for state attribute"
 
-#: ../src/theme-parser.c:3593
+#: ../src/ui/theme-parser.c:3593
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "A style called \"%s\" has not been defined"
 
-#: ../src/theme-parser.c:3604
+#: ../src/ui/theme-parser.c:3604
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "No \"resize\" attribute on <%s> element"
 
-#: ../src/theme-parser.c:3614 ../src/theme-parser.c:3637
+#: ../src/ui/theme-parser.c:3614 ../src/ui/theme-parser.c:3637
 #, c-format
 msgid "\"%s\" is not a valid value for resize attribute"
 msgstr "\"%s\" is not a valid value for resize attribute"
 
-#: ../src/theme-parser.c:3648
+#: ../src/ui/theme-parser.c:3648
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
@@ -2932,24 +3030,24 @@ msgstr ""
 "Should not have \"resize\" attribute on <%s> element for maximized/shaded "
 "states"
 
-#: ../src/theme-parser.c:3662
+#: ../src/ui/theme-parser.c:3662
 #, c-format
 msgid ""
 "Should not have \"resize\" attribute on <%s> element for maximized states"
 msgstr ""
 "Should not have \"resize\" attribute on <%s> element for maximized states"
 
-#: ../src/theme-parser.c:3676 ../src/theme-parser.c:3698
+#: ../src/ui/theme-parser.c:3676 ../src/ui/theme-parser.c:3698
 #, c-format
 msgid "Style has already been specified for state %s resize %s focus %s"
 msgstr "Style has already been specified for state %s resize %s focus %s"
 
-#: ../src/theme-parser.c:3687 ../src/theme-parser.c:3709
+#: ../src/ui/theme-parser.c:3687 ../src/ui/theme-parser.c:3709
 #, c-format
 msgid "Style has already been specified for state %s focus %s"
 msgstr "Style has already been specified for state %s focus %s"
 
-#: ../src/theme-parser.c:3748
+#: ../src/ui/theme-parser.c:3748
 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)"
@@ -2957,7 +3055,7 @@ msgstr ""
 "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)"
 
-#: ../src/theme-parser.c:3786
+#: ../src/ui/theme-parser.c:3786
 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)"
@@ -2965,7 +3063,7 @@ msgstr ""
 "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)"
 
-#: ../src/theme-parser.c:3824
+#: ../src/ui/theme-parser.c:3824
 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)"
@@ -2973,318 +3071,321 @@ msgstr ""
 "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)"
 
-#: ../src/theme-parser.c:3872
+#: ../src/ui/theme-parser.c:3872
 #, c-format
 msgid "Outermost element in theme must be <metacity_theme> not <%s>"
 msgstr "Outermost element in theme must be <metacity_theme> not <%s>"
 
-#: ../src/theme-parser.c:3892
+#: ../src/ui/theme-parser.c:3892
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 msgstr ""
 "Element <%s> is not allowed inside a name/author/date/description element"
 
-#: ../src/theme-parser.c:3897
+#: ../src/ui/theme-parser.c:3897
 #, c-format
 msgid "Element <%s> is not allowed inside a <constant> element"
 msgstr "Element <%s> is not allowed inside a <constant> element"
 
-#: ../src/theme-parser.c:3909
+#: ../src/ui/theme-parser.c:3909
 #, c-format
 msgid ""
 "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 msgstr ""
 "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
 
-#: ../src/theme-parser.c:3931
+#: ../src/ui/theme-parser.c:3931
 #, c-format
 msgid "Element <%s> is not allowed inside a draw operation element"
 msgstr "Element <%s> is not allowed inside a draw operation element"
 
-#: ../src/theme-parser.c:3941 ../src/theme-parser.c:3971
-#: ../src/theme-parser.c:3976 ../src/theme-parser.c:3981
+#: ../src/ui/theme-parser.c:3941 ../src/ui/theme-parser.c:3971
+#: ../src/ui/theme-parser.c:3976 ../src/ui/theme-parser.c:3981
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "Element <%s> is not allowed inside a <%s> element"
 
-#: ../src/theme-parser.c:4203
+#: ../src/ui/theme-parser.c:4203
 msgid "No draw_ops provided for frame piece"
 msgstr "No draw_ops provided for frame piece"
 
-#: ../src/theme-parser.c:4218
+#: ../src/ui/theme-parser.c:4218
 msgid "No draw_ops provided for button"
 msgstr "No draw_ops provided for button"
 
-#: ../src/theme-parser.c:4270
+#: ../src/ui/theme-parser.c:4270
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "מלל לא מורשה בתג <%s>"
 
-#: ../src/theme-parser.c:4325
+#: ../src/ui/theme-parser.c:4325
 msgid "<name> specified twice for this theme"
 msgstr "<name> צויין פעמיים בערכת נושא זו"
 
-#: ../src/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4336
 msgid "<author> specified twice for this theme"
 msgstr "<author> צויין פעמיים בערכת נושא זו"
 
-#: ../src/theme-parser.c:4347
+#: ../src/ui/theme-parser.c:4347
 msgid "<copyright> specified twice for this theme"
 msgstr "<copyright> צויין פעמיים בערכת נושא זו"
 
-#: ../src/theme-parser.c:4358
+#: ../src/ui/theme-parser.c:4358
 msgid "<date> specified twice for this theme"
 msgstr "<date> צויין פעמיים בערכת נושא זו"
 
-#: ../src/theme-parser.c:4369
+#: ../src/ui/theme-parser.c:4369
 msgid "<description> specified twice for this theme"
 msgstr "<description> צויין פעמיים בערכת נושא זו"
 
-#: ../src/theme-parser.c:4636
+#: ../src/ui/theme-parser.c:4636
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Failed to find a valid file for theme %s\n"
 
-#: ../src/theme-parser.c:4692
+#: ../src/ui/theme-parser.c:4692
 #, c-format
 msgid "Theme file %s did not contain a root <metacity_theme> element"
 msgstr "Theme file %s did not contain a root <metacity_theme> element"
 
-#: ../src/theme-viewer.c:74
+#: ../src/ui/theme-viewer.c:74
 msgid "/_Windows"
-msgstr ""
+msgstr "/_Windows"
 
-#: ../src/theme-viewer.c:75
+#: ../src/ui/theme-viewer.c:75
 msgid "/Windows/tearoff"
-msgstr ""
+msgstr "/Windows/tearoff"
 
-#: ../src/theme-viewer.c:76
+#: ../src/ui/theme-viewer.c:76
 msgid "/Windows/_Dialog"
-msgstr ""
+msgstr "/Windows/_Dialog"
 
-#: ../src/theme-viewer.c:77
+#: ../src/ui/theme-viewer.c:77
 msgid "/Windows/_Modal dialog"
-msgstr ""
+msgstr "/Windows/_Modal dialog"
 
-#: ../src/theme-viewer.c:78
+#: ../src/ui/theme-viewer.c:78
 msgid "/Windows/_Utility"
-msgstr ""
+msgstr "/Windows/_Utility"
 
-#: ../src/theme-viewer.c:79
+#: ../src/ui/theme-viewer.c:79
 msgid "/Windows/_Splashscreen"
-msgstr ""
+msgstr "/Windows/_Splashscreen"
 
-#: ../src/theme-viewer.c:80
+#: ../src/ui/theme-viewer.c:80
 msgid "/Windows/_Top dock"
-msgstr ""
+msgstr "/Windows/_Top dock"
 
-#: ../src/theme-viewer.c:81
+#: ../src/ui/theme-viewer.c:81
 msgid "/Windows/_Bottom dock"
-msgstr ""
+msgstr "/Windows/_Bottom dock"
 
-#: ../src/theme-viewer.c:82
+#: ../src/ui/theme-viewer.c:82
 msgid "/Windows/_Left dock"
-msgstr ""
+msgstr "/Windows/_Left dock"
 
-#: ../src/theme-viewer.c:83
+#: ../src/ui/theme-viewer.c:83
 msgid "/Windows/_Right dock"
-msgstr ""
+msgstr "/Windows/_Right dock"
 
-#: ../src/theme-viewer.c:84
+#: ../src/ui/theme-viewer.c:84
 msgid "/Windows/_All docks"
-msgstr ""
+msgstr "/Windows/_All docks"
 
-#: ../src/theme-viewer.c:85
+#: ../src/ui/theme-viewer.c:85
 msgid "/Windows/Des_ktop"
-msgstr ""
+msgstr "/Windows/Des_ktop"
 
-#: ../src/theme-viewer.c:134
+#: ../src/ui/theme-viewer.c:134
 msgid "Open another one of these windows"
-msgstr ""
+msgstr "Open another one of these windows"
 
-#: ../src/theme-viewer.c:141
+#: ../src/ui/theme-viewer.c:141
 msgid "This is a demo button with an 'open' icon"
-msgstr ""
+msgstr "This is a demo button with an 'open' icon"
 
-#: ../src/theme-viewer.c:148
+#: ../src/ui/theme-viewer.c:148
 msgid "This is a demo button with a 'quit' icon"
-msgstr ""
+msgstr "This is a demo button with a 'quit' icon"
 
-#: ../src/theme-viewer.c:241
+#: ../src/ui/theme-viewer.c:241
 msgid "This is a sample message in a sample dialog"
-msgstr ""
+msgstr "This is a sample message in a sample dialog"
 
-#: ../src/theme-viewer.c:324
+#: ../src/ui/theme-viewer.c:324
 #, c-format
 msgid "Fake menu item %d\n"
-msgstr ""
+msgstr "Fake menu item %d\n"
 
-#: ../src/theme-viewer.c:358
+#: ../src/ui/theme-viewer.c:358
 msgid "Border-only window"
-msgstr ""
+msgstr "Border-only window"
 
-#: ../src/theme-viewer.c:360
+#: ../src/ui/theme-viewer.c:360
 msgid "Bar"
-msgstr ""
+msgstr "Bar"
 
-#: ../src/theme-viewer.c:377
+#: ../src/ui/theme-viewer.c:377
 msgid "Normal Application Window"
-msgstr ""
+msgstr "Normal Application Window"
 
-#: ../src/theme-viewer.c:381
+#: ../src/ui/theme-viewer.c:381
 msgid "Dialog Box"
-msgstr ""
+msgstr "Dialog Box"
 
-#: ../src/theme-viewer.c:385
+#: ../src/ui/theme-viewer.c:385
 msgid "Modal Dialog Box"
-msgstr ""
+msgstr "Modal Dialog Box"
 
-#: ../src/theme-viewer.c:389
+#: ../src/ui/theme-viewer.c:389
 msgid "Utility Palette"
-msgstr ""
+msgstr "Utility Palette"
 
-#: ../src/theme-viewer.c:393
+#: ../src/ui/theme-viewer.c:393
 msgid "Torn-off Menu"
-msgstr ""
+msgstr "Torn-off Menu"
 
-#: ../src/theme-viewer.c:397
+#: ../src/ui/theme-viewer.c:397
 msgid "Border"
-msgstr ""
+msgstr "Border"
 
-#: ../src/theme-viewer.c:725
+#: ../src/ui/theme-viewer.c:725
 #, c-format
 msgid "Button layout test %d"
-msgstr ""
+msgstr "Button layout test %d"
 
-#: ../src/theme-viewer.c:754
+#: ../src/ui/theme-viewer.c:754
 #, c-format
 msgid "%g milliseconds to draw one window frame"
-msgstr ""
+msgstr "%g milliseconds to draw one window frame"
 
-#: ../src/theme-viewer.c:797
+#: ../src/ui/theme-viewer.c:797
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
-msgstr ""
+msgstr "Usage: metacity-theme-viewer [THEMENAME]\n"
 
-#: ../src/theme-viewer.c:804
+#: ../src/ui/theme-viewer.c:804
 #, c-format
 msgid "Error loading theme: %s\n"
-msgstr "נכשל בטעינת ערכת נושא : %s\n"
+msgstr "Error loading theme: %s\n"
 
-#: ../src/theme-viewer.c:810
+#: ../src/ui/theme-viewer.c:810
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
-msgstr ""
+msgstr "Loaded theme \"%s\" in %g seconds\n"
 
-#: ../src/theme-viewer.c:833
+#: ../src/ui/theme-viewer.c:833
 msgid "Normal Title Font"
-msgstr ""
+msgstr "Normal Title Font"
 
-#: ../src/theme-viewer.c:839
+#: ../src/ui/theme-viewer.c:839
 msgid "Small Title Font"
-msgstr ""
+msgstr "Small Title Font"
 
-#: ../src/theme-viewer.c:845
+#: ../src/ui/theme-viewer.c:845
 msgid "Large Title Font"
-msgstr ""
+msgstr "Large Title Font"
 
-#: ../src/theme-viewer.c:850
+#: ../src/ui/theme-viewer.c:850
 msgid "Button Layouts"
-msgstr ""
+msgstr "Button Layouts"
 
-#: ../src/theme-viewer.c:855
+#: ../src/ui/theme-viewer.c:855
 msgid "Benchmark"
-msgstr ""
+msgstr "Benchmark"
 
-#: ../src/theme-viewer.c:902
+#: ../src/ui/theme-viewer.c:902
 msgid "Window Title Goes Here"
-msgstr ""
+msgstr "Window Title Goes Here"
 
-#: ../src/theme-viewer.c:1006
+#: ../src/ui/theme-viewer.c:1006
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
 "seconds wall clock time including X server resources (%g milliseconds per "
 "frame)\n"
 msgstr ""
+"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
+"seconds wall clock time including X server resources (%g milliseconds per "
+"frame)\n"
 
-#: ../src/theme-viewer.c:1225
+#: ../src/ui/theme-viewer.c:1225
 msgid "position expression test returned TRUE but set error"
-msgstr ""
+msgstr "position expression test returned TRUE but set error"
 
-#: ../src/theme-viewer.c:1227
+#: ../src/ui/theme-viewer.c:1227
 msgid "position expression test returned FALSE but didn't set error"
-msgstr ""
+msgstr "position expression test returned FALSE but didn't set error"
 
-#: ../src/theme-viewer.c:1231
+#: ../src/ui/theme-viewer.c:1231
 msgid "Error was expected but none given"
-msgstr ""
+msgstr "Error was expected but none given"
 
-#: ../src/theme-viewer.c:1233
+#: ../src/ui/theme-viewer.c:1233
 #, c-format
 msgid "Error %d was expected but %d given"
-msgstr ""
+msgstr "Error %d was expected but %d given"
 
-#: ../src/theme-viewer.c:1239
+#: ../src/ui/theme-viewer.c:1239
 #, c-format
 msgid "Error not expected but one was returned: %s"
-msgstr ""
+msgstr "Error not expected but one was returned: %s"
 
-#: ../src/theme-viewer.c:1243
+#: ../src/ui/theme-viewer.c:1243
 #, c-format
 msgid "x value was %d, %d was expected"
-msgstr ""
+msgstr "x value was %d, %d was expected"
 
-#: ../src/theme-viewer.c:1246
+#: ../src/ui/theme-viewer.c:1246
 #, c-format
 msgid "y value was %d, %d was expected"
-msgstr ""
+msgstr "y value was %d, %d was expected"
 
-#: ../src/theme-viewer.c:1311
+#: ../src/ui/theme-viewer.c:1311
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-msgstr ""
+msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 
-#: ../src/theme.c:208
+#: ../src/ui/theme.c:256
 msgid "top"
 msgstr "top"
 
-#: ../src/theme.c:210
+#: ../src/ui/theme.c:258
 msgid "bottom"
 msgstr "bottom"
 
-#: ../src/theme.c:212
+#: ../src/ui/theme.c:260
 msgid "left"
 msgstr "left"
 
-#: ../src/theme.c:214
+#: ../src/ui/theme.c:262
 msgid "right"
 msgstr "right"
 
-#: ../src/theme.c:228
+#: ../src/ui/theme.c:289
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "frame geometry does not specify \"%s\" dimension"
 
-#: ../src/theme.c:247
+#: ../src/ui/theme.c:308
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "frame geometry does not specify dimension \"%s\" for border \"%s\""
 
-#: ../src/theme.c:284
+#: ../src/ui/theme.c:345
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Button aspect ratio %g is not reasonable"
 
-#: ../src/theme.c:296
+#: ../src/ui/theme.c:357
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Frame geometry does not specify size of buttons"
 
-#: ../src/theme.c:927
+#: ../src/ui/theme.c:988
 msgid "Gradients should have at least two colors"
 msgstr "Gradients should have at least two colors"
 
-#: ../src/theme.c:1053
+#: ../src/ui/theme.c:1114
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -3293,7 +3394,7 @@ msgstr ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 
-#: ../src/theme.c:1067
+#: ../src/ui/theme.c:1128
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -3302,17 +3403,17 @@ msgstr ""
 "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\""
 
-#: ../src/theme.c:1078
+#: ../src/ui/theme.c:1139
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Did not understand state \"%s\" in color specification"
 
-#: ../src/theme.c:1091
+#: ../src/ui/theme.c:1152
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Did not understand color component \"%s\" in color specification"
 
-#: ../src/theme.c:1121
+#: ../src/ui/theme.c:1182
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -3321,44 +3422,44 @@ msgstr ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 
-#: ../src/theme.c:1132
+#: ../src/ui/theme.c:1193
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Could not parse alpha value \"%s\" in blended color"
 
-#: ../src/theme.c:1142
+#: ../src/ui/theme.c:1203
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 
-#: ../src/theme.c:1190
+#: ../src/ui/theme.c:1251
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 
-#: ../src/theme.c:1201
+#: ../src/ui/theme.c:1262
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Could not parse shade factor \"%s\" in shaded color"
 
-#: ../src/theme.c:1211
+#: ../src/ui/theme.c:1272
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Shade factor \"%s\" in shaded color is negative"
 
-#: ../src/theme.c:1241
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Could not parse color \"%s\""
 
-#: ../src/theme.c:1462
+#: ../src/ui/theme.c:1560
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Coordinate expression contains character '%s' which is not allowed"
 
-#: ../src/theme.c:1489
+#: ../src/ui/theme.c:1587
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -3367,12 +3468,12 @@ msgstr ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 
-#: ../src/theme.c:1503
+#: ../src/ui/theme.c:1601
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Coordinate expression contains integer '%s' which could not be parsed"
 
-#: ../src/theme.c:1610
+#: ../src/ui/theme.c:1723
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -3381,36 +3482,36 @@ msgstr ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 
-#: ../src/theme.c:1667
+#: ../src/ui/theme.c:1780
 msgid "Coordinate expression was empty or not understood"
 msgstr "Coordinate expression was empty or not understood"
 
-#: ../src/theme.c:1764 ../src/theme.c:1774 ../src/theme.c:1808
+#: ../src/ui/theme.c:1891 ../src/ui/theme.c:1901 ../src/ui/theme.c:1935
 msgid "Coordinate expression results in division by zero"
 msgstr "Coordinate expression results in division by zero"
 
-#: ../src/theme.c:1816
+#: ../src/ui/theme.c:1943
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 
-#: ../src/theme.c:1872
+#: ../src/ui/theme.c:1999
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 
-#: ../src/theme.c:1881
+#: ../src/ui/theme.c:2008
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Coordinate expression had an operand where an operator was expected"
 
-#: ../src/theme.c:1889
+#: ../src/ui/theme.c:2016
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Coordinate expression ended with an operator instead of an operand"
 
-#: ../src/theme.c:1899
+#: ../src/ui/theme.c:2026
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -3419,34 +3520,34 @@ msgstr ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 
-#: ../src/theme.c:2023 ../src/theme.c:2064
+#: ../src/ui/theme.c:2173 ../src/ui/theme.c:2214
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Coordinate expression had unknown variable or constant \"%s\""
 
-#: ../src/theme.c:2108
+#: ../src/ui/theme.c:2268
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Coordinate expression parser overflowed its buffer."
 
-#: ../src/theme.c:2137
+#: ../src/ui/theme.c:2297
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Coordinate expression had a close parenthesis with no open parenthesis"
 
-#: ../src/theme.c:2201
+#: ../src/ui/theme.c:2361
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Coordinate expression had an open parenthesis with no close parenthesis"
 
-#: ../src/theme.c:2212
+#: ../src/ui/theme.c:2372
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Coordinate expression doesn't seem to have any operators or operands"
 
-#: ../src/theme.c:2398 ../src/theme.c:2418 ../src/theme.c:2438
+#: ../src/ui/theme.c:2574 ../src/ui/theme.c:2594 ../src/ui/theme.c:2614
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Theme contained an expression that resulted in an error: %s\n"
 
-#: ../src/theme.c:3942
+#: ../src/ui/theme.c:4133
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -3455,25 +3556,25 @@ msgstr ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 
-#: ../src/theme.c:4418 ../src/theme.c:4443
+#: ../src/ui/theme.c:4609 ../src/ui/theme.c:4634
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 
-#: ../src/theme.c:4487
+#: ../src/ui/theme.c:4678
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Failed to load theme \"%s\": %s\n"
 
-#: ../src/theme.c:4613 ../src/theme.c:4620 ../src/theme.c:4627
-#: ../src/theme.c:4634 ../src/theme.c:4641
+#: ../src/ui/theme.c:4804 ../src/ui/theme.c:4811 ../src/ui/theme.c:4818
+#: ../src/ui/theme.c:4825 ../src/ui/theme.c:4832
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "No <%s> set for theme \"%s\""
 
-#: ../src/theme.c:4649
+#: ../src/ui/theme.c:4840
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -3482,116 +3583,22 @@ msgstr ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 
-#: ../src/theme.c:5016 ../src/theme.c:5078 ../src/theme.c:5141
+#: ../src/ui/theme.c:5207 ../src/ui/theme.c:5269 ../src/ui/theme.c:5332
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 
-#: ../src/theme.c:5024 ../src/theme.c:5086 ../src/theme.c:5149
+#: ../src/ui/theme.c:5215 ../src/ui/theme.c:5277 ../src/ui/theme.c:5340
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Constant \"%s\" has already been defined"
 
-#: ../src/util.c:98
-#, c-format
-msgid "Failed to open debug log: %s\n"
-msgstr "Failed to open debug log: %s\n"
-
-#: ../src/util.c:108
-#, c-format
-msgid "Failed to fdopen() log file %s: %s\n"
-msgstr "Failed to fdopen() log file %s: %s\n"
-
-#: ../src/util.c:114
-#, c-format
-msgid "Opened log file %s\n"
-msgstr "Opened log file %s\n"
-
-#: ../src/util.c:231
-msgid "Window manager: "
-msgstr "Window manager: "
-
-#: ../src/util.c:379
-msgid "Bug in window manager: "
-msgstr "Bug in window manager: "
-
-#: ../src/util.c:408
-msgid "Window manager warning: "
-msgstr "Window manager warning: "
-
-#: ../src/util.c:432
-msgid "Window manager error: "
-msgstr "Window manager error: "
-
-#: ../src/window-props.c:192
-#, c-format
-msgid "Application set a bogus _NET_WM_PID %lu\n"
-msgstr "Application set a bogus _NET_WM_PID %lu\n"
-
-#: ../src/window-props.c:324
-#, c-format
-msgid "%s (on %s)"
-msgstr "%s (מעל %s)"
-
-#: ../src/window-props.c:1406
-#, c-format
-msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
-msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
-
-#. first time through
-#: ../src/window.c:5650
-#, c-format
-msgid ""
-"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
-"window as specified in the ICCCM.\n"
-msgstr ""
-"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
-"window as specified in the ICCCM.\n"
-
-#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
-#. * authoritative source for that info. Some apps such as mplayer or
-#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
-#. * leads to e.g. us not fullscreening their windows.  Apps that set
-#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
-#. * about these apps but make them work.
-#.
-#: ../src/window.c:6215
-#, c-format
-msgid ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
-"d x %d and max size %d x %d; this doesn't make much sense.\n"
-msgstr ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
-"d x %d and max size %d x %d; this doesn't make much sense.\n"
-
-#: ../src/xprops.c:155
-#, c-format
-msgid ""
-"Window 0x%lx has property %s\n"
-"that was expected to have type %s format %d\n"
-"and actually has type %s format %d n_items %d.\n"
-"This is most likely an application bug, not a window manager bug.\n"
-"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
-msgstr ""
-"Window 0x%lx has property %s\n"
-"that was expected to have type %s format %d\n"
-"and actually has type %s format %d n_items %d.\n"
-"This is most likely an application bug, not a window manager bug.\n"
-"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
-
-#: ../src/xprops.c:401
-#, c-format
-msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
-msgstr "Property %s on window 0x%lx contained invalid UTF-8\n"
-
-#: ../src/xprops.c:484
+#: ../src/tools/metacity-message.c:150
 #, c-format
-msgid ""
-"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
-msgstr ""
-"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
+msgid "Usage: %s\n"
+msgstr "שימוש: %s\n"
 
 #~ msgid "On _Top"
 #~ msgstr "מ_על"