Sync translations with transifex

author: Stefano Karapetsas <[email protected]> 2013-10-11 11:54:05 +0200
committer: Stefano Karapetsas <[email protected]> 2013-10-11 11:54:05 +0200
commit: 009111b1ce05e1fb3b787254a4fd0d780c6c483c (patch)
tree: 793db5d72353fa9042952a90abdc1cff627d4c28 /po
parent: e5734e2b6017c36fca8ab2403ed6cabfa7ef0d23 (diff)
download: mate-menus-009111b1ce05e1fb3b787254a4fd0d780c6c483c.tar.bz2
mate-menus-009111b1ce05e1fb3b787254a4fd0d780c6c483c.tar.xz
89 files changed, 6171 insertions, 16794 deletions
diff --git a/po/af.po b/po/af.po
index d508efb..374fb61 100644
--- a/po/af.po
+++ b/po/af.po
@@ -1,258 +1,170 @@
-# Afrikaans translation of mate-menus
-# This file is distributed under the same license as the mate-menus package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # F Wolff <[email protected]>, 2008
+# nato323 <[email protected]>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-22 00:23+0200\n"
-"PO-Revision-Date: 2008-09-15 20:46+0200\n"
-"Last-Translator: F Wolff <[email protected]>\n"
-"Language-Team: [email protected]\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-05 14:32+0000\n"
+"Last-Translator: nato323 <[email protected]>\n"
+"Language-Team: Afrikaans (http://www.transifex.com/projects/p/MATE/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: VirTaal 0.1\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimediakieslys"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Klank & video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimedia menu"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmering"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Gereedskap vir sagtewareontwikkeling"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Opvoeding"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Speletjies"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Speletjies en vermaak"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafika-toepassings"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardeware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
-msgstr "Instellings vir verskeie hardewaretoestelle"
+msgstr "Stellings vir verskeie hardewaretoestelle"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet en netwerk"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
-msgstr "Netwerkverwante instellings"
+msgstr "Netwerkverwante stellings"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
-msgstr "Voorkoms en gedrag"
+msgstr "Verskyning en gedrag"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
-msgstr "Instellings wat die werkskerm se voorkoms en gedrag beheer"
+msgstr "Instellings wat die werkskerm se verskyning en gedrag beheer"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programme vir Internettoegang soos web en e-pos"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Kantoor"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Kantoortoepassings"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
-msgstr "Persoonlike instellings"
+msgstr "Persoonlike stellings"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administrasie"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Wysig instellings stelselwyd (affekteer alle gebruikers)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Persoonlike voorkeure"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Voorkeure"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Persoonlike voorkeure"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Stelsel"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Stelselinstellings"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Stelselgereedskap"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Stelselopstelling en monitering"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universele toegang"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Verstelling van universele toegang"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Toebehore"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Werkskermtoebehore"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Toepassings"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Persoonlike voorkeure en administrasie-instellings"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Toepassings wat nie in ander kategorieë pas nie"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Ander"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Kieslysredigeerder"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Redigeer kieslyste"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Toepassings:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Verstekwaardes"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Kieslyste:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Naam"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Wys"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Kan nie tuisgids vind nie: nie aangedui in /etc/passwd nie een geen waarde "
-"vir $HOME in die omgewing nie"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Kieslyslêer"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr ""
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr ""
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr ""
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr ""
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr ""
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr ""
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr ""
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr ""
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Voorkeure aangaande universele toegang"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Persoonlike voorkeure en instellings"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Toepassings wat nie in ander kategorieë pas nie"
diff --git a/po/an.po b/po/an.po
index ccdf461..905e5c3 100644
--- a/po/an.po
+++ b/po/an.po
@@ -1,211 +1,169 @@
-# Aragonese translations mate-menus.
-# Copyright (C) 2010 Mate Foundation
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Daniel Martinez <[email protected]>, 2010.
-#
+# 
+# Translators:
+# Daniel Martinez <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD.an\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2010-09-15 06:57+0000\n"
-"PO-Revision-Date: 2010-04-24 02:30+0200\n"
-"Last-Translator: Daniel Martinez <[email protected]>\n"
-"Language-Team: Aragonés <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Aragonese (http://www.transifex.com/projects/p/MATE/language/an/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: an\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menú de programas multimedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Vidio y soniu"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menú de programas multimedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programacion"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Ainas ta lo desarrollo de software"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Educacion"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Chuegos"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Chuegos y distraccions"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graficos"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicacions graficas"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Propiedaz ta varios dispositivos de hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet y rete"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Propiedatz arredol d'o rete"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Visualizacion y comportamiento"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Propiedaz que controlan l'apariencia y o comportamiento d'o escritorio"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programas ta l'acceso a internet, tals como web y e-mail"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Oficina"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicacions d'oficina"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Presonal"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Peferencias presonals"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Almenistracion"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Cambear as preferencias globals d'o sistema (ta toz os usuarios)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferencias presonals "
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferencias presonals "
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Preferencias d'o sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Ainas d'o sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuracion y monitorizacion d'o sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Acceso universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Preferencias d'acceso universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accesorios"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accesorios d'o escritorio"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferencias presonals y opcions d'almenistracion"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicacions que no dentran en denguna atra categoria"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Atras"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor d'o menu"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Editar menus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplicacions:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Predeterminaus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menus:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Editor simple d'o menu %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nome"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Amostrar"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"No s'ha puesto trobar lo direutorio presonal: no ye estableciu en o /etc/"
-"passwd y no bi ha dengun valor en a variable d'entorno $HOME"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicacions que no dentran en denguna atra categoria"
diff --git a/po/ar.po b/po/ar.po
index accbbec..9bbc3cb 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,270 +1,173 @@
-# translation of mate-menus.HEAD.po to Arabic
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER, 2005.
-# Djihed Afifi <[email protected]>, 2006.
-# Khaled Hosny <[email protected]>, 2006, 2007, 2008, 2009.
-# Anas Husseini <[email protected]>, 2007.
+# 
+# Translators:
+# linostar <[email protected]>, 2007
+# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER, 2005
+# Djihed Afifi <[email protected]>, 2006
+# Khaled Hosny <[email protected]>, 2006-2009
+# moceap <[email protected]>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-20 21:13+0300\n"
-"PO-Revision-Date: 2009-08-20 21:17+0300\n"
-"Last-Translator: Khaled Hosny <[email protected]>\n"
-"Language-Team: Arabic <[email protected]>\n"
-"Language: ar\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2013-10-05 15:11+0000\n"
+"Last-Translator: mauron\n"
+"Language-Team: Arabic (http://www.transifex.com/projects/p/MATE/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.4.0\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "المرئيّات و الصوتيّات"
+
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
 msgid "Multimedia menu"
 msgstr "قائمة الوسائط المتعدّدة"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:2
-msgid "Sound & Video"
-msgstr "صوت و فيديو"
-
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "برمجة"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "أدوات لتطوير البرامج"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "تعليمي"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "ألعاب"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "الألعاب و التسلية"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "رسوميات"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "تطبيقات الرّسوميات"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "عتاد"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "إعدادات للعديد من أجهزة العتاد"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "الإنترنت والشبكة"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "الإعدادات المتعلّقة بالشبكة"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "المظهر"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "إعدادات تتحكّم في مظهر وسلوك سطح المكتب"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
-msgstr "إنترنت"
+msgstr "الشّابكة"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
-msgstr "برامج للنّفاذ إلى الإنترنت مثل الوب و البريد الإلكتروني"
+msgstr "برامج للنّفاذ إلى الشّابكة مثل الوب و البريد الإلكتروني"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "مكتب"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "التطبيقات المكتبيّة"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "شخصي"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "الإعدادات الشخصيّة"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "إدارة"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "غيّر إعدادات النظام العامة (يؤثّر على جميع المستخدمين)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "التفضيلات الشخصيّة"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "تفضيلات"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "التفضيلات الشخصيّة"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "نظام"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "إعدادات النظام"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "أدوات النّظام"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "إعداد و مراقبة النّظام"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "الإتاحة"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "إعدادات الإتاحة"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "ملحقات"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ملحقات سطح المكتب"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "تطبيقات"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "التفضيلات الشخصيّة و إعدادات الإدارة"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "تطبيقات لا تندرج تحت الفئات الأخرى"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "أخرى"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "محرر القوائم"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "حرّر القوائم"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "ال_تطبيقات:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "ال_مبدئيات"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "ال_قوائم:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "محرر القوائم البسيط %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "الاسم"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "اعرض"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"لا يمكن العثور على الدليل المنزلي: غير مضبوط في ‎/etc/passwd ‏ولا قيمة لمتغيّر "
-"البيئة ‎$HOME"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "ملف القائمة"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "ارصد تغيرات القوائم"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "اشمل المدخلات المستبعدة"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "اشمل مدخلات NoDisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "رقم ملف سطح مكتب غير صحيح"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[اسم ملف غير صالح]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <مستبعدة>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== تغيرت القائمة، تتم إعادة التحميل ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "شجرة القوائم خالية"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- اختبر تَنْفِيذ جنوم لمُوَاصِفَات قائمة سطح المكتب"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "تطبيقات لا تندرج تحت الفئات الأخرى"
diff --git a/po/as.po b/po/as.po
index 01e8cf6..b0dc50b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1,277 +1,169 @@
-# translation of as.po to Assamese
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Amitakhya Phukan <[email protected]>, 2007, 2009.
+# 
+# Translators:
+# Amitakhya Phukan <[email protected]>, 2007, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: as\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-09-21 09:40+0530\n"
-"Last-Translator: \n"
-"Language-Team: Assamese <>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Assamese (http://www.transifex.com/projects/p/MATE/language/as/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
-"Plural-Forms: nplurals=2; plural=(n!=1)\n"
+"Language: as\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "মাল্টি-মিডিয়া তালিকা"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "শব্দ ও ভিডিও"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "মাল্টি-মিডিয়া তালিকা"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "প্ৰোগ্ৰামিং"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "চালনাজ্ঞান উন্নয়নৰ সামগ্ৰী"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "শিক্ষাবিষয়ক বস্তু"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "খেলা"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "খেলা ও বিনোদন"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "গ্ৰাফিক্স"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "চাত্ৰাঙ্কিত অনুপ্ৰয়োগ"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "যান্ত্ৰিক সামগ্ৰী"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "বিবিধ যন্ত্ৰৰ সামগ্ৰীৰ সংক্ৰান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ইন্টাৰনেট ও নেটৱৰ্ক"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "নেটৱৰ্ক সংক্ৰান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "চেহেৰা ছবি"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ডেস্কটপৰ চেহেৰা ও আচৰণ নিয়ন্ত্ৰণকাৰী বৈশিষ্ট্য"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ইন্টাৰনেট"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "ইন্টাৰনেট ব্যবহাৰৰ অনুপ্ৰয়োগ যেনে ওৱেব আৰু ই-মেইল অনুপ্ৰয়োগ"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "কাৰ্যালয়"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "কাৰ্যালয়ৰ অনুপ্ৰয়োগ"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "ব্যক্তিগত বৈশিষ্ট্য"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "প্ৰশাসনিক বৈশিষ্ট্য"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"সম্পূৰ্ণ ব্যৱস্থাপ্ৰণালী ব্যাপী বৈশিষ্ট্য পৰিবৰ্তন কৰক (সকলো ব্যৱহাৰকৰোঁতা প্ৰভাবিত হ'ব)"
+msgstr "সম্পূৰ্ণ ব্যৱস্থাপ্ৰণালী ব্যাপী বৈশিষ্ট্য পৰিবৰ্তন কৰক (সকলো ব্যৱহাৰকৰোঁতা প্ৰভাবিত হ'ব)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ব্যক্তিগত পছন্দ"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ব্যক্তিগত পছন্দ"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "ব্যৱস্থাপ্ৰণালী"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "ব্যৱস্থাপ্ৰণালী সংক্ৰান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "ব্যৱস্থাপ্ৰণালীৰ বিভিন্ন সৰঞ্জাম"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "ব্যৱস্থাপ্ৰণালীৰ বৈশিষ্ট্যৰ বিন্যাস এবং নিৰীক্ষণ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "সাৰ্বজনীন ব্যবহাৰাধিকাৰ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "সাৰ্বজনীন ব্যবহাৰাধিকাৰ সংক্ৰান্ত সম্পৰ্কিত বৈশিষ্ট্য"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "আনুষঙ্গিক"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ডেস্কটপৰ ব্যৱহৃত আনুষঙ্গিক বস্তু"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "অনুপ্ৰয়োগ"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ব্যক্তিগত পছন্দ ও প্ৰশাসনিক বৈশিষ্ট্য"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "অন্যান্য শ্ৰেণীত অন্তৰ্গত নকৰা অনুপ্ৰয়োগ"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "তালিকা সম্পাদক"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "তালিকা সম্পাদন কৰক"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "অনুপ্ৰয়োগ :(_A)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "অবিকল্পিত মান(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "তালিকা:(_M)"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "%s তালিকা সম্পাদক"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "নাম"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "দেখুৱাওক"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"ব্যক্তিগত পঞ্জিকাৰ সন।ধান পোৱা ন'গ'ল: /etc/passwd নথিপত্ৰত উল্লেখ নাই আৰু পৰিবেশৰ "
-"$HOME চলকৰ মান অনুপস্থিত"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "তালিকাৰ নথিপত্ৰ"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "তালিকা পৰিবৰ্তণৰ নিৰীক্ষণ ব্যৱস্থা"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<Exclude> কৰা নিবেশ অন্তৰ্ভুক্ত কৰা হ'ব"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true নিবেশসমূহ অন্তৰ্ভুক্ত কৰা হ'ব"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ডেস্কটপ নথিপত্ৰৰ ID বৈধ নহয়"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[অবৈধ নথিপত্ৰৰ নাম]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== তালিকা পৰিবৰ্তিত হৈছে, পুনঃ তুলি লোৱা হৈছে ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "তালিকা-ট্ৰি বৰ্তমানে ৰিক্ত"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- MATE'ৰ ডেস্কটপ তালিকাৰ বৈশিষ্ট্যাবলী প্ৰয়োগৰ পৰীক্ষা কৰক"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "সাৰ্বজনীন ব্যৱহাৰধিকাৰ সামগ্ৰী সম্পৰ্কিত পছন্দ"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "ব্যক্তিগত পছন্দ এবং বৈশিষ্ট্যাবলী"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "অন্যান্য শ্ৰেণীত অন্তৰ্গত নকৰা অনুপ্ৰয়োগ"
diff --git a/po/ast.po b/po/ast.po
index 2ea0fc3..a7871f6 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,265 +1,170 @@
-# translation of mate-menus.po to Asturian
-# Asturian translation for mate-menus
-# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
-# This file is distributed under the same license as the mate-menus package.
-#
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
-# Xose S. Puente <[email protected]>, 2007.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007
+# Xose S. Puente <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-23 15:37+0200\n"
-"PO-Revision-Date: 2008-10-06 09:03+0000\n"
-"Last-Translator: Astur <[email protected]>\n"
-"Language-Team: Asturian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Asturian (http://www.transifex.com/projects/p/MATE/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-10-22 08:36+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menú multimedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Soníu y Vídeu"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menú multimedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programación"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Ferramientes pa desendolcu de programes"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Educación"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Xuegos"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Xuegos y entretenimientu"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicaciones gráfiques"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Opciones pa dellos preseos de hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet y rede"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Opciones rellacionaes col trabayu en rede"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aldéu"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Propiedaes que remanen l'aldéu y el comportamientu del escritoriu"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programes p'accesu a Internet como web y corréu"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Oficina"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicaciones d'Oficina"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personal"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Preferencies personales"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Alministración"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"Fai cambeos nes preferencies globales del sistema (afeuta a tolos usuarios)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferencies personales"
+msgstr "Fai cambeos nes preferencies globales del sistema (afeuta a tolos usuarios)"
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferencies"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferencies personales"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Preferencies del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Ferramientes del Sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuración y monitorización del sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Accesu universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Preferencies del accesu universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accesorios"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accesorios d'Escritoriu"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferencies personales y parámetros d'alministración"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicaciones que nun encaxen n'otres estayes"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Otres"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor del Menú"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Remanar Menús"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Aplicaciones:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Predeterminaos"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Menús:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nome"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Amosar"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Nun pudo atopase la carpeta home: nun ta establecía en /etc/passwd y nun hai "
-"valor pa $HOME nel ambiente"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Ficheru de menú"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitor pa cambeos nel menú"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Incluyir entraes <Exclude>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Incluyir entraes Nodisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ID de ficheru d'escritoriu non válidu"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Nome de ficheru Inválidu]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <escluyíes>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Cambió'l menú, recargando ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "L'árbol del menú ta ermu"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-"- prebe la implementación MATE de la Especificación del Menú d'Escriyoriu"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicaciones que nun encaxen n'otres estayes"
diff --git a/po/be.po b/po/be.po
index 951bdd7..47e8bd2 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,269 +1,170 @@
-# Беларускі пераклад mate-menus.
-# Copyright (C) 2005 THE mate-menus'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-menus package.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Ales Nyakhaychyk <[email protected]>, 2005, 2007
-# Ihar Hrachyshka <[email protected]>, 2006.
-#
+# booxter <[email protected]>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus mate-2-12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-02 03:41+0100\n"
-"PO-Revision-Date: 2007-06-13 23:52+0300\n"
-"Last-Translator: Alexander Nyakhaychyk <[email protected]>\n"
-"Language-Team: Belarusian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/MATE/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Universal Access"
-msgstr "Унівэрсальны доступ"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Universal Access Settings"
-msgstr "Настаўленьні унівэрсальнага доступу"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "Інструмэнты"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "Настольныя інструмэнты"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "Дастасаваньні"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Personal preferences and administration settings"
-msgstr "Прыватныя перавагі і адміністрацыйныя настаўленьні"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "Аўдыё і відэа"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-#: ../desktop-directories/System.directory.in.h:1
-msgid "System"
-msgstr "Сыстэма"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Мультымэдыя"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Праграмаваньне"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Інструмэнты для распрацоўкі праграм"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Адукацыя"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Гульні"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Гульні і забавы"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Графіка"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Графічныя дастасаваньні"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Апаратура"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Настаўленьні для апаратуры"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Інтэрнэт і сетка"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Настаўленьні сеткі"
 
-#: ../desktop-directories/Internet.directory.in.h:1
-msgid "Internet"
-msgstr "Інтэрнэт"
-
-#: ../desktop-directories/Internet.directory.in.h:2
-msgid "Programs for Internet access such as web and email"
-msgstr "Праграмы для доступу ў Інтэрнэт (Сеціва, пошта і інш.)"
-
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Вонкавы выгляд"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Настаўленьні, якія кантралююць вонавы выгляд і паводзіны асяродзьдзя"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Мультымэдыя"
+#: ../desktop-directories/mate-network.directory.in.h:1
+msgid "Internet"
+msgstr "Інтэрнэт"
 
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "Аўдыё і відэа"
+#: ../desktop-directories/mate-network.directory.in.h:2
+msgid "Programs for Internet access such as web and email"
+msgstr "Праграмы для доступу ў Інтэрнэт (Сеціва, пошта і інш.)"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Офіс"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Офісныя дастасаваньні"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Дастасаваньні, якія ня трапілі ў іншыя катэгорыі"
-
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "Іншыя"
-
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Пэрсанальныя"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Пэрсанальныя настаўленьні"
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Асабістыя перавагі"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "Адміністраваньне"
+
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr "Зьмены сыстэмных настаўленьняў (датычацца ўсіх карыстальнікаў"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Перавагі"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Universal access related preferences"
-msgstr "Перавагі, якія датычацца унівэрсальнага доступу"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Асабістыя перавагі"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "Пэрсанальныя перавагі і настаўленьні"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr "Сыстэма"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Сыстэмныя настаўленьні"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "Адміністраваньне"
-
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change system-wide settings (affects all users)"
-msgstr "Зьмены сыстэмных настаўленьняў (датычацца ўсіх карыстальнікаў"
-
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Сыстэмныя інструмэнты"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Наладка сыстэмы і маніторынг"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Рэдактар мэню"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Дазваляе рэдагаваць мэню"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "Д_астасаваньні:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "Пра_двызначаныя значэньні"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Мэню:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "Назва"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "Паказваць"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Немагчыма знайсьці сваю тэчку: яна ня вызначаная ў /etc/passwd, а таксама "
-"зьменная асяродзьдзя $HOME нявызначаная"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Файл мэню"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "ФАЙЛ_МЭНЮ"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
+msgstr "Унівэрсальны доступ"
 
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Сачыць за зьменамі мэню"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr "Настаўленьні унівэрсальнага доступу"
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Уключыць <Выключан>ыя пункты"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "Інструмэнты"
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Уключыць NoDisplay=true элемэнты"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "Настольныя інструмэнты"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Кепскі ID desktop-файла"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "Дастасаваньні"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Кепская назва файла]"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "Прыватныя перавагі і адміністрацыйныя настаўленьні"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <выключаны>"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "Іншыя"
 
