diff --git a/po/sl.po b/po/sl.po
index 393a1f4e9..50d165ac9 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
 #
 # Andraz Tori <andraz.tori1@guest.arnes.si>, 2000.
 # Matjaž Horvat <m@owca.info>, 2006.
-# Matej Urbančič <mateju@svn.gnome.org>, 2007
+# Matej Urbančič <mateju@svn.gnome.org>, 2007 - 2008
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-10-03 03:39+0100\n"
-"PO-Revision-Date: 2007-12-20 14:18+0100\n"
+"PO-Revision-Date: 2008-01-26 09:52+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,69 +28,59 @@ msgstr "Namizje"
 msgid "Window Management"
 msgstr "Upravljanje oken"
 
-#: ../src/tools/metacity-message.c:150
-#, c-format
-msgid "Usage: %s\n"
-msgstr "Uporaba: %s\n"
-
-#: ../src/tools/metacity-message.c:176
-#: ../src/util.c:133
-msgid "Metacity was compiled without support for verbose mode\n"
-msgstr "Metacity je bil preveden brez podpore za podrobni način\n"
-
-#: ../src/core.c:206
+#: ../src/core/core.c:206
 #, c-format
 msgid "Unknown window information request: %d"
 msgstr "Zahteva izpisa podrobnosti neznanega okna: %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 "Ni mogoče razčleniti \"%s\" kot celoštevilčne vrednosti"
 
-#: ../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 "Ni mogoče razumeti končnih znakov \"%s\" v nizu \"%s\""
 
-#: ../src/delete.c:132
+#: ../src/core/delete.c:132
 #, c-format
 msgid "Failed to parse message \"%s\" from dialog process\n"
 msgstr "Ni mogoče razčleniti sporočila \"%s\" iz procesa dialogov\n"
 
-#: ../src/delete.c:267
+#: ../src/core/delete.c:267
 #, c-format
 msgid "Error reading from dialog display process: %s\n"
 msgstr "Napaka ob branju iz procesa prikaza dialogov: %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 "Napaka ob zaganjanju metacity-dialog, da bi vprašal o ubijanju programa: %s\n"
 
-#: ../src/delete.c:459
+#: ../src/core/delete.c:459
 #, c-format
 msgid "Failed to get hostname: %s\n"
 msgstr "Ni mogoče dobiti gostitelja z imenom: %s\n"
 
-#: ../src/display.c:204
+#: ../src/core/display.c:256
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Manjka razširitev %s, ki je ključna za sestavljanje"
 
-#: ../src/display.c:368
+#: ../src/core/display.c:438
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
 
-#: ../src/errors.c:271
+#: ../src/core/errors.c:271
 #, c-format
 msgid ""
 "Lost connection to the display '%s';\n"
@@ -101,386 +91,376 @@ msgstr ""
 "najverjetneje se je strežnik X ugasnil ali pa prisilno izklopljen\n"
 "upravljalnik oken.\n"
 
-#: ../src/errors.c:278
+#: ../src/core/errors.c:278
 #, c-format
 msgid "Fatal IO error %d (%s) on display '%s'.\n"
 msgstr "Usodna napaka IO %d (%s) na zaslonu '%s'.\n"
 
-#: ../src/frames.c:1078
-msgid "Close Window"
-msgstr "Zapri okno"
-
-# G:1 K:1 O:0
-#: ../src/frames.c:1081
-msgid "Window Menu"
-msgstr "Menu oken"
-
-# G:0 K:1 O:0
-#: ../src/frames.c:1084
-msgid "Minimize Window"
-msgstr "Skrči okno"
-
-#: ../src/frames.c:1087
-msgid "Maximize Window"
-msgstr "Razpri okno"
-
 # G:1 K:0 O:0
-#: ../src/frames.c:1090
-msgid "Unmaximize Window"
-msgstr "Pomanjšaj okno"
-
-# G:2 K:0 O:0
-#: ../src/frames.c:1093
-msgid "Roll Up Window"
-msgstr "Zavij okno"
-
-#: ../src/frames.c:1096
-msgid "Unroll Window"
-msgstr "Odvij okno"
-
-#: ../src/frames.c:1099
-msgid "Keep Window On Top"
-msgstr "Ohrani okno na vrhu"
-
-#: ../src/frames.c:1102
-msgid "Remove Window From Top"
-msgstr "Odstrani okno z vrha"
-
-# G:1 K:0 O:0
-#: ../src/frames.c:1105
-msgid "Always On Visible Workspace"
-msgstr "Vedno na vidni delovni površini"
-
-#: ../src/frames.c:1108
-msgid "Put Window On Only One Workspace"
-msgstr "Postavi okno na samo eno delovno površino"
-
-# G:1 K:0 O:0
-#: ../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 "Tipko %s s spremenilnikom %x uporablja že nek drug program\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 "Napaka ob zaganjanju metacity-dialog za izpis napake o ukazu: %s\n"
 
-#: ../src/keybindings.c:2838
+#: ../src/core/keybindings.c:2838
 #, c-format
 msgid "No command %d has been defined.\n"
 msgstr "Ukaz %d ni bil naveden.\n"
 
-#: ../src/keybindings.c:3866
+#: ../src/core/keybindings.c:3866
 msgid "No terminal command has been defined.\n"
 msgstr "Ni bilo navedenih ukazov terminala.\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"
-"Avtorske pravice pridržane (C) 2001-2007 Havoc Pennington, Red Hat in drugi\n"
+"Avtorske pravice pridržane (C) 2001-2008 Havoc Pennington, Red Hat in drugi\n"
 "To je prosto programje; za pogoje kopiranja si poglejte izvorno kodo.\n"
-"Program prihaja BREZ KAKRŠNIHKOLI ZAGOTOVIL\n"
+"Program prihaja BREZ KAKRŠNIHKOLI ZAGOTOVIL.\n"
 
-#: ../src/main.c:172
+#: ../src/core/main.c:239
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upraviteljem sej"
 
-#: ../src/main.c:178
+#: ../src/core/main.c:245
 msgid "Replace the running window manager with Metacity"
 msgstr "Zamenjaj trenutnega upravitelja oken z Metacity"
 
-#: ../src/main.c:184
+#: ../src/core/main.c:251
 msgid "Specify session management ID"
 msgstr "Navedite ID upravljanja seje"
 
-#: ../src/main.c:189
+#: ../src/core/main.c:256
 msgid "X Display to use"
 msgstr "Zaslon X za uporabo"
 
-#: ../src/main.c:195
+#: ../src/core/main.c:262
 msgid "Initialize session from savefile"
 msgstr "Zagon seje iz datoteke"
 
-#: ../src/main.c:201
+#: ../src/core/main.c:268
 msgid "Print version"
 msgstr "Izpiši različico"
 
-#: ../src/main.c:207
+#: ../src/core/main.c:274
 msgid "Make X calls synchronous"
 msgstr "Naredi klice X usklajene"
 
-#: ../src/main.c:361
+#: ../src/core/main.c:425
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Ni mogoče preiskati mape tem: %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 "Ni mogoče najti teme! Prepričajte se, da %s obstaja in vsebuje običajne teme.\n"
 
-#: ../src/main.c:452
+#: ../src/core/main.c:513
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "Ni mogoče znova pognati: %s\n"
 
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:70
-msgid "Mi_nimize"
-msgstr "_Skrči"
+#: ../src/core/prefs.c:434
+#, c-format
+msgid "Type of %s was not integer"
+msgstr "Vrsta %s ni celo število"
 
 # G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:72
