diff --git a/mcs-plugin/xfce-wm-settings.desktop b/mcs-plugin/xfce-wm-settings.desktop
index 3fa9155fdad00a93adbce47304babdf3d13303c9..42ac58234e5ff30802d3eefa4ec174c11cdd4608 100644
--- a/mcs-plugin/xfce-wm-settings.desktop
+++ b/mcs-plugin/xfce-wm-settings.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
 Name=Xfce 4 Window Manager Settings
+Name[et]=Xfce 4 aknahalduri seaded
 Name[fr]=Paramètres du gestionnaire de fenêtres de Xfce 4
 Name[he]=הגדרות מנהל החלונות Xfce 4
 Name[ko]=Xfce 4 창관리자 설정
 Name[nl]=Instellingen Xfce 4 Window Manager
 Name[zh_TW]=Xfce 4 視窗管理程式設定
 Comment=Window Manager Settings
+Comment[et]=Aknahalduri seaded
 Comment[fr]=Paramétrage du gestionnaire de fenêtres
 Comment[he]=הגדרות מנהל החלונות
 Comment[ko]=창관리자 설정
@@ -19,5 +22,6 @@ Type=Application
 Categories=X-XFCE;Settings;DesktopSettings;
 OnlyShowIn=XFCE;
 GenericName=Window Manager Settings
+GenericName[et]=Aknahalduri seaded
 GenericName[ko]=창관리자 설정
 GenericName[nl]=Instellingen Window Manager
diff --git a/mcs-plugin/xfce-workspaces-settings.desktop b/mcs-plugin/xfce-workspaces-settings.desktop
index 1f1ee20060716abbf4c4321b8cc532f03b21f170..04f4688105a8be4df80b5d0deb8577dfedf228b5 100644
--- a/mcs-plugin/xfce-workspaces-settings.desktop
+++ b/mcs-plugin/xfce-workspaces-settings.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
+Version=1.0
 Encoding=UTF-8
 Name=Xfce 4 Workspaces Settings
+Name[et]=Xfce 4 töölaua seaded
 Name[fr]=Paramètres des espaces virtuels de Xfce 4
 Name[he]=הגדרות סביבות העבודה Xfce 4
 Name[ko]=Xfce 4 작업공간 설정
 Name[nl]=Instellingen Xfce 4 Virtuele Bureaubladen
 Name[zh_TW]=Xfce 4 工作區設定
 Comment=Workspaces Settings
+Comment[et]=Töölaua seaded
 Comment[fr]=Paramétrage des espaces virtuels
 Comment[he]=הגדרות סביבות העבודה
 Comment[ko]=작업공간 설정
@@ -19,5 +22,7 @@ Type=Application
 Categories=X-XFCE;Settings;DesktopSettings;
 OnlyShowIn=XFCE;
 GenericName=Workspaces Settings
+Genericname[et]=Töölaua seaded
 GenericName[ko]=작업공간 설정
 GenericName[nl]=Instellingen Virtuele Bureaubladen
+
diff --git a/po/et.gmo b/po/et.gmo
index b9087a4de03ddce5e7336d2218230a014efe4ea1..f49f9f3ed3273e9c2e8aa2a8aa7c47f466811711 100644
Binary files a/po/et.gmo and b/po/et.gmo differ
diff --git a/po/et.po b/po/et.po
index e074d7eb23ffb7195fc96242e2b4843b2432a305..6c4b3d00fd7515df3ab34d211979110692595909 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfwm4 VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-10 06:26+0100\n"
-"PO-Revision-Date: 2004-02-03 10:04+0200\n"
-"Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
-"Language-Team: Estonian <et@li.org>\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2004-12-09 01:45+0300\n"
+"Last-Translator: Mart Tõnso <mart.tonso@ttu.ee>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,8 +19,7 @@ msgid "Workspace Margins"
 msgstr "Tööala ääred"
 
 #: mcs-plugin/margins.c:137
-msgid ""
-"Margins are areas on the edges of the screen where no window will be placed"
+msgid "Margins are areas on the edges of the screen where no window will be placed"
 msgstr "Ääred on alad ekraani äärtes, kuhu aknaid ei paigutata"
 
 #: mcs-plugin/margins.c:168
@@ -39,12 +38,15 @@ msgstr "Ãœlemine :"
 msgid "Bottom :"
 msgstr "Alumine :"
 
-#: mcs-plugin/plugin.c:109 mcs-plugin/plugin.c:152
+#: mcs-plugin/plugin.c:109
+#: mcs-plugin/plugin.c:152
 msgid "Workspaces and Margins"
 msgstr "Tööruumid ja ääred"
 
 #. Number of workspaces