-#: ../util/test-menu-spec.c:164
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Мэню зьмянілася; перачытваецца... ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Мэню пустое"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- праверыць рэалізацыю спэцыфікацыі мэню стальца ў MATE"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Дастасаваньні, якія ня трапілі ў іншыя катэгорыі"
diff --git a/po/bg.po b/po/bg.po
index 93025f0..d71f4f4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,272 +1,171 @@
-# Bulgarian translation of mate-menus po-file.
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation
-# This file is distributed under the same license as the mate-menus package.
-# Vladimir "Kaladan" Petkov <[email protected]>, 2004, 2005, 2007.
-# Rostislav "zbrox" Raykov <[email protected]>, 2005.
-# Alexander Shopov <[email protected]>, 2008, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Alexander Shopov <[email protected]>, 2008, 2009
+# Rostislav "zbrox" Raykov <[email protected]>, 2005
+# Vladimir "Kaladan" Petkov <[email protected]>, 2004, 2005, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-14 07:47+0300\n"
-"PO-Revision-Date: 2009-08-14 07:47+0300\n"
-"Last-Translator: Alexander Shopov <[email protected]>\n"
-"Language-Team: Bulgarian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/MATE/language/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Меню за мултимедия"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Звук и видео"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Меню за мултимедия"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Разработка"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Инструменти за разработка на софтуер"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Обучение"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Игри"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Игри и забавления"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Програми за работа с графика"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Хардуер"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Настройки за много хардуерни устройства"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Интернет и мрежа"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Настройки за мрежата"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Външен изглед"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Настройки за външния изглед и поведение на работния плот"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Интернет"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Програми за работа в Интернет, например е-поща и браузър"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Офис"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Офисни програми"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Лични"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Лични настройки"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Администрация на системата"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"Промяна на глобалните настройки на системата (ще се отрази на всички "
-"потребители)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Лични предпочитания"
+msgstr "Промяна на глобалните настройки на системата (ще се отрази на всички потребители)"
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Лични предпочитания"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Система"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Системни настройки"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Системни инструменти"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Следене и настройване на системата"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Универсален достъп"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Настройки на универсалния достъп"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Помощни програми"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Набор от помощни програми"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Програми"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Лични предпочитания и административни настройки"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Програми, които не принадлежат към друга категория"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Други"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Редактор на менюта"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Редакция на менютата"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Програми:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Стандартни"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Менюта:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Лесен редактор на менюта %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Име"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Показване"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Домашната папка не може да бъде намерена: не е зададена в /etc/passwd и няма "
-"стойност за $HOME в средата"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Файл за меню"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "ФАЙЛ_ЗА_МЕНЮ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Наблюдение за промени в менюто"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Включване на елементите отбелязани за <пропускане>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Включване на елементите отбелязани за <непоказване>"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Невалиден идентификатор на файла .desktop"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[невалидно име на файл]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <пропускане>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Менюто е било променено — презарежда се ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Дървовидната структура на менюто е празна."
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-"— тестване на реализацията на спецификацията за менюта към работния плот на "
-"MATE"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Програми, които не принадлежат към друга категория"
diff --git a/po/bn.po b/po/bn.po
index b135766..8bf62d7 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -1,301 +1,171 @@
-# Bengali translation of mate-menus
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Mahay Alam Khan <[email protected]>, 2005.
-# Samia Niamatullah <[email protected]>, 2005.
-# Sadia Afroz <[email protected]>, 2010.
-#
+# 
+# Translators:
+# Mahay Alam Khan <[email protected]>, 2005
+# Sadia Afroz <[email protected]>, 2010
+# Samia Niamatullah <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: bn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2010-01-24 22:55+0600\n"
-"Last-Translator: Sadia Afroz <[email protected]>\n"
-"Language-Team: Bengali <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Bengali (http://www.transifex.com/projects/p/MATE/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "মাল্টিমিডিয়া মেনু"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "শব্দ ও ভিডিও"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "মাল্টিমিডিয়া মেনু"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "প্রোগ্রামিং"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "সফটওয়্যার ডেভেলপমেন্টের যন্ত্রপাতি"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "শিক্ষা"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "খেলা"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "খেলা ও বিনোদন"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "গ্রাফিক্স"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "গ্রাফিক্স অ্যাপ্লিকেশন"
 
-# Translated by sadia
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-# Translated by sadia
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "কয়েকটি হার্ডওয়্যার ডিভাইসের সেটিংস "
 
-# Translated by sadia
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ইন্টারনেট ও নেটওয়ার্ক"
 
-# Translated by sadia
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "নেটওয়ার্ক সম্পর্কিত সেটিংস "
 
-# Translated by sadia
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "দেখুন ও উপভোগ করুন"
 
-# Translated by sadia
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ডেক্সটপের অবয়ব ও আচরণ নিয়ন্ত্রণের সেটিংস"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ইন্টারনেট"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "ইন্টারনেট ব্যবহারের প্রোগ্রাম, যেমন ওয়েব বা ইমেইল"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "অফিস"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "অফিস অ্যাপলিকেশন"
 
-# Translated by sadia
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-# Translated by sadia
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "ব্যক্তিগত সেটিংস"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "অ্যাডমিনস্ট্রেশন"
 
-# Translated by sadia
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "সিস্টেমব্যাপী সেটিংস পরিবর্তন করা হবে (সব ব্যবহারকারীর জন্য প্রযোজ্য)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ব্যক্তিগত পছন্দতালিকা"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "পছন্দতালিকা"
 
-# Translated by sadia
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ব্যক্তিগত পছন্দতালিকা"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "সিস্টেম "
 
-# Translated by sadia
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "সিস্টেম সেটিংস "
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "সিস্টেম টুল"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "সিস্টেম কনফিগারেশন এবং মনিটরিং"
 
-# Translated by sadia
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "সর্বজনীন প্রবেশাধিকার"
 
-# Translated by sadia
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "সর্বজনীন প্রবেশাধিকার সেটিংস"
 
-# আনুসাঙ্গিক - mak
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "আনুসাঙ্গিক"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ডেস্কটপের আনুসাঙ্গিক অ্যাপ্লিকেশন"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "অ্যাপলিকেশন"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ব্যক্তিগত পছন্দতালিকা এবং অ্যাডমিনস্ট্রেশন বৈশিষ্ট্যাবলী"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "অ্যাপ্লিকেশন যেগুলো অন্য কোন শ্রেণীভূক্ত নয়"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "মেনু সম্পাদক"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "মেনু সম্পাদন"
-
-# the (_)underscore can be used with the English "A", but it's not possible to use with bangla অ্যা cause user canot press the Alt+অ্যা simultaneously. - mak
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "অ্যাপ্লিকেশন (_অ):"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "ডিফল্ট (_ড)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "মেনু (_ম):"
-
-# Translated by sadia
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "সাধারণ মেনু সম্পাদক %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "নাম"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "প্রদর্শন করো"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"home ডিরেক্টরি পাওয়া যায়নি: /etc/passwd তে সেট করা নেই এবং পরিবেশে $HOME এর "
-"কোন মান নেই"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "মেনু ফাইল"
-
-# sam: variable?
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "মেনু পরিবর্তনের মনিটর"
-
-# <Exclude> = variable?
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "বাদ দেয়া <Exclude> অংশগুলো অন্তর্ভুক্ত করো"
-
-# <Exclude> = variable?
-#
-# Translated by sadia
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Include NoDisplay=true entries"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "অবৈধ ডেস্কটপ ফাইল আইডি"
-
-# ত্রুটিযুক্ত ফাইলের নাম
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Invalid Filename]"
-
-# <বাদ দেওয়া হয়েছে>
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== মেনু পরিবর্তিত হয়েছে, পুনরায় লোড করা হচ্ছে ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "মেনু ট্রী খালি"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "‌- MATE দ্বারা ডেস্কটপ মেনু বৈশিষ্ট্যাবলীর প্রয়োগ পরীক্ষা করো"
-
-# Easy to access by physically handicapped persons. Translation should be done regarding this fact. - mak
-#~ msgid "Accessibility"
-#~ msgstr "অভিগম্যতা"
-
-#~ msgid "Desktop"
-#~ msgstr "ডেস্কটপ"
-
-#~ msgid "Accessibility related preferences"
-#~ msgstr "অভিগম্যতা সম্পর্কীয় পছন্দতালিকা"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "অ্যাপ্লিকেশন যেগুলো অন্য কোন শ্রেণীভূক্ত নয়"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 029ce9a..9725407 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1,280 +1,171 @@
-# translation of bn_IN.po to Bengali INDIA
-# Bengali India translation of mate-menus
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Mahay Alam Khan <[email protected]>, 2005.
-# Samia Niamatullah <[email protected]>, 2005.
-# Runa Bhattacharjee <[email protected]>, 2009.
+# 
+# Translators:
+# Mahay Alam Khan <[email protected]>, 2005
+# runab <[email protected]>, 2009
+# Samia Niamatullah <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: bn_IN\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-08-28 12:29+0530\n"
-"Last-Translator: Runa Bhattacharjee <[email protected]>\n"
-"Language-Team: Bengali INDIA <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/MATE/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: bn_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "মাল্টি-মিডিয়া মেনু"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "শব্দ ও ভিডিও"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "মাল্টি-মিডিয়া মেনু"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "প্রোগ্রামিং"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "সফ্টওয়্যার ডিভেলপমেন্টের সামগ্রী"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "শিক্ষাবিষয়ক বস্তু"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "খেলা"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "খেলা ও বিনোদন"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "গ্রাফিক্স"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "গ্রাফিক্স অ্যাপ্লিকেশন"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "হার্ডওয়্যার"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "বিবিধ হার্ডওয়্যার ডিভাইস সংক্রান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ইন্টারনেট ও নেটওয়ার্ক"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "নেটওয়ার্ক সংক্রান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "চেহারা ছবি"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ডেস্কটপের চেহারা ও আচরণ নিয়ন্ত্রণকারী বৈশিষ্ট্য"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ইন্টারনেট"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "ইন্টারনেট ব্যবহারের প্রোগ্রাম যেমন ওয়েব ও ই-মেইল প্রোগ্রাম"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "অফিস"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "অফিস অ্যাপলিকেশন"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "ব্যক্তিগত বৈশিষ্ট্য"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "প্রশাসনিক বৈশিষ্ট্য"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "সম্পূর্ণ সিস্টেমব্যাপী বৈশিষ্ট্য পরিবর্তন করুন (সকল ব্যবহারকারী প্রভাবিত হবেন)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ব্যক্তিগত পছন্দ"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "পছন্দ"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ব্যক্তিগত পছন্দ"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "সিস্টেম"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "সিস্টেম সংক্রান্ত বৈশিষ্ট্য"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "সিস্টেমের বিভিন্ন সরঞ্জাম"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "সিস্টেমের বৈশিষ্ট্য কনফিগারেশন এবং নিরীক্ষণ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "সার্বজনীন ব্যবহারাধিকার"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "সার্বজনীন ব্যবহারাধিকার সংক্রান্ত সম্পর্কিত বৈশিষ্ট্য"
 
-# আনুসাঙ্গিক - mak
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "আনুষঙ্গিক"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ডেস্কটপের ব্যবহৃত আনুষঙ্গিক বস্তু"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "অ্যাপলিকেশন"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ব্যক্তিগত পছন্দ ও প্রশাসনিক বৈশিষ্ট্য"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "অন্যান্য শ্রেণীর মধ্যে অন্তর্গত না করা অ্যাপ্লিকেশন"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "মেনু সম্পাদক"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "মেনু সম্পাদন করুন"
-
-# the (_)underscore can be used with the English "A", but it's not possible to use with bangla অ্যা cause user canot press the Alt+অ্যা simultaneously. - mak
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "অ্যাপ্লিকেশন :(_A)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "ডিফল্ট মান(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "মেনু:(_M)"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "সহজ মেনু সম্পাদন ব্যবস্থা, সংস্করণ %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "নাম"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "প্রদর্শন করা হবে"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"ব্যক্তিগত (home) ডিরেক্টরি পাওয়া যায়নি: /etc/passwd ফাইলে উল্লিখিত হয়নি ও "
-"পরিবেশের $HOME ভেরিয়েবলের মান অনুপস্থিত"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "মেনুর ফাইল"
-
-# sam: variable?
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "মেনু পরিবর্তন নিরীক্ষণ ব্যবস্থা"
-
-# <Exclude> = variable?
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<Exclude> করা এন্ট্রিগুলি অন্তর্ভুক্ত করা হবে"
-
-# <Exclude> = variable?
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true এন্ট্রিগুলি অন্তর্ভুক্ত করা হবে"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ডেস্কটপ ফাইলের ID বৈধ নয়"
-
-# ত্রুটিযুক্ত ফাইলের নাম
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[অবৈধ ফাইলের নাম]"
-
-# <বাদ দেওয়া হয়েছে>
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== মেনু পরিবর্তিত হয়েছে, পুনরায় লোড করা হচ্ছে ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "মেনু-ট্রি বর্তমানে ফাঁকা"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- MATE'র ডেস্কটপ মেনুর বৈশিষ্ট্যাবলী প্রয়োগ পরীক্ষা করুন"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "অন্যান্য শ্রেণীর মধ্যে অন্তর্গত না করা অ্যাপ্লিকেশন"
diff --git a/po/br.po b/po/br.po
index 525041d..0cbc968 100644
--- a/po/br.po
+++ b/po/br.po
@@ -1,266 +1,169 @@
-# Breton translation of mate-menus.
-# Copyright (C) 2004-2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menu package.
-#
-# Jérémy Ar Floc'h <[email protected]>, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jérémy Ar Floc'h <[email protected]>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menu 2.14\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-07-29 05:10+0000\n"
-"PO-Revision-Date: 2009-07-29 07:38+0100\n"
-"Last-Translator: Denis <[email protected]>\n"
-"Language-Team: MATE Breton Team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Breton (http://www.transifex.com/projects/p/MATE/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-12 09:20+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: br\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Lañser al liesvedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Son ha video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Lañser al liesvedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Gouleviñ"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Binvioù da ziorren ar meziantoù"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Deskadurezh"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "C'hoarioù"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "C'hoarioù ha diduelloù"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Skeudennoù"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Arloadoù skeudennaouiñ"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Periant"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Arventennoù evit meur a drobarzhell"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Kenrouedad ha Rouedad"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Arventennoù ar rouedad"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Neuz ha Feson"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Arventennoù a reol neuz ar burev hag e emzalc'h"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Kenrouedad"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Goulevioù evit tizhout ar c'henrouedad, posteliñ ha furcherezh"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Bureveg"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Arloadoù burev all"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personel"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Arventennoù personel"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Merañ"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Kemmañ dre vras arventennoù ar reizhiad (evit an holl arveriaded)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Gwellvezioù hiniennel"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Gwellvezioù"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Gwellvezioù hiniennel"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Reizhiad"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Arventennoù ar reizhiad"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Binvioù reizhiad"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Neuziadur hag eveshaerezh ar reizhiad"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Haezhiñ hollvedel"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Dibarzhioù haezhiñ hollvedel"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Mavegoù"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Mavegoù ar burev"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Arloadoù"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Dibarzhioù hiniennel ha arventennoù merañ"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Arloadoù n'int ket stag ouzh ur rummad all ebet"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Arloadoù all"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Embanner lañserioù"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Embanner al lañserioù"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Arloadoù :"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Dre ziouer"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Lañserioù :"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Embanner lañserioù eeun %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Anv"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Diskouez"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "Dibosupl eo kavout ar renkell Kêr : n'eo ket e-barzh /etc/passwd ha n'eus road ebet evit $HOME en endro"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Restr lañser"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "RESTR_LAÑSER"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Eveshaat kemmoù ar lañserioù"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Enlakaat enankadoù forc'het gant <Exclude>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Enlakaat an enankadoù NoDisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Didalvoudek eo hennad (ID) ar restr desktop"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Anv restr dididalvoudek]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <forc'het>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Kemmet al lañser, oc'h adkargañ ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169
-#: ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Goullo eo gwezenn al lañser"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- o testiñ emplementadur MATE el lañseroù dibarek .desktop"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Arloadoù n'int ket stag ouzh ur rummad all ebet"
diff --git a/po/ca.po b/po/ca.po
index 9f6c944..ba1c079 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,272 +1,170 @@
-# Catalan translation of MATE Menus.
-# Copyright © 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-# Jordi Mallach <[email protected]>, 2004, 2005, 2006, 2007.
-# Gil Forcada <[email protected]>, 2008, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2008, 2009
+# Jordi Mallach <[email protected]>, 2004, 2005, 2006, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-17 08:22+0100\n"
-"PO-Revision-Date: 2010-04-02 17:41+0200\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:47+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/MATE/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menú multimèdia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "So i vídeo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menú multimèdia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programació"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Eines per a desenvolupar programari"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Educació"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Jocs"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Jocs i entreteniments"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicacions de gràfics"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Paràmetres per a diferents dispositius de maquinari"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet i xarxa"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Paràmetres de xarxa"
 
-# Termcat (josep)
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aspecte i comportament"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Paràmetres que controlen l'aspecte i el comportament de l'escriptori"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programes per a accedir a Internet, com la web i el correu"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ofimàtica"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicacions ofimàtiques"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personal"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Paràmetres personals"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administració"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Canvia els paràmetres del sistema (afecta tots els usuaris)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferències personals"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferències personals"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Paràmetres del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Eines del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuració i supervisió del sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Accés universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Paràmetres d'accés universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accessoris"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accessoris de l'escriptori"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferències personals i paràmetres d'administració"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicacions que no encaixaven en d'altres categories"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Altres"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor del menú"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Edita els menús"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplicacions:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Predeterminats"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menús:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Editor del menú (versió %s)"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nom"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Mostra"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"No s'ha trobat el directori d'inici: no està establert al fitxer /etc/passwd "
-"i no hi ha cap valor per a $HOME a l'entorn"
-
-#~ msgid "Menu file"
-#~ msgstr "Fitxer de menú"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "FITXER_MENU"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Fes un seguiment dels canvis del menú"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Inclou entrades excloses amb <Exclude>"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "Inclou entrades amb NoDisplay=true"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "L'ID del fitxer desktop és invàlid"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Nom de fitxer invàlid]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <exclòs>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "=== El menú ha canviat, s'està tornant a carregar ===\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "L'arbre del menú és buit"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr ""
-#~ "- proveu la implementació del MATE de l'especificació del menú "
-#~ "d'escriptori"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Preferències relacionades amb l'accés universal"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Preferències i paràmetres personals"
-
-#~ msgid "Accessibility"
-#~ msgstr "Accessibilitat"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Paràmetres d'accessibilitat"
-
-#~ msgid "Desktop"
-#~ msgstr "Escriptori"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicacions que no encaixaven en d'altres categories"
diff --git a/po/[email protected] b/po/[email protected]
index 27db3e0..980673b 100644
--- a/po/[email protected]
+++ b/po/[email protected]
@@ -1,272 +1,170 @@
-# Catalan translation of MATE Menus.
-# Copyright © 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-# Jordi Mallach <[email protected]>, 2004, 2005, 2006, 2007.
-# Gil Forcada <[email protected]>, 2008, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gil Forcada <[email protected]>, 2008, 2009
+# Jordi Mallach <[email protected]>, 2004, 2005, 2006, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus 2.12\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 23:31+0200\n"
-"PO-Revision-Date: 2010-04-02 17:41+0200\n"
-"Last-Translator: Gil Forcada <[email protected]>\n"
-"Language-Team: Catalan <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:47+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/MATE/language/ca@valencia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ca@valencia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menú multimèdia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "So i vídeo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menú multimèdia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programació"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Eines per a desenvolupar programari"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Educació"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Jocs"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Jocs i entreteniments"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Gràfics"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicacions de gràfics"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Maquinari"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Paràmetres per a diferents dispositius de maquinari"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet i xarxa"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Paràmetres de xarxa"
 
-# Termcat (josep)
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aspecte i comportament"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Paràmetres que controlen l'aspecte i el comportament de l'escriptori"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programes per a accedir a Internet, com la web i el correu"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ofimàtica"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicacions ofimàtiques"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personal"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Paràmetres personals"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administració"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Canvia els paràmetres del sistema (afecta tots els usuaris)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferències personals"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferències"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferències personals"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Paràmetres del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Eines del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuració i supervisió del sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Accés universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Paràmetres d'accés universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accessoris"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accessoris de l'escriptori"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplicacions"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferències personals i paràmetres d'administració"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicacions que no encaixaven en d'altres categories"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Altres"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor del menú"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Edita els menús"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplicacions:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Predeterminats"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menús:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Editor del menú (versió %s)"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nom"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Mostra"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"No s'ha trobat el directori d'inici: no està establit al fitxer /etc/passwd "
-"i no hi ha cap valor per a $HOME a l'entorn"
-
-#~ msgid "Menu file"
-#~ msgstr "Fitxer de menú"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "FITXER_MENU"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Fes un seguiment dels canvis del menú"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Inclou entrades excloses amb <Exclude>"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "Inclou entrades amb NoDisplay=true"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "L'ID del fitxer desktop és invàlid"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Nom de fitxer invàlid]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <exclòs>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "=== El menú ha canviat, s'està tornant a carregar ===\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "L'arbre del menú és buit"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr ""
-#~ "- proveu la implementació del MATE de l'especificació del menú "
-#~ "d'escriptori"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Preferències relacionades amb l'accés universal"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Preferències i paràmetres personals"
-
-#~ msgid "Accessibility"
-#~ msgstr "Accessibilitat"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Paràmetres d'accessibilitat"
-
-#~ msgid "Desktop"
-#~ msgstr "Escriptori"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicacions que no encaixaven en d'altres categories"
diff --git a/po/crh.po b/po/crh.po
index 5047004..5dd29f3 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -1,271 +1,169 @@
-# translation of mate-menus to Qırımtatarca
-# This file is distributed under the same license as the mate-menus package.
-#
-# Reşat SABIQ <[email protected]>, 2009, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Reşat SABIQ <[email protected]>, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus TRUNK\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-21 00:24-0500\n"
-"PO-Revision-Date: 2010-03-30 00:46-0500\n"
-"Last-Translator: Reşat SABIQ <[email protected]>\n"
-"Language-Team: QIRIMTATARCA (Qırım Türkçesi) <tilde-birlik-tercime@lists."
-"sourceforge.net>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Crimean Turkish (http://www.transifex.com/projects/p/MATE/language/crh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: crh\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Çoqlu-vasat menüsi"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Davuş & Video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Çoqlu-vasat menüsi"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programlav"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Yazılım inkişafı içün aletler"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Maarif"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Oyunlar"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Oyunlar ve eglenceler"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafikler"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafikiy uyğulamalar"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Donanım"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Bir qaç donanım cihazı içün tesbitler"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "İnternet ve Ağ"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Ağ-alâqalı tesbitler"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Körüniş ve Seziliş"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Masaüstü körüniş ve sezilişini muraqabe etken tesbitler"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "İnternet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "İnternet irişimi içün programlar, kezici ve e-poçta kibi"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ofis"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Ofis Uyğulamaları"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Şahsiy"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Şahsiy ayarlar"
 
-# tüylü
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Memuriyet"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"Bütün-sistem tesbitlerini deñiştir (qullanıcılarnıñ episine tesir eter)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Şahsiy tercihler"
+msgstr "Bütün-sistem tesbitlerini deñiştir (qullanıcılarnıñ episine tesir eter)"
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Şahsiy tercihler"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistem"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Sistem tesbitleri"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Sistem Aletleri"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Sistem ayarlaması ve közetimi"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Alemiy İrişim"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Universal İrişim Tesbitleri"
 
-# tüylü
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Aksessuarlar"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Masaüstü donantıları"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Uyğulamalar"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Şahsiy tercihler ve idare tesbitleri"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Diger ulamlarğa yaraşmağan uyğulamalar"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Diger"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menü Muarriri"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Menülerni Tarir Et"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Uyğulamalar:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Ög-belgilemeler"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menüler:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Basit Menü Muarriri %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "İsim"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Köster"
-
-# tüylü
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Ev fihristini tapamayım: /etc/passwd içinde tesbit etilgen degil ve çevrede "
-"$HOME içün bir qıymet yoq"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menü dosyesi"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Menü deñişmeleri içün közet"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Müstesna (<Exclude>) etilgen kirdilerni kirset"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true kirdilerini kirset"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Keçersiz masaüstü dosye kimligi"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Keçersiz Dosye-adı]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menü deñişti, kene yüklene ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menü teregi boştır"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- Masaüstü Menü Belirtiminiñ MATE tarafından edasını sına"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Diger ulamlarğa yaraşmağan uyğulamalar"
diff --git a/po/cs.po b/po/cs.po
index 5c60d5a..374744e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,269 +1,172 @@
-# Czech translation of mate-menus.
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 the author(s) of mate-menus.
-# Copyright (C) 2004, 2005 Miloslav Trmac <[email protected]>.
-# This file is distributed under the same license as the mate-menus package.
-# Miloslav Trmac <[email protected]>, 2004, 2005.
-# Petr Tomeš <[email protected]>, 2006.
-# Jakub Friedl <[email protected]>, 2007.
-# Petr Kovar <[email protected]>, 2007, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Jakub Friedl <[email protected]>, 2007
+# Miloslav Trmač <[email protected]>, 2004, 2005
+# Petr Kovar <[email protected]>, 2007, 2009
+# Petr Tomeš <[email protected]>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-21 04:22+0200\n"
-"PO-Revision-Date: 2009-09-21 04:17+0200\n"
-"Last-Translator: Petr Kovar <[email protected]>\n"
-"Language-Team: Czech <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:47+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/MATE/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Nabídka multimédií"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Zvuk a video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Nabídka multimédií"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programování"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Nástroje na vývoj softwaru"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Vzdělávání"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Hry"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Hry a zábava"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplikace pro grafiku"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Nastavení různých hardwarových zařízení"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet a síť"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Nastavení související se sítí"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Vzhled a chování"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Nastavení ovládající vzhled a chování pracovního prostředí"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programy pro přístup k Internetu, například WWW a e-mail"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Kancelář"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Kancelářské aplikace"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Osobní nastavení"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Správa"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Změnit nastavení pro celý systém (ovlivní všechny uživatele)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Osobní volby"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Volby"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Osobní volby"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Systém"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Systémová nastavení"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Systémové nástroje"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Nastavení a sledování systému"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Zpřístupnění"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Nastavení zpřístupnění"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Příslušenství"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Příslušenství prostředí pracovní plochy"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplikace"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Osobní volby a nastavení správy"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplikace nepatřící do jiných kategorií"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Ostatní"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor nabídek"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Upravit nabídky"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplikace:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "Vý_chozí"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "Na_bídky:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Jednoduchý editor nabídek %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Název"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Zobrazit"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Nelze najít domovský adresář: nenastaveno v /etc/passwd a žádná hodnota "
-"$HOME v prostředí"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Soubor nabídky"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "SOUBOR_NABÍDKY"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Sleduje změny nabídky"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Zahrne položky \"<Exclude>\""
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Zahrne položky s \"NoDisplay=true\""
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Neplatné ID souboru desktop"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Neplatný název souboru]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Nabídka změněna, načítá se znovu ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Strom nabídky je prázdný"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- otestuje implementaci \"Desktop Menu Specification\" v MATE"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplikace nepatřící do jiných kategorií"
diff --git a/po/cy.po b/po/cy.po
index cbfa097..c29bac1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,231 +1,169 @@
-# MATE Menus in Welsh.
-#
-# This file is distributed under the same license as the mate-menus package.
-# Dafydd Harries <[email protected]>, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Dafydd Harries <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-02 06:52+0100\n"
-"PO-Revision-Date: 2006-03-02 12:05-0000\n"
-"Last-Translator: Rhys Jones <[email protected]>\n"
-"Language-Team: Welsh <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Welsh (http://www.transifex.com/projects/p/MATE/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Hygyrchedd"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Gosodiadau Hygyrchedd"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "Ategolion"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "Ategolion penbwrdd"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "Rhaglenni"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Desktop"
-msgstr "Penbwrdd"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "Sain a Fideo"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-msgid "Personal preferences and administration settings"
-msgstr "Hoffterau personol a gosodiadau gweinyddol"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Dewislen amlgyfrwng"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Rhaglennu"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Offer ar gyfer datblygu meddalwedd"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Addysg"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Gemau"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Gemau a difyrrwch"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graffeg"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Rhaglennu graffeg"
 
-#: ../desktop-directories/Internet.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
+msgid "Hardware"
+msgstr ""
+
+#: ../desktop-directories/mate-hardware.directory.in.h:2
+msgid "Settings for several hardware devices"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
+msgid "Internet and Network"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
+msgid "Network-related settings"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
+msgid "Look and Feel"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
+msgid "Settings controlling the desktop appearance and behavior"
+msgstr ""
+
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Rhyngrwyd"
 
-#: ../desktop-directories/Internet.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Rhaglenni ar gyfer mynediad Rhyngrwyd megis y we ac e-bost"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Dewislen amlgyfrwng"
-
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "Sain a Fideo"
-
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Swyddfa"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Rhaglenni Swyddfa"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Rhaglenni nad ydynt yn ffitio yng nghategorïau eraill"
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
+msgid "Personal"
+msgstr ""
 
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "Eraill"
+#: ../desktop-directories/mate-personal.directory.in.h:3
+msgid "Personal settings"
+msgstr ""
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Hoffterau personol"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "Gweinyddiaeth"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr ""
+
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Hoffterau"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Accessibility related preferences"
-msgstr "Hoffterau yn gysylltiedig â hygyrchedd"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "Hoffterau a gosodiadau personol"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Hoffterau personol"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "Gweinyddiaeth"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr ""
 
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change systemwide settings (affects all users)"
-msgstr "Newid gosodiadau system-eang (sy'n effeithio pob defnyddiwr)"
+#: ../desktop-directories/mate-system.directory.in.h:2
+msgid "System settings"
+msgstr ""
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Offer System"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Cyflunio a monitro system"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Golygydd Dewislen"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Golygu Dewislenni"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Rhaglenni:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Rhagosodiadau"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Dewislenni"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "Enw"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "Dangos"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
 msgstr ""
-"Methu darganfod cyfeiriadur cartref: nid oes cofnod yn /etc/passwd na gwerth "
-"ar gyfer $HOME yn yr amgylchedd"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Ffeil ddewislen"
 
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "FFEIL_DDEWISLEN"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitro newidiadau yn y ddewislen"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr ""
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Cynnwys y cofnodion a <eithriwyd>"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "Ategolion"
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Cynnwys y cofnodion a chanddynt NoDisplay=True"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "Ategolion penbwrdd"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ID ffeil penbwrdd annilys"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "Rhaglenni"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Enw Ffeil Annilys]"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "Hoffterau personol a gosodiadau gweinyddol"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <eithriwyd>"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "Eraill"
 