-msgid "Ma_ximize"
-msgstr "Ra_zpni"
+#: ../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 "Ključ GConf \"%s\" je nastavljen na neveljavno vrsto\n"
+
+#: ../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\", ki je bil najden v podatkovni zbirki nastavitev ni veljaven spremenilnik za miškine gumbe.\n"
+
+#: ../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 "Ključ GConf '%s' je nastavljen na neveljavno vrednost\n"
+
+#: ../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, ki je shranjen v ključu GConf %s, ni običajen cursor_size; mora biti število med 1..128\n"
+
+#: ../src/core/prefs.c:1357
+#, c-format
+msgid "Could not parse font description \"%s\" from GConf key %s\n"
+msgstr "Ni mogoče razčleniti opisa \"%s\" iz ključa GConf %s\n"
+
+#: ../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 shranjen v ključu GConf %s ni normalno število delovnih površin, trenutno največje število je %d\n"
+
+#: ../src/core/prefs.c:1659
+msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
+msgstr "Obhodi za pokvarjene programe so izključeni. Nekateri programi se morda ne bodo pravilno obnašali.\n"
+
+#: ../src/core/prefs.c:1732
+#, c-format
+msgid "%d stored in GConf key %s is out of range 0 to %d\n"
+msgstr "%d shranjen v GConf ključu %s je izven meje med 0 in %d\n"
+
+#: ../src/core/prefs.c:1881
+#, c-format
+msgid "Error setting number of workspaces to %d: %s\n"
+msgstr "Napaka ob nastavljanju števila delovnih površin na %d: %s\n"
 
 # G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:74
-msgid "Unma_ximize"
-msgstr "Pomanjšaj"
-
-# G:2 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:76
-msgid "Roll _Up"
-msgstr "_Zavij"
-
-# G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:78
-msgid "_Unroll"
-msgstr "_Odvij"
-
-# G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:80
-msgid "_Move"
-msgstr "_Premakni"
-
-# G:2 K:2 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:82
-msgid "_Resize"
-msgstr "Sp_remeni velikost"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:84
-msgid "Move Titlebar On_screen"
-msgstr "Premakni naslovno vrstico na _zaslon"
-
-#. 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"
-msgstr "Vedno na _vrhu"
-
-# G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:91
-msgid "_Always on Visible Workspace"
-msgstr "Vedno n_a vidni delovni površini"
-
-# G:1 K:0 O:0
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:93
-msgid "_Only on This Workspace"
-msgstr "Sam_o na tej delovni površini"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:95
-msgid "Move to Workspace _Left"
-msgstr "Premakni na _levo delovno površino"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:97
-msgid "Move to Workspace R_ight"
-msgstr "Premakni na _desno delovno površino"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:99
-msgid "Move to Workspace _Up"
-msgstr "Premakni na _zgornjo delovno površino"
-
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:101
-msgid "Move to Workspace _Down"
-msgstr "Premakni na _spodnjo delovno površino"
-
-# G:0 K:1 O:0
-#. separator
-#. Translators: Translate this string the same way as you do in libwnck!
-#: ../src/menu.c:105
-msgid "_Close"
-msgstr "_Zapri"
-
-# G:1 K:0 O:0
-#: ../src/menu.c:199
-#: ../src/prefs.c:2246
-#: ../src/prefs.c:2780
+#: ../src/core/prefs.c:2246
+#: ../src/core/prefs.c:2780
+#: ../src/ui/menu.c:199
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"
 
-# G:1 K:0 O:0
-#: ../src/menu.c:208
-msgid "Workspace 1_0"
-msgstr "Delovna površina 1_0"
+#: ../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\" najden v podatkovni zbirki nastavitev ni veljaven ključ za tipkovno vez \"%s\"\n"
+
+#: ../src/core/prefs.c:2861
+#, c-format
+msgid "Error setting name for workspace %d to \"%s\": %s\n"
+msgstr "Napaka ob nastavljanju imena delovne površine %d na \"%s\": %s\n"
+
+#: ../src/core/screen.c:410
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
+
+#: ../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 "Zaslon %d na prikazu \"%s\" že ima upravljalnik oken; poskušajte uporabiti možnost --replace za zamenjavo trenutnega upravljalnika zaslona.\n"
+
+#: ../src/core/screen.c:453
+#, c-format
+msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
+msgstr "Ni mogoče dobiti izbire upravljalnika oken na zaslonu %d prikaz \"%s\"\n"
+
+#: ../src/core/screen.c:511
+#, c-format
+msgid "Screen %d on display \"%s\" already has a window manager\n"
+msgstr "Zaslon %d na prikazu \"%s\" že ima upravljalnik oken\n"
+
+#: ../src/core/screen.c:721
+#, c-format
+msgid "Could not release screen %d on display \"%s\"\n"
+msgstr "Ni mogoče opustiti prikaza %d prikazu \"%s\"\n"
+
+#: ../src/core/session.c:826
+#: ../src/core/session.c:833
+#, c-format
+msgid "Could not create directory '%s': %s\n"
+msgstr "Ni mogoče ustvariti imenika %s %s\n"
 
 # G:2 K:0 O:0
-#: ../src/menu.c:210
+#: ../src/core/session.c:843
 #, c-format
-msgid "Workspace %s%d"
-msgstr "Delovna površina %s%d"
+msgid "Could not open session file '%s' for writing: %s\n"
+msgstr "Ni mogoče odpreti datoteke seje '%s' za pisanje: %s\n"
 
-#: ../src/menu.c:390
-msgid "Move to Another _Workspace"
-msgstr "Premakni na dru_go delovno površino"
-
-#. 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"
-
-# G:2 K:1 O:0
-#. 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"
-
-# G:2 K:1 O:0
-#. 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"
-
-# G:5 K:2 O:0
-#. 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 "Meta"
-
-# G:0 K:2 O:0
-#. 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"
-
-#. 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 "Hiper"
-
-# G:1 K:0 O:0
-#. 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"
-
-#. 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"
-
-# G:0 K:1 O:0
-#. 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"
-
-#. 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/metacity-dialog.c:90
+#: ../src/core/session.c:995
 #, c-format
-msgid "\"%s\" is not responding."
-msgstr "\"%s\" se ne odziva."
+msgid "Error writing session file '%s': %s\n"
+msgstr "Napaka ob zapisovanju datoteke seje '%s': %s\n"
 
-#: ../src/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 "Lahko počakate za nadaljevanje ali pa na silo zaprete program."
+#: ../src/core/session.c:1000
+#, c-format
+msgid "Error closing session file '%s': %s\n"
+msgstr "Napaka ob zapiranju datoteke seje '%s': %s\n"
 
-#: ../src/metacity-dialog.c:107
-msgid "_Wait"
-msgstr "_Počakaj"
+#: ../src/core/session.c:1075
+#, c-format
+msgid "Failed to read saved session file %s: %s\n"
+msgstr "Ni mogoče prebrati datoteke shranjene seje %s: %s\n"
 
-#: ../src/metacity-dialog.c:109
-msgid "_Force Quit"
-msgstr "_Vsili izhod"
+#: ../src/core/session.c:1110
+#, c-format
+msgid "Failed to parse saved session file: %s\n"
+msgstr "Ni mogoče razčleniti datoteke shranjene seje: %s\n"
 
-#: ../src/metacity-dialog.c:206
-msgid "Title"
-msgstr "Naziv"
+#: ../src/core/session.c:1159
+msgid "<metacity_session> attribute seen but we already have the session ID"
+msgstr "atribut <metacity_session> je bil viden, a mi že imamo ID seje"
 
-# G:1 K:0 O:0
-#: ../src/metacity-dialog.c:218
-msgid "Class"
-msgstr "Razred"
+#: ../src/core/session.c:1172
+#, c-format
+msgid "Unknown attribute %s on <metacity_session> element"
+msgstr "Neznan atribut %s v elementu <metacity_session>"
 
-# G:2 K:6 O:0
-#: ../src/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 "Ta okna ne podpirajo možnosti \"shranjevanja trenutnih nastavitev\", zato bodo morala biti ob vaši naslednji prijavi znova zagnana ročno."
+#: ../src/core/session.c:1189
+msgid "nested <window> tag"
+msgstr "gnezdena označba <window>"
 