-#: mcs-plugin/plugin.c:135 mcs-plugin/plugin.c:166 mcs-plugin/workspaces.c:544
+#: mcs-plugin/plugin.c:135
+#: mcs-plugin/plugin.c:166
+#: mcs-plugin/workspaces.c:544
 msgid "Workspaces"
 msgstr "Tööruumid"
 
@@ -56,11 +58,16 @@ msgstr "Ääred"
 msgid "Change name"
 msgstr "Muuda nime"
 
-#: mcs-plugin/workspaces.c:355 mcs-plugin/xfwm4_shortcuteditor.c:482
-#: mcs-plugin/xfwm4_shortcuteditor.c:491 mcs-plugin/xfwm4_shortcuteditor.c:500
-#: mcs-plugin/xfwm4_shortcuteditor.c:509 mcs-plugin/xfwm4_shortcuteditor.c:518
-#: mcs-plugin/xfwm4_shortcuteditor.c:527 mcs-plugin/xfwm4_shortcuteditor.c:536
-#: mcs-plugin/xfwm4_shortcuteditor.c:545 mcs-plugin/xfwm4_shortcuteditor.c:554
+#: mcs-plugin/workspaces.c:355
+#: mcs-plugin/xfwm4_shortcuteditor.c:482
+#: mcs-plugin/xfwm4_shortcuteditor.c:491
+#: mcs-plugin/xfwm4_shortcuteditor.c:500
+#: mcs-plugin/xfwm4_shortcuteditor.c:509
+#: mcs-plugin/xfwm4_shortcuteditor.c:518
+#: mcs-plugin/xfwm4_shortcuteditor.c:527
+#: mcs-plugin/xfwm4_shortcuteditor.c:536
+#: mcs-plugin/xfwm4_shortcuteditor.c:545
+#: mcs-plugin/xfwm4_shortcuteditor.c:554
 #, c-format
 msgid "Workspace %d"
 msgstr "Tööruum %d"
@@ -106,15 +113,18 @@ msgstr "Suurenda"
 msgid "Close"
 msgstr "Sulge"
 
-#: mcs-plugin/xfwm4_plugin.c:86 mcs-plugin/xfwm4_shortcuteditor.c:371
+#: mcs-plugin/xfwm4_plugin.c:86
+#: mcs-plugin/xfwm4_shortcuteditor.c:371
 msgid "Shade window"
 msgstr "Varja aken"
 
-#: mcs-plugin/xfwm4_plugin.c:87 mcs-plugin/xfwm4_shortcuteditor.c:366
+#: mcs-plugin/xfwm4_plugin.c:87
+#: mcs-plugin/xfwm4_shortcuteditor.c:366
 msgid "Hide window"
 msgstr "Peida aken"
 
-#: mcs-plugin/xfwm4_plugin.c:88 mcs-plugin/xfwm4_shortcuteditor.c:351
+#: mcs-plugin/xfwm4_plugin.c:88
+#: mcs-plugin/xfwm4_shortcuteditor.c:351
 msgid "Maximize window"
 msgstr "Suurenda aken"
 
@@ -158,7 +168,8 @@ msgstr "Varjatud"
 msgid "Font Selection Dialog"
 msgstr "Fondi valimise dialoog"
 
-#: mcs-plugin/xfwm4_plugin.c:1384 mcs-plugin/xfwm4_plugin.c:1903
+#: mcs-plugin/xfwm4_plugin.c:1384
+#: mcs-plugin/xfwm4_plugin.c:1903
 msgid "Window Manager"
 msgstr "Aknahaldur"
 
@@ -191,11 +202,13 @@ msgstr "Stiil"
 msgid "Window shortcuts"
 msgstr "Akende kiirklahvid"
 
-#: mcs-plugin/xfwm4_plugin.c:1511 mcs-plugin/xfwm4_plugin.c:1544
+#: mcs-plugin/xfwm4_plugin.c:1511
+#: mcs-plugin/xfwm4_plugin.c:1544
 msgid "Command"
 msgstr "Käsk"
 
-#: mcs-plugin/xfwm4_plugin.c:1516 mcs-plugin/xfwm4_plugin.c:1548
+#: mcs-plugin/xfwm4_plugin.c:1516
+#: mcs-plugin/xfwm4_plugin.c:1548
 msgid "Shortcut"
 msgstr "Kiirklahvid"
 
@@ -275,11 +288,13 @@ msgstr "Haagi aknaid teiste akende külge"
 msgid "Distance :"
 msgstr "Kaugus :"
 
-#: mcs-plugin/xfwm4_plugin.c:1699 mcs-plugin/xfwm4_plugin.c:1749
+#: mcs-plugin/xfwm4_plugin.c:1699
+#: mcs-plugin/xfwm4_plugin.c:1749
 msgid "Small"
 msgstr "Väike"
 