-#: ../util/test-menu-spec.c:164
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"=== Newidiwyd y ddewislen; ail-lwytho===\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Coeden ddewislen yn wag"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- profi gweithrediad MATE o Fanyleb Dewislenni Penbwrdd"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Rhaglenni nad ydynt yn ffitio yng nghategorïau eraill"
diff --git a/po/da.po b/po/da.po
index 8f17a70..db4716a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,284 +1,172 @@
-# Danish translation of mate-menus.
-# Copyright (C) 2007 Mark McLoughlin
-# This file is distributed under the same license as the mate-menus package.
-# David Nielsen <[email protected]>, 2004.
-# Martin Willemoes Hansen <[email protected]>, 2005.
-# Ole Laursen <[email protected]>, 2006.
-# Peter Bach <[email protected]>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# David Nielsen <[email protected]>, 2004
+# Martin Willemoes Hansen <[email protected]>, 2005
+# Ole Laursen <[email protected]>, 2006
+# Peter Bach <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-13 03:23+0200\n"
-"PO-Revision-Date: 2009-09-12 18:19+0200\n"
-"Last-Translator: Peter Bach <[email protected]>\n"
-"Language-Team: Danish <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/MATE/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimedie-menu"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Lyd og video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimedie-menu"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmering"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Værktøj til programudvikling"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Læringsprogrammer"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Spil"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Spil og underholdning"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafikprogrammer"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Indstillinger for flere hardware-enheder"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet og netværk"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Netværksrelaterede indstillinger"
 
-# det er et fast udtryk på engelsk, skal ikke opfattes bogstaveligt
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Udseende og opførsel"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Indstillinger for kontrol af skrivebordets udseende og opførelse"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programmer til internetadgang, såsom web og e-post"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Kontor"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Kontorprogrammer"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Personlige indstillinger"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administration"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Ændr systemindstillinger (påvirker alle brugere)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Personlige indstillinger"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Personlige indstillinger"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "System"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Systemindstillinger"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Systemværktøjer"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Systemkonfiguration og -overvågning"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universel adgang"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Indstillinger for universel adgang"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Tilbehør"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Skrivebordstilbehør"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Programmer"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Personlige indstillinger og administrationskonfiguration"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Programmer som ikke passer i andre katagorier"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Andre"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menuredigering"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Redigér menuer"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Programmer:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Forvalg"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menuer:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Simpel menuredigering %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Navn"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Vis"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Kan ikke finde hjemmekataloget: det er ikke i /etc/passwd og der findes "
-"ingen værdi for $HOME i miljøet"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menufil"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FIL"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Overvåg menuændringer"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Medtag ekskluderede punkter (<Exclude>)"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Medtag punkter med NoDisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Ugyldig skrivebordsfil-id"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Ugyldigt filnavn]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <ekskluderet>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menu ændret, genindlæser ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menutræ er tomt"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- test Mates implementering af specifikationen til skrivebordsmenuer"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Indstillinger relateret til universel adgang"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Personlige indstillinger"
-
-#~ msgid "Accessibility"
-#~ msgstr "Tilgængelighed"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Tilgængelighedsindstillinger"
-
-#~ msgid "Desktop"
-#~ msgstr "Skrivebord"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Programmer som ikke passer i andre katagorier"
diff --git a/po/de.po b/po/de.po
index 41da967..7673f99 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,273 +1,171 @@
-# German translation of mate-menus.
-# Copyright (C) 2004 THE mate-menus'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-menus package.
-# Hendrik Brandt <[email protected]>, 2004-2005.
-# Hendrik Richter <[email protected]>, 2006, 2007.
-# Mario Blättermann <[email protected]>, 2009.
-# Christian Kirbach <[email protected]>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Christian <[email protected]>, 2010
+# Hendrik Richter <[email protected]>, 2006, 2007
+# Mario Blättermann <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-31 20:08+0200\n"
-"PO-Revision-Date: 2010-03-31 20:09+0200\n"
-"Last-Translator: Christian Kirbach <[email protected]>\n"
-"Language-Team: Deutsch <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/MATE/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimedia-Menü"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Multimedia"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimedia-Menü"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Entwicklung"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Werkzeuge zur Software-Entwicklung"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Bildung"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Spiele"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Spiel und Spaß"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Anwendungen zur Grafikbearbeitung"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Einstellungen für Hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet und Netzwerk"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Netzwerkbezogene Einstellungen"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Darstellung"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Einstellungen für das Aussehen und das Verhalten der Arbeitsoberfläche"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programme um Internet-Dienste wie E-Mail oder das WWW zu nutzen"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Büro"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Büroanwendungen"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Persönliche Vorlieben und Einstellungen"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Systemverwaltung"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Systemweite Einstellungen ändern (dies betrifft alle Benutzer)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Persönliche Einstellungen"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Persönliche Einstellungen"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "System"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Systemeinstellungen"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Systemwerkzeuge"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Systemkonfiguration und -überwachung"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Barrierefreiheit"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Einstellungen zur Barrierefreiheit"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Zubehör"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Desktop-Zubehör"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Anwendungen"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Persönliche Anpassungen und Administratoreinstellungen"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Anwendungen welche in keine andere Kategorie eingeordnet werden können"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Sonstige"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menüeditor"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Menüs bearbeiten"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Anwendungen:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Vorgaben"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menüs:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Einfacher Menüeditor %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Name"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Das Heimatverzeichnis des Benutzers konnte nicht gefunden werden: es ist "
-"weder in /etc/passwd angegeben, noch gibt es einen Wert für die "
-"Umgebungsvariable $HOME"
-
-#~ msgid "Menu file"
-#~ msgstr "Menüdatei"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "MENÜ_DATEI"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Menüänderungen überwachen"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Mit »<ausschließen>« markierte Einträge einbeziehen"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "Mit »NoDisplay=true« markierte Einträge einbeziehen"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "Ungültige Desktop-Dateikennung"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Ungültiger Dateiname]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <ausschließen>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menü wurde geändert, wird neu geladen ====\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "Der Menübaum ist leer"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr "- testen der MATE-Implementation der Desktop-Menü-Spezifikation"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Einstellungen zur Barrierefreiheit"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Persönliche Vorlieben und Einstellungen"
-
-#~ msgid "Accessibility"
-#~ msgstr "Barrierefreiheit"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Einstellungen zur Barrierefreiheit"
-
-#~ msgid "Desktop"
-#~ msgstr "Desktop"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Anwendungen welche in keine andere Kategorie eingeordnet werden können"
diff --git a/po/dz.po b/po/dz.po
index 3c6f7dc..b508249 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,275 +1,168 @@
-# Dzongkha translation of mate-menus
-# Copyright @ 2006 Free Software Foundation, Inc.
-# Mindu Dorji
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD.dz\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-02 03:41+0100\n"
-"PO-Revision-Date: 2007-06-27 04:18+0530\n"
-"Last-Translator: Tshewang Norbu <[email protected]>\n"
-"Language-Team: DZONGKHA <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Dzongkha (http://www.transifex.com/projects/p/MATE/language/dz/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2;plural=(n!=1);\n"
-"X-Poedit-Language: Dzongkha\n"
-"X-Poedit-Country: BHUTAN\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: dz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Universal Access"
-msgstr "འཛམ་གླིང་ཡོངས་ཁྱབ་འཛུལ་སྤྱོད་འབད་ནི"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Universal Access Settings"
-msgstr "འཛམ་གླིང་ཡོངས་ཁྱབ་འཛུལ་སྤྱོད་ཀྱི་གཞི་སྒྲིག་ཚུ"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "ཡན་ལག་ཅ་ཆས།"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "ཌེཀསི་ཊོཔ་གི་ ཡན་ལག་ཅ་ཆས།"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "གློག་རིམ།"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Personal preferences and administration settings"
-msgstr "རང་དོན་དགའ་གདམ་དང་ བདག་སྐྱོང་གི་གཞི་སྒྲིག་ཚུ།"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "སྒྲ་སྐད་དང་གཟུགས་བརྙན།"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-#: ../desktop-directories/System.directory.in.h:1
-msgid "System"
-msgstr "རིམ་ལུགས་"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "སྣ་མང་བརྡ་ལམ་དཀར་ཆག།"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "ལས་རིམ་བཟོ་བ།"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "མཉེན་ཆས་བཟོ་ནིའི་ལག་ཆས།"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "ཤེས་རིག"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "རྩེད་རིགས།"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "རྩེད་རིགས་དང་ དགོད་བྲ་ཚུ།"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "ཚད་རིས།"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "ཚད་རིས་ཀྱི་གློག་རིམ།"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "སྲ་ཆས་"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "སྲ་ཆས་ཀྱི་ཐབས་འཕྲུལ་ལེ་ཤ་ཅིག་གི་དོན་ལུ་སྒྲིག་སྟངས་"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ཨིན་ཊར་ནེཊི་དང་ཡོངས་འབྲེལ་"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "ཡོང་འབྲེལ་དང་འབྲེལ་བའི་སྒྲིག་སྟངས་"
 
-#: ../desktop-directories/Internet.directory.in.h:1
-msgid "Internet"
-msgstr "ཨིན་ཊར་ནེཊི།"
-
-#: ../desktop-directories/Internet.directory.in.h:2
-msgid "Programs for Internet access such as web and email"
-msgstr "ཨིན་ཊར་ནེཊི་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་ལས་རིམ་ དཔེར་ན་ ཝེབ་དང་གློག་འཕྲིན་ལྟ་བུ།"
-
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "བལྟ་ནི་དང་འཚོར་སྣང་"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ཌེཀསི་ཊོཔ་གི་འབྱུང་སྣང་དང་སྤཡོད་ལམ་འདི་ཚད་འཛིན་འབད་མི་སྒྲིག་སྟངས་"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "སྣ་མང་བརྡ་ལམ་དཀར་ཆག།"
+#: ../desktop-directories/mate-network.directory.in.h:1
+msgid "Internet"
+msgstr "ཨིན་ཊར་ནེཊི།"
 
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "སྒྲ་སྐད་དང་གཟུགས་བརྙན།"
+#: ../desktop-directories/mate-network.directory.in.h:2
+msgid "Programs for Internet access such as web and email"
+msgstr "ཨིན་ཊར་ནེཊི་ལུ་ འཛུལ་སྤྱོད་འབད་ནིའི་ལས་རིམ་ དཔེར་ན་ ཝེབ་དང་གློག་འཕྲིན་ལྟ་བུ།"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "ཡིག་ཚང་།"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "ཡིག་ཚང་གི་གློག་རིམ།"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "དབྱེ་ཁག་གཞན་ནང་ ཚུད་སྒྲིག་མེད་པའི་གློག་རིམ།"
-
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "གཞན།"
-
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "རང་དོན་"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "རང་དོན་སྒྲིག་སྟངས་"
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "རང་དོན་དགའ་གདམ་ཚུ།"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "བདག་སྐྱོང་།"
+
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr "རིམ་ལུགས་ཡོངས་ཀྱི་ གཞི་སྒྲིག་བསྒྱུར་བཅོས་འབད (ལག་ལེན་པ་ཀུན་ལུ་ཕན་གནོད་ཡོད)"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "དགའ་གདམ་ཚུ།"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Universal access related preferences"
-msgstr "འཛམ་གླིང་ཡོངས་ཁྱབ་འཛུལ་སྤྱོད་དང་འབྲེལ་བའི་ དགའ་གདམ་ཚུ"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "རང་དོན་དགའ་གདམ་ཚུ།"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "རང་དོན་དགའ་གདམ་དང་ གཞི་སྒྲིག་ཚུ།"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr "རིམ་ལུགས་"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "རིམ་ལུགས་སྒྲིག་སྟངས་"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "བདག་སྐྱོང་།"
-
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change system-wide settings (affects all users)"
-msgstr "རིམ་ལུགས་ཡོངས་ཀྱི་ གཞི་སྒྲིག་བསྒྱུར་བཅོས་འབད (ལག་ལེན་པ་ཀུན་ལུ་ཕན་གནོད་ཡོད)"
-
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "རིམ་ལུགས་ལག་ཆས།"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "རིམ་ལུགས་རིམ་སྒྲིག་དང་ལྟ་རྟོག།"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "དཀར་ཆག་ཞུན་དགཔ།"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "དཀར་ཆག་ཚུ་ཞུན་དག་རྐྱབས།"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "གློག་རིམ་ཚུ་:(_A)"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "སྔོན་སྒྲིག་ཚུ།(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "དཀར་ཆག་ཚུ་:(_M)"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "མིང་།"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "སྟོན།"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "ཁྱིམ་གྱི་སྣོད་ཐོ་ འཚོལ་མི་ཐོབ་པས་: /etc/passwd ནང་ གཞི་སྒྲིག་མ་འབདཝ་མ་ཚད་ མཐའ་འཁོར་ནང་ $HOME གི་དོན་ལུ་ ལེ་བུ་མིན་འདུག"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "དཀར་ཆག་ཡིག་སྣོད།"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "དཀར་ཆག་ཡིག་སྣོད།(_F)"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "དཀར་ཆག་བསྒྱུར་བཅོས་ཀྱི་ལྟ་རྟོག་པ།"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
+msgstr "འཛམ་གླིང་ཡོངས་ཁྱབ་འཛུལ་སྤྱོད་འབད་ནི"
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "ཌི་ཐོ་བཀོད་ཚུ་ གྲངས་སུ་བཙུགས་ <གྲངས་ལས་བཏོན་>"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr "འཛམ་གླིང་ཡོངས་ཁྱབ་འཛུལ་སྤྱོད་ཀྱི་གཞི་སྒྲིག་ཚུ"
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "ནོ་ཌིསི་པེ་ལེ་ གྲངས་སུ་བཙུགས་ = ཐོ་བཀོད་ངེས་བདེན་ཚུ།"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "ཡན་ལག་ཅ་ཆས།"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ནུས་མེད་ཌེཀསི་ཊོཔ་ཡིག་སྣོད་ཀྱི་ཨའི་ཌི།"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "ཌེཀསི་ཊོཔ་གི་ ཡན་ལག་ཅ་ཆས།"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[ནུས་མེད་ཡིག་སྣོད་མིང་]"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "གློག་རིམ།"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr "<གྲངས་ལས་བཏོན་ཡོདཔ་>"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "རང་དོན་དགའ་གདམ་དང་ བདག་སྐྱོང་གི་གཞི་སྒྲིག་ཚུ།"
 
-#: ../util/test-menu-spec.c:164
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== དཀར་ཆག་སོར་ཡི། སླར་མངོན་གསལ་འབད་དོ། ====\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169
-#: ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "དཀར་ཆག་རྩ་འབྲེལ་སྟོངམ་ཨིན་པས།"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "ཌེཀསི་ཊོཔ་ དཀར་ཆག་གསལ་བཀོད་ཀྱི་ ཇི་ནོམ་བསྟར་སྤྱོད་ལུ་ བརྟག་ཞིབ་འབད།"
-
-#~ msgid "Accessibility"
-#~ msgstr "འཛུལ་སྤྱོད།"
-#~ msgid "Accessibility Settings"
-#~ msgstr "འཛུལ་སྤྱོད་ཀྱི་གཞི་སྒྲིག་ཚུ།"
-#~ msgid "Desktop"
-#~ msgstr "ཌེཀསི་ཊོཔ།"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "གཞན།"
 
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "དབྱེ་ཁག་གཞན་ནང་ ཚུད་སྒྲིག་མེད་པའི་གློག་རིམ།"
diff --git a/po/el.po b/po/el.po
index f422b6c..050ff5a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,255 +1,171 @@
-# Translation of mate-menus to Greek
-# This file is distributed under the same license as the mate-menus package.
-# Copyright (C) Free Software Foundation.
-#
-# Simos Xenitellis <[email protected]>, 2004.
-# Nikos Charonitakis <[email protected]>, 2005.
-# Kostas Papadimas <[email protected]>, 2006.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Kostas Papadimas <[email protected]>, 2006
+# Nikos Charonitakis <[email protected]>, 2005
+# Simos Xenitellis <[email protected]>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-28 09:57+0300\n"
-"PO-Revision-Date: 2010-03-28 10:00+0200\n"
-"Last-Translator: Kostas Papadimas <[email protected]>\n"
-"Language-Team: Greek <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/MATE/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Μενού πολυμέσων"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Ήχος και βίντεο"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Μενού πολυμέσων"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Προγραμματισμός"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Εργαλεία για ανάπτυξη λογισμικού"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Εκπαίδευση"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Παιχνίδια"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Παιχνίδια και διασκέδαση"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Γραφικά"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Εφαρμογές γραφικών"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Υλικό"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Ρυθμίσεις για διάφορες συσκευές"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Διαδίκτυο και δίκτυο"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Ρυθμίσεις για το δίκτυο"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Ρυθμίσεις εμφάνισης"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Ρυθμίσεις για την εμφάνιση και συμπεριφορά της επιφάνειας εργασίας"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Διαδίκτυο"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Προγράμματα πρόσβασης στο Διαδίκτυο όπως φυλλομετρητής και ηλεκ. αλληλογραφία"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Γραφείο"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Εφαρμογές γραφείου"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Προσωπικές ρυθμίσεις"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Διαχείριση συστήματος"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Τροποποίηση ρυθμίσεων συστήματος (επηρεάζει όλους τους χρήστες)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Προσωπικές προτιμήσεις"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Προσωπικές προτιμήσεις"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Σύστημα"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Ρυθμίσεις συστήματος"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Εργαλεία συστήματος"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Ρύθμιση και έλεγχος συστήματος"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Γενική πρόσβαση"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Ρυθμίσεις γενικής πρόσβασης"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Βοηθήματα"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Βοηθήματα επιφάνειας εργασίας"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Εφαρμογές"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Προσωπικές προτιμήσεις και ρυθμίσεις διαχείρισης"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Εφαρμογές που δεν ταιριάζουν στις άλλες κατηγορίες"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Άλλα"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Επεξεργαστής μενού"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Επεξεργασία μενού"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Εφαρμογές:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Προεπιλεγμένα"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Μενού:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Απλός Επεξεργαστής μενού %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Όνομα"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Εμφάνιση"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "Αδυναμία εύρεσης αρχικού καταλόγου: δεν έχει ορισθεί τιμή στο /etc/passwd και στο$HOME στο περιβάλλον"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Προτιμήσεις σχετικά με γενική πρόσβαση"
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Προσωπικές προτιμήσεις και ρυθμίσεις"
-#~ msgid "Menu file"
-#~ msgstr "Αρχείο μενού"
-#~ msgid "MENU_FILE"
-#~ msgstr "MENU_FILE"
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Παρακολούθηση για αλλαγές στο μενού"
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Να συμπεριλαμβάνονται <αποκλεισμένες> καταχωρίσεις"
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "Να συμπεριλαμβάνονται <αποκλεισμένες> καταχωρίσεις"
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "Μη έγκυρο αναγνωριστικό αρχείου επιφάνειας εργασίας"
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Μη έγκυρο όνομα αρχείου]"
-#~ msgid " <excluded>"
-#~ msgstr " <αποκλεισμένα>"
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Το μενού άλλαξε, επαναφόρτωση ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgid "Menu tree is empty"
-#~ msgstr "Το δέντρο μενού είναι κενό"
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr ""
-#~ "- δοκιμή της εφαρμογής από το MATE των οδηγιών μενού επιφάνειας εργασίας"
-#~ msgid "Accessibility"
-#~ msgstr "Προσιτότητα"
-#~ msgid "Accessibility Settings"
-#~ msgstr "Ρυθμίσεις Προσιτότητας"
-#~ msgid "Desktop"
-#~ msgstr "Επιφάνεια Εργασίας"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Εφαρμογές που δεν ταιριάζουν στις άλλες κατηγορίες"
diff --git a/po/en_CA.po b/po/en_CA.po
index c783eb7..cdc813e 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,232 +1,169 @@
-# Canadian English translation for mate-menus
-# Copyright (C) 2004-2005 Adam Weinberger and the MATE Foundation
-# This file is distributed under the same licence as the mate-menus package.
-# Adam Weinberger <[email protected]>, 2004, 2005.
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Adam Weinberger <[email protected]>, 2004, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-23 02:37-0500\n"
-"PO-Revision-Date: 2005-08-02 01:44-0400\n"
-"Last-Translator: Adam Weinberger <[email protected]>\n"
-"Language-Team: Canadian English <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: English (Canada) (http://www.transifex.com/projects/p/MATE/language/en_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_CA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "Accessibility"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "Accessibility Settings"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "Accessories"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "Desktop accessories"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "Applications"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Desktop"
-msgstr "Desktop"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "Sound & Video"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-msgid "Personal preferences and administration settings"
-msgstr "Personal preferences and administration settings"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimedia menu"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programming"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Tools for software development"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Education"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Games"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Games and amusements"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Graphics applications"
 