-#: ../src/metacity-dialog.c:310
+#: ../src/core/session.c:1247
+#: ../src/core/session.c:1279
+#, c-format
+msgid "Unknown attribute %s on <window> element"
+msgstr "Neznan atribut %s elementa <window>"
+
+#: ../src/core/session.c:1351
+#, c-format
+msgid "Unknown attribute %s on <maximized> element"
+msgstr "Neznan atribut %s elementa <maximize>"
+
+#: ../src/core/session.c:1411
+#, c-format
+msgid "Unknown attribute %s on <geometry> element"
+msgstr "Neznan atribut %s elementa <geometry>"
+
+#: ../src/core/session.c:1431
+#, c-format
+msgid "Unknown element %s"
+msgstr "Neznan element %s"
+
+#: ../src/core/session.c:1868
+#, c-format
+msgid "Error launching metacity-dialog to warn about apps that don't support session management: %s\n"
+msgstr "Napaka ob zaganjanju metacity-dialog za opozorilo o programih, ki ne podpirajo upravljanja seje: %s\n"
+
+#: ../src/core/util.c:98
+#, c-format
+msgid "Failed to open debug log: %s\n"
+msgstr "Odpiranje razhroščevalnega dnevnika ni uspelo: %s\n"
+
+#: ../src/core/util.c:108
+#, c-format
+msgid "Failed to fdopen() log file %s: %s\n"
+msgstr "Odpiranje dnevniške datoteke %s s fdopen() ni uspelo: %s\n"
+
+#: ../src/core/util.c:114
+#, c-format
+msgid "Opened log file %s\n"
+msgstr "Odpri dnevniško datoteko %s\n"
+
+#: ../src/core/util.c:133
+#: ../src/tools/metacity-message.c:176
+msgid "Metacity was compiled without support for verbose mode\n"
+msgstr "Metacity je bil preveden brez podpore za podrobni način\n"
+
+#: ../src/core/util.c:231
+msgid "Window manager: "
+msgstr "Upravljavec oken: "
+
+# G:4 K:0 O:0
+#: ../src/core/util.c:379
+msgid "Bug in window manager: "
+msgstr "Hrošč v upravljavcu oken: "
+
+#: ../src/core/util.c:408
+msgid "Window manager warning: "
+msgstr "Opozorilo upravljavca oken: "
+
+#: ../src/core/util.c:432
+msgid "Window manager error: "
+msgstr "Napaka upravljavca oken: "
+
+#: ../src/core/window-props.c:192
+#, c-format
+msgid "Application set a bogus _NET_WM_PID %lu\n"
+msgstr "Program je nastavil pokvarjen _NET_WM_PID %lu\n"
+
+#: ../src/core/window-props.c:324
+#, c-format
+msgid "%s (on %s)"
+msgstr "%s (na %s)"
+
+#: ../src/core/window-props.c:1406
+#, c-format
+msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
+msgstr "Neveljaven WM_TRANSIENT_FOR za okno 0x%lx naveden za %s.\n"
+
+#. first time through
+#: ../src/core/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 "Okno %s nastavi svoj SM_CLIENT_ID, namesto, da bi nastavilo WM_CLIENT_LEADER kot je zavedeno v 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/core/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 "Okno %s določi namig MWM, ki pove, da ni mogoče spremeniti velikosti, hkrati pa določi najmanjšo velikost na %d x %d in največjo na %d x %d; vrednost ni smiselna.\n"
+
+#: ../src/core/xprops.c:155
 #, c-format
 msgid ""
-"There was an error running \"%s\":\n"
-"%s."
+"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 ""
-"Med zagonom \"%s\" je prišlo do napake:\n"
-"%s."
+"Okno 0x%lx ima lastnost %s,\n"
+"za katero se je pričakovalo, da je vrste %s oblike %d,\n"
+"a je v resnici vrste %s oblike %d n_items %d.\n"
+"To je najverjetneje hrošč v programu in ne v upravljalniku oken.\n"
+"Okno ima 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 "Lastnost %s okna 0x%lx vsebuje neveljaven znak 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 "Lastnost %s okna 0x%lx vsebuje neveljaven znak UTF-8 za %d. predmet na seznamu\n"
 
 #: ../src/metacity.desktop.in.h:1
 msgid "Metacity"
@@ -1303,1272 +1283,1292 @@ msgstr "Način fokusiranja oken"
 msgid "Window title font"
 msgstr "Pisava naziva okna"
 
-#: ../src/prefs.c:434
-#, c-format
-msgid "Type of %s was not integer"
-msgstr "Vrsta %s ni celo število"
+#: ../src/ui/frames.c:1077
+msgid "Close Window"
+msgstr "Zapri okno"
+
+# G:1 K:1 O:0
+#: ../src/ui/frames.c:1080
+msgid "Window Menu"
+msgstr "Menu oken"
+
+# G:0 K:1 O:0
+#: ../src/ui/frames.c:1083
+msgid "Minimize Window"
+msgstr "Skrči okno"
+
+#: ../src/ui/frames.c:1086
+msgid "Maximize Window"
+msgstr "Razpri okno"
 
 # G:1 K:0 O:0
-#: ../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
+#: ../src/ui/frames.c:1089
+msgid "Unmaximize Window"
+msgstr "Pomanjšaj okno"
+
+# G:2 K:0 O:0
+#: ../src/ui/frames.c:1092
+msgid "Roll Up Window"
+msgstr "Zavij okno"
+
+#: ../src/ui/frames.c:1095
+msgid "Unroll Window"
+msgstr "Odvij okno"
+
+#: ../src/ui/frames.c:1098
+msgid "Keep Window On Top"
+msgstr "Ohrani okno na vrhu"
+
+#: ../src/ui/frames.c:1101
+msgid "Remove Window From Top"
+msgstr "Odstrani okno z vrha"
+
+# G:1 K:0 O:0
+#: ../src/ui/frames.c:1104
+msgid "Always On Visible Workspace"
+msgstr "Vedno na vidni delovni površini"
+
+#: ../src/ui/frames.c:1107
+msgid "Put Window On Only One Workspace"
+msgstr "Postavi okno na samo eno delovno površino"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:70
+msgid "Mi_nimize"
+msgstr "_Skrči"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:72
+msgid "Ma_ximize"
+msgstr "Ra_zpni"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:74
+msgid "Unma_ximize"
+msgstr "Pomanjšaj"
+
+# G:2 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:76
+msgid "Roll _Up"
+msgstr "_Zavij"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:78
+msgid "_Unroll"
+msgstr "_Odvij"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:80
+msgid "_Move"
+msgstr "_Premakni"
+
+# G:2 K:2 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:82
+msgid "_Resize"
+msgstr "Sp_remeni velikost"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:84
+msgid "Move Titlebar On_screen"
+msgstr "Premakni naslovno vrstico na _zaslon"
+
+#. 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 "Vedno na _vrhu"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:91
+msgid "_Always on Visible Workspace"
+msgstr "Vedno n_a vidni delovni površini"
+
+# G:1 K:0 O:0
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:93
+msgid "_Only on This Workspace"
+msgstr "Sam_o na tej delovni površini"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:95
+msgid "Move to Workspace _Left"
+msgstr "Premakni na _levo delovno površino"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:97
+msgid "Move to Workspace R_ight"
+msgstr "Premakni na _desno delovno površino"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:99
+msgid "Move to Workspace _Up"
+msgstr "Premakni na _zgornjo delovno površino"
+
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:101
+msgid "Move to Workspace _Down"
+msgstr "Premakni na _spodnjo delovno površino"
+
+# G:0 K:1 O:0
+#. separator
+#. Translators: Translate this string the same way as you do in libwnck!
+#: ../src/ui/menu.c:105
+msgid "_Close"
+msgstr "_Zapri"
+
+# G:1 K:0 O:0
+#: ../src/ui/menu.c:208
+msgid "Workspace 1_0"
+msgstr "Delovna površina 1_0"
+
+# G:2 K:0 O:0
+#: ../src/ui/menu.c:210
 #, c-format
-msgid "GConf key \"%s\" is set to an invalid type\n"
-msgstr "Ključ GConf \"%s\" je nastavljen na neveljavno vrsto\n"
+msgid "Workspace %s%d"
+msgstr "Delovna površina %s%d"
 