-#: mcs-plugin/xfwm4_plugin.c:1705 mcs-plugin/xfwm4_plugin.c:1755
+#: mcs-plugin/xfwm4_plugin.c:1705
+#: mcs-plugin/xfwm4_plugin.c:1755
 msgid "Wide"
 msgstr "Suur"
 
@@ -327,7 +342,8 @@ msgstr "Edasijõudnud"
 msgid "Do you really want to remove this keybinding theme ?"
 msgstr "Kas sa tahad selle kiirklahvide teema kustutada?"
 
-#: mcs-plugin/xfwm4_shortcuteditor.c:121 mcs-plugin/xfwm4_shortcuteditor.c:127
+#: mcs-plugin/xfwm4_shortcuteditor.c:121
+#: mcs-plugin/xfwm4_shortcuteditor.c:127
 msgid "Add keybinding theme"
 msgstr "Lisa kiirklahvide teema"
 
@@ -512,7 +528,8 @@ msgstr ""
 "Ei õnnestu avada %s : \n"
 "%s"
 
-#: mcs-plugin/xfwm4_shortcuteditor.c:873 mcs-plugin/xfwm4_shortcuteditor.c:884
+#: mcs-plugin/xfwm4_shortcuteditor.c:873
+#: mcs-plugin/xfwm4_shortcuteditor.c:884
 #, c-format
 msgid ""
 "Cannot write in %s : \n"
@@ -610,7 +627,8 @@ msgstr "_Eemalda nael"
 msgid "Context _help"
 msgstr "Konteksti _abi"
 
-#: src/menu.c:49 src/menu.c:50
+#: src/menu.c:49
+#: src/menu.c:50
 msgid "Always on top"
 msgstr "Alati kõige peal"
 
@@ -644,7 +662,7 @@ msgstr "Töölaud %i (%s)"
 msgid "Workspace %i"
 msgstr "Töölaud %i"
 
-#: src/menu.c:416
+#: src/menu.c:422
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr "%s: 'GtkMenu'-l ebaõnnestus kursori haaramine\n"
@@ -677,67 +695,3 @@ msgstr "Lülitu ..."
 msgid "Unknown application!"
 msgstr "Tundmatu rakendus!"
 
-#~ msgid "Workspace 1"
-#~ msgstr "Töölaud 1"
-
-#~ msgid "Workspace 2"
-#~ msgstr "Töölaud 2"
-
-#~ msgid "Workspace 3"
-#~ msgstr "Töölaud 3"
-
-#~ msgid "Workspace 4"
-#~ msgstr "Töölaud 4"
-
-#~ msgid "Workspace 5"
-#~ msgstr "Töölaud 5"
-
-#~ msgid "Workspace 6"
-#~ msgstr "Töölaud 6"
-
-#~ msgid "Workspace 7"
-#~ msgstr "Töölaud 7"
-
-#~ msgid "Workspace 8"
-#~ msgstr "Töölaud 8"
-
-#~ msgid "Workspace 9"
-#~ msgstr "Töölaud 9"
-
-#~ msgid "%s: Operation not supported (yet)\n"
-#~ msgstr "%s: Operatsioon pole (veel) toetatud\n"
-
-#~ msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
-#~ msgstr "%s: haldamata net_wm_state (window 0x%lx)"
-
-#, fuzzy
-#~ msgid "%s: Another compositing manager is running on screen %i"
-#~ msgstr "%s: Mingi aknahaldur juba töötab"
-
-#, fuzzy
-#~ msgid "%s: Cannot create root picture on screen %i"
-#~ msgstr "%s: Ei suutnud tekitada aktiivitu värvi %s\n"
-
-#~ msgid "%s: Another Window Manager is already running"
-#~ msgstr "%s: Mingi aknahaldur juba töötab"
-
-#~ msgid "%s: Missing data from default files"
-#~ msgstr "%s: Puuduvad andmed vaikimisi failidest"
-
-#~ msgid "%s: Failed to enter daemon mode: %s"
-#~ msgstr "%s: Deemoni režiimi sisenemine ebaõnnestus: %s"
-
-#~ msgid "%s: Failed to create new process: %s"
-#~ msgstr "%S: Uue protsessi loomine ebaõnnestus: %s"
-
-#~ msgid "%s: Unknown error occured"
-#~ msgstr "%s: Juhtus tundmatu viga"
-
-#~ msgid "%s: Missing defaults file"
-#~ msgstr "%s: Puudub vaikeandmete fail"
-
-#~ msgid "%s: specified key theme \"%s\" missing, using default"
-#~ msgstr "%s: määratud klahvi teema \"%s\" puudub, kasutan vaikimist"
-
-#~ msgid "%s: Missing values in defaults file"
-#~ msgstr "%s: Puuduvad väärtused algandmete failis"