-#: ../desktop-directories/Internet.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
+msgid "Hardware"
+msgstr ""
+
+#: ../desktop-directories/mate-hardware.directory.in.h:2
+msgid "Settings for several hardware devices"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
+msgid "Internet and Network"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
+msgid "Network-related settings"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
+msgid "Look and Feel"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
+msgid "Settings controlling the desktop appearance and behavior"
+msgstr ""
+
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Internet.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programs for Internet access, such as web and email"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimedia menu"
-
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "Sound & Video"
-
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Office"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Office Applications"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Applications that do not fit in other categories"
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
+msgid "Personal"
+msgstr ""
 
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "Other"
+#: ../desktop-directories/mate-personal.directory.in.h:3
+msgid "Personal settings"
+msgstr ""
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Personal preferences"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "Administration"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr ""
+
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Accessibility related preferences"
-msgstr "Accessibility-related preferences"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "Personal preferences and settings"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Personal preferences"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "Administration"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr ""
 
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change systemwide settings (affects all users)"
-msgstr "Change system-wide settings (affects all users)"
+#: ../desktop-directories/mate-system.directory.in.h:2
+msgid "System settings"
+msgstr ""
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "System Tools"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "System configuration and monitoring"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menu Editor"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Edit Menus"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Applications:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Defaults"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Menus:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "Name"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "Show"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
 msgstr ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menu file"
 
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitor for menu changes"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr ""
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Include <Exclude>d entries"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "Accessories"
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Include NoDisplay=true entries"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "Desktop accessories"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Invalid desktop file ID"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "Applications"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Invalid Filename]"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "Personal preferences and administration settings"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "Other"
 
-#: ../util/test-menu-spec.c:164
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed; reloading ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menu tree is empty"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- test MATE's implementation of the Desktop Menu Specification"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Applications that do not fit in other categories"
diff --git a/po/en_GB.po b/po/en_GB.po
index a2d0872..b57e550 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,283 +1,170 @@
-# English (British) translation for mate-menus
-# Copyright (C) 2005 The Mate Foundation
-# This file is distributed under the same license as the mate-menus package.
-# David Lodge <[email protected]>, 2005.
-# Philip Withnall <[email protected]>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# David Lodge <[email protected]>, 2005
+# pwithnall <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 23:34+0100\n"
-"PO-Revision-Date: 2007-05-15 22:40-0000\n"
-"Last-Translator: Philip Withnall <[email protected]>\n"
-"Language-Team: British English <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/MATE/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimedia menu"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Sound & Video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimedia menu"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programming"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Tools for software development"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Education"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Games"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Games and amusements"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graphics"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Graphics applications"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Settings for several hardware devices"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet and Network"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Network-related settings"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Look and Feel"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Settings controlling the desktop appearance and behaviour"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programs for Internet access such as web and email"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Office"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Office Applications"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personal"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Personal settings"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administration"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Change system-wide settings (affects all users)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Personal preferences"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Personal preferences"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "System"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "System settings"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "System Tools"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "System configuration and monitoring"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universal Access"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Universal Access Settings"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accessories"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Desktop accessories"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Applications"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Personal preferences and administration settings"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Applications that did not fit in other categories"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Other"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menu Editor"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Edit Menus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Applications:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Defaults"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menus:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Simple Menu Editor %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Name"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Show"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menu file"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitor for menu changes"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Include <Exclude>d entries"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Include NoDisplay=true entries"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Invalid desktop file ID"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Invalid Filename]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menu tree is empty"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- test MATE's implementation of the Desktop Menu Specification"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Universal access related preferences"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Personal preferences and settings"
-
-#~ msgid "Accessibility"
-#~ msgstr "Accessibility"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Accessibility Settings"
-
-#~ msgid "Desktop"
-#~ msgstr "Desktop"
-
-#~ msgid "Hide"
-#~ msgstr "Hide"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Applications that did not fit in other categories"
diff --git a/po/eo.po b/po/eo.po
index ab93197..689894e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,315 +1,171 @@
-# Esperanto translation for mate-menus
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
-# This file is distributed under the same license as the mate-menus package.
-#
-# Joop EGGEN <[email protected]>, 2006
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Guillaume SAVATON <[email protected]>, 2006
-# Kristjan SCHMIDT <[email protected]>, 2010.
-#
+# Joop EGGEN <[email protected]>, 2006
+# kristjan <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2010-06-22 01:58+0000\n"
-"PO-Revision-Date: 2010-06-23 17:13+0200\n"
-"Last-Translator: Kristjan SCHMIDT <[email protected]>\n"
-"Language-Team: Esperanto <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Esperanto (http://www.transifex.com/projects/p/MATE/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-23 15:12+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Plurmediomenuo"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Sono kaj video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Plurmediomenuo"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programado"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Iloj por programado"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Edukado"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Ludoj"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Ludoj kaj amuzoj"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafikoj"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafikaj aplikaĵoj"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Aparataro"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Agordaro por pluraj aparatoj"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Interreto kaj reto"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Retrilata agordaro"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aspekto kaj konduto"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Agordaro reganta aspekton kaj konduton de la labortablo"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Interreto"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programoj por retuzo, ekzemple por retlegado kaj retpoŝto"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Oficejo"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Oficejaj aplikaĵoj"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Persona"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Persona agordaro"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administrado"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Ŝanĝi plensistemajn agordojn (aplikiĝas al ĉiuj uzantoj)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Personaj agordoj"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Agordoj"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Personaj agordoj"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistemo"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Sistema agordaro"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Sistemaj iloj"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Agordi kaj kontroli sistemon"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universala aliro"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Agordoj por universala aliro"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Utilaĵoj"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Labortablaj utilaĵoj"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplikaĵoj"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Personaj preferoj kaj administraj agordoj"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplikaĵoj neagordaj aliajn kategoriojn"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Alia"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menua redaktilo"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Redakti menuojn"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplikaĵoj:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Defaŭltoj"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menuoj:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Simpla menu-redaktilo %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nomo"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Montri"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Ne eblas trovi hejman dosierujon: ne agordita en /etc/passwd kaj mankas "
-"valoro por media variablo $HOME"
-
-#~ msgid "Action"
-#~ msgstr "Ago"
-
-#~ msgid "Action games"
-#~ msgstr "Agaj ludoj"
-
-#~ msgid "Adventure"
-#~ msgstr "Aventuro"
-
-#~ msgid "Adventure style games"
-#~ msgstr "Aventur-ludoj"
-
-#~ msgid "Arcade"
-#~ msgstr "Arkado"
-
-#~ msgid "Arcade style games"
-#~ msgstr "Arkadmanieraj ludoj"
-
-#~ msgid "Falling blocks"
-#~ msgstr "Falantaj blokoj"
-
-#~ msgid "Falling blocks games"
-#~ msgstr "Ludoj de falantaj blokoj"
-
-#~ msgid "Board"
-#~ msgstr "Tabulo"
-
-#~ msgid "Board games"
-#~ msgstr "Tabulaj ludoj"
-
-#~ msgid "Card games"
-#~ msgstr "Kart-ludoj"
-
-#~ msgid "Cards"
-#~ msgstr "Kartoj"
-
-#~ msgid "Debian"
-#~ msgstr "Debiano"
-
-#~ msgid "The Debian menu"
-#~ msgstr "La Debiana menuo"
-
-#~ msgid "Science"
-#~ msgstr "Scienco"
-
-#~ msgid "Scientific applications"
-#~ msgstr "Sciencaj programoj"
-
-#~ msgid "Games for kids"
-#~ msgstr "Infan-ludoj"
-
-#~ msgid "Kids"
-#~ msgstr "Infanoj"
-
-#~ msgid "Logic"
-#~ msgstr "Logiko"
-
-#~ msgid "Logic and puzzle games"
-#~ msgstr "Puzloj kaj logikaj ludoj"
-
-#~ msgid "Role playing"
-#~ msgstr "Rolo"
-
-#~ msgid "Role playing games"
-#~ msgstr "Rolo-ludoj"
-
-#~ msgid "Simulation"
-#~ msgstr "Ŝajnigado"
-
-#~ msgid "Simulation games"
-#~ msgstr "Ŝajnigadaj ludoj"
-
-#~ msgid "Sports"
-#~ msgstr "Sporto"
-
-#~ msgid "Sports games"
-#~ msgstr "Sportaj ludoj"
-
-#~ msgid "Strategy"
-#~ msgstr "Strategio"
-
-#~ msgid "Strategy games"
-#~ msgstr "Strategiaj ludoj"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Kontrolilo por menuaj ŝanĝoj"
-
-#~ msgid "Menu file"
-#~ msgstr "Menua dosiero"
-
-#~ msgid " <excluded>"
-#~ msgstr " <ekskludita>"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Nevalida dosiernomo]"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "MENU_FILE"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplikaĵoj neagordaj aliajn kategoriojn"
diff --git a/po/es.po b/po/es.po
index 490cf3b..aeebead 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,281 +1,172 @@
-# translation of mate-menus to spanish
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) 2005 Mate Foundation, 2005.
-#
-# Francisco Javier F. Serrador <[email protected]>, 2005, 2006.
-# Claudio Saavedra <[email protected]>, 2007.
-# Jorge González <[email protected]>, 200, 2009.
+# 
+# Translators:
+# Claudio Saavedra <[email protected]>, 2007
+# Copyright (C) 2005 Mate Foundation, 2005
+# Francisco Javier F. Serrador <[email protected]>, 2005, 2006
+# Jorge González <[email protected]>, 200, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD.es\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-06-27 14:57+0200\n"
-"Last-Translator: Jorge González <[email protected]>\n"
-"Language-Team: Español <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/MATE/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menú de programas para multimedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Sonido y vídeo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menú de programas para multimedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programación"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Herramientas para el desarrollo del software"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Educación"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Juegos"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Juegos y distracciones"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicaciones gráficas"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Propiedades para varios dispositivos de hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet y red"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Propiedades relacionadas con la red"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Visualización y comportamiento"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
-msgstr ""
-"Propiedades que controlan la apariencia y el comportamiento del escritorio"
+msgstr "Propiedades que controlan la apariencia y el comportamiento del escritorio"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programas para acceso a Internet, tales como web y correo-e"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Oficina"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicaciones de oficina"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personal"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Preferencias personales"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administración"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"Cambia las preferencias globales del sistema (afecta a todos los usuarios)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferencias personales"
+msgstr "Cambia las preferencias globales del sistema (afecta a todos los usuarios)"
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferencias personales"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Preferencias del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Herramientas del sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuración y monitorización del sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Acceso universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Preferencias del acceso universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accesorios"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accesorios del escritorio"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Propiedades personales y opciones de administración"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicaciones que no entran en otras categorías"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Otras"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor del menú"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Editar menús"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplicaciones:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Predeterminados"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menús:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "Editor simple del menú %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nombre"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"No se puede encontrar el directorio personal: no está establecido en /etc/"
-"passwd y no hay ningún valor en la variable de entorno $HOME"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Archivo de menú"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "ARCHIVO_MENÚ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitorizar cambios en el menú"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Incluir entradas <Exclude>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Incluir entradas Nodisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Id de archivo de escritorio inválido"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Nombre de archivo inválido]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== El menú ha cambiado, recargándolo ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "El árbol del menú está vacío"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-"- probar la implementación de MATE de la Especificación del Menú de "
-"Escritorio"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Preferencias relacionadas con el acceso universal"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Preferencias y configuración personales"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicaciones que no entran en otras categorías"
diff --git a/po/et.po b/po/et.po
index 473495d..95b36fb 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,219 +1,170 @@
-# MATE menüüde eesti keele tõlge
-# Estonian translation of Mate-menus
-#
-# Copyright (C) 2005 Free Software Foundation, Inc.
-# Copyright (C) 2007 The MATE Project
-# This file is distributed under the same license as the Mate-menus package.
-#
-# Priit Laes <[email protected]>, 2005.
-# Ivar Smolin <[email protected]>, 2005, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ivar Smolin <[email protected]>, 2005, 2007
+# Priit Laes <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-06-25 01:27+0300\n"
-"Last-Translator: Mattias Põldaru <mahfiaz gmail com>\n"
-"Language-Team: Estonian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/MATE/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-msgid "Multimedia menu"
-msgstr "Multimeediamenüü"
-
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Audio ja video"
 
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimeediamenüü"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmeerimine"
 
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Tarkvaraarenduse tööriistad"
 
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Õppeprogrammid"
 
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Mängud"
 
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Mängud ja meelelahutus"
 
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graafika"
 
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Graafikatöötlusprogrammid"
 
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Riistvara"
 
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Mõnede riistvaraliste seadmete sätted"
 
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet ja võrk"
 
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Võrguga seotud sätted"
 
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Välimus ja tunnetus"
 
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Töölaua välimuse ja käitumise juhtimine"
 
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Internetprogrammid - näiteks veebi ja e-posti jaoks"
 
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Kontor"
 
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Kontoritarkvara"
 
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Isiklik"
 
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Isiklikud sätted"
 
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Haldamine"
 
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Ülesüsteemiliste sätete muutmine (mõjutab kõiki kasutajaid)"
 
-msgid "Personal preferences"
-msgstr "Isiklikud eelistused"
-
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Eelistused"
 
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Isiklikud eelistused"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Süsteem"
 
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Süsteemi sätted"
 
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Süsteemi tööriistad"
 
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Süsteemi seadistamine ja jälgimine"
 
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universaalne ligipääs"
 
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Universaalse ligipääsu sätted"
 
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Tarvikud"
 
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Töölaua tarvikud"
 
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Rakendused"
 
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Isiklikud eelistused ja haldussätted"
 
-msgid "Applications that did not fit in other categories"
-msgstr "Rakendused, mis ei sobinud teistesse kategooriatesse"
-
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Muu"
 