-#: ../src/prefs.c:1103
+#: ../src/ui/menu.c:390
+msgid "Move to Another _Workspace"
+msgstr "Premakni na dru_go delovno površino"
+
+#. 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"
+
+# G:2 K:1 O:0
+#. 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"
+
+# G:2 K:1 O:0
+#. 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"
+
+# G:5 K:2 O:0
+#. 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 "Meta"
+
+# G:0 K:2 O:0
+#. 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 "Hiper"
+
+# G:1 K:0 O:0
+#. 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"
+
+# G:0 K:1 O:0
+#. 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 "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
-msgstr "\"%s\", ki je bil najden v podatkovni zbirki nastavitev ni veljaven spremenilnik za miškine gumbe.\n"
+msgid "\"%s\" is not responding."
+msgstr "\"%s\" se ne odziva."
 
-#: ../src/prefs.c:1127
-#: ../src/prefs.c:1148
-#: ../src/prefs.c:1705
+#: ../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 "Lahko počakate za nadaljevanje ali pa na silo zaprete program."
+
+#: ../src/ui/metacity-dialog.c:107
+msgid "_Wait"
+msgstr "_Počakaj"
+
+#: ../src/ui/metacity-dialog.c:109
+msgid "_Force Quit"
+msgstr "_Vsili izhod"
+
+#: ../src/ui/metacity-dialog.c:206
+msgid "Title"
+msgstr "Naziv"
+
+# G:1 K:0 O:0
+#: ../src/ui/metacity-dialog.c:218
+msgid "Class"
+msgstr "Razred"
+
+# G:2 K:6 O:0
+#: ../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 "Ta okna ne podpirajo možnosti \"shranjevanja trenutnih nastavitev\", zato bodo morala biti ob vaši naslednji prijavi znova zagnana ročno."
+
+#: ../src/ui/metacity-dialog.c:310
 #, c-format
-msgid "GConf key '%s' is set to an invalid value\n"
-msgstr "Ključ GConf '%s' je nastavljen na neveljavno vrednost\n"
+msgid ""
+"There was an error running \"%s\":\n"
+"%s."
+msgstr ""
+"Med zagonom \"%s\" je prišlo do napake:\n"
+"%s."
 
-#: ../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, ki je shranjen v ključu GConf %s, ni običajen cursor_size; mora biti število med 1..128\n"
-
-#: ../src/prefs.c:1357
-#, c-format
-msgid "Could not parse font description \"%s\" from GConf key %s\n"
-msgstr "Ni mogoče razčleniti opisa \"%s\" iz ključa GConf %s\n"
-
-#: ../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 shranjen v ključu GConf %s ni normalno število delovnih površin, trenutno največje število je %d\n"
-
-#: ../src/prefs.c:1659
-msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
-msgstr "Obhodi za pokvarjene programe so izključeni. Nekateri programi se morda ne bodo pravilno obnašali.\n"
-
-#: ../src/prefs.c:1732
-#, c-format
-msgid "%d stored in GConf key %s is out of range 0 to %d\n"
-msgstr "%d shranjen v GConf ključu %s je izven meje med 0 in %d\n"
-
-#: ../src/prefs.c:1881
-#, c-format
-msgid "Error setting number of workspaces to %d: %s\n"
-msgstr "Napaka ob nastavljanju števila delovnih površin na %d: %s\n"
-
-#: ../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\" najden v podatkovni zbirki nastavitev ni veljaven ključ za tipkovno vez \"%s\"\n"
-
-#: ../src/prefs.c:2861
-#, c-format
-msgid "Error setting name for workspace %d to \"%s\": %s\n"
-msgstr "Napaka ob nastavljanju imena delovne površine %d na \"%s\": %s\n"
-
-#: ../src/resizepopup.c:113
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
 
-#: ../src/screen.c:410
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
-
-#: ../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 "Zaslon %d na prikazu \"%s\" že ima upravljalnik oken; poskušajte uporabiti možnost --replace za zamenjavo trenutnega upravljalnika zaslona.\n"
-
-#: ../src/screen.c:453
-#, c-format
-msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
-msgstr "Ni mogoče dobiti izbire upravljalnika oken na zaslonu %d prikaz \"%s\"\n"
-
-#: ../src/screen.c:511
-#, c-format
-msgid "Screen %d on display \"%s\" already has a window manager\n"
-msgstr "Zaslon %d na prikazu \"%s\" že ima upravljalnik oken\n"
-
-#: ../src/screen.c:721
-#, c-format
-msgid "Could not release screen %d on display \"%s\"\n"
-msgstr "Ni mogoče opustiti prikaza %d prikazu \"%s\"\n"
-
-#: ../src/session.c:826
-#: ../src/session.c:833
-#, c-format
-msgid "Could not create directory '%s': %s\n"
-msgstr "Ni mogoče ustvariti imenika %s %s\n"
-
-# G:2 K:0 O:0
-#: ../src/session.c:843
-#, c-format
-msgid "Could not open session file '%s' for writing: %s\n"
-msgstr "Ni mogoče odpreti datoteke seje '%s' za pisanje: %s\n"
-
-#: ../src/session.c:995
-#, c-format
-msgid "Error writing session file '%s': %s\n"
-msgstr "Napaka ob zapisovanju datoteke seje '%s': %s\n"
-
-#: ../src/session.c:1000
-#, c-format
-msgid "Error closing session file '%s': %s\n"
-msgstr "Napaka ob zapiranju datoteke seje '%s': %s\n"
-
-#: ../src/session.c:1075
-#, c-format
-msgid "Failed to read saved session file %s: %s\n"
-msgstr "Ni mogoče prebrati datoteke shranjene seje %s: %s\n"
-
-#: ../src/session.c:1110
-#, c-format
-msgid "Failed to parse saved session file: %s\n"
-msgstr "Ni mogoče razčleniti datoteke shranjene seje: %s\n"
-
-#: ../src/session.c:1159
-msgid "<metacity_session> attribute seen but we already have the session ID"
-msgstr "atribut <metacity_session> je bil viden, a mi že imamo ID seje"
-
-#: ../src/session.c:1172
-#, c-format
-msgid "Unknown attribute %s on <metacity_session> element"
-msgstr "Neznan atribut %s v elementu <metacity_session>"
-
-#: ../src/session.c:1189
-msgid "nested <window> tag"
-msgstr "gnezdena označba <window>"
-
-#: ../src/session.c:1247
-#: ../src/session.c:1279
-#, c-format
-msgid "Unknown attribute %s on <window> element"
-msgstr "Neznan atribut %s elementa <window>"
-
-#: ../src/session.c:1351
-#, c-format
-msgid "Unknown attribute %s on <maximized> element"
-msgstr "Neznan atribut %s elementa <maximize>"
-
-#: ../src/session.c:1411
-#, c-format
-msgid "Unknown attribute %s on <geometry> element"
-msgstr "Neznan atribut %s elementa <geometry>"
-
-#: ../src/session.c:1431
-#, c-format
-msgid "Unknown element %s"
-msgstr "Neznan element %s"
-
-#: ../src/session.c:1868
-#, c-format
-msgid "Error launching metacity-dialog to warn about apps that don't support session management: %s\n"
-msgstr "Napaka ob zaganjanju metacity-dialog za opozorilo o programih, ki ne podpirajo upravljanja seje: %s\n"
-
-#: ../src/theme-parser.c:227
-#: ../src/theme-parser.c:245
+#: ../src/ui/theme-parser.c:227
+#: ../src/ui/theme-parser.c:245
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "Vrstica %d, znak %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 "Atribut \"%s\" je bil v enakem elementu <%s> ponovljen dvakrat"
 
-#: ../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 "Atribut \"%s\" je v tem kontekstu v elementu <%s> neveljaven"
 
-#: ../src/theme-parser.c:500
+#: ../src/ui/theme-parser.c:500
 #, c-format
 msgid "Integer %ld must be positive"
 msgstr "Celoštevilska vrednost %ld mora biti pozitivna"
 
-#: ../src/theme-parser.c:508
+#: ../src/ui/theme-parser.c:508
 #, c-format
 msgid "Integer %ld is too large, current max is %d"
 msgstr "Celoštevilska vrednost %ld je prevelika, trenutna omejitev je %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 "Ni mogoče razčleniti \"%s\" kot števila s plavajočo vejico"
 
-#: ../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 "Vrednosti boolean morajo biti \"true\" ali \"false\" in ne \"%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 "Kot mora biti med 0.0 in 360.0, bil pa je %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 "Alfa mora biti med 0.0 (nevidno) in 1.0 (popolnoma vidno), bilo je %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,large,x-large,xx-large)\n"
 msgstr "Neveljavna velikost naziva \"%s\" (mora biti eno od 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 "Atributa \"%s\" ni v elementu <%s>"
 
-#: ../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 "ime <%s> \"%s\" je uporabljeno drugič"
 
-#: ../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 "nadrejeni predmet <%s> \"%s\" ni bil naveden"
 
-#: ../src/theme-parser.c:1057
+#: ../src/ui/theme-parser.c:1057
 #, c-format
 msgid "<%s> geometry \"%s\" has not been defined"
 msgstr "geometrija <%s> \"%s\" ni bila navedena"
 
-#: ../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> mora navesti ali geometrijo ali nadrejeni predmet, ki ima geometrijo"
 
-#: ../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 "Določiti morate ozadje, če želite, da ima alfa vrednost pomen."
 
-#: ../src/theme-parser.c:1203
+#: ../src/ui/theme-parser.c:1203
 #, c-format
 msgid "Unknown type \"%s\" on <%s> element"
 msgstr "Neznana vrsta \"%s\" v elementu <%s>"
 
-#: ../src/theme-parser.c:1214
+#: ../src/ui/theme-parser.c:1214
 #, c-format
 msgid "Unknown style_set \"%s\" on <%s> element"
 msgstr "Neznan style_set \"%s\" v elementu <%s>"
 
-#: ../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 "Vrsti okna \"%s\" je bil nabor sloga že določen"
 
-#: ../src/theme-parser.c:1258
+#: ../src/ui/theme-parser.c:1258
 msgid "Theme already has a fallback icon"
 msgstr "Tema že ima vzpostavitveno ikono"
 
-#: ../src/theme-parser.c:1270
+#: ../src/ui/theme-parser.c:1270
 msgid "Theme already has a fallback mini_icon"
 msgstr "Tema že ima vzpostavitveno mini ikono"
 
-#: ../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> ni dovoljen pod <%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 "Element <%s> nima atributa \"name\""
 
-#: ../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 "Element <%s> nima atributa \"value\""
 
-#: ../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 "Ni mogoče navesti obojega \"button_width\"/\"button_height\" in razmerje aspect ratio za gumbe"
 
-#: ../src/theme-parser.c:1434
+#: ../src/ui/theme-parser.c:1434
 #, c-format
 msgid "Distance \"%s\" is unknown"
 msgstr "Razdalja \"%s\" je neznana"
 
-#: ../src/theme-parser.c:1493
+#: ../src/ui/theme-parser.c:1493
 #, c-format
 msgid "Aspect ratio \"%s\" is unknown"
 msgstr "Razmerje \"%s\" je neznano"
 
-#: ../src/theme-parser.c:1537
+#: ../src/ui/theme-parser.c:1537
 #, c-format
 msgid "No \"top\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"top\""
 
-#: ../src/theme-parser.c:1544
+#: ../src/ui/theme-parser.c:1544
 #, c-format
 msgid "No \"bottom\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"bottom\""
 
-#: ../src/theme-parser.c:1551
+#: ../src/ui/theme-parser.c:1551
 #, c-format
 msgid "No \"left\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"left\""
 
-#: ../src/theme-parser.c:1558
+#: ../src/ui/theme-parser.c:1558
 #, c-format
 msgid "No \"right\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"right\""
 
-#: ../src/theme-parser.c:1590
+#: ../src/ui/theme-parser.c:1590
 #, c-format
 msgid "Border \"%s\" is unknown"
 msgstr "Rob \"%s\" je neznan"
 
-#: ../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 "Element <%s> nima atributa \"color\""
 
-#: ../src/theme-parser.c:1743
+#: ../src/ui/theme-parser.c:1743
 #, c-format
 msgid "No \"x1\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"x1\""
 
-#: ../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 "Element <%s> nima atributa \"y1\""
 
-#: ../src/theme-parser.c:1757
+#: ../src/ui/theme-parser.c:1757
 #, c-format
 msgid "No \"x2\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"x2\""
 
-#: ../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 "Element <%s> nima atributa \"y2\""
 
-#: ../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 "Element <%s> nima atributa \"x\""
 
-#: ../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 "Element <%s> nima atributa \"y\""
 
-#: ../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 "Element <%s> nima atributa \"width\""
 
-#: ../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 "Element <%s> nima atributa \"height\""
 
-#: ../src/theme-parser.c:1998
+#: ../src/ui/theme-parser.c:1998
 #, c-format
 msgid "No \"start_angle\" or \"from\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"start_angle\" ali \"from\""
 
-#: ../src/theme-parser.c:2005
+#: ../src/ui/theme-parser.c:2005
 #, c-format
 msgid "No \"extent_angle\" or \"to\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"extent_angle\" ali \"to\""
 
-#: ../src/theme-parser.c:2014
+#: ../src/ui/theme-parser.c:2014
 #, c-format
 msgid "No \"start_angle\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"start_angle\""
 
-#: ../src/theme-parser.c:2021
+#: ../src/ui/theme-parser.c:2021
 #, c-format
 msgid "No \"extent_angle\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"extent_angle\""
 
-#: ../src/theme-parser.c:2227
+#: ../src/ui/theme-parser.c:2227
 #, c-format
 msgid "No \"alpha\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"alpha\""
 
-#: ../src/theme-parser.c:2299
+#: ../src/ui/theme-parser.c:2299
 #, c-format
 msgid "No \"type\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"type\""
 
-#: ../src/theme-parser.c:2349
+#: ../src/ui/theme-parser.c:2349
 #, c-format
 msgid "Did not understand value \"%s\" for type of gradient"
 msgstr "Ni mogoče razumeti vrednost za vrsto preliva \"%s\""
 
-#: ../src/theme-parser.c:2436
+#: ../src/ui/theme-parser.c:2436
 #, c-format
 msgid "No \"filename\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"filename\""
 
-#: ../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 "Nerazpoznavna vrsta polnjenja \"%s\" za element <%s>"
 
-#: ../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 "Element <%s> nima atributa \"state\""
 
-#: ../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 "Element <%s> nima atributa \"shadow\""
 
-#: ../src/theme-parser.c:2623
+#: ../src/ui/theme-parser.c:2623
 #, c-format
 msgid "No \"arrow\" attribute on element <%s>"
 msgstr "Element <%s> nima atributa \"arrow\""
 
-#: ../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 "Ni mogoče razumeti stanja \"%s\" za element <%s>"
 
-#: ../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 "Ni mogoče razumeti senčenja \"%s\" za element <%s>"
 
-#: ../src/theme-parser.c:2696
+#: ../src/ui/theme-parser.c:2696
 #, c-format
 msgid "Did not understand arrow \"%s\" for <%s> element"
 msgstr "Ni mogoče razumeti puščice \"%s\" za element <%s>"
 
-#: ../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 "<draw_ops> imenovan \"%s\" ni bil naveden"
 
-#: ../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 "Vključevanje draw_ops \"%s\" tu, bi ustvarilo krožno nanašanje"
 
-#: ../src/theme-parser.c:3314
+#: ../src/ui/theme-parser.c:3314
 #, c-format
 msgid "No \"value\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"value\""
 
-#: ../src/theme-parser.c:3371
+#: ../src/ui/theme-parser.c:3371
 #, c-format
 msgid "No \"position\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"position\""
 