-msgid "Menu Editor"
-msgstr "Menüüredaktor"
-
-msgid "Edit Menus"
-msgstr "Menüüde redigeermine"
-
-msgid "_Applications:"
-msgstr "_Rakendused:"
-
-msgid "_Defaults"
-msgstr "_Vaikimisi"
-
-msgid "_Menus:"
-msgstr "_Menüüd:"
-
-#. Translators: %s is the version number
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "Lihtne menüüredaktor %s"
-
-msgid "Name"
-msgstr "Nimi"
-
-msgid "Show"
-msgstr "Vaade"
-
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Kodukausta pole võimalik leida: seda pole määratud ei /etc/passwd failis ega "
-"$HOME keskkonnamuutujas"
-
-msgid "Menu file"
-msgstr "Menüüfail"
-
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-msgid "Monitor for menu changes"
-msgstr "Jälgi muudatusi menüüs"
-
-msgid "Include <Exclude>d entries"
-msgstr "Kaasa ka <välistatud> kirjed"
-
-msgid "Include NoDisplay=true entries"
-msgstr "Kaasa ka <NoDisplay=true> kirjed"
-
-msgid "Invalid desktop file ID"
-msgstr "Vigane töölauafaili ID"
-
-msgid "[Invalid Filename]"
-msgstr "[Vigane failinimi]"
-
-msgid " <excluded>"
-msgstr "<välistatud>"
-
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menüü muudetud, laaditakse uuesti ====\n"
-"\n"
-"\n"
-
-msgid "Menu tree is empty"
-msgstr "Menüüpuu on tühi"
-
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- testi MATE'ipoolset teostust Töölauamenüü spetsifikatsioonist"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Universaalse ligipääsuga seotud eelistused"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Isiklikud eelistused ja sätted"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Rakendused, mis ei sobinud teistesse kategooriatesse"
diff --git a/po/eu.po b/po/eu.po
index 5a54c81..2395013 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,269 +1,171 @@
-# translation of eu.po to Basque
-# This file is distributed under the same license as the mate-menus package.
-#
-# Mikel Olasagasti <[email protected]>, 2004, 2005.
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2005, 2007, 2008, 2009, 2010.
-# Iñaki Larrañaga Murgoitio <[email protected]>, 2007.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Iñaki Larrañaga Murgoitio <[email protected]>, 2005, 2007, 2008, 2009, 2010
+# Iñaki Larrañaga Murgoitio <[email protected]>, 2007
+# Mikel Olasagasti <[email protected]>, 2004, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 18:26+0200\n"
-"PO-Revision-Date: 2010-03-23 15:09+0100\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <[email protected]>\n"
-"Language-Team: Basque <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/MATE/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimediaren menua"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Soinua eta bideoa"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimediaren menua"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programazioa"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Softwarea garatzeko tresnak"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Hezkuntza"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Jokoak"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Jokoak eta denbora-pasak"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Irudiak"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Irudi aplikazioak"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardwarea"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Hainbat gailuentzako ezarpenak"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet eta sarea"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Sareko ezarpenak"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Itxura eta izaera"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Mahaigainaren itxura eta portaera kontrolatzeko ezarpenak"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Interneteko programak (web arakatzaileak eta posta bezeroak adib.)"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Bulegoa"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Bulegorako aplikazioak"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Ezarpen pertsonalak"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Sistema-konfigurazioa"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Aldatu sistema osoko ezarpenak (erabiltzaile guztiengan du eragina)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Hobespen pertsonalak"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Hobespen pertsonalak"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Sistemaren ezarpenak"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Sistemaren tresnak"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Sistemaren konfigurazioa eta monitorizazioa"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Sarbide unibertsala"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Sarbide unibertsalaren ezarpenak"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Gehigarriak"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Mahaigainaren gehigarriak"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplikazioak"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Hobespen pertsonalak eta administrazio-ezarpenak"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Sailkatu ezin diren aplikazioak"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Bestelakoak"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menu-editorea"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Editatu menuak"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplikazioak:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Lehenetsiak"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menuak:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Menu-editore bakuna %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Izena"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Erakutsi"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Ezin izan da etxeko direktorioa aurkitu: ez dago /etc/passwd-en ezarrita, "
-"ezta ere inguruneko $HOME aldagaian"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menu-fitxategia"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FITXATEGIA"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Menu-aldaketen monitorea"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Txertatu <Exclude> sarrerak"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Txertatu 'NoDisplay=true' sarrerak"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Mahaigaineko fitxategiaren ID baliogabea"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Fitxategi-izen baliogabea]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <baztertua>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menua aldatua, birkargatzen ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menuaren zuhaitza hutsik dago"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- probatu MATEren mahaigaineko menuak zehazteko inplementazioa"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Sailkatu ezin diren aplikazioak"
diff --git a/po/fa.po b/po/fa.po
index a47c116..068fcf3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,272 +1,173 @@
-# Persian translation of mate-menus.
-# Copyright (C) 2005 Sharif FarsiWeb, Inc.
-# This file is distributed under the same license as the mate-menus package.
-# Farzaneh Sarafraz <[email protected]>, 2005.
-# Meelad Zakaria <[email protected]>, 2005.
-# Roozbeh Pournader <[email protected]>, 2005, 2008.
-# Arash Mousavi <[email protected]>, 2008.
-# Elnaz Sarbar <[email protected]>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# arashm <[email protected]>, 2008
+# Elnaz Sarbar <[email protected]>, 2008
+# Farzaneh Sarafraz <[email protected]>, 2005
+# Meelad Zakaria <[email protected]>, 2005
+# Roozbeh Pournader <[email protected]>, 2005, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-17 14:41+0100\n"
-"PO-Revision-Date: 2008-09-18 22:48-0700\n"
-"Last-Translator: Roozbeh Pournader <[email protected]>\n"
-"Language-Team: Persian\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Persian (http://www.transifex.com/projects/p/MATE/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "منوی چندرسانه‌ای"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "صدا و تصویر"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "منوی چندرسانه‌ای"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "برنامه‌سازی"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "ابزارهای تولید نرم‌افزار"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "آموزش"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "بازی‌ها"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "بازی و سرگرمی"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "گرافیک"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "برنامه‌های گرافیکی"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "سخت‌افزار"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "تنظیمات دستگاه‌های مختلف سخت‌افزاری"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "اینترنت و شبکه"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "تنظیمات مربوط به شبکه"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "شکل و رفتار"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "تنظیماتی که ظاهر و رفتار رومیزی را کنترل می‌کنند"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "اینترنت"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "برنامه‌هایی برای دست‌یابی به اینترنت مثل وب و پست الکترونیکی"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "اداری"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "برنامه‌های اداری"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "شخصی"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "تنظیمات شخصی"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "مدیریت"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "تغییر تنظیمات کل سیستم (همه‌ی کاربران متأثر می‌شوند)‏"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ترجیحات شخصی"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "ترجیحات"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ترجیحات شخصی"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "سیستم"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "تنظیمات سیستم"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "ابزارهای سیستم"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "پیکربندی و پایشگری سیستم"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "دسترسی همگانی"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "تنظیمات دسترسی همگانی"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "لوازم"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "لوازم رومیزی"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "برنامه‌ها"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ترجیحات شخصی و تنظیمات مدیریتی"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "برنامه‌هایی که در مقولات دیگر جا نمی‌گیرند"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "غیره"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "ویرایشگر منو"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "ویرایش منوها"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_برنامه‌ها:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_پیش‌فرض‌ها"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_منوها:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "نام"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "نشان دادن"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"شاخه‌ی آغازه پیدا نمی‌شود: در ‎/etc/passwd تنظیم نشده و ‎$HOME نیز در محیط مقدار "
-"ندارد"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "پرونده‌ی منو"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "پایشگر تغییرات منو"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "شامل کردن مدخل‌های <Exclude>شده‏"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "شامل کردن مدخل‌های NoDisplay=درست"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "شناسه‌ی نامعتبر برای پرونده‌ی رومیزی"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[پرونده‌ی نامعتبر]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <کنار گذاشته شده>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== منو تغییر کرد، مجدداً بارگیری می‌شود ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "درخت منو خالی است"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- آزمایش پیاده‌سازی گنوم از توصیف منوی رومیزی"
-
-#~ msgid "Accessibility"
-#~ msgstr "دسترسی‌پذیری"
-
-#~ msgid "Desktop"
-#~ msgstr "رومیزی"
-
-#~ msgid "Accessibility related preferences"
-#~ msgstr "ترجیحات مربوط به دسترسی‌پذیری"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "برنامه‌هایی که در مقولات دیگر جا نمی‌گیرند"
diff --git a/po/fi.po b/po/fi.po
index 5747de4..2d6cb1e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,282 +1,169 @@
-# Finnish messages for mate-menus
-# Copyright (C) 2004-2005 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gail package.
-# Tommi Vainikainen <[email protected]>, 2004-2005.
-# Ilkka Tuohela <[email protected]>, 2005.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ilkka Tuohela <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 10:39+0300\n"
-"PO-Revision-Date: 2009-07-19 10:45+0300\n"
-"Last-Translator: Ilkka Tuohela <[email protected]>\n"
-"Language-Team: Finnish <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/MATE/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimediavalikko"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Ääni & video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimediavalikko"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Ohjelmointi"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Työkaluja sovelluskehitykseen"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Opetusohjelmat"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Pelit"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Pelit ja viihde"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafiikka"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafiikkasovellukset"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Laitteisto"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Laitteiston asetukset"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet ja verkko"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Verkkoon liittyvät asetukset"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Ulkoasu ja käyttötuntuma"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Työpöytäympäristön ulkoasua ja toimintaa ohjaavat asetukset"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Internet-sovellukset kuten selain ja sähköposti"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Toimisto"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Toimistosovellukset"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Henkilökohtaiset"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Henkilökohtaiset asetukset"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Ylläpito"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Muuta järjestelmänlaajuisia asetuksia (vaikuttaa joka käyttäjään)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Henkilökohtaiset valinnat"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Henkilökohtaiset valinnat"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Järjestelmän asetukset"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Järjestelmätyökalut"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Järjestelmäasetukset ja -seuranta"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Esteettömyys"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Esteettömän käytön asetukset"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Apuohjelmat"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Työpöydän apuohjelmat"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Sovellukset"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Henkilökohtaiset ja järjestelmän asetukset"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Muihin luokkiin sopimattomat sovellukset"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Muut"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Valikkomuokkain"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Muokkaa valikkoja"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Sovellukset:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Oletukset"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Valikot:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Valikkomuokkain %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nimi"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Näytä"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Kotihakemistoa ei löydy: ei asetettu tiedostossa /etc/passwd eikä $HOME "
-"muuttujalla ole arvoa"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Valikkotiedosto"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Tarkkaile valikkomuutoksia"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Näytä myös piilotetut (<Exclude>) kohdat"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Näytä myös \"NoDisplay=true\"-kohdat"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Virheellinen työpöytätiedoston tunniste"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Virheellinen tiedostonimi]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr "<piilotettu>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Valikko on muuttunut, ladataan uudelleen ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Valikkopuu on tyhjä"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- testaa Maten toteutusta Työpöytävalikkojen määrittelystä"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Esteettömyyteen liittyvät asetukset"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Henkilökohtaiset asetukset"
-
-#~ msgid "Accessibility"
-#~ msgstr "Esteettömyys"
-
-#~ msgid "Accessibility Settings"
-#~ msgstr "Esteettömyysasetukset"
-
-#~ msgid "Desktop"
-#~ msgstr "Työpöytä"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Muihin luokkiin sopimattomat sovellukset"
diff --git a/po/fr.po b/po/fr.po
index 16e1654..61b8b5b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,274 +1,172 @@
-# French translation of mate-menus.
-# Copyright (C) 2004-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menu package.
-#
-# Baptiste Mille-Mathias <[email protected]>, 2004-2005.
-# Vincent Untz <[email protected]>, 2005.
-# Christophe Merlet <[email protected]>, 2005.
-# Robert-André Mauchin <[email protected]>, 2007.
-# Stéphane Raimbault <[email protected]>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Christophe Merlet <[email protected]>, 2005
+# Robert-André Mauchin <[email protected]>, 2007
+# Stéphane Raimbault <[email protected]>, 2007
+# Vincent Untz <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD.fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 21:30+0200\n"
-"PO-Revision-Date: 2009-08-26 21:32+0200\n"
-"Last-Translator: Claude Paroz <[email protected]>\n"
-"Language-Team: MATE French team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/MATE/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimédia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Son et vidéo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimédia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmation"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Les outils de développement de logiciels"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Éducation"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Jeux"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Jeux et divertissements"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Graphisme"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Applications graphiques"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Matériel"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Paramètres pour certains périphériques"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet et réseau"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Paramètres concernant le réseau"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Apparence"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Paramètres contrôlant l'apparence et le comportement du bureau"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Les programmes pour accéder à Internet tel que le Web ou la messagerie"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Bureautique"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Autres applications"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Paramètres personnels"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administration"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr ""
-"Modifie globalement les paramètres du système (affecte tous les utilisateurs)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Préférences personnelles"
+msgstr "Modifie globalement les paramètres du système (affecte tous les utilisateurs)"
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Préférences personnelles"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Système"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Paramètres système"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Outils système"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configuration et surveillance système"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Accès universel"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Paramètres d'accès universel"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accessoires"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accessoires du bureau"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Applications"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Préférences personnelles et paramètres du système"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Les applications qui ne conviennent à aucune autre catégorie"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Autre"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Éditeur de menus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Éditer les menus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Applications :"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "Valeurs par _défaut"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menus :"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Éditeur simple de menus %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nom"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Afficher"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Impossible de trouver le dossier personnel : il n'est pas configuré dans /"
-"etc/passwd et aucune valeur pour $HOME ne se trouve dans l'environnement"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Fichier de menu"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "FICHIER_MENU"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Surveiller les changements de menu"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Inclure les entrées exclues avec <Exclude>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Inclure les entrées NoDisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Identifiant de fichier .desktop non valide"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Nom de fichier non valide]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <exclus>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Changement du menu, rechargement ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "L'arbre de menu est vide"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- teste l'implémentation MATE de la spécification des menus .desktop"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Préférences et paramètres personnels"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Les applications qui ne conviennent à aucune autre catégorie"
diff --git a/po/fur.po b/po/fur.po
index 710f3ce..0f99e2b 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -1,270 +1,169 @@
-# Friulian translation of mate-menus.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# Massimo Furlani <[email protected]>, 2007.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Massimo Furlani <[email protected]>, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-11 13:20+0100\n"
-"PO-Revision-Date: 2008-03-10 13:15+0100\n"
-"Last-Translator: Massimo Furlani <[email protected]>\n"
-"Language-Team: FRIULIAN <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Friulian (http://www.transifex.com/projects/p/MATE/language/fur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Friulian\n"
-"X-Poedit-Country: ITALY\n"
+"Language: fur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Universal Access"
-msgstr "Acess Universâl"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Universal Access Settings"
-msgstr "Impostazions Acess Universâl"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "Robutis"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "Robutis dal desktop"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "Aplicazions"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Personal preferences and administration settings"
-msgstr "Preferencis personâls e impostazions di aministrazion"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "Audio e video"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-#: ../desktop-directories/System.directory.in.h:1
-msgid "System"
-msgstr "Sisteme"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menu multimediâl"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programazion"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Imprescj par il svilup dal software"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Istruzion"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Zûcs"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Zûcs e golosets"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafiche"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplicazions di grafiche"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Impostazions par cetancj dispositîfs hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet e Rêt"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Impostazions de rêt"
 