-#: ../src/theme-parser.c:3380
+#: ../src/ui/theme-parser.c:3380
 #, c-format
 msgid "Unknown position \"%s\" for frame piece"
 msgstr "Neznan položaj \"%s\" za del okvirja"
 
-#: ../src/theme-parser.c:3388
+#: ../src/ui/theme-parser.c:3388
 #, c-format
 msgid "Frame style already has a piece at position %s"
 msgstr "Slog okvirja že ima del na položaju %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 "Za ime \"%s\" ni bilo navedenega <draw_ops>"
 
-#: ../src/theme-parser.c:3433
+#: ../src/ui/theme-parser.c:3433
 #, c-format
 msgid "No \"function\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"function\""
 
-#: ../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 "Element <%s> nima atributa \"state\""
 
-#: ../src/theme-parser.c:3450
+#: ../src/ui/theme-parser.c:3450
 #, c-format
 msgid "Unknown function \"%s\" for button"
 msgstr "Neznana funkcija \"%s\" za gumb"
 
-#: ../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 "Funkcija gumba \"%s\" ne obstaja v tej različici (%d, zahtevana %d)"
 
-#: ../src/theme-parser.c:3471
+#: ../src/ui/theme-parser.c:3471
 #, c-format
 msgid "Unknown state \"%s\" for button"
 msgstr "Neznano stanje \"%s\" za gumb"
 
-#: ../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 "Slog okvirja že ima gumb za funkcijo %s stanje %s"
 
-#: ../src/theme-parser.c:3549
+#: ../src/ui/theme-parser.c:3549
 #, c-format
 msgid "No \"focus\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"fokus\""
 
-#: ../src/theme-parser.c:3565
+#: ../src/ui/theme-parser.c:3565
 #, c-format
 msgid "No \"style\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"style\""
 
-#: ../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\" ni veljavna vrednost za atribut \"focus\""
 
-#: ../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\" ni veljavna vrednost za atribut \"state\""
 
-#: ../src/theme-parser.c:3593
+#: ../src/ui/theme-parser.c:3593
 #, c-format
 msgid "A style called \"%s\" has not been defined"
 msgstr "Slog imenovan \"%s\" ni bil določen"
 
-#: ../src/theme-parser.c:3604
+#: ../src/ui/theme-parser.c:3604
 #, c-format
 msgid "No \"resize\" attribute on <%s> element"
 msgstr "Element <%s> nima atributa \"resize\""
 
-#: ../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\" ni veljavna vrednost za atribut \"resize\""
 
-#: ../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 states"
 msgstr "Element <%s> ne bi smel imeti atributa \"resize\" za razpeta/senčena stanja"
 
-#: ../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 "Element <%s> ne bi smel imeti atributa \"resize\" za razpeta stanja"
 
-#: ../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 "Slog za stanje %s resize %s fokus %s je bil že naveden"
 
-#: ../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 "Slog za stanje %s fokus %s je bil že naveden"
 
-#: ../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)"
 msgstr "Za element <piece> ni mogoče imeti dveh draw_ops (tema je navedla atribut draw_ops in hkrati element <draw_ops> ali navedena dva elementa)"
 
-#: ../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)"
 msgstr "Za element <button> ni mogoče imeti dveh draw_ops (tema je navedla atribut draw_ops in hkrati element <draw_ops> ali navedena dva elementa)"
 
-#: ../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)"
 msgstr "Za element <menu_icon> ni mogoče imeti dveh draw_ops (tema je navedla atribut draw_ops in hkrati element <draw_ops> ali navedena dva elementa)"
 
-#: ../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 "Najbolj zunanji element teme mora biti <metacity_theme> in ne <%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> ni dovoljen znotraj elementov name, author, date ali description"
 
-#: ../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> ni dovoljen znotraj elementa <constant>"
 
-#: ../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> ni dovoljen znotraj elementov distance/border/aspect_ration"
 
-#: ../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> ni dovoljen znotraj elementa operacije draw"
 
-#: ../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> ni dovoljen znotraj elementa <%s>"
 
-#: ../src/theme-parser.c:4203
+#: ../src/ui/theme-parser.c:4203
 msgid "No draw_ops provided for frame piece"
 msgstr "Za del okvirja ni naveden draw_ops"
 
-#: ../src/theme-parser.c:4218
+#: ../src/ui/theme-parser.c:4218
 msgid "No draw_ops provided for button"
 msgstr "Za gumb ni naveden draw_ops"
 
-#: ../src/theme-parser.c:4270
+#: ../src/ui/theme-parser.c:4270
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "Znotraj elementa <%s> besedilo ni dovoljeno"
 
-#: ../src/theme-parser.c:4325
+#: ../src/ui/theme-parser.c:4325
 msgid "<name> specified twice for this theme"
 msgstr "Za to temo je element <name> naveden dvakrat"
 
-#: ../src/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4336
 msgid "<author> specified twice for this theme"
 msgstr "Za to temo je element <author> naveden dvakrat"
 
-#: ../src/theme-parser.c:4347
+#: ../src/ui/theme-parser.c:4347
 msgid "<copyright> specified twice for this theme"
 msgstr "Za to temo je element <copyright> naveden dvakrat"
 
-#: ../src/theme-parser.c:4358
+#: ../src/ui/theme-parser.c:4358
 msgid "<date> specified twice for this theme"
 msgstr "Za to temo je element <date> naveden dvakrat"
 
-#: ../src/theme-parser.c:4369
+#: ../src/ui/theme-parser.c:4369
 msgid "<description> specified twice for this theme"
 msgstr "Za to temo je element <description> naveden dvakrat"
 
-#: ../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 "Ni mogoče najti veljavne datoteke za temo %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 "Datoteka teme %s ne vsebuje korenskega elementa <metacity_theme>"
 
-#: ../src/theme-viewer.c:74
+#: ../src/ui/theme-viewer.c:74
 msgid "/_Windows"
 msgstr "/_Okna"
 
-#: ../src/theme-viewer.c:75
+#: ../src/ui/theme-viewer.c:75
 msgid "/Windows/tearoff"
 msgstr "/Okna/odtrgaj"
 
-#: ../src/theme-viewer.c:76
+#: ../src/ui/theme-viewer.c:76
 msgid "/Windows/_Dialog"
 msgstr "/Okna/_Pogovorno okno"
 
-#: ../src/theme-viewer.c:77
+#: ../src/ui/theme-viewer.c:77
 msgid "/Windows/_Modal dialog"
 msgstr "/Okna/_Modalno okno"
 
-#: ../src/theme-viewer.c:78
+#: ../src/ui/theme-viewer.c:78
 msgid "/Windows/_Utility"
 msgstr "/Okna/P_ripomoček"
 
-#: ../src/theme-viewer.c:79
+#: ../src/ui/theme-viewer.c:79
 msgid "/Windows/_Splashscreen"
 msgstr "/Okna/Pre_dstavitveno okno"
 
-#: ../src/theme-viewer.c:80
+#: ../src/ui/theme-viewer.c:80
 msgid "/Windows/_Top dock"
 msgstr "/Okna/_Zgornje sidro"
 
-#: ../src/theme-viewer.c:81
+#: ../src/ui/theme-viewer.c:81
 msgid "/Windows/_Bottom dock"
 msgstr "/Okna/_Spodnje sidro"
 
-#: ../src/theme-viewer.c:82
+#: ../src/ui/theme-viewer.c:82
 msgid "/Windows/_Left dock"
 msgstr "/Okna/_Levo sidro"
 
-#: ../src/theme-viewer.c:83
+#: ../src/ui/theme-viewer.c:83
 msgid "/Windows/_Right dock"
 msgstr "/Okna/_Desno sidro"
 
-#: ../src/theme-viewer.c:84
+#: ../src/ui/theme-viewer.c:84
 msgid "/Windows/_All docks"
 msgstr "/Okna/_Vsa sidra"
 
-#: ../src/theme-viewer.c:85
+#: ../src/ui/theme-viewer.c:85
 msgid "/Windows/Des_ktop"
 msgstr "/Okna/_Namizje"
 