-#: ../desktop-directories/Internet.directory.in.h:1
-msgid "Internet"
-msgstr "Internet"
-
-#: ../desktop-directories/Internet.directory.in.h:2
-msgid "Programs for Internet access such as web and email"
-msgstr "Programs par internet come web e mail"
-
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aspiet e stîl"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Impostazions ch'a controlin l'aspiet e il compuartament dal desktop"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menu multimediâl"
+#: ../desktop-directories/mate-network.directory.in.h:1
+msgid "Internet"
+msgstr "Internet"
 
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "Audio e video"
+#: ../desktop-directories/mate-network.directory.in.h:2
+msgid "Programs for Internet access such as web and email"
+msgstr "Programs par internet come web e mail"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ufici"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplicazions di ufici"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplicazions ch'a no jentrin ta chês altres categoriis"
-
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "Altri"
-
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personâl"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Impostazions personâls"
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferencis personâls"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "Aministrazion"
+
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr "Modifiche impostazions di sisteme (par ducj i utents)"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferencis"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Universal access related preferences"
-msgstr "Preferencis relativis a l'acess universâl"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferencis personâls"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "Preferencis e impostazions personâls"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr "Sisteme"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Impostazions di sisteme"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "Aministrazion"
-
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change system-wide settings (affects all users)"
-msgstr "Modifiche impostazions di sisteme (par ducj i utents)"
-
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Imprescj di sisteme"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configurazion e monitoragjo di sisteme"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Modificadôr di menu"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Modifiche i menu"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Aplicazions:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "Pre_definidis"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Menu:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "Nom"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "Mostre"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Impussibil cjatâ la directory home: no je impostade in /etc/passwd e la "
-"variabil di ambient $HOME no a nissun valôr"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "File di menu"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "FILE_MENU"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
+msgstr "Acess Universâl"
 
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitorê i gambiaments di menu"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr "Impostazions Acess Universâl"
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Meti dentri lis vôs <Exclude>"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "Robutis"
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Meti dentri lis vôs NoDisplay=true"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "Robutis dal desktop"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ID di file desktop nô valid"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "Aplicazions"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Nom di file no valid]"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "Preferencis personâls e impostazions di aministrazion"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "Altri"
 
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menu gambiât, lu torni a cjamâ ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "L'arbul dai menu al è vueit"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- test da implementazion di MATE da specifiche par i menu dal desktop"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplicazions ch'a no jentrin ta chês altres categoriis"
diff --git a/po/fy.po b/po/fy.po
index 0223372..c53a6f4 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -1,269 +1,172 @@
-# Frisian translation for mate-menus
-#
-# This file is distributed under the same license as the mate-menus package.
-# Dooitze de Jong <[email protected]>, 2009-2010.
-# Jaap Haitsma <[email protected]>, 2007.
-# Peter Hoogsteen <[email protected] >, 2008.
-# Sietse <>, 2009.
-# berend <[email protected]>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# berend <[email protected]>, 2009
+# Jaap Haitsma <[email protected]>, 2007
+# Peter Hoogsteen <[email protected] >, 2008
+# Sietse <>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2010-07-07 11:52+0000\n"
-"PO-Revision-Date: 2010-07-18 00:30+0100\n"
-"Last-Translator: Sense Hofstede <[email protected]>\n"
-"Language-Team: Frisian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Western Frisian (http://www.transifex.com/projects/p/MATE/language/fy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-17 16:24+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: fy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Media"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Lûd en Fideo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Media"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmeare"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Programma's foar it untwikkelje fan programma's"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Edukaasje"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Spultsjes"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Spultsjes en Ferdiverdaasje"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafysk"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafyske programma's"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Ynstellings foar ferskillende hardware apparaten"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Ynternet en Netwurk"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Netwurk-relativearre ynstellings"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Uterlik"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Ynstellingen foar it gedrach en it uterlik fan it bureaublêd"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Ynternet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programma's foar Ynternet tagong sa as web en ynternet post"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Kantoar"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Kantoar programma's"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Persoanlik"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Persoanlike Ynstellingen"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administraasje"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Systeem-wide ynstellingen (alle brûkers)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Persoanlike foarkarren"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Ynstellingen"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Persoanlike foarkarren"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Systeem"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Systeem Ynstellingen"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Systeem Tapassingen"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Systeem konfiguraasje en kontrolearje"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Algemiene Tagong"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Algemiene Tagong Ynstellingen"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Assesoires"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Bureaublêd assesoires"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Programma's"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Persoanlike foarkarren en administraasje ynstellings"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Applicaties die net yn oare categorien passe"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Oare programma's"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menu Bewurker"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Bewurkje Menus"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Programma's:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Standaardynstellingen"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menu's:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Simpele Menu Bewurker %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Namme"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Toane"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "Kin persoanlike map net fine: net ynsteld yn /etc/passwd en gjin wearde foar $HOME yn de omjouwing"
-
-#~ msgid "Action"
-#~ msgstr "Aksje"
-#~ msgid "Action games"
-#~ msgstr "Aksje spultsjes"
-#~ msgid "Adventure"
-#~ msgstr "Aventoer"
-#~ msgid "Adventure style games"
-#~ msgstr "Aventoere Spultsjes"
-#~ msgid "Arcade"
-#~ msgstr "Arkade"
-#~ msgid "Arcade style games"
-#~ msgstr "Arkade spultsjes"
-#~ msgid "Falling blocks"
-#~ msgstr "Fallende blokjes"
-#~ msgid "Falling blocks games"
-#~ msgstr "Fallende blokjes spultsjes"
-#~ msgid "Board"
-#~ msgstr "Boerd"
-#~ msgid "Board games"
-#~ msgstr "Boerd spultsjes"
-#~ msgid "Card games"
-#~ msgstr "Kaart spultsjes"
-#~ msgid "Cards"
-#~ msgstr "Kaarten"
-#~ msgid "Debian"
-#~ msgstr "Debian"
-#~ msgid "The Debian menu"
-#~ msgstr "It Debian menu"
-#~ msgid "Science"
-#~ msgstr "Wittenskip"
-#~ msgid "Scientific applications"
-#~ msgstr "Wittenskiplike programma's"
-#~ msgid "Games for kids"
-#~ msgstr "Bernespultsjes"
-#~ msgid "Kids"
-#~ msgstr "Bern"
-#~ msgid "Logic"
-#~ msgstr "Logika"
-#~ msgid "Logic and puzzle games"
-#~ msgstr "Logika en puzzel spultsjes"
-#~ msgid "Role playing"
-#~ msgstr "Rollen spyljen"
-#~ msgid "Role playing games"
-#~ msgstr "Rollespultsjes"
-#~ msgid "Simulation"
-#~ msgstr "Simulaasje"
-#~ msgid "Simulation games"
-#~ msgstr "Simulaasje spultsjes"
-#~ msgid "Sports"
-#~ msgstr "Sport"
-#~ msgid "Sports games"
-#~ msgstr "Sport spultsjes"
-#~ msgid "Strategy"
-#~ msgstr "Strategy"
-#~ msgid "Strategy games"
-#~ msgstr "Strategyske spultsjes"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Applicaties die net yn oare categorien passe"
diff --git a/po/ga.po b/po/ga.po
index 7664237..181d4e0 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,267 +1,168 @@
-# Irish translations for mate-menus package.
-# Copyright (C) 2007-2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-# Seán de Búrca <[email protected]>, 2007-2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 17:44-0600\n"
-"PO-Revision-Date: 2009-07-29 17:44-0600\n"
-"Last-Translator: Seán de Búrca <[email protected]>\n"
-"Language-Team: Irish <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:47+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Irish (http://www.transifex.com/projects/p/MATE/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n%"
-"10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Roghchlár ilmheán"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Fuaim & Fís"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Roghchlár ilmheán"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Ríomhchlárú"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Uirlisí d'fhorbairt bogearraí"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Oideachas"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Cluichí"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Cluichí agus siamsaíochtaí"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafaic"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Feidhmchláir grafaice"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Crua-Earraí"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Socruithe do roinnt ghléasanna crua-earraí"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Idirlíon agus Líonra"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Socruithe líonra-gaolta"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Cuma agus Mothú"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Socruithe ag rialú cuma agus oibrithe na deisce"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Idirlíon"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Feidhmchláir do rochtain an Idirlín mar ghréasán agus ríomhphost"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Oifig"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Feidhmchláir Oifige"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Pearsanta"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Socruithe pearsanta"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Riarachán"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Athraigh socruithe ar fud an chórais (tionchar ar gach úsáideoir)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Sainroghanna pearsanta"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Sainroghanna"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Sainroghanna pearsanta"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Córas"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Socruithe an chórais"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Uirlisí Córais"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Cumraíocht agus monatóireacht an chórais"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Rochtain Uilíoch"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Socruithe Rochtana Uilíoch"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Oiriúintí"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Oiriúintí deisce"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Feidhmchláir"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Sainroghanna pearsanta agus socruithe riaracháin"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Feidhmchláir nár oiriúnaigh i gcatagóirí eile"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Eile"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Eagarthóir na Roghchlár"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Cuir Roghchláir in Eagar"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Feidhmchláir:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "Réamh_shocruithe"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Roghchláir:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Eagarthóir na Roghchlár Simplí %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Ainm"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Taispeáin"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Ní féidir comhadlann bhaile a aimsiú: níl sí socraithe i /etc/passwd agus "
-"níl luach ann do $HOME sa timpealleacht"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Comhad roghchláir"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "COMHAD_ROGHCHLÁIR"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Déan monatóireacht ar athruithe roghchlár"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Cuir iontrálacha <Exclude>áilte san áireamh"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Cuir iontrálacha NoDisplay=true san áireamh"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "CA chomhaid deisce neamhbhailí"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Ainm Comhaid Neamhbhailí]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr "<eisiata>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Athraíodh an roghchlár, á athluchtú ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Tá an crann roghchlár folamh"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- tastáil feidhmiú MATE den tSonraíocht Roghchláir Deisce"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Feidhmchláir nár oiriúnaigh i gcatagóirí eile"
diff --git a/po/gu.po b/po/gu.po
index 1df97ac..66749f4 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1,270 +1,171 @@
-# translation of mate-menus.master.gu.po to Gujarati
-# Ankit Patel <[email protected]>, 2007.
-# Ankit Patel <[email protected]>, 2007.
-# Sweta Kothari <[email protected]>, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Ankit Patel <[email protected]>, 2007
+# Ankit Patel <[email protected]>, 2007
+# sweta <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.master.gu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-07-19 07:40+0000\n"
-"PO-Revision-Date: 2009-08-24 15:37+0530\n"
-"Last-Translator: Sweta Kothari <[email protected]>\n"
-"Language-Team: Gujarati\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:47+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/MATE/language/gu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"\n"
-"\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "મલ્ટીમીડિયા મેનુ"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "સાઉન્ડ & વીડિયો"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "મલ્ટીમીડિયા મેનુ"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "પ્રોગ્રામીંગ"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "સોફ્ટવેર વિકાસ સાધનો"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "શિક્ષણ"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "રમતો"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "રમતો અને મનોરંજકો"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "ગ્રાફિક્સ"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "ગ્રાફિક્સ કાર્યક્રમો"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "હાર્ડવેર"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "ઘણા હાર્ડવેર ઉપકરણો માટે સુયોજનો"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ઈન્ટરનેટ અને નેટવર્ક"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "નેટવર્ક-સંબંધિત સુયોજનો"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "દેખાવ અને વર્તણૂક"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ડેસ્કટોપ દેખાવ અને વર્તણૂક સંભાળી રહેલ સુયોજનો"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ઈન્ટરનેટ"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "વેબ અને ઈમેઈલ જેવા ઈન્ટરનેટ વપરાશ માટેના કાર્યક્રમો"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "ઓફિસ"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "ઓફિસ કાર્યક્રમો"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "વ્યક્તિગત"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "વ્યક્તિગત સુયોજનો"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "સંચાલન"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "સિસ્ટમ-લગતા સુયોજનો બદલો (બધા વપરાશકર્તાઓને અસર કરશે)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ખાનગી પસંદગીઓ"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "પસંદગીઓ"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ખાનગી પસંદગીઓ"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "સિસ્ટમ"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "સિસ્ટમ સુયોજનો"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "સિસ્ટમ સાધનો"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "સિસ્ટમ રૂપરેખાંકન અને મોનિટરીંગ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "સાર્વત્રિક વપરાશ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "સાર્વત્રિક વપરાશ સુયોજનો"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "સહાયક કાર્યક્રમો"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ડેસ્કટોપ સહાયક કાર્યક્રમો"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "કાર્યક્રમો"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ખાનગી પસંદગીઓ અને સંચાલન સુયોજનો"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "કાર્યક્રમો કે જે અન્ય વર્ગોમાં નહિં બંધબેસે"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "અન્ય"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "મેનુ સંપાદક"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "ફેરફાર મેનુઓ"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "કાર્યક્રમો (_A):"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "મૂળભુતો (_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "મેનુઓ (_M):"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "સાદુ મેનુ સંપાદક %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "નામ"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "બતાવો"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"ઘર ડિરેક્ટરી શોધી શકતા નથી: /etc/passwd માં સુયોજિત નથી અને પર્યાવરણમાં $HOME માટે "
-"કોઈ કિંમત નથી"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "મેનુ ફાઈલ"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "મેનુ ફેરફારો માટે મોનીટર"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<Exclude>d પ્રવેશો સમાવો"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true પ્રવેશો સમાવો"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ડેસ્કટોપ ફાઈલ ID અયોગ્ય છે"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[અયોગ્ય ફાઈલનામ]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== મેનુ બદલાઈ ગયેલ છે, પુનઃલોડ કરી રહ્યા છીએ ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "મેનુ વૃક્ષ ખાલી છે"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- ચકાસણી જીનોમના ડેસ્કટોપ મેનુ સ્પષ્ટીકરણોનું અમલીકરણ"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "કાર્યક્રમો કે જે અન્ય વર્ગોમાં નહિં બંધબેસે"
diff --git a/po/ha.po b/po/ha.po
index 34b9485..588fba6 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -1,272 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.mate-2-12\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-01-01 18:52+0000\n"
-"PO-Revision-Date: 2006-04-05 12:17+0100\n"
-"Last-Translator: \n"
-"Language-Team: <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Hausa (http://www.transifex.com/projects/p/MATE/language/ha/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10\n"
+"Language: ha\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Mazaɓen masilimanta"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Sauti & Bidiyo"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Mazaɓen masilimanta"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Yin Shirin Aiki"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Kayan aiki na ci-gaban masarrafin kwamfyuta"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Ilimi"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Wasanni"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Wasanni da kayan da da dariya"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Zane-Zane"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Shiryoyin ayukan zane-zane"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr ""
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr ""
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr ""
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr ""
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr ""
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr ""
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Intanet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Shiryoyi na samun hanyar Intanet zuwa wurare kamar yana da e-meli"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ofis"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Shiryoyin Ayukan Ofis"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr ""
 
-#: ../desktop-directories/Personal.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
-msgstr "Fifiko da kewayen ka"
+msgstr ""
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Hukuma"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr "Canza kayan daidaita na'ura (zai shafi duk masu amfani da shi)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Fifiko na Kanka"
+msgstr ""
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Fifiko"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Fifiko na Kanka"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
-msgstr "Kayan Aikin Na'ura"
+msgstr ""
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr ""
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Kayan Aikin Na'ura"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Canza tsari da kulawan na'ura"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr ""
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
-msgstr "Kayan Daidaita Fasahan Mataimakin Naƙasan Mutum"
+msgstr ""
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Aksesori"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Aksesori na Kwamfyutan Tebur"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Shiryoyin Ayuka"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Kayan daidaita fifkonka da hukumanka"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Shiryoyin Ayuka waɗanda basu dace cikin wasu jinsi ba"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Waccan"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editar Mazaɓa"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Mazaɓen Shiryawa"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "Shiryoyin Ayukan_:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "Difwalt na_"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "Mazaɓen_:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Suna"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Nuna"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Ana kasa gano gafakan gida: ba ya cikin/etc/makulli kuma babu kima wa $GIDA "
-"cikin muhalli"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Fayil ɗin mazaɓa"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "FAYIL ƊIN_MAZAƁA"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Ka kula wa canje-canjen mazaɓa"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Haɗa da <Fid da> bayanen da aka shigar"
-
-#: ../util/test-menu-spec.c:36
-#, fuzzy
-msgid "Include NoDisplay=true entries"
-msgstr "Haɗa da <Fid da> bayanen da aka shigar"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Shaidar fayil na kwamfyutan tebur mai maras inganci"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Sunafayil Mai Maras Inganci]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <fid da>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== An canza mazaɓa, ana sake lodi ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Babu komai cikin bishiyar mazaɓa"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-"- jarraba yanda MATE ke aiwatar da Cikakken Bayani na Mazaɓen Kwamfyutan "
-"Tebur"
-
-#~ msgid "Accessibility"
-#~ msgstr "Fasahan Mataimakin Naƙasan Mutum"
-
-#~ msgid "Accessibility related preferences"
-#~ msgstr "Fifiko da suka danganta da fasahan mataimaki naƙasan mutum"
-
-#~ msgid "Desktop"
-#~ msgstr "Kwamfyutan Tebur"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Shiryoyin Ayuka waɗanda basu dace cikin wasu jinsi ba"
diff --git a/po/he.po b/po/he.po
index 36d7dfb..fb5ddc3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,276 +1,169 @@
-# translation of mate-menus.mate-2-10.po to Hebrew
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Yuval Tanny <[email protected]>, 2005.
-#
+# 
+# Translators:
+# Yuval Tanny <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.mate-2-10\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-07-04 22:37+0200\n"
-"Last-Translator: Yaron Shahrabani <[email protected]>\n"
-"Language-Team: <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Hebrew (http://www.transifex.com/projects/p/MATE/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "תפריט מולטימדיה"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "צליל ווידאו"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "תפריט מולטימדיה"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "תכנות"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "כלים לפיתוח תוכנה"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "לימוד"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "משחקים"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "משחקים ושעשועים"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "גרפיקה"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "יישומים גרפיים"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "חומרה"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "הגדרות עבור מספר התקני חומרה"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "אינטרט ורשת"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "הגדרות רשת"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "מראה ומרגש"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "הגדרות לשליטה במראה והתנהגות שולחן העבודה"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "אינטרנט"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "תוכנות לגישה לאינטרנט כגון דפדפן ולקוח דואר"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "משרד"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "יישומים משרדיים"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "אישי"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "הגדרות אישיות"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "ניהול"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "שנה הגדרות מערכת כלליות (משפיע על כל המשתמשים)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "העדפות אישיות"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "העדפות אישיות"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "מערכת"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "הגדרות מערכת"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "כלי מערכת"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "הגדרה וניטור של המערכת"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "גישה אוניברסלית"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "הגדרות גישה אוניברסלית"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "עזרים"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "עזרי שולחן עבודה"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "יישומים"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "העדפות אישיות והגדרות ניהול"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "יישומים שלא התאימו בקטגוריות אחרות"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "אחר"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "עורך תפריטים"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "ערוך תפריטים"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_יישומים:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_ברירות מחדל"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_תפריטים:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "עורך תפריטים פשוט %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "שם"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "הצג"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "לא ניתן למצוא את תיקיית הבית: לא נקבע ב- etc/passwd/ ולא קיים ערך עבור HOME$ בסביבה"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menu file"
-
-# msgstr "קובץ תפריט"
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitor for menu changes"
-
-# msgstr "פקח על שינויים בתפריט"
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Include <Exclude>d entries"
-
-# msgstr "פקח על שינויים בתפריט"
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Include NoDisplay=true entries"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "מזהה קובץ שולחן עבודה לא תקין"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Invalid Filename]"
-
-# msgstr "[שם קובץ לא תקין]"
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-
-# "\n"
-# "\n"
-# "\n"
-# "==== התפריט השתנה, טוען מחדש ====\n"
-# "\n"
-# "\n"
-#: ../util/test-menu-spec.c:169
-#: ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menu tree is empty"
-
-# msgstr "עץ התפריט ריק"
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- test MATE's implementation of the Desktop Menu Specification"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "יישומים שלא התאימו בקטגוריות אחרות"
diff --git a/po/hi.po b/po/hi.po
index 391ffa4..a44985c 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,277 +1,171 @@
-# translation of mate-menus.master.po to Hindi
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Amanpreet Singh Alam <[email protected]>, 2004.
-# Rajesh Ranjan <[email protected]>, 2005, 2006, 2008, 2009.
-# Rajesh Ranjan <[email protected]>, 2009.
+# 
+# Translators:
+# Amanpreet Singh Alam <[email protected]>, 2004
+# Rajesh Ranjan <[email protected]>, 2009
+# Rajesh Ranjan <[email protected]>, 2005, 2006, 2008, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-09-16 13:46+0530\n"
-"Last-Translator: Rajesh Ranjan <[email protected]>\n"
-"Language-Team: Hindi <hindi.sf.net>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/MATE/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-"\n"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "मल्टीमीडिया मेनू"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "ध्वनि व वीडियो"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "मल्टीमीडिया मेनू"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "प्रोग्रामिंग"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "सॉफ्टवेयर विकास के औज़ार"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "शिक्षा"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "खेल"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "खेल व मनोरंजन"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "चित्रादि"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "चित्रादि अनुप्रयोग"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "कई हार्डवेयर युक्तियों के लिए सेटिंग"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "इंटरनेट व संजाल"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "संजाल संबंधित सेटिंग"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "रूप-रंग"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "डेस्कटॉप रूपाकार व व्यवहार का नियंत्रण करने वाले सेटिंग"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "इंटरनेट"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "इंटरनेट पहुँच के लिए वेब व ईमेल जैसे प्रोग्राम"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "कार्यालय अनुप्रयोग"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "निजी"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "निजी सेटिंग"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "प्रशासन"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "तंत्र स्तरीय सेटिंग बदलें (सभी उपयोक्ता प्रभावित होते हैं)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "निजी वरीयता"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "वरीयता"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "निजी वरीयता"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "तंत्र"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "तंत्र सेटिंग"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "तंत्र औज़ार"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "तंत्र विन्यास व निरीक्षण"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "सार्वभौमिक पहुँच"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "सार्वभौमिक पहुँच सेटिंग"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "उपसाधन"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "डेस्कटॉप उपसाधन"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "अनुप्रयोग"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "निजी वरीयता व प्रशासन सेटिंग"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "अनुप्रयोग जो अन्य श्रेणी में सटीक नहीं बैठा"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "अन्य"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "मेन्यू संपादक"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "मेन्यू संपादित करें"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "अनुप्रयोग (_A)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "तयशुदा (_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "मेन्यू (_M):"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "सरल मेन्यू संपादक %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "नाम"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "दिखाएँ"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"घर निर्देशिका नहीं पा सकता है: /etc/passwd में सेट नहीं है और $HOME के लिये वातावरण में "
-"कोई मान नहीं है"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "मेन्यू फ़ाइल"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "मेन्यू परिवर्तन के लिए मॉनिटर"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<निकाली> गई प्रविष्टि शामिल करें"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true प्रविष्टि शामिल करें"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "अवैध डेस्कटॉप फ़ाइल आईडी"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[अवैध फ़ाइलनाम]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <निकाली गई>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== मेन्यू परिवर्तित, फिर लोड कर रहा है ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "मेन्यू तरू रिक्त है"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- डेस्कटॉप मेन्यू विनिर्दिष्टता के ग्नोम कार्यान्वयन की जाँच करें"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "अनुप्रयोग जो अन्य श्रेणी में सटीक नहीं बैठा"
diff --git a/po/hu.po b/po/hu.po
index a2c7b02..88c4596 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,268 +1,170 @@
-# Hungarian translation of mate-menus.
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-#
-# Gabor Kelemen <kelemeng at mate dot hu>, 2004, 2005, 2006, 2007, 2008, 2009.
-# Laszlo Dvornik <dvornik at mate dot hu>, 2005.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gabor Kelemen <kelemeng at mate dot hu>, 2004, 2005, 2006, 2007, 2008, 2009
+# Laszlo Dvornik <dvornik at mate dot hu>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-07 02:30+0200\n"
-"PO-Revision-Date: 2009-09-07 02:30+0200\n"
-"Last-Translator: Gabor Kelemen <kelemeng at mate dot hu>\n"
-"Language-Team: Hungarian <mate at fsf dot hu>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/MATE/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimédia menü"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Hang és videó"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimédia menü"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Fejlesztés"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Szoftverfejlesztési eszközök"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Oktatás"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Játékok"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Játék és szórakozás"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafikai alkalmazások"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardver"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Különböző hardvereszközök beállításai"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet és hálózat"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Hálózattal kapcsolatos beállítások"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Megjelenés"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Az asztal megjelenését és viselkedését vezérlő beállítások"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programok az internet használatához (pl. web és e-mail)"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Iroda"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Irodai alkalmazások"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Személyes"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Személyes beállítások"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Rendszerszintű beállítások módosítása (minden felhasználóra kihat)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Személyes beállítások"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Személyes beállítások"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Rendszer"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Rendszerbeállítások"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Rendszereszközök"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Rendszerbeállítás és megfigyelés"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Akadálymentesítés"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Akadálymentesítés beállításai"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Kellékek"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Asztali kellékek"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Alkalmazások"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Személyes és adminisztrációs beállítások"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Más kategóriákba be nem sorolható alkalmazások"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Menüszerkesztő"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Menük szerkesztése"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Alkalmazások:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "Ala_pértelmezések"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menük:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Egyszerű menüszerkesztő %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Név"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Megjelenítés"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Nem található a saját könyvtár: nincs beállítva az /etc/passwd fájlban és a "
-"$HOME környezeti változónak nincs értéke"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menüfájl"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENÜ_FÁJL"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Menüváltozások figyelése"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<Kihagyott> bejegyzések bevétele"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "A NoDisplay=true bejegyzések felvétele"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Érvénytelen desktop fájl azonosító"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Érvénytelen fájlnév]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <kihagyott>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== A menü megváltozott, újratöltés ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "A menüfa üres"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "– Az Asztali Menü Specifikáció MATE megvalósításának tesztelése"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Más kategóriákba be nem sorolható alkalmazások"
diff --git a/po/hy.po b/po/hy.po
index e8af56c..91747d0 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -1,266 +1,169 @@
-# translation of mate-menus.HEAD.po to armenian
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005.
-# Ruzanna Khachatryan <[email protected]>
-# Norayr Chilingaryan <[email protected]>
+# 
+# Translators:
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-30 20:21+0400\n"
-"PO-Revision-Date: 2009-01-30 20:22+0400\n"
-"Last-Translator: Norayr Chilingaryan <[email protected]>\n"
-"Language-Team: <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Armenian (http://www.transifex.com/projects/p/MATE/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Language: hy\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Համասփյուռ ծրագրերի ցանկ"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Ձայն և Վիդեո"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Համասփյուռ ծրագրերի ցանկ"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Ծրագրավորում"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Ծրագրերի մշակման գործիքներ"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Ուսուցում"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Խաղեր"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Խաղեր և զվարճություններ"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Գրաֆիկա"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Գրաֆիկական ծրագրեր"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Երկաթ"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Տարբեր սարքերի հատկություններ"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Ինտերնետ և Ցանց"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Ցանցային հատկություններ"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Տեսք"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Աշխատասեղանի տեսքի և վարքի հատկություններ"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Համացանց"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Համացանցում աշխատելու ծրագրեր, ինչպես վեպ զննիչը"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Օֆիս"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Օֆիսային Ծրագրեր"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Անձնական"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Հատկություններ"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Կառավարում"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr "Փոխել ամբողջ համակարգի նախընտրանքները (վերաբերում է բոլոր գործարկողներին)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Անհատական նախընտրանքներ"
+msgstr ""
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Հատկություններ"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Անհատական նախընտրանքներ"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Համակարգ"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Համակարգի հատկություններ"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Համակարգի գործիքներ"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Համակարգի կարգավորում և վերահսկում"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Ընդհանուր Մատչելիություն"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Հնարավորությունների կարգավորումներ"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Աքսեսուարներ"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Աշխատասեղանի աքսեսուարներ"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Ծրագրեր"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Անհատական և կառավարման կարգավորումներ"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Ծրագրեր, որոնք այլ կատեգորիաներին չեն համապատասխանում"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Այլ"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Ցանկի Խմբագրիչ"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Ցանկերի խմբագրում"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "Ծրագրեր"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "Նախնական"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "Ցանկ"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Անուն"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Ցուցադրում"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "Չի հաջողվել գտնել տան ապանակը։ այն նշված չէ /etc/passwd ֆայլի մեջ և $HOME միջավայրի փոփոխականը չի պարունակում ոչ մի արժեք"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Ցանկի ֆայլ"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "ՑԱՆԿԻ―ՖԱՅԼ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Ցանկի փոփոխությունները"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Ընդգրկել <բացառված> միավորները"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Ընդգրկել NoDisplay=true միավորները"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Սխալ ֆայլի ID"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Սխալ ֆայլանուն]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr "<բացառված>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Ցանկը փոխցած է, վերաբեռնում ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169
-#: ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Ցանկը դատարկ է"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr " - ստուգեք ԳՆՈՄ-ի Աշխատասեղանի Ցանկի Բնորոշման իրագործումը"
-
-#~ msgid "Accessibility"
-#~ msgstr "Հնարավորություններ"
-#~ msgid "Desktop"
-#~ msgstr "Աշխատասեղան"
-#~ msgid "Accessibility related preferences"
-#~ msgstr "Ծրագրերին առնչվող պարամետրեր"
-
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Ծրագրեր, որոնք այլ կատեգորիաներին չեն համապատասխանում"
diff --git a/po/id.po b/po/id.po
index fef0377..75d37f1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,217 +1,171 @@
-# translation of mate-menus.master.id.po to MATE Indonesian Translation Team
-# Indonesian translation of mate-menus.
-# Copyright (C) 2005 THE mate-menus's COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-menus package.
-#
-#
-# ahmad riza h nst <[email protected]>, 2005.
-# Dirgita <[email protected]>, 2010.
-# Dirgita <[email protected]>, 2010.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# ahmad riza h nst <[email protected]>, 2005
+# Dirgita <[email protected]>, 2010
+# dirgita <[email protected]>, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.master.id\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2010-07-20 10:11+0000\n"
-"PO-Revision-Date: 2010-05-24 10:37+0700\n"
-"Last-Translator: Dirgita <[email protected]>\n"
-"Language-Team: MATE Indonesian Translation Team <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Indonesian (http://www.transifex.com/projects/p/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menu multimedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Suara & Video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menu multimedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Pemrograman"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Perkakas untuk pengembangan perangkat lunak"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Pendidikan"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Permainan"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Permainan dan hiburan"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafik"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Aplikasi grafik"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Perangkat Keras"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Pengaturan untuk sejumlah perangkat keras"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet dan Jaringan"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Pengaturan jaringan"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Tampilan dan Rasa"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Mengelola tampilan dan perilaku desktop"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Program untuk mengakses internet, seperti web dan surel"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Perkantoran"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Aplikasi Perkantoran"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Pribadi"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Pengaturan pribadi"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administrasi"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Pengaturan sistem secara luas (mempengaruhi seluruh pengguna)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferensi pribadi"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferensi"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferensi pribadi"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistem"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Pengaturan sistem"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Perkakas Sistem"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Konfigurasi serta pengawasan sistem"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Akses Universal"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Pengaturan Akses Universal"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Aksesoris"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Aksesoris desktop"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Aplikasi"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferensi pribadi dan pengaturan administrasi"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Aplikasi yang tidak termasuk dalam kategori manapun"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Lainnya"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Penyunting Menu"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Sunting Menu"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Aplikasi:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Baku"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menu:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Penyunting Menu Sederhana %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nama"
-
-# Ini tombol ceklis untuk memilih menu-menu apa saja yang tampak dalam daftar menu utama.
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Tampak"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Tidak menemukan direktori rumah: tidak tercantum di /etc/passwd maupun pada "
-"variabel lingkungan $HOME"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Aplikasi yang tidak termasuk dalam kategori manapun"
diff --git a/po/ig.po b/po/ig.po
index 07e0f93..523fe5d 100644
--- a/po/ig.po
+++ b/po/ig.po
@@ -1,270 +1,168 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.mate-2-12\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-01-01 18:52+0000\n"
-"PO-Revision-Date: 2006-04-05 12:38+0100\n"
-"Last-Translator: translator\n"
-"Language-Team: <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:50+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Igbo (http://www.transifex.com/projects/p/MATE/language/ig/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"Language: ig\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Mọltimidia menu"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Ụda na Vidio"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Mọltimidia menu"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programịn"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Ngwaọrụ maka ntolite Sọftwịa"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Ọmụmụ"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Egwuregwu"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Egwuregwu na obiụtọ"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Nsepụtainyogo"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Usoro iheomume nsepụtainyogo"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr ""
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr ""
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr ""
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr ""
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr ""
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr ""
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Ịntaneetị"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Program maka ikikembanye ịntaneetị dịka web na Imeelụ"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ụlọọrụ"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Usoro iheomume ụlọọrụ"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr ""
 
-#: ../desktop-directories/Personal.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
-msgstr "Nkarachọ nkeonwe na nhazi"
+msgstr ""
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Nhazi "
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
-msgstr "Gbanwee nhazi systemwide (na-emetụta ndị ojieme)"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Nkarachọ nkeonwe"
+msgstr ""
 
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Nkarachọ"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Nkarachọ nkeonwe"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
-msgstr "Ngwaọrụ sistem"
+msgstr ""
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr ""
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Ngwaọrụ sistem"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Nhazi na ilereanya nke sistem"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr ""
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
-#, fuzzy
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
-msgstr "Nhazi ikikembanye"
+msgstr ""
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Nnyemaka ngwaọrụ"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Nnyemaka ngwaọrụ Desktọọpụ"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Usoro ihe omume"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Nkarachọ nkeonwe na ọdịdị Nhazi "
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Usoro iheomume na-abanyeghị n'ọ́nụ́ ndị ọzọ"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Ọzọ"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Odezi menu"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Dezie menu"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Usoro iheomume:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Difọọltụ"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Menus"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Aha"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Gosi"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Achọtaghịnwu ihenlereanya keụlọ: Ekpokọtaghị ya na /dgz/okwumbanye na nke na-"
-"abaghị uru maka ụlọ $HOME"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Faịlụ menu"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FAỊLỤ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Inyogo maka mgbanwe menu"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Gbakwunye <Exclude>mbanye ahụ"
-
-#: ../util/test-menu-spec.c:36
-#, fuzzy
-msgid "Include NoDisplay=true entries"
-msgstr "Gbakwunye <Exclude>mbanye ahụ"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Desktọọpụ Faịlụ ID na-enweghị isi"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Ahịrịnkọwa faịlụ na-enweghị isi]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr "<excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"====ọtụtụ gbanwere, bubatagharịa ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Osisi Menu ghe oghe"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- Nnwale MATE Nwepụta nke Desktọọpụ nzipụta menu"
-
-#~ msgid "Accessibility"
-#~ msgstr "Ikikembanye"
-
-#~ msgid "Accessibility related preferences"
-#~ msgstr "Ikikembanye yiwere nkarachọ"
-
-#~ msgid "Desktop"
-#~ msgstr "Desktọọpụ"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Usoro iheomume na-abanyeghị n'ọ́nụ́ ndị ọzọ"
diff --git a/po/is.po b/po/is.po
index 7e718e3..5cf663d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,268 +1,170 @@
-# Icelandic translation of Mate.
-# Icelandic translation of mate-menus.
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# Anna Jonna Ármannsdóttir <[email protected]>, 2008.
-# Sveinn í Felli <[email protected]>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Anna Jonna Ármannsdóttir <[email protected]>, 2008
+# Sveinn í Felli <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2009-09-29 14:04+0000\n"
-"PO-Revision-Date: 2008-05-14 01:40+0000\n"
-"Last-Translator: Sveinn í Felli <[email protected]>\n"
-"Language-Team: Icelandic\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Icelandic (http://www.transifex.com/projects/p/MATE/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Margmiðlun"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Hljóð og mynd"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Margmiðlun"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Forritun"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Þróunarverkfæri"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Menntun"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Leikir"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Leikir og skemmtun"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Myndefni"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Myndefnisforrit"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Vélbúnaður"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Uppsetning á ýmsum vélbúnaði"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet og netkerfi"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Netkerfistengdar stillingar"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Útlit og viðmót"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Stillingar sem stjórna útliti og hegðun skjáborðsins"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Forrit til að nálgast netið eins og vefinn og tölvupóst"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Skrifstofa"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Skrifstofuforrit"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Persónulegt"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Persónulegar stillingar"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Stjórnun"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Breyta stillingum fyrir allt kerfið (hefur áhrif á alla notendur)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Persónulegir valmöguleikar"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Stillingar"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Persónulegir valmöguleikar"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Kerfið"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Kerfisstillingar"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Kerfistól"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Kerfisstillingar og vöktun"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Altækur aðgangur"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Stillingar fyrir altækan aðgang"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Aukahlutir"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Aukahlutir fyrir skjáborð"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Forrit"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Persónulegir valmöguleikar og stjórnunar stillingar"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Forrit sem passa ekki í aðra flokka"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Annað"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Valmyndaritill"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Breyta valmyndum"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Forrit:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Sjálfgefið"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Valmyndir:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Einfaldur valmyndaritill %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nafn"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Sýna"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Gat ekki fundið heimamöppu: er ekki stillt í /etc/passwd og ekkert gildi "
-"fyrir $HOME í víðværum breytum"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Valmyndaskrá"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "VALMYNDAR_SKRÁ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Fylgjast með breytingum í valmynd"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Taka <útilokað>ar færslur með"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Taka NoDisplay=true færslur með"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Kenni skjáborðsskrár er ógilt"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Ógilt skráarnafn]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <útilokað>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Valmynd breytt, endurhleð ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Valmyndatréð er tómt"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- prófa útfærslu MATE á Desktop Menu Specification"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Forrit sem passa ekki í aðra flokka"
diff --git a/po/it.po b/po/it.po
index 1728843..68784c4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,267 +1,170 @@
-# Italian translation of mate-menus.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 The Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-# Francesco Marletta <francesco.marletta @ tiscali.it>, 2005, 206, 2007, 2008, 2009.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Francesco Marletta <francesco.marletta @ tiscali.it>, 2005, 206, 2007, 2008, 2009
 # Luca Ferretti <[email protected]>, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus 2.28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-08-26 07:31+0000\n"
-"PO-Revision-Date: 2009-09-18 15:06+0200\n"
-"Last-Translator: Luca Ferretti <[email protected]>\n"
-"Language-Team: Italian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:49+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/MATE/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Menù multimedia"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Audio e video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Menù multimedia"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmazione"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Strumenti per lo sviluppo software"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Istruzione"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Giochi"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Giochi e passatempi"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafica"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Applicazioni grafiche"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hardware"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Impostazioni per parecchi dispositivi hardware"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internet e rete"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Impostazioni relative alla rete"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Aspetto e stile"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Impostazioni che controllano l'aspetto e il comportamento del desktop"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internet"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programmi per l'accesso a Internet come web ed email"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Ufficio"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Applicazioni da ufficio"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personale"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Impostazioni personali"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Modifica impostazioni di sistema (influenzano tutti gli utenti)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Preferenze personali"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Preferenze personali"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Impostazioni di sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Strumenti di sistema"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Configurazione e monitoraggio del sistema"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Accesso universale"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Impostazioni accesso universale"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Accessori"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Accessori del desktop"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Applicazioni"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Preferenze personali e impostazioni di amministrazione"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Applicazioni che non rientrano in altre categorie"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Altro"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Editor del menù"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Modifica i menù"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Applicazioni:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "Pre_definite"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Menù:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "Editor dei menù semplice %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nome"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Mostra"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Impossibile trovare la directory home: non è impostata in /etc/passwd e la "
-"variabile d'ambiente $HOME non ha alcun valore"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "File di menù"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "FILE_MENU"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Monitora i cambiamenti dei menù"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Includere le voci <Exclude>"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Includere le voci NoDisplay=true"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ID di file desktop non valido"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Nome di file non valido]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Menù cambiato, ricarica in corso ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "L'albero dei menù è vuoto"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr ""
-"- test dell'implementazione di MATE della specifica per i menù del desktop"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Applicazioni che non rientrano in altre categorie"
diff --git a/po/ja.po b/po/ja.po
index 3591df1..97883aa 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,263 +1,169 @@
-# ja.po for mate-menus.
-# Copyright (C) 2004-2007,2009-2010 THE mate-menus' COPYRIGHT HOLDER
-# This file is distributed under the same license as the mate-menus package.
-# Satoru SATOH <[email protected]>, 2004.
-# Takeshi AIHANA <[email protected]>, 2005-2007.
-# Takayuki KUSANO <[email protected]>, 2009-2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Satoru SATOH <[email protected]>, 2004
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-"
-"menus&component=general\n"
-"POT-Creation-Date: 2010-09-18 18:45+0000\n"
-"PO-Revision-Date: 2009-09-08 22:13+0900\n"
-"Last-Translator: Takayuki KUSANO <[email protected]>\n"
-"Language-Team: Japanese <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/MATE/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "マルチメディア関連のプログラムです"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "サウンドとビデオ"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "マルチメディア関連のプログラムです"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "プログラミング"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "ソフトウェア開発者向けのツールです"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "教育・教養"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "ゲーム"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "気晴しにゲームをどうぞ"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "グラフィックス"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "グラフィックス関連のアプリケーションです"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "ハードウェア"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "使用するハードウェア・デバイスを設定します"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "インターネットとネットワーク"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "ネットワークに関連する設定を行います"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "ルック＆フィール"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "デスクトップの外観や動きを調整します"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "インターネット"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "ウェブやメールなどインターネットにアクセスのためのプログラムです"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "オフィス"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "オフィス・アプリケーションです"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "ユーザ向け"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "ユーザ向けの設定を変更します"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "システム管理"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "システム規模の設定を変更します (すべてのユーザに影響します)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ユーザ専用の設定"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "設定"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ユーザ専用の設定"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "システム"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "システム規模の設定を変更します"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "システムツール"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "システムの設定と監視を行うプログラムです"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "ユニバーサル・アクセス"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "ユニバーサル・アクセスの設定を変更します"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "アクセサリ"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "デスクトップ用のアクセサリーです"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "アプリケーション"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "個人設定と管理者向けの設定ツールです"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "他のカテゴリにあてはまらないアプリケーション"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "その他"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "メニュー・エディタ"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "メニューの編集"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "アプリケーション(_A):"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "デフォルト(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "メニュー(_M):"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "シンプル・メニュー・エディタ %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "名前"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "表示"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"ホーム・フォルダが見つかりません: \"/etc/passwd\" に記述されていないか、環境"
-"変数 $HOME の値が空です。"
-
-#~ msgid "Menu file"
-#~ msgstr "メニュー・ファイル"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "MENU_FILE"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "メニューの変更を監視する"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "<Exclude> のエントリを含める"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "NoDisplay=true のエントリを含める"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr ".desktop ファイルの ID が間違っています"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[ファイル名が間違っています]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <excluded>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== メニューが変更されました (再読み込み中...) ====\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "メニューのツリーが空です"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr "- MATE のデスクトップ・メニューの実装をテストします"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "ユニバーサル・アクセスに関連する設定を変更します"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "ユーザ向けの設定を変更します"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "他のカテゴリにあてはまらないアプリケーション"
diff --git a/po/ka.po b/po/ka.po
index 03eec73..ecf2cb2 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -1,238 +1,170 @@
-# Georgian translation for mate-menus
-# Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
-# This file is distributed under the same license as the mate-menus package.
-# <>, 2005.
-# , fuzzy
-# <>, 2006.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # 
+# Translators:
+# <>, 2005
+# <>, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-09 23:56+0100\n"
-"PO-Revision-Date: 2006-03-16 19:00+0100\n"
-"Last-Translator: Vladimer Sichinava <[email protected]>\n"
-"Language-Team: Georgian <http://geoubuntu.cjb.net/>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Georgian (http://www.transifex.com/projects/p/MATE/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
-
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Accessibility"
-msgstr "დამხმარე საშუალებები"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Accessibility Settings"
-msgstr "დამხმარე საშუალებათა პარამეტრები"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "აქსესუარები"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "სამუშაო მაგიდის აქსესუარები"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "პროგრამები"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Desktop"
-msgstr "სამუშაო მაგიდა"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "ხმა და ვიდეო"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-msgid "Personal preferences and administration settings"
-msgstr "საკუთარი პარამეტრები და ადმინისტრაცია"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "მულტიმედიის მენუ"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "პროგრამირება"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "პროგრამირების ხელსაწყოები"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "განათლება"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "თამაშები"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "თამაშები და სხვა"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "გრაფიკა"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "გრაფიკული პროგრამები"
 
-#: ../desktop-directories/Internet.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
+msgid "Hardware"
+msgstr ""
+
+#: ../desktop-directories/mate-hardware.directory.in.h:2
+msgid "Settings for several hardware devices"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
+msgid "Internet and Network"
+msgstr ""
+
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
+msgid "Network-related settings"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
+msgid "Look and Feel"
+msgstr ""
+
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
+msgid "Settings controlling the desktop appearance and behavior"
+msgstr ""
+
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ინტერნეტი"
 
-#: ../desktop-directories/Internet.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "პროგრამები ინტერნეტისათვის, ვები და მეილი"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "მულტიმედიის მენუ"
-
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "ხმა და ვიდეო"
-
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "ოფისი"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "საოფისე პროგრამები"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "პროგრამები რომლებიც არც ერთ კატეგორიაში არ შედიან"
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
+msgid "Personal"
+msgstr ""
 
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "სხვა"
+#: ../desktop-directories/mate-personal.directory.in.h:3
+msgid "Personal settings"
+msgstr ""
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "პერსონალური პარამეტრები"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "ადმინისტრაცია"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr ""
+
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "პარამეტრები"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Accessibility related preferences"
-msgstr "სპეც შესაძლებლობების პარამეტრები"
-
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
 msgstr "პერსონალური პარამეტრები"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "ადმინისტრაცია"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr ""
 
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change systemwide settings (affects all users)"
-msgstr "გლობალური სისტემური ცვლილებები (ვრცელდება ყველა მომხმარებელზე)"
+#: ../desktop-directories/mate-system.directory.in.h:2
+msgid "System settings"
+msgstr ""
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "სისტემური ხელსაწყოები"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "სისტემის კონფიგურაცია და მონიტორინგი"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "მენუს ედიტორი"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "მენუს დამუშავება"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_პროგრამები:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_ნაგულისხმევი პარამეტრები"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_მენუ"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "სახელი"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "ანახე"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr "ვერ ვპოულობ სახლის დირექტორიას: არ იქნება დაყენებული /etc/passwd-ში"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "მენუ ფაილი"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "მენუში ცვლილებათა მონიტორინგი"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
+msgstr ""
 
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<ჩაუმატებელი> ელემენტების ჩამატება"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr ""
 
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "ჩართე NoDisplay=true ელემენტები"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "აქსესუარები"
 
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "არასწორი ID დესკტოპ ფაილისა"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "სამუშაო მაგიდის აქსესუარები"
 
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[მცდარი ფაილსახელი]"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "პროგრამები"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "საკუთარი პარამეტრები და ადმინისტრაცია"
 
-#: ../util/test-menu-spec.c:164
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"↵\n"
-"↵\n"
-"↵\n"
-"==== მენუ შეიცვალა, გადათვირთვა ====↵\n"
-"↵\n"
-"↵\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "მენუს ხე ცარიელია"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "-·test·MATE's·implementation·of·the·Desktop·Menu·Specification"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "სხვა"
 
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "პროგრამები რომლებიც არც ერთ კატეგორიაში არ შედიან"
diff --git a/po/kk.po b/po/kk.po
index 9f07a3d..ef40435 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,255 +1,171 @@
-# translation of mate-menus to Kazakh
-# Copyright (C) 2008 Free Software Foundation, Inc.
-#
-# Moldabekov Margulan <[email protected]>, 2008
-# Erzhan Shaniev <[email protected]>, 2008
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
 # Baurzhan Muftakhidinov <[email protected]>, 2010