-#: ../src/theme-viewer.c:134
+#: ../src/ui/theme-viewer.c:134
 msgid "Open another one of these windows"
 msgstr "Odpri drugo izmed teh oken"
 
-#: ../src/theme-viewer.c:141
+#: ../src/ui/theme-viewer.c:141
 msgid "This is a demo button with an 'open' icon"
 msgstr "To je preizkusni gumb z ikono 'odpri'"
 
-#: ../src/theme-viewer.c:148
+#: ../src/ui/theme-viewer.c:148
 msgid "This is a demo button with a 'quit' icon"
 msgstr "To je preizkusni gumb z ikono 'izhod'"
 
-#: ../src/theme-viewer.c:241
+#: ../src/ui/theme-viewer.c:241
 msgid "This is a sample message in a sample dialog"
 msgstr "To je preizkusno sporočilo v pogovornem oknu"
 
-#: ../src/theme-viewer.c:324
+#: ../src/ui/theme-viewer.c:324
 #, c-format
 msgid "Fake menu item %d\n"
 msgstr "Ponarejen predmet menija %d\n"
 
-#: ../src/theme-viewer.c:358
+#: ../src/ui/theme-viewer.c:358
 msgid "Border-only window"
 msgstr "Okno samo z okvirjem"
 
-#: ../src/theme-viewer.c:360
+#: ../src/ui/theme-viewer.c:360
 msgid "Bar"
 msgstr "Vrstica"
 
-#: ../src/theme-viewer.c:377
+#: ../src/ui/theme-viewer.c:377
 msgid "Normal Application Window"
 msgstr "Običajno okno programa"
 
-#: ../src/theme-viewer.c:381
+#: ../src/ui/theme-viewer.c:381
 msgid "Dialog Box"
 msgstr "Pogovorno okno"
 
-#: ../src/theme-viewer.c:385
+#: ../src/ui/theme-viewer.c:385
 msgid "Modal Dialog Box"
 msgstr "Modalno pogovorno okno"
 
-#: ../src/theme-viewer.c:389
+#: ../src/ui/theme-viewer.c:389
 msgid "Utility Palette"
 msgstr "Paleta pripomočkov"
 
-#: ../src/theme-viewer.c:393
+#: ../src/ui/theme-viewer.c:393
 msgid "Torn-off Menu"
 msgstr "Odtrgan menu"
 
-#: ../src/theme-viewer.c:397
+#: ../src/ui/theme-viewer.c:397
 msgid "Border"
 msgstr "Okvir"
 
-#: ../src/theme-viewer.c:725
+#: ../src/ui/theme-viewer.c:725
 #, c-format
 msgid "Button layout test %d"
 msgstr "Preizkus razporeditve gumbov %d"
 
-#: ../src/theme-viewer.c:754
+#: ../src/ui/theme-viewer.c:754
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisekund za risanje ene sličice okna"
 
-#: ../src/theme-viewer.c:797
+#: ../src/ui/theme-viewer.c:797
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Uporaba: metacity-theme-viewer [IMETEME]\n"
 
-#: ../src/theme-viewer.c:804
+#: ../src/ui/theme-viewer.c:804
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Napaka pri nalaganju teme: %s\n"
 
-#: ../src/theme-viewer.c:810
+#: ../src/ui/theme-viewer.c:810
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Tema \"%s\" naložena v %g sekundah\n"
 
-#: ../src/theme-viewer.c:833
+#: ../src/ui/theme-viewer.c:833
 msgid "Normal Title Font"
 msgstr "Običajna pisava naslova"
 
-#: ../src/theme-viewer.c:839
+#: ../src/ui/theme-viewer.c:839
 msgid "Small Title Font"
 msgstr "Majhna pisava naslova"
 
-#: ../src/theme-viewer.c:845
+#: ../src/ui/theme-viewer.c:845
 msgid "Large Title Font"
 msgstr "Velika pisava naslova"
 
-#: ../src/theme-viewer.c:850
+#: ../src/ui/theme-viewer.c:850
 msgid "Button Layouts"
 msgstr "Razpored gumbov"
 
-#: ../src/theme-viewer.c:855
+#: ../src/ui/theme-viewer.c:855
 msgid "Benchmark"
 msgstr "Meritev"
 
-#: ../src/theme-viewer.c:902
+#: ../src/ui/theme-viewer.c:902
 msgid "Window Title Goes Here"
 msgstr "Tukaj je naslov okna"
 
-#: ../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 "Izrisanih %d sličic v %g sekundah odjemalca (%g milisekund na sličico) in %g sekund v času stenske ure, upoštevajoč sredstva strežnika X (%g milisekund na sličico)\n"
 
-#: ../src/theme-viewer.c:1225
+#: ../src/ui/theme-viewer.c:1225
 msgid "position expression test returned TRUE but set error"
 msgstr "preizkus izjave položaja je vrnil TRUE, a je nastavil napako"
 
-#: ../src/theme-viewer.c:1227
+#: ../src/ui/theme-viewer.c:1227
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "preizkus izjave položaja je vrnil FALSE, a ni nastavil napake"
 
-#: ../src/theme-viewer.c:1231
+#: ../src/ui/theme-viewer.c:1231
 msgid "Error was expected but none given"
 msgstr "Pričakovana je bila napaka, a do nje ni prišlo"
 
-#: ../src/theme-viewer.c:1233
+#: ../src/ui/theme-viewer.c:1233
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Pričakovana je bila napaka %d, vrnjeno pa je bilo %d"
 
-#: ../src/theme-viewer.c:1239
+#: ../src/ui/theme-viewer.c:1239
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Napaka ni bila pričakovana, a je bila kljub temu vrnjena: %s"
 
-#: ../src/theme-viewer.c:1243
+#: ../src/ui/theme-viewer.c:1243
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "vrednost x je bila %d, pričakovana pa %d"
 
-#: ../src/theme-viewer.c:1246
+#: ../src/ui/theme-viewer.c:1246
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "vrednost z je bila %d, pričakovana pa %d"
 
-#: ../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 "%d izjav koordinat razčlenjenih v %g sekundah (%g sekund v povprečju)\n"
 
-#: ../src/theme.c:208
+#: ../src/ui/theme.c:256
 msgid "top"
 msgstr "zgoraj"
 
 # G:12 K:5 O:0
-#: ../src/theme.c:210
+#: ../src/ui/theme.c:258
 msgid "bottom"
 msgstr "spodaj"
 
 # G:10 K:4 O:0
-#: ../src/theme.c:212
+#: ../src/ui/theme.c:260
 msgid "left"
 msgstr "levo"
 
 # G:1 K:0 O:0
-#: ../src/theme.c:214
+#: ../src/ui/theme.c:262
 msgid "right"
 msgstr "desno"
 
 # G:1 K:0 O:0
-#: ../src/theme.c:228
+#: ../src/ui/theme.c:289
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "geometrija okvirja ne navaja dimenzije \"%s\""
 
-#: ../src/theme.c:247
+#: ../src/ui/theme.c:308
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "geometrija okvirja ne navaja dimenzije \"%s\" za rob \"%s\""
 
-#: ../src/theme.c:284
+#: ../src/ui/theme.c:345
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Razmerje gumba %g ni smiselno"
 
-#: ../src/theme.c:296
+#: ../src/ui/theme.c:357
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Geometrija okvirja ne navaja velikosti gumbov"
 
-#: ../src/theme.c:927
+#: ../src/ui/theme.c:988
 msgid "Gradients should have at least two colors"
 msgstr "Prelivi bi morali imeti vsaj dve barvi"
 
-#: ../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] where NORMAL is the state; could not parse \"%s\""
 msgstr "Navedba barve GTK mora vsebovati stanje v oglatih oklepajih, npr. gtk:fg[NORMAL], kjer je NORMAL stanje; ni mogoče razčleniti \"%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:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "Navedbi barve GTK manjka oglati zaklepaj za stanjem, npr. gtk:fg[NORMAL], kjer je NORMAL stanje; ni mogoče razčleniti \"%s\""
 
-#: ../src/theme.c:1078
+#: ../src/ui/theme.c:1139
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Ni mogoče razumeti stanja \"%s\" v navedbi barve "
 
-#: ../src/theme.c:1091
+#: ../src/ui/theme.c:1152
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Ni mogoče razumeti barvne komponente \"%s\" v navedbi barve"
 
-#: ../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 format"
 msgstr "Oblika zapisa preliva je \"blend/bg_color/fg_color/alpha\", \"%s\" ne ustreza pravilni obliki"
 
-#: ../src/theme.c:1132
+#: ../src/ui/theme.c:1193
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "V prelivni barvi ni mogoče razčleniti vrednosti alfa \"%s\""
 
-#: ../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 "V prelivni barvi alfa vrednost \"%s\" ni med 0.0 in 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 "Oblika zapisa barve senčenja je \"shade/base_color/factor\", \"%s\" ne ustreza pravilni obliki."
 
-#: ../src/theme.c:1201
+#: ../src/ui/theme.c:1262
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Ni mogoče razčleniti faktorja senčenja \"%s\" v senčeni barvi"
 
-#: ../src/theme.c:1211
+#: ../src/ui/theme.c:1272
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "V senčeni barvi je faktor senčenja \"%s\" negativen"
 
-#: ../src/theme.c:1241
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Ni mogoče razčleniti barve \"%s\""
 
-#: ../src/theme.c:1462
+#: ../src/ui/theme.c:1560
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Izraz koordinat vsebuje znak '%s', ki ni dovoljen"
 
-#: ../src/theme.c:1489
+#: ../src/ui/theme.c:1587
 #, c-format
 msgid "Coordinate expression contains floating point number '%s' which could not be parsed"
 msgstr "Izraz koordinat vsebuje številko s plavajočo vejico '%s', ki ne more biti razčlenjena"
 
-#: ../src/theme.c:1503
+#: ../src/ui/theme.c:1601
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Izraz koordinat vsebuje celo število '%s', ki ga ni mogoče razčleniti"
 
-#: ../src/theme.c:1610
+#: ../src/ui/theme.c:1723
 #, c-format
 msgid "Coordinate expression contained unknown operator at the start of this text: \"%s\""
 msgstr "Izraz koordinat vsebuje neznan operator na pričetku besedila: \"%s\""
 
-#: ../src/theme.c:1667
+#: ../src/ui/theme.c:1780
 msgid "Coordinate expression was empty or not understood"
 msgstr "Izraz koordinat je prazen ali ni razumljen"
 
-#: ../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 "Izraz koordinat se povzroči deljenje z ničlo"
 
-#: ../src/theme.c:1816
+#: ../src/ui/theme.c:1943
 msgid "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Izraz koordinat poskuša uporabiti operator mod ali številko s plavajočo vejico"
 
-#: ../src/theme.c:1872
+#: ../src/ui/theme.c:1999
 #, c-format
 msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Izraz koordinat vsebuje operator \"%s\", kjer je pričakovan operand"
 
-#: ../src/theme.c:1881
+#: ../src/ui/theme.c:2008
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Izraz koordinat vsebuje operand kjer je pričakovan operator"
 
-#: ../src/theme.c:1889
+#: ../src/ui/theme.c:2016
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Izraz koordinat se konča z operatorjem namesto z operandom"
 
-#: ../src/theme.c:1899
+#: ../src/ui/theme.c:2026
 #, c-format
 msgid "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"
 msgstr "Izraz koordinat vsebuje operator \"%c\", ki sledi operatorju \"%c\", brez vmesnega operanda"
 
-#: ../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 "Izraz koordinat vsebuje neznano spremenljivko ali konstanto \"%s\""
 
-#: ../src/theme.c:2108
+#: ../src/ui/theme.c:2268
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Razčlenjevalnik izrazov koordinat je preplavil medpomnilnik."
 
-#: ../src/theme.c:2137
+#: ../src/ui/theme.c:2297
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Izraz koordinat vsebuje zaklepaj, a ne oklepaja"
 
-#: ../src/theme.c:2201
+#: ../src/ui/theme.c:2361
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Izraz koordinat vsebuje uklepaj, vendar je brez zaklepaja"
 
-#: ../src/theme.c:2212
+#: ../src/ui/theme.c:2372
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Videti je, da izraz koordinat ne vsebuje operatorjev ali operandov"
 
-#: ../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 "Tema vsebuje izraz, ki je povzročil napako: %s\n"
 
-#: ../src/theme.c:3942
+#: ../src/ui/theme.c:4133
 #, c-format
 msgid "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"
 msgstr "za ta slog okvirja mora biti naveden <button function=\"%s\" state=\"%s\" draw_ops=\"karkoli\"/>"
 
-#: ../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 "Manjka <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"karkoli\"/>"
 
-#: ../src/theme.c:4487
+#: ../src/ui/theme.c:4678
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Nalaganje teme \"%s\" ni uspelo: %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 "Ni nastavljen <%s> za temo \"%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 type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "Slog okvirja za okno vrste \"%s\" v temi \"%s\" ni nastavljen, dodajte element <window type=\"%s\" style_set=\"whatever\"/>"
 
-#: ../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 "Uporabniško določene konstante se morajo začeti z veliko črko; \"%s\" se ne"
 
-#: ../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 "Konstanta \"%s\" je bila že določena"
 
-#: ../src/util.c:98
+#: ../src/tools/metacity-message.c:150
 #, c-format
-msgid "Failed to open debug log: %s\n"
-msgstr "Odpiranje razhroščevalnega dnevnika ni uspelo: %s\n"
-
-#: ../src/util.c:108
-#, c-format
-msgid "Failed to fdopen() log file %s: %s\n"
-msgstr "Odpiranje dnevniške datoteke %s s fdopen() ni uspelo: %s\n"
-
-#: ../src/util.c:114
-#, c-format
-msgid "Opened log file %s\n"
-msgstr "Odpri dnevniško datoteko %s\n"
-
-#: ../src/util.c:231
-msgid "Window manager: "
-msgstr "Upravljavec oken: "
-
-# G:4 K:0 O:0
-#: ../src/util.c:379
-msgid "Bug in window manager: "
-msgstr "Hrošč v upravljavcu oken: "
-
-#: ../src/util.c:408
-msgid "Window manager warning: "
-msgstr "Opozorilo upravljavca oken: "
-
-#: ../src/util.c:432
-msgid "Window manager error: "
-msgstr "Napaka upravljavca oken: "
-
-#: ../src/window-props.c:192
-#, c-format
-msgid "Application set a bogus _NET_WM_PID %lu\n"
-msgstr "Program je nastavil pokvarjen _NET_WM_PID %lu\n"
-
-#: ../src/window-props.c:324
-#, c-format
-msgid "%s (on %s)"
-msgstr "%s (na %s)"
-
-#: ../src/window-props.c:1406
-#, c-format
-msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
-msgstr "Neveljaven WM_TRANSIENT_FOR za okno 0x%lx naveden za %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 "Okno %s nastavi svoj SM_CLIENT_ID, namesto, da bi nastavilo WM_CLIENT_LEADER kot je zavedeno v 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 "Okno %s določi namig MWM, ki pove, da ni mogoče spremeniti velikosti, hkrati pa določi najmanjšo velikost na %d x %d in največjo na %d x %d; vrednost ni smiselna.\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 ""
-"Okno 0x%lx ima lastnost %s,\n"
-"za katero se je pričakovalo, da je vrste %s oblike %d,\n"
-"a je v resnici vrste %s oblike %d n_items %d.\n"
-"To je najverjetneje hrošč v programu in ne v upravljalniku oken.\n"
-"Okno ima 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 "Lastnost %s okna 0x%lx vsebuje neveljaven znak UTF-8\n"
-
-#: ../src/xprops.c:484
-#, c-format
-msgid "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
-msgstr "Lastnost %s okna 0x%lx vsebuje neveljaven znak UTF-8 za %d. predmet na seznamu\n"
+msgid "Usage: %s\n"
+msgstr "Uporaba: %s\n"