+# Erzhan Shaniev <[email protected]>, 2008
+# Moldabekov Margulan <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus trunk\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2010-07-02 11:40+0000\n"
-"PO-Revision-Date: 2010-09-15 12:55+0600\n"
-"Last-Translator: Baurzhan Muftakhidinov <[email protected]>\n"
-"Language-Team: Kazakh <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Kazakh (http://www.transifex.com/projects/p/MATE/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"X-Poedit-Language: Kazakh\n"
-"X-Poedit-Country: KAZAKHSTAN\n"
+"Language: kk\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Мультимедиа"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Аудио және видео"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Мультимедиа"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Бағдарламалау"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Бағдарламалауға арналған құралдар"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Оқыту"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Ойындар"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Ойын-сауық"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Графикалық қолданбалар"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Құрылғылар"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Құрылғылардың баптаулары"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Интернет пен желі"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Желілік баптаулар"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Сыртқы түрі"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Жұмыс үстелін көркейтетін баптаулар"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Интернет"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Интернетті қолдануға арналған бағдарламалар (пошта, браузер, т.б.)"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Кеңселік"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Кеңселік қолданбалар"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Жеке"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Жеке баптаулар"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Әкімшілік"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Жүйелік баптауларды өзгерту (барлық пайдаланушылар үшін)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Жеке баптаулар"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Баптаулар"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Жеке баптаулар"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Жүйелік"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Жүйелік баптаулар"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Жүйелік саймандар"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Жүйені баптау мен бақылау"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Арнайы мүмкіндіктер"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Арнайы мүмкіндіктер баптаулары"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Қалыпты"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Қалыпты қолданбалар"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Қолданбалар"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Жеке мен әкімшілік баптаулар"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Ешқандай санатқа жатпайтын қолданбалар"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Басқалар"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Мәзір түзетушісі"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Мәзірді түзету"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "Қ_олданбалар:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Бастапқы қалпы"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Мәзірлер:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "Қарапайым мәзір түзетушісі %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Аты"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Көрсету"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
-msgstr "Үй бумасы табылмады: /etc/passwd ішінде жоқ және $HOME айнымалысы орнатылмаған"
-
-#~ msgid "Menu file"
-#~ msgstr "Мәзір файлы"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "МӘЗІР_ФАЙЛЫ"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Мәзірде болған өзгерістерді бақылау"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Шығарылған элементтерді іске келтіру"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "NoDisplay=true элементтерін іске келтіру"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "Desktop-файлдың ID-і қате"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[файлдың аты дұрыс емес]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <excluded>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Мәзір өзгертілді, жаңадан қосылуда ====\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "Мәзір ағашы бос"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr "- MATE-да қолданылған Desktop Menu-дің тексерісі"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Ешқандай санатқа жатпайтын қолданбалар"
diff --git a/po/kn.po b/po/kn.po
index 00c3749..41b30ba 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1,256 +1,169 @@
-# translation of mate-menus.master.kn.po to Kannada
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Shankar Prasad <[email protected]>, 2007, 2008, 2009, 2010.
+# 
+# Translators:
+# shankar <[email protected]>, 2007, 2008, 2009, 2010
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.master.kn\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-21 11:48+0530\n"
-"PO-Revision-Date: 2010-03-24 17:49+0530\n"
-"Last-Translator: Shankar Prasad <[email protected]>\n"
-"Language-Team: kn-IN <>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Kannada (http://www.transifex.com/projects/p/MATE/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "ಮಲ್ಟಿಮೀಡಿಯಾ ಅಂಶಪಟ್ಟಿ"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "ಧ್ವನಿ ಹಾಗು ದೃಶ್ಯ"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "ಮಲ್ಟಿಮೀಡಿಯಾ ಅಂಶಪಟ್ಟಿ"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "ಪ್ರೊಗ್ರಾಮಿಂಗ್"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "ತಂತ್ರಾಂಶ ವಿಕಸನೆಗಾಗಿನ ಉಪಕರಣಗಳು"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "ಶಿಕ್ಷಣ"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "ಆಟಗಳು"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "ಆಟಗಳು ಹಾಗು ರಂಜನೆಗಳು"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "ಗ್ರಾಫಿಕ್ಸ್"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "ಗ್ರಾಫಿಕ್ಸ್ ಅನ್ವಯಗಳು"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "ಯಂತ್ರಾಂಶ"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "ಹಲವಾರು ಯಂತ್ರಾಂಶ ಸಾಧನಗಳಿಗಾಗಿನ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "ಅಂತರಜಾಲ ಹಾಗು ಜಾಲಬಂಧ"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "ಜಾಲಬಂಧ-ಸಂಬಂಧಿತ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "ನೋಟ ಹಾಗು ಮಾಟ"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "ಗಣಕತೆರೆಯ ಸ್ವರೂಪ ಹಾಗು ವರ್ತನೆಯನ್ನು ನಿಯಂತ್ರಿಸುವ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "ಅಂತರಜಾಲ"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "ಜಾಲ ಹಾಗು ಇಮೈಲಿನಂತಹ ಅಂತರಜಾಲವನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳುವ ಪ್ರೊಗ್ರಾಂಗಳು"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "ಆಫೀಸ್"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "ಆಫೀಸ್ ಅನ್ವಯಗಳು"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "ವೈಯಕ್ತಿಕ"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "ವೈಯಕ್ತಿಕ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "ನಿರ್ವಹಣೆ"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "ವ್ಯವಸ್ಥೆಯಾದ್ಯಂತದ ಸಿದ್ಧತೆಗಳನ್ನು ಬದಲಾಯಿಸಿ (ಎಲ್ಲಾ ಬಳಕೆದಾರರ ಮೇಲೂ ಪರಿಣಾಮಬೀರುತ್ತದೆ)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "ಆದ್ಯತೆಗಳು"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "ವ್ಯವಸ್ಥೆ"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಉಪಕರಣಗಳು"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "ವ್ಯವಸ್ಥೆಯ ಸಂರಚನೆ ಹಾಗು ಪರಿವೀಕ್ಷಣೆ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "ಜಾಗತಿಕ ನಿಲುಕಣೆ"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "ಜಾಗತಿಕ ನಿಲುಕಣೆ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "ಸಲಕರಣೆಗಳು"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "ಗಣಕತೆರೆಯ ಸಲಕರಣೆಗಳು"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "ಅನ್ವಯಗಳು"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "ವೈಯಕ್ತಿಕ ಆದ್ಯತೆಗಳು ಹಾಗು ನಿರ್ವಹಣಾ ಸಿದ್ಧತೆಗಳು"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "ಬೇರೆ ವರ್ಗಗಳಿಗೆ ಸೇರದೇ ಇರುವಂತಹ ಅನ್ವಯಗಳು"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "ಇತರೆ"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "ಮೆನು ಸಂಪಾದಕ"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "ಮೆನುಗಳನ್ನು ಸಂಪಾದಿಸು"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "ಅನ್ವಯಗಳು(_A):"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "ಪೂರ್ವನಿಯೋಜಿತ(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "ಮೆನುಗಳು(_M):"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "ಸರಳ ಮೆನು ಸಂಪಾದಕ %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "ಹೆಸರು"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "ತೋರಿಸು"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"ನೆಲೆ ಕಡತಕೋಶವು ಕಂಡುಬಂದಿಲ್ಲ: /etc/passwd ನಲ್ಲಿ ಸಿದ್ಧಗೊಳಿಸಿಲ್ಲ ಹಾಗು ವಾತಾವರಣದಲ್ಲಿ "
-"$HOME ಗೆ ಯಾವುದೇ ಮೌಲ್ಯವಿಲ್ಲ"
-
-#~ msgid "Menu file"
-#~ msgstr "ಮೆನು ಕಡತ"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "MENU_FILE"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "ಮೆನು ಬದಲಾವಣೆಗಳ ಪರಿವೀಕ್ಷಕ"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "<Exclude>ಆದಂತಹ ನಮೂದುಗಳನ್ನು ಅಡಕಗೊಳಿಸು"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "NoDisplay=true ನಮೂದನ್ನು ಅಡಕಗೊಳಿಸು"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "ಸಿಂಧುವಲ್ಲದ ಗಣಕತೆರೆ ಕಡತ ID"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[ಸಿಂಧುವಲ್ಲದ ಕಡತಹೆಸರು]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <excluded>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== ಮೆನು ಬದಲಾಯಿಸಲ್ಪಟ್ಟಿದೆ, ಪುನಃ ಲೋಡ್ ಆಗುತ್ತಿದೆ ====\n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "ಮೆನು ವೃಕ್ಷವು(tree) ಖಾಲಿ ಇದೆ"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr "- ಗಣಕತೆರೆ ಮೆನು ಸೂಚನೆಗಳ MATE ನ ಅನ್ವಯಿಸುವಿಕೆಯನ್ನು ಪರೀಕ್ಷಿಸುತ್ತದೆ"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "ಬೇರೆ ವರ್ಗಗಳಿಗೆ ಸೇರದೇ ಇರುವಂತಹ ಅನ್ವಯಗಳು"
diff --git a/po/ko.po b/po/ko.po
index f3bfea9..3cf3193 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,268 +1,172 @@
-# mate-menus Korean message translation
-# This file is distributed under the same license as the mate-menus package.
-#
-# Sung-Hyun Nam <[email protected]>, 2000.
-# Young-Ho Cha <[email protected]>, 2000,2001,2003, 2007.
-# Eunju Kim <[email protected]>, 2007.
-# Changwoo Ryu <[email protected]>, 1998, 2002, 2003, 2008, 2009, 2010.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Changwoo Ryu <[email protected]>, 1998, 2002, 2003, 2008, 2009, 2010
+# eukim <[email protected]>, 2007
+# Sung-Hyun Nam <[email protected]>, 2000
+# Young-Ho Cha <[email protected]>, 2000, 2001, 2003, 2007
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-08-23 07:27+0900\n"
-"PO-Revision-Date: 2010-03-13 23:55+0900\n"
-"Last-Translator: Changwoo Ryu <[email protected]>\n"
-"Language-Team: MATE Korea <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/MATE/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "멀티미디어 메뉴"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "음악과 비디오"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "멀티미디어 메뉴"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "개발"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "소프트웨어 개발을 위한 도구"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "교육"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "게임"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "게임 메뉴"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "그래픽"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "그래픽 응용프로그램"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "하드웨어"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "하드웨어 장치를 설정합니다"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "인터넷과 네트워크"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "네트워크와 관련된 설정을 합니다"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "모양새"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "바탕환경의 모양새와 행동을 설정합니다"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "인터넷"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "웹과 전자메일 같은 인터넷에 접근 가능한 프로그램"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "오피스"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "오피스 응용프로그램"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "개인"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "개인 설정"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "관리"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "시스템 전체 설정을 바꿉니다 (모든 사용자에게 영향을 미칩니다)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "개인 기본 설정"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "개인 기본 설정"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "시스템"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "시스템 설정"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "시스템 도구"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "시스템 설정과 감시"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "보편적 접근성"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "보편적 접근성 설정"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "보조 프로그램"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "바탕환경의 보조 프로그램"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "프로그램"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "개인 기본 설정과 관리자 설정"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "어떤 범주에도 해당되지 않는 프로그램"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "기타"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "메뉴 편집기"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "메뉴 편집"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "프로그램(_A):"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "기본값(_D)"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "메뉴(_M):"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "간단한 메뉴 편집기 %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "이름"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "보이기"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"홈 디렉터리를 찾을 수 없습니다: /etc/passwd와 $HOME 환경변수가 설정이 되어 있"
-"지 않습니다"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "메뉴 파일"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "메뉴 바꿈 감시"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<차단>된 항목 포함"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true 항목 포함"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "잘못된 바탕 화면 파일 ID"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[잘못된 파일 이름]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <차단됨>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== 메뉴가 바뀌었습니다, 다시 읽습니다 ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "메뉴 트리가 비었습니다"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- 그놈의 데스크톱 메뉴 명세서의 테스트 구현"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "어떤 범주에도 해당되지 않는 프로그램"
diff --git a/po/ku.po b/po/ku.po
index e888cf8..d4e7198 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1,285 +1,170 @@
-# translation of ku.po to Kurdish
-# translation of mate-menus.HEAD.po to Kurdish
-# Kurdish translation for mate-menus
-# Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
-# This file is distributed under the same license as the mate-menus package.
-# Erdal Ronahi <[email protected]>, 2005.
-# Erdal Ronahi <[email protected]>, 2005.
-# Erdal Ronahi <[email protected], [email protected]>, 2005, 2006.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# erdalronahi <[email protected]>, 2005
+# Erdal Ronahi <[email protected], [email protected]>, 2005, 2006
 msgid ""
 msgstr ""
-"Project-Id-Version: ku\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-08 13:14+0100\n"
-"PO-Revision-Date: 2007-08-13 14:13+0000\n"
-"Last-Translator: Erdal Ronahi <[email protected]>\n"
-"Language-Team: Kurdish <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Kurdish (http://www.transifex.com/projects/p/MATE/language/ku/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-01-08 10:24+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-"X-Poedit-Language: Kurdish\n"
+"Language: ku\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/Accessibility.directory.in.h:1
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:1
-msgid "Universal Access"
-msgstr "Gihîştina Gerdûnî"
-
-#: ../desktop-directories/Accessibility.directory.in.h:2
-msgid "Universal Access Settings"
-msgstr "Mîhengên Gihîştina Gerdûnî"
-
-#: ../desktop-directories/Accessories.directory.in.h:1
-msgid "Accessories"
-msgstr "Bernameyên Alîkar"
-
-#: ../desktop-directories/Accessories.directory.in.h:2
-msgid "Desktop accessories"
-msgstr "Bernameyên alîkar ên sermaseyê"
-
-#: ../desktop-directories/Applications.directory.in.h:1
-msgid "Applications"
-msgstr "Sepan"
-
-#: ../desktop-directories/Desktop.directory.in.h:1
-msgid "Personal preferences and administration settings"
-msgstr "Vebijêrkên takekesî û mîhengên rêveberiyê"
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
+msgid "Sound & Video"
+msgstr "Deng & Vîdeo"
 
-#: ../desktop-directories/Desktop.directory.in.h:2
-#: ../desktop-directories/System.directory.in.h:1
-msgid "System"
-msgstr "Pergal"
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Pêşeka multîmedya"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Bernamekirin"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Amûrên ji bo pêşdebirina nivîsbariyê"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Perwerdehî"
 
-#: ../desktop-directories/Games.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Lîstik"
 
-#: ../desktop-directories/Games.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Lîstik û demxweşî"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafîk"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Sepanên grafîkê"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Hişkalav"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Mîhengên çend cîhazên hişkalavê"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Înternet û Tor"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Mîhengên têkildarî torê"
 
-#: ../desktop-directories/Internet.directory.in.h:1
-msgid "Internet"
-msgstr "Înternet"
-
-#: ../desktop-directories/Internet.directory.in.h:2
-msgid "Programs for Internet access such as web and email"
-msgstr "Bernameyên wekî epeyam û gerokan yên ji bo pêwendiya înternetê"
-
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Dîtin û Hestkirin"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Mîhengên xuyabûn û tevgerînên sermasê"
 
-#: ../desktop-directories/Multimedia.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Pêşeka multîmedya"
+#: ../desktop-directories/mate-network.directory.in.h:1
+msgid "Internet"
+msgstr "Înternet"
 
-#: ../desktop-directories/Multimedia.directory.in.h:2
-msgid "Sound & Video"
-msgstr "Deng & Vîdeo"
+#: ../desktop-directories/mate-network.directory.in.h:2
+msgid "Programs for Internet access such as web and email"
+msgstr "Bernameyên wekî epeyam û gerokan yên ji bo pêwendiya înternetê"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Nivîsgeh"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Sepandinên Ofîsê"
 
-#: ../desktop-directories/Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Sepanên ku nakevin kategoriyên din"
-
-#: ../desktop-directories/Other.directory.in.h:2
-msgid "Other"
-msgstr "Yên din"
-
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Takekesî"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Mîhengên takekesî"
 
-#: ../desktop-directories/Preferences.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Vebijêrkên takekesî"
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
+msgid "Administration"
+msgstr "Rêveberî"
 
-#: ../desktop-directories/Preferences.directory.in.h:2
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
+msgid "Change system-wide settings (affects all users)"
+msgstr "Eyarên hemû pergalê biguherîne (ji bo hemû bikarhêneran derbas dibe)"
+
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Vebijêrk"
 
-#: ../desktop-directories/Settings-Accessibility.directory.in.h:2
-msgid "Universal access related preferences"
-msgstr "Vebijêrkên têkildarî gihîştina gerdûnî"
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Vebijêrkên takekesî"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences and settings"
-msgstr "Mîheng û vebijêrkên takekesî"
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
+msgid "System"
+msgstr "Pergal"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Mîhengên pergalê"
 
-#: ../desktop-directories/System-Settings.directory.in.h:1
-msgid "Administration"
-msgstr "Rêveberî"
-
-#: ../desktop-directories/System-Settings.directory.in.h:2
-msgid "Change system-wide settings (affects all users)"
-msgstr "Eyarên hemû pergalê biguherîne (ji bo hemû bikarhêneran derbas dibe)"
-
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Amûrên Pergalê"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Avakirin û şopandina pergalê"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Edîtorê Pêşekê"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
-msgid "Edit Menus"
-msgstr "Pêşekan biguherîne"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
-msgid "_Applications:"
-msgstr "_Sepan:"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
-msgid "_Defaults"
-msgstr "_Standard"
-
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
-msgid "_Menus:"
-msgstr "_Pêşek:"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:96
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:123
-msgid "Name"
-msgstr "Nav"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:115
-msgid "Show"
-msgstr "Nîşan bide"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Peldanka mal nayê dîtin: di /etc/passwd nehat mîheng kirin û di environment "
-"de nirxa $HOME tune"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Pelê pêşekê"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "PELÊ_PÊŞEKÊ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Guherînên pêşekê temaşe bike"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Yên <hatiye derxistin> bihundirîne"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Ketinên (entry) NoDisplay=true bihundirîne"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "ID ya dosiya sermaseyê ne derbasdar e"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Navê pelî yê nederbasdar]"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
+msgid "Universal Access"
+msgstr "Gihîştina Gerdûnî"
 
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <hatiye derxistin>"
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
+msgid "Universal Access Settings"
+msgstr "Mîhengên Gihîştina Gerdûnî"
 
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Pêşek hat guherandin, ji nû ve tê bar kirin====\n"
-"\n"
-"\n"
+#: ../desktop-directories/mate-utility.directory.in.h:1
+msgid "Accessories"
+msgstr "Bernameyên Alîkar"
 
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Dara pêşekê vala ye"
+#: ../desktop-directories/mate-utility.directory.in.h:2
+msgid "Desktop accessories"
+msgstr "Bernameyên alîkar ên sermaseyê"
 
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- bikaranîna Desktop Menu Specification a MATE'yê test bike"
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
+msgid "Applications"
+msgstr "Sepan"
 
-msgid "Accessibility"
-msgstr "Gihîstin"
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
+msgid "Personal preferences and administration settings"
+msgstr "Vebijêrkên takekesî û mîhengên rêveberiyê"
 
-msgid "Desktop"
-msgstr "Sermasê"
+#: ../desktop-directories/mate-other.directory.in.h:1
+msgid "Other"
+msgstr "Yên din"
 
-#~ msgid "Accessibility related preferences"
-#~ msgstr "Vebijêrkên gihîştinê"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Sepanên ku nakevin kategoriyên din"
diff --git a/po/lt.po b/po/lt.po
index b39aee6..fb8ffc0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,280 +1,170 @@
-# translation of lt.po to Lithuanian
-# Lithuanian translation of mate-menus.
-# Copyright (C) 2004-2007, 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the mate-menus package.
-#
-# I'm a rolling thunder, a pouring rain
-# I'm comin' on like a hurricane
-#
-# Justina Klingaitė <[email protected]>, 2005.
-# Žygimantas Beručka <[email protected]>, 2004-2007.
-# Gintautas Miliauskas <[email protected]>, 2007, 2008.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Gintautas Miliauskas <[email protected]>, 2007, 2008
+# Justina Klingaitė <[email protected]>, 2005
 msgid ""
 msgstr ""
-"Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-15 02:11+0300\n"
-"PO-Revision-Date: 2009-09-15 02:11+0300\n"
-"Last-Translator: Gintautas Miliauskas <[email protected]>\n"
-"Language-Team: Lithuanian <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/MATE/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Daugialypės terpės meniu"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Garsas ir vaizdas"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Daugialypės terpės meniu"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programavimas"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Programinės įrangos kūrimo įrankiai"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Švietimas"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Žaidimai"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Žaidimai ir pramogos"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafinės programos"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Aparatinė įranga"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Kai kurių aparatinių įrenginių nustatymai"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internetas ir tinklas"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Su tinklu susiję nustatymai"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Išvaizda ir elgsena"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Darbo aplinkos išvaizdos ir elgsenos nustatymai"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internetas"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programos interneto prieigai (žiniatinklis, el. paštas)"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Raštinė"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Raštinės programos"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Asmeniniai nustatymai"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administravimas"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Keisti sisteminio masto nustatymus (paveikia visus naudotojus)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Asmeniniai nustatymai"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Asmeniniai nustatymai"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistema"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Sistemos nustatymai"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Sistemos įrankiai"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Sistemos konfigūravimas ir stebėjimas"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universali prieiga"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Universalios prieigos nustatymai"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Reikmenys"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Darbo aplinkos reikmenys"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Programos"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Asmeniniai ir administravimo nustatymai"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Programos, kurios netiko kitose kategorijose"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Kitos"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Meniu redaktorius"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Redaguoti meniu"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Programos:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Numatytieji"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Meniu:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-msgid "Simple Menu Editor %s"
-msgstr "Paprastas meniu redaktorius %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Pavadinimas"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Rodyti"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Nepavyko rasti namų aplanko: /etc/passwd nenurodyta ir aplinkoje nėra $HOME "
-"reikšmės"
-
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Meniu failas"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENIU_FAILAS"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Stebėti meniu pakeitimus"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Įtraukti <Pašalint>us įrašus"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "Įtraukti NoDisplay=true įrašus"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Netinkamas darbastalio failo ID"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Netaisyklingas failo vardas]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <pašalintas>"
-
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Meniu pakeistas, perkraunama ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Meniu medis yra tuščias"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test MATE's implementation of the Desktop Menu Specification"
-msgstr "- patikrinti MATE darbo aplinkos meniu specifikacijos įgyvendinimą"
-
-#~ msgid "Universal access related preferences"
-#~ msgstr "Su universalia prieiga susiję nustatymai"
-
-#~ msgid "Personal preferences and settings"
-#~ msgstr "Asmeniniai nustatymai"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Programos, kurios netiko kitose kategorijose"
diff --git a/po/lv.po b/po/lv.po
index d34aae9..ba8fe8d 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -1,261 +1,170 @@
-# translation of lv.po to Latvian
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-#
-# Raivis Dejus <[email protected]>, 2006, 2007, 2009.
-# Peteris Krisjanis <[email protected]>, 2010.
+# 
+# Translators:
+# Pēteris Krišjānis <[email protected]>, 2010
+# Raivis Dejus <[email protected]>, 2006, 2007, 2009
 msgid ""
 msgstr ""
-"Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2010-03-28 07:09+0000\n"
-"PO-Revision-Date: 2010-04-24 22:21+0300\n"
-"Last-Translator: Peteris Krisjanis <[email protected]>\n"
-"Language-Team: Latviešu <[email protected]>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:48+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/MATE/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"Language: lv\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "Multimediju izvēlne"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "Skaņa un video"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "Multimediju izvēlne"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "Programmēšana"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "Programmatūras izstrādes rīki"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "Izglītība"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "Spēles"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "Spēles un izklaides programmas"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "Grafika"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "Grafikas programmas"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "Aparatūra"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "Dažu aparatūras ierīču iestatījumi"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "Internets un tīkli"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "Ar tīklu saistīti iestatījumi"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "Izskats un uzvedība"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "Iestatījumi, kas nosaka darbvirsmas izskatu un uzvedību"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "Internets"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "Programmas darbam internetā kā tīmekļa pārlūkošana un e-pasts"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "Birojs"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "Biroja lietotnes"
 
 #. Translators: this is Personal as in "Personal settings"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "Personīgie"
 
-#: ../desktop-directories/Personal.directory.in.h:3
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 msgstr "Personīgie iestatījumi"
 
-#: ../desktop-directories/Settings-System.directory.in.h:1
+#: ../desktop-directories/mate-settings-system.directory.in.h:1
 msgid "Administration"
 msgstr "Administrēšana"
 
-#: ../desktop-directories/Settings-System.directory.in.h:2
+#: ../desktop-directories/mate-settings-system.directory.in.h:2
 msgid "Change system-wide settings (affects all users)"
 msgstr "Sistēmas iestatījumu maiņa (ietekmē visus lietotājus)"
 
-#: ../desktop-directories/Settings.directory.in.h:1
-msgid "Personal preferences"
-msgstr "Personīgie iestatījumi"
-
-#: ../desktop-directories/Settings.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:1
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: ../desktop-directories/System.directory.in.h:1
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:2
+#: ../desktop-directories/mate-settings.directory.in.h:2
+msgid "Personal preferences"
+msgstr "Personīgie iestatījumi"
+
+#: ../desktop-directories/mate-system.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:1
 msgid "System"
 msgstr "Sistēma"
 
-#: ../desktop-directories/System.directory.in.h:2
+#: ../desktop-directories/mate-system.directory.in.h:2
 msgid "System settings"
 msgstr "Sistēmas iestatījumi"
 
-#: ../desktop-directories/System-Tools.directory.in.h:1
+#: ../desktop-directories/mate-system-tools.directory.in.h:1
 msgid "System Tools"
 msgstr "Sistēma rīki"
 
-#: ../desktop-directories/System-Tools.directory.in.h:2
+#: ../desktop-directories/mate-system-tools.directory.in.h:2
 msgid "System configuration and monitoring"
 msgstr "Sistēmas konfigurācija un pārraudzība"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:1
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:1
 msgid "Universal Access"
 msgstr "Universālā piekļuve"
 
-#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
+#: ../desktop-directories/mate-utility-accessibility.directory.in.h:2
 msgid "Universal Access Settings"
 msgstr "Universālās piekļuves iestatījumi"
 
-#: ../desktop-directories/Utility.directory.in.h:1
+#: ../desktop-directories/mate-utility.directory.in.h:1
 msgid "Accessories"
 msgstr "Piederumi"
 
-#: ../desktop-directories/Utility.directory.in.h:2
+#: ../desktop-directories/mate-utility.directory.in.h:2
 msgid "Desktop accessories"
 msgstr "Darbvirsmas piederumi"
 
-#: ../desktop-directories/X-MATE-Menu-Applications.directory.in.h:1
+#: ../desktop-directories/mate-menu-applications.directory.in.h:1
 msgid "Applications"
 msgstr "Lietotnes"
 
-#: ../desktop-directories/X-MATE-Menu-System.directory.in.h:1
+#: ../desktop-directories/mate-menu-system.directory.in.h:2
 msgid "Personal preferences and administration settings"
 msgstr "Personīgie un administrācijas iestatījumi"
 
-#: ../desktop-directories/X-MATE-Other.directory.in.h:1
-msgid "Applications that did not fit in other categories"
-msgstr "Lietotnes, kas neiederas nevienā citā kategorijā"
-
-#: ../desktop-directories/X-MATE-Other.directory.in.h:2
+#: ../desktop-directories/mate-other.directory.in.h:1
 msgid "Other"
 msgstr "Citas lietotnes"
 
-#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
-msgid "Menu Editor"
-msgstr "Izvēlņu redaktors"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:1
-msgid "Edit Menus"
-msgstr "Izvēlņu rediģēšana"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:2
-msgid "_Applications:"
-msgstr "_Lietotnes:"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:3
-msgid "_Defaults"
-msgstr "_Noklusētie"
-
-#: ../simple-editor/gmenu-simple-editor.ui.h:4
-msgid "_Menus:"
-msgstr "_Izvēlnes:"
-
-#. Translators: %s is the version number
-#: ../simple-editor/GMenuSimpleEditor/main.py:49
-#, python-format
-#| msgid "Menu Editor"
-msgid "Simple Menu Editor %s"
-msgstr "Vienkāršs izvēlņu redaktors %s"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
-msgid "Name"
-msgstr "Nosaukums"
-
-#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113
-msgid "Show"
-msgstr "Rādīt"
-
-#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42
-msgid ""
-"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
-"environment"
-msgstr ""
-"Neizdodas atrast mājas direktoriju: tā nav norādīta /etc/passwd un nav arī "
-"$HOME vides mainīgā"
-
-#~ msgid "Menu file"
-#~ msgstr "Izvēlnes fails"
-
-#~ msgid "MENU_FILE"
-#~ msgstr "MENU_FILE"
-
-#~ msgid "Monitor for menu changes"
-#~ msgstr "Izvēlņu izmaiņu pārraugs"
-
-#~ msgid "Include <Exclude>d entries"
-#~ msgstr "Pievienot <Exclude> ierakstus"
-
-#~ msgid "Include NoDisplay=true entries"
-#~ msgstr "Pievienot NoDisplay=true ierakstus"
-
-#~ msgid "Invalid desktop file ID"
-#~ msgstr "Nederīgs darbvirsmas faila ID"
-
-#~ msgid "[Invalid Filename]"
-#~ msgstr "[Nederīgs faila nosaukums]"
-
-#~ msgid " <excluded>"
-#~ msgstr " <excluded>"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Menu changed, reloading ====\n"
-#~ "\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "==== Izvēlne izmainīta, pārlādēju ==== \n"
-#~ "\n"
-#~ "\n"
-
-#~ msgid "Menu tree is empty"
-#~ msgstr "Izvēlņu koks ir tukšs"
-
-#~ msgid "- test MATE's implementation of the Desktop Menu Specification"
-#~ msgstr ""
-#~ "- pārbaudiet MATE darbvirsmas izvēlņu specifikācijas implementāciju"
+#: ../desktop-directories/mate-other.directory.in.h:2
+msgid "Applications that did not fit in other categories"
+msgstr "Lietotnes, kas neiederas nevienā citā kategorijā"
diff --git a/po/mai.po b/po/mai.po
index c7815c0..e424fb0 100644
--- a/po/mai.po
+++ b/po/mai.po
@@ -1,272 +1,170 @@
-# translation of mate-menus.master.mai.po to Hindi
-# translation of mate-menus.HEAD.po to
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# Sangeeta Kumari <[email protected]>, 2008.
-# Rajesh Ranjan <[email protected]>, 2009.
+# 
+# Translators:
+# Rajesh Ranjan <[email protected]>, 2009
+# Sangeeta Kumari <[email protected]>, 2008
 msgid ""
 msgstr ""
-"Project-Id-Version: mate-menus.master.mai\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mate-menus&component=general\n"
-"POT-Creation-Date: 2009-06-21 17:35+0000\n"
-"PO-Revision-Date: 2009-09-20 12:27+0530\n"
-"Last-Translator: Rajesh Ranjan <[email protected]>\n"
-"Language-Team: Hindi <hindi.sf.net>\n"
+"Project-Id-Version: MATE Desktop Environment\n"
+"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
+"POT-Creation-Date: 2012-07-04 15:45+0200\n"
+"PO-Revision-Date: 2012-07-04 13:51+0000\n"
+"Last-Translator: Stefano Karapetsas <[email protected]>\n"
+"Language-Team: Maithili (http://www.transifex.com/projects/p/MATE/language/mai/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
-"\n"
+"Language: mai\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../desktop-directories/AudioVideo.directory.in.h:1
-msgid "Multimedia menu"
-msgstr "मल्टीमीडिया मेनू"
-
-#: ../desktop-directories/AudioVideo.directory.in.h:2
+#: ../desktop-directories/mate-audio-video.directory.in.h:1
 msgid "Sound & Video"
 msgstr "ध्वनि आ वीडियो"
 
-#: ../desktop-directories/Development.directory.in.h:1
+#: ../desktop-directories/mate-audio-video.directory.in.h:2
+msgid "Multimedia menu"
+msgstr "मल्टीमीडिया मेनू"
+
+#: ../desktop-directories/mate-development.directory.in.h:1
 msgid "Programming"
 msgstr "प्रोग्रामिंग"
 
-#: ../desktop-directories/Development.directory.in.h:2
+#: ../desktop-directories/mate-development.directory.in.h:2
 msgid "Tools for software development"
 msgstr "साफ्टवेयर विकासक लेल अओजार"
 
-#: ../desktop-directories/Education.directory.in.h:1
+#: ../desktop-directories/mate-education.directory.in.h:1
 msgid "Education"
 msgstr "शिक्षा"
 
-#: ../desktop-directories/Game.directory.in.h:1
+#: ../desktop-directories/mate-game.directory.in.h:1
 msgid "Games"
 msgstr "खेल"
 
-#: ../desktop-directories/Game.directory.in.h:2
+#: ../desktop-directories/mate-game.directory.in.h:2
 msgid "Games and amusements"
 msgstr "खेल आ मनोरंजन"
 
-#: ../desktop-directories/Graphics.directory.in.h:1
+#: ../desktop-directories/mate-graphics.directory.in.h:1
 msgid "Graphics"
 msgstr "आलेखी"
 
-#: ../desktop-directories/Graphics.directory.in.h:2
+#: ../desktop-directories/mate-graphics.directory.in.h:2
 msgid "Graphics applications"
 msgstr "आलेखी अनुप्रयोगसभ"
 
-#: ../desktop-directories/Hardware.directory.in.h:1
+#: ../desktop-directories/mate-hardware.directory.in.h:1
 msgid "Hardware"
 msgstr "हार्डवेयर"
 
-#: ../desktop-directories/Hardware.directory.in.h:2
+#: ../desktop-directories/mate-hardware.directory.in.h:2
 msgid "Settings for several hardware devices"
 msgstr "कतेक हार्डवेयर युक्तिक लेल सेटिंग"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:1
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:1
 msgid "Internet and Network"
 msgstr "इंटरनेट आ संजाल"
 
-#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
+#: ../desktop-directories/mate-internet-and-network.directory.in.h:2
 msgid "Network-related settings"
 msgstr "संजाल संबंधित सेटिंग"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:1
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:1
 msgid "Look and Feel"
 msgstr "रूप-रंग"
 
-#: ../desktop-directories/LookAndFeel.directory.in.h:2
+#: ../desktop-directories/mate-look-and-feel.directory.in.h:2
 msgid "Settings controlling the desktop appearance and behavior"
 msgstr "डेस्कटाप रूपाकार आ व्यवहारक नियंत्रण करैबला सेटिंग"
 
-#: ../desktop-directories/Network.directory.in.h:1
+#: ../desktop-directories/mate-network.directory.in.h:1
 msgid "Internet"
 msgstr "इंटरनेट"
 
-#: ../desktop-directories/Network.directory.in.h:2
+#: ../desktop-directories/mate-network.directory.in.h:2
 msgid "Programs for Internet access such as web and email"
 msgstr "इंटरनेटसँ जुड़बाक लेल वेब आ इमेल जहिना प्रोग्राम"
 
-#: ../desktop-directories/Office.directory.in.h:1
+#: ../desktop-directories/mate-office.directory.in.h:1
 msgid "Office"
 msgstr "कार्यालय"
 
-#: ../desktop-directories/Office.directory.in.h:2
+#: ../desktop-directories/mate-office.directory.in.h:2
 msgid "Office Applications"
 msgstr "कार्यालयक अनुप्रयोग"
 
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/mate-personal.directory.in.h:2
 msgid "Personal"
 msgstr "निजी"
 
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/mate-personal.directory.in.h:3
 msgid "Personal settings"
 ms
author	Stefano Karapetsas <[email protected]>	2013-10-11 11:54:05 +0200
committer	Stefano Karapetsas <[email protected]>	2013-10-11 11:54:05 +0200
commit	009111b1ce05e1fb3b787254a4fd0d780c6c483c (patch)
tree	793db5d72353fa9042952a90abdc1cff627d4c28 /po
parent	e5734e2b6017c36fca8ab2403ed6cabfa7ef0d23 (diff)
download	mate-menus-009111b1ce05e1fb3b787254a4fd0d780c6c483c.tar.bz2 mate-menus-009111b1ce05e1fb3b787254a4fd0d780c6c483c.tar.xz