updating desktop files with esperanto and french translations

71 files changed, 1002 insertions, 859 deletions

diff --git a/config/default/profile.desktop b/config/default/profile.desktop
index 11d946380e..07c3faddd5 100644
--- a/config/default/profile.desktop
+++ b/config/default/profile.desktop
@@ -1,31 +1,32 @@
 [Desktop Entry]
-Type=Link
-Name=Default
-Name[cs]=Výchozí
-Name[eo]=Aprioro
-Name[es]=Predefinido
-Name[gl]=Predefinido
-Name[it]=Predefinito
-Name[hu]=Alapértelmezett
-Name[fr]=Prédéfini
-Name[el]=Προκαθορισμένο
-Name[zh_CN]=默认
-Name[pt]=Predefinições
-Name[ru]=По умолчанию
-Name[tr]=Öntanımlı
-Name[ko]=기본
-Icon=enlightenment-default
 Comment=Select this to begin the initial setup again.
-Comment[ru]=Выберите этот пункт, чтобы начать настройку сначала.
 Comment[cs]=Vyberte pro znovuspuštění<br>tohoto průvodce.
+Comment[el]=Επέλεξε αυτό για να <br>ξεκινήσεις την αρχική ρύθμιση ξανά.
 Comment[eo]=Elektu ĉi tion por ekigi komencan agordadon.
 Comment[es]=Seleccione esto para volver a la configuración inicial.
+Comment[fr]=Sélectionnez ceci pour retrouver la configuration<br>par défaut et reprendre le paramétrage initial.
 Comment[gl]=Seleccione isto para voltar á configuración inicial.
-Comment[it]=Selezionare questo per riprendere la<br>configurazione iniziale.
 Comment[hu]=Válaszd ezt az alap<br>beállítáok megismétléséhez.
-Comment[fr]=Sélectionnez ceci pour retrouver la configuration<br>par défaut et reprendre le paramétrage initial.
-Comment[el]=Επέλεξε αυτό για να <br>ξεκινήσεις την αρχική ρύθμιση ξανά.
-Comment[zh_CN]=点击这里重新进行初始化设置主题。
+Comment[it]=Selezionare questo per riprendere la<br>configurazione iniziale.
+Comment[ko]=초기 설정을 다시 하려면 이 부분을 선택하세요.
 Comment[pt]=Escolha isto para executar novamente a configuração inicial
+Comment[ru]=Выберите этот пункт, чтобы начать настройку сначала.
 Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin.
-Comment[ko]=초기 설정을 다시 하려면 이 부분을 선택하세요.
+Comment[zh_CN]=点击这里重新进行初始化设置主题。
+Encoding=UTF-8
+Icon=enlightenment-default
+Name=Default
+Name[cs]=Výchozí
+Name[el]=Προκαθορισμένο
+Name[eo]=Aprioro
+Name[es]=Predefinido
+Name[fr]=Prédéfini
+Name[gl]=Predefinido
+Name[hu]=Alapértelmezett
+Name[it]=Predefinito
+Name[ko]=기본
+Name[pt]=Predefinições
+Name[ru]=Заново
+Name[tr]=Öntanımlı
+Name[zh_CN]=默认
+Type=Link
diff --git a/config/mobile/profile.desktop b/config/mobile/profile.desktop
index 95f8a9cf08..55429370fa 100644
--- a/config/mobile/profile.desktop
+++ b/config/mobile/profile.desktop
@@ -1,20 +1,21 @@
 [Desktop Entry]
-Type=Link
-Name=Mobile
-Name[eo]=Portebla
-Name[es]=Móvil
-Name[fr]=Écran tactile
-Name[gl]=Móbil
-Name[pt]=Ecrã tátil
-Name[ru]=Мобильные устройства
-Name[ko]=터치스크린
-Icon=enlightenment-mobile
 Comment=EXPERIMENTAL!<br>Configuration set up to work best with touchscreen<br>phones, tablets and similar devices.
 Comment[eo]=EKSPERIMENTA!<br>Agordoj kongruas plej kun tuŝekranaj telefonoj,<br> tabulkomputiloj aŭ similaj aparatoj.
 Comment[es]=¡EXPERIMENTAL!<br>Configuración adaptada para el uso en móviles<br>de pantalla táctil, tablets y dispositivos similares.
 Comment[fr]=EXPÉRIMENTAL !<br>Configuration adaptée aux écrans tactiles<br>des téléphones, tablettes et apparentés.
 Comment[gl]=EXPERIMENTAL!<br>Configuración adaptada para o uso en móbiles<br>de pantalla táctil, tablets e dispositivos similares.
 Comment[it]=SPERIMENTALE!<br>Configurazione adatta per l'uso in smartphone<br>con interfaccia tattile, tablets e similari.
+Comment[ko]=실험 단계중!<br>터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
 Comment[pt]=EXPERIMENTAL!<br>Configuração de ecrãs táteis como os dos telefones, tablets e similares.
 Comment[ru]=Экспериментально!<br>Конфигурация предназначенная специально для сенсорных<br>экранов телефонов, планшетов и прочих подобных устройств.
-Comment[ko]=실험 단계중!<br>터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
+Encoding=UTF-8
+Icon=enlightenment-mobile
+Name=Mobile
+Name[eo]=Poŝtelefono
+Name[es]=Móvil
+Name[fr]=Écran tactile
+Name[gl]=Móbil
+Name[ko]=터치스크린
+Name[pt]=Ecrã tátil
+Name[ru]=Мобильные устройства
+Type=Link
diff --git a/config/standard/profile.desktop b/config/standard/profile.desktop
index b560f60182..1c19e5e71a 100644
--- a/config/standard/profile.desktop
+++ b/config/standard/profile.desktop
@@ -1,21 +1,22 @@
 [Desktop Entry]
-Type=Link
+Comment=Configuration for devices with keyboards and mice<br>like your average PC Desktop, Laptop or Netbook<br>with Enlightenment's traditional keyboard bindings<br>and mouse controls.
+Comment[eo]=Agordoj por aparatoj kun klavaro kaj muso<br>samkiel via kutima PC aŭ portebla komputilo<br>kun kutima klavaraj bindaĵoj de Enlightenment kaj musaj kontroloj.
+Comment[es]=Configuración para dispositivos con teclado y<br>ratón, como puede ser un PC de escritorio, portátil o Netbook,<br>con las asociaciones de teclado y ratón<br>tradicionales de Enlightenment.
+Comment[fr]=Configuration pour les machines avec clavier et<br>souris comme les PC de bureau et les portables,<br>offrant raccourcis et contrôles traditionnels.
+Comment[gl]=Configuración para dispositivos con teclado e<br>rato, tal como un PC de escritorio, portátil ou Netbook,<br>coas asociacións de teclado e rato<br>tradicionais de Enlightenment.
+Comment[it]=Configurazione per macchine con tastiera e mouse,<br>come i normali computer fissi e portatili,<br>con le tradizionali associazioni di tasti e controlli<br>del mouse.
+Comment[ko]=일반적인 PC 데스크탑, 노트북, 넷북 환경과 같이 키보드와 마우스 기반 환경 설정. Enlightenment 의 전통적인 키보드 바인딩 및 마우스 동작 지원.
+Comment[pt]=Configuração de dispositivos com teclados e ratos como os computadores de secretária ou portáteis, com os atalhos padrão do Enlightenment.
+Comment[ru]=Конфигурация для устройств с клавиатурой и мышью,<br>таких как обычный компьютер или ноутбук,<br>с традиционными для Enlightenment'а сочетаниями<br>клавиш и управлением мышью.
+Encoding=UTF-8
+Icon=enlightenment-standard
 Name=Computer (Standard Enlightenment)
 Name[eo]=Komputilo (kutima Enlightenment)
 Name[es]=Ordenador (Enlightenment estándar)
 Name[fr]=Ordinateur (Enlightenment standard)
 Name[gl]=Ordenador (Enlightenment estándar)
 Name[it]=Computer (Enlightenment standard)
+Name[ko]=컴퓨터 (표준 Enlightenment)
 Name[pt]=Computador (Enlightenment padrão)
 Name[ru]=Компьютер (Стандартный Enlightenment)
-Name[ko]=컴퓨터 (표준 Enlightenment)
-Icon=enlightenment-standard
-Comment=Configuration for devices with keyboards and mice<br>like your average PC Desktop, Laptop or Netbook<br>with Enlightenment's traditional keyboard bindings<br>and mouse controls.
-Comment[eo]=Agordoj por aparatoj kun klavaro kaj muso<br>samkiel via kutima PC aŭ portebla komputilo<br>kun kutima klavaraj bindaĵoj de Enlightenment kaj musaj kontroloj. 
-Comment[es]=Configuración para dispositivos con teclado y<br>ratón, como puede ser un PC de escritorio, portátil o Netbook,<br>con las asociaciones de teclado y ratón<br>tradicionales de Enlightenment. 
-Comment[fr]=Configuration pour les machines avec clavier et<br>souris comme les PC de bureau et les portables,<br>offrant raccourcis et contrôles traditionnels.
-Comment[gl]=Configuración para dispositivos con teclado e<br>rato, tal como un PC de escritorio, portátil ou Netbook,<br>coas asociacións de teclado e rato<br>tradicionais de Enlightenment.
-Comment[it]=Configurazione per macchine con tastiera e mouse,<br>come i normali computer fissi e portatili,<br>con le tradizionali associazioni di tasti e controlli<br>del mouse.
-Comment[pt]=Configuração de dispositivos com teclados e ratos como os computadores de secretária ou portáteis, com os atalhos padrão do Enlightenment.
-Comment[ru]=Конфигурация для устройств с клавиатурой и мышью,<br>таких как обычный компьютер или ноутбук,<br>с традиционными для Enlightenment'а сочетаниями<br>клавиш и управлением мышью.
-Comment[ko]=일반적인 PC 데스크탑, 노트북, 넷북 환경과 같이 키보드와 마우스 기반 환경 설정. Enlightenment 의 전통적인 키보드 바인딩 및 마우스 동작 지원.
+Type=Link
diff --git a/data/desktop/enlightenment_filemanager.desktop b/data/desktop/enlightenment_filemanager.desktop
index 19806bfcd9..05775b98ae 100644
--- a/data/desktop/enlightenment_filemanager.desktop
+++ b/data/desktop/enlightenment_filemanager.desktop
@@ -1,24 +1,27 @@
 [Desktop Entry]
-Type=Application
-Name=Enlightenment File Manager
-Name[eo]=Dosieradministrilo de Enlightenment
-Name[es]=Administrador de archivos de Enlightenment
-Name[gl]=Xestor de ficheiros de Enlightenment
-Name[it]=Filemanager di Enlightenment
-Name[pt]=Gestor de ficheiros do Enlightenment
-Name[ru]=Файловый менеджер для Enlightenment
+Categories=FileManager;Utility;Core;System;FileTools;
 Comment=File Manager provided by Enlightenment
 Comment[eo]=La dosieradministrilo provizita de Enlightenment
 Comment[es]=El administrador de ficheros proporcionado por Enlightenment
+Comment[fr]=Explorateur de fichier fourni par Enlightenment
 Comment[gl]=O xestor de ficheiros fornecido por Enlightenment
 Comment[it]=Il filemanager fornito da Enlightenment
 Comment[pt]=Gestor de ficheiros para o Enlightenment
 Comment[ru]=Файловый менеджер встроенный в Enlightenment
+Encoding=UTF-8
 Exec=enlightenment_filemanager %U
 Icon=system-file-manager
-Categories=FileManager;Utility;Core;System;FileTools;
-Terminal=false
+MimeType=inode/directory;
+Name=Enlightenment File Manager
+Name[eo]=Dosieradministrilo de Enlightenment
+Name[es]=Administrador de archivos de Enlightenment
+Name[fr]=Gestionnaire de fichiers d'Enlightenment
+Name[gl]=Xestor de ficheiros de Enlightenment
+Name[it]=Filemanager di Enlightenment
+Name[pt]=Gestor de ficheiros do Enlightenment
+Name[ru]=Файловый менеджер для Enlightenment
+OnlyShowIn=X-Enlightenment;
 StartupNotify=false
 StartupWMClass=e_fm
-OnlyShowIn=X-Enlightenment;
-MimeType=inode/directory;
+Terminal=false
+Type=Application
diff --git a/data/favorites/desktop.desktop b/data/favorites/desktop.desktop
index 03f7647bfd..0810850c6a 100644
--- a/data/favorites/desktop.desktop
+++ b/data/favorites/desktop.desktop
@@ -1,11 +1,4 @@
 [Desktop Entry]
-Name=Desktop
-Name[eo]=Labortablo
-Name[es]=Escritorio
-Name[fr]=Bureau
-Name[gl]=Escritorio
-Name[pt]=Área de trabalho
-Name[ru]=Рабочий стол
 Comment=Files on your Desktop
 Comment[eo]=Dosieroj sur via labortablo
 Comment[es]=Los archivos en su escritorio
@@ -14,8 +7,16 @@ Comment[gl]=Os ficheiros no seu escritorio
 Comment[it]=I file sul vostro desktop
 Comment[pt]=Os ficheiros da área de trabalho
 Comment[ru]=Файлы на рабочем столе
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:$HOME/Desktop
+Encoding=UTF-8
 Icon=user-desktop
+Name=Desktop
+Name[eo]=Labortablo
+Name[es]=Escritorio
+Name[fr]=Bureau
+Name[gl]=Escritorio
+Name[pt]=Área de trabalho
+Name[ru]=Рабочий стол
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:$HOME/Desktop
+X-Enlightenment-Type=Mount
diff --git a/data/favorites/home.desktop b/data/favorites/home.desktop
index a5fa25d4fc..e64a986005 100644
--- a/data/favorites/home.desktop
+++ b/data/favorites/home.desktop
@@ -1,10 +1,4 @@
 [Desktop Entry]
-Name=Home
-Name[eo]=Hejmo
-Name[es]=Carpeta personal
-Name[gl]=Cartafol persoal
-Name[pt]=Pasta pessoal
-Name[ru]=Домашний каталог
 Comment=The Directory containing all your personal files
 Comment[eo]=La dosierujo enhavante viajn proprajn dosieroj
 Comment[es]=El directorio que contiene todos sus archivos personales
@@ -13,8 +7,16 @@ Comment[gl]=O directorio que contén tódolos seus ficheiros persoais
 Comment[it]=La directory contenente i vostri file personali
 Comment[pt]=O diretório com os ficheiros do utilizador
 Comment[ru]=Каталог содержащий ваши личные файлы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:$HOME
+Encoding=UTF-8
 Icon=user-home
+Name=Home
+Name[eo]=Hejmo
+Name[es]=Carpeta personal
+Name[fr]=Accueil
+Name[gl]=Cartafol persoal
+Name[pt]=Pasta pessoal
+Name[ru]=Домашний каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:$HOME
+X-Enlightenment-Type=Mount
diff --git a/data/favorites/root.desktop b/data/favorites/root.desktop
index 628c9228aa..3a55c3d8f9 100644
--- a/data/favorites/root.desktop
+++ b/data/favorites/root.desktop
@@ -1,7 +1,4 @@
 [Desktop Entry]
-Name=Root
-Name[eo]=Radiko
-Name[ru]=Корневой каталог
 Comment=The Root Filesystem base
 Comment[eo]=La radika dosiersistemo
 Comment[es]=El sistema de archivos root
@@ -10,8 +7,13 @@ Comment[gl]=O sistema de ficheiros root
 Comment[it]=Il filesystem principale
 Comment[pt]=O sistema de ficheiros root
 Comment[ru]=Корень файловой системы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:/
+Encoding=UTF-8
 Icon=computer
+Name=Root
+Name[eo]=Radiko
+Name[fr]=Dossier racine
+Name[ru]=Корневой каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:/
+X-Enlightenment-Type=Mount
diff --git a/data/favorites/tmp.desktop b/data/favorites/tmp.desktop
index 766dcd3cfa..72c2e0733f 100644
--- a/data/favorites/tmp.desktop
+++ b/data/favorites/tmp.desktop
@@ -1,8 +1,4 @@
 [Desktop Entry]
-Name=Temp
-Name[eo]=Dumtempaj
-Name[pt]=Temporários
-Name[ru]=Временный каталог
 Comment=Temporary files
 Comment[eo]=Dumtempaj dosieroj
 Comment[es]=Archivos temporales
@@ -11,8 +7,14 @@ Comment[gl]=Ficheiros temporais
 Comment[it]=File temporanei
 Comment[pt]=Ficheiros temporários
 Comment[ru]=Временные файлы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:/tmp
+Encoding=UTF-8
 Icon=user-temp
+Name=Temp
+Name[eo]=Dumtempaj
+Name[fr]=Temporaires
+Name[pt]=Temporários
+Name[ru]=Временный каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:/tmp
+X-Enlightenment-Type=Mount
diff --git a/data/xsession/enlightenment.desktop.in b/data/xsession/enlightenment.desktop.in
index b4a73bb874..6a11d7ca35 100644
--- a/data/xsession/enlightenment.desktop.in
+++ b/data/xsession/enlightenment.desktop.in
@@ -1,10 +1,4 @@
 [Desktop Entry]
-Name=Enlightenment
-Name[ca]=Enlightenment
-Name[el]=Enlightenment
-Name[eo]=Enlightenment
-Name[ru]=Enlightenment
-Name[tr]=Enlightenment
 Comment=Log in using Enlightenment (Version @VERSION@)
 Comment[ca]=Iniciar sessió amb Enlightenment (Versió @VERSION@)
 Comment[el]=Είσοδος με το Enlightenment (Έκδοση @VERSION@)
@@ -12,12 +6,20 @@ Comment[eo]=Ensaluti pere de Enlightenment (Versio @VERSION@)
 Comment[es]=Iniciar sesión usando Enlightenment (Versión @VERSION@)
 Comment[fr]=Ouvrir une session Enlightenment (Version @VERSION@)
 Comment[gl]=Iniciar sesión usando Enlightenment (Versión @VERSION@)
-Comment[ko]=Enlightenment 로그인(버전 @VERSION@)
 Comment[it]=Accedi con Enlightenment (Versione @VERSION@)
+Comment[ko]=Enlightenment 로그인(버전 @VERSION@)
 Comment[pt]=Iniciar sessão no Enlightenment (Versão @VERSION@)
 Comment[ru]=Войти используя Enlightenment (Версия @VERSION@)
 Comment[tr]=Enlightenment kullanarak giriş yaın (Version @VERSION@)
-Type=Application
-Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
+Encoding=UTF-8
 Exec=@prefix@/bin/enlightenment_start
+Icon=@prefix@/share/enlightenment/data/images/enlightenment.png
+Name=Enlightenment
+Name[ca]=Enlightenment
+Name[el]=Enlightenment
+Name[eo]=Enlightenment
+Name[fr]=Enlightenment
+Name[ru]=Enlightenment
+Name[tr]=Enlightenment
 TryExec=@prefix@/bin/enlightenment_start
+Type=Application
diff --git a/src/modules/access/module.desktop.in b/src/modules/access/module.desktop.in
index 75e43a082e..291f22f84f 100644
--- a/src/modules/access/module.desktop.in
+++ b/src/modules/access/module.desktop.in
@@ -1,18 +1,22 @@
 [Desktop Entry]
-Type=Link
-Name=Access
-Name[ca]=Accessibilitat
-Name[es]=Accesibilidad
-Name[gl]=Accesibilidade
-Name[pt]=Acessibilidade
-Name[ru]=Доступность
-Icon=preferences-desktop-accessibility
-X-Enlightenment-ModuleType=utils
 Comment=Accessibility module designed to improve ease of use for the vision impaired and the blind.
 Comment[ca]=Mòdul d'accessibilitat dissenyat per a facilitar l'ús a persones amb discapacitat visual.
+Comment[eo]=Modulo por alirebleco elpensita por plifaciligi uzadon de vido ĉe misvidantoj kaj blinduloj.
 Comment[es]=Módulo de accesibilidad diseñado para facilitar el uso a ciegos y discapacitados visuales.
 Comment[fr]=Module d'accessibilité permettant d'améliorer l'expérience utilisateur des déficients visuels.
 Comment[gl]=Módulo de accesibilidade programado para facilitar o uso a cegos e discapacitados visuais.
 Comment[it]=Modulo per l'accessibilità, progettato per facilitare l'uso agli ipovedenti e ai ciechi.
 Comment[pt]=Módulo de acessibilidade para ajudar os deficientes visuais
 Comment[ru]=Модуль разработанный для упрощения работы за компьютером людей со слабым зрением.
+Encoding=UTF-8
+Icon=preferences-desktop-accessibility
+Name=Access
+Name[ca]=Accessibilitat
+Name[eo]=Atingo
+Name[es]=Accesibilidad
+Name[fr]=Accès
+Name[gl]=Accesibilidade
+Name[pt]=Acessibilidade
+Name[ru]=Доступность
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/backlight/module.desktop.in b/src/modules/backlight/module.desktop.in
index 60e89e7c14..b46b5c2169 100644
--- a/src/modules/backlight/module.desktop.in
+++ b/src/modules/backlight/module.desktop.in
@@ -1,19 +1,22 @@
 [Desktop Entry]
-Type=Link
-Name=Backlight
-Name[ca]=Il·luminació
-Name[es]=Iluminación
-Name[fr]=Rétroéclairage
-Name[gl]=Iluminación
-Name[pt]=Iluminação
-Name[ru]=Подсветка
-Icon=e-module-backlight
-X-Enlightenment-ModuleType=utils
 Comment=Backlight control slider gadget
 Comment[ca]=Cursor per a controlar la retroil·luminació.
+Comment[eo]=Akcesorajo de kontrolo-ŝovilo de fona lumo
 Comment[es]=Deslizador para controlar la iluminación.
 Comment[fr]=Slider de contrôle du rétroéclairage.
 Comment[gl]=Cursor para controlar a iluminación.
 Comment[it]=Fornisce un cursore per il controllo della retroilluminazione.
 Comment[pt]=Um cursor para controlar a iluminação do monitor
 Comment[ru]=Слайдер для управления подсветкой
+Encoding=UTF-8
+Icon=e-module-backlight
+Name=Backlight
+Name[ca]=Il·luminació
+Name[eo]=Fona lumo
+Name[es]=Iluminación
+Name[fr]=Rétroéclairage
+Name[gl]=Iluminación
+Name[pt]=Iluminação
+Name[ru]=Подсветка
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop.in
index 9014ccf5ce..c0367c013e 100644
--- a/src/modules/battery/module.desktop.in
+++ b/src/modules/battery/module.desktop.in
@@ -1,24 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Battery
-Name[ca]=Bateria
-Name[cs]=Baterie
-Name[de]=Batterie
-Name[el]=Μπαταρία
-Name[eo]=Baterío
-Name[es]=Batería
-Name[fr]=Batterie
-Name[gl]=Batería
-Name[hu]=Akkumulátor
-Name[it]=
-Name[ja]=
-Name[pt]=Bateria
-Name[pt_BR]=
-Name[ru]=Батарея
-Name[tr]=Pil
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-battery
 Comment=A gadget to visualize your battery status.
 Comment[ca]=Un mòdul que mostra l'estat de la bateria.
 Comment[cs]=Gadget pro zobrazení stavu vaší baterie v notebooku.
@@ -37,4 +17,25 @@ Comment[ru]=Гаджет для отображения статуса батар
 Comment[tr]=Pil durumunu görselleştiren araç.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-battery
+Name=Battery
+Name[ca]=Bateria
+Name[cs]=Baterie
+Name[de]=Batterie
+Name[el]=Μπαταρία
+Name[eo]=Baterio
+Name[es]=Batería
+Name[fr]=Batterie
+Name[gl]=Batería
+Name[hu]=Akkumulátor
+Name[it]=
+Name[ja]=
+Name[pt]=Bateria
+Name[pt_BR]=
+Name[ru]=Батарея
+Name[tr]=Pil
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop.in
index 8dae939699..e8bf0b48a7 100644
--- a/src/modules/clock/module.desktop.in
+++ b/src/modules/clock/module.desktop.in
@@ -1,5 +1,24 @@
 [Desktop Entry]
-Type=Link
+Comment=Nice clock gadget to show current time.
+Comment[ca]=Un bonic rellotge per a mostrar l'hora actual.
+Comment[cs]=Gadget pro zobrazení aktuálního času.
+Comment[de]=Netter Helfer zum Anzeigen der aktuellen Uhrzeit.
+Comment[el]=Ένα όμορφο συστατικό που σας δείχνει την ώρα.
+Comment[eo]=Vidigi la nunan horon.
+Comment[es]=Un lindo reloj para mostrar la hora actual.
+Comment[fr]=Une jolie horloge avec calendrier intégré.
+Comment[gl]=Un bonito reloxo para amosar a hora actual.
+Comment[hu]=Egy szimpatikus, a pontos időt megjelenítő eszköz.
+Comment[it]=Un simpatico orologio per mostrare l'ora attuale.
+Comment[ja]=
+Comment[pt]=Um relógio para exibir a hora atual
+Comment[pt_BR]=
+Comment[ru]=Гаджет для отображения текущего времени.
+Comment[tr]=Şu anki saati gösteren şık bir alet.
+Comment[zh_CN]=
+Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-clock
 Name=Clock
 Name[ca]=Rellotge
 Name[cs]=Hodiny
@@ -18,23 +37,5 @@ Name[ru]=Часы
 Name[tr]=Saat
 Name[zh_CN]=
 Name[zh_TW]=
-Icon=e-module-clock
+Type=Link
 X-Enlightenment-ModuleType=utils
-Comment=Nice clock gadget to show current time.
-Comment[ca]=Un bonic rellotge per a mostrar l'hora actual.
-Comment[cs]=Gadget pro zobrazení aktuálního času.
-Comment[de]=Netter Helfer zum Anzeigen der aktuellen Uhrzeit.
-Comment[el]=Ένα όμορφο συστατικό που σας δείχνει την ώρα.
-Comment[eo]=Vidigi la nunan horon.
-Comment[es]=Un lindo reloj para mostrar la hora actual.
-Comment[fr]=Une jolie horloge avec calendrier intégré.
-Comment[gl]=Un bonito reloxo para amosar a hora actual.
-Comment[hu]=Egy szimpatikus, a pontos időt megjelenítő eszköz.
-Comment[it]=Un simpatico orologio per mostrare l'ora attuale.
-Comment[ja]=
-Comment[pt]=Um relógio para exibir a hora atual
-Comment[pt_BR]=
-Comment[ru]=Гаджет для отображения текущего времени.
-Comment[tr]=Şu anki saati gösteren şık bir alet.
-Comment[zh_CN]=
-Comment[zh_TW]=
diff --git a/src/modules/conf/module.desktop.in b/src/modules/conf/module.desktop.in
index 47243ded39..dbeddb3bd1 100644
--- a/src/modules/conf/module.desktop.in
+++ b/src/modules/conf/module.desktop.in
@@ -1,24 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Settings Panel
-Name[ca]=Panell de control
-Name[cs]=Ovládací centrum
-Name[de]=Einstellungsleiste
-Name[el]=Πάνελ ρυθμίσεων
-Name[eo]=Panelo de agordado
-Name[es]=Panel de configuración
-Name[fr]=Panneau de contrôle
-Name[gl]=Panel de configuración
-Name[hu]=Enlightenment Vezérlőpult
-Name[it]=Pannello di configurazione
-Name[ja]=
-Name[pt]=Painel de definições
-Name[pt_BR]=
-Name[ru]=Панель настроек
-Name[tr]=Ayarlar Paneli
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf
 Comment=General Enlightenment configuration panel.
 Comment[ca]=Panell de configuració general de Enlightenment.
 Comment[cs]=
@@ -37,4 +17,25 @@ Comment[ru]=Модуль панели настроек Enlightenment.
 Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf
+Name=Settings Panel
+Name[ca]=Panell de control
+Name[cs]=Ovládací centrum
+Name[de]=Einstellungsleiste
+Name[el]=Πάνελ ρυθμίσεων
+Name[eo]=Panelo de agordoj
+Name[es]=Panel de configuración
+Name[fr]=Panneau de contrôle
+Name[gl]=Panel de configuración
+Name[hu]=Enlightenment Vezérlőpult
+Name[it]=Pannello di configurazione
+Name[ja]=
+Name[pt]=Painel de definições
+Name[pt_BR]=
+Name[ru]=Панель настроек
+Name[tr]=Ayarlar Paneli
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=core
diff --git a/src/modules/conf_applications/module.desktop.in b/src/modules/conf_applications/module.desktop.in
index 9993cb2cf6..5def5debee 100644
--- a/src/modules/conf_applications/module.desktop.in
+++ b/src/modules/conf_applications/module.desktop.in
@@ -1,24 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Applications
-Name[ca]=Aplicacions
-Name[cs]=Aplikace
-Name[de]=
-Name[el]=Εφαρμογές
-Name[eo]=Aplikaĵoj
-Name[es]=Aplicaciones
-Name[fr]=Applications
-Name[gl]=Aplicativos
-Name[hu]=Alkalmazások
-Name[it]=Applicazioni
-Name[ja]=
-Name[pt]=Aplicações
-Name[pt_BR]=
-Name[ru]=Приложения
-Name[tr]=Uygulamalar
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_applications
 Comment=Allows configuration of Ibar, Restart, and Startup applications.
 Comment[ca]=Permet configurar les aplicacions per a iniciar i reiniciar tasques, així com la barra Ibar.
 Comment[cs]=Umožňuje nastavit iBar spouštěče, aplikace při restartu a aplikace při startu.
@@ -37,4 +17,25 @@ Comment[ru]=Позволяет настройку приложений для Ib
 Comment[tr]=IBar, Açılış ve Yeniden Başlat uygulamalarının yapılandırılmasına izin verir.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_applications
+Name=Applications
+Name[ca]=Aplicacions
+Name[cs]=Aplikace
+Name[de]=
+Name[el]=Εφαρμογές
+Name[eo]=Aplikaĵoj
+Name[es]=Aplicaciones
+Name[fr]=Applications
+Name[gl]=Aplicativos
+Name[hu]=Alkalmazások
+Name[it]=Applicazioni
+Name[ja]=
+Name[pt]=Aplicações
+Name[pt_BR]=
+Name[ru]=Приложения
+Name[tr]=Uygulamalar
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop.in
index 24bd1b033f..c30203683f 100644
--- a/src/modules/conf_dialogs/module.desktop.in
+++ b/src/modules/conf_dialogs/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Dialogs
-Name[ca]=Diàlegs
-Name[cs]=Dialogy
-Name[de]=
-Name[eo]=Dialogoj
-Name[es]=Diálogos
-Name[fr]=Boîtes de dialogue
-Name[gl]=Diálogos
-Name[hu]=Párbeszédablakok
-Name[it]=Finestre di dialogo
-Name[ja]=
-Name[pt]=Diálogos
-Name[pt_BR]=
-Name[ru]=Диалоги
-Name[tr]=Diyaloglar
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_dialogs
 Comment=Configure default dialog properties.
 Comment[ca]=Configuració de les propietats predefinides dels diàlegs.
 Comment[cs]=Volby výchozích vlastností dialogů.
@@ -35,4 +16,24 @@ Comment[ru]=Настройка стандартных параметров ди�
 Comment[tr]=Öntanımlı pencere özelliklerini yapılandırır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_dialogs
+Name=Dialogs
+Name[ca]=Diàlegs
+Name[cs]=Dialogy
+Name[de]=
+Name[eo]=Dialogoj
+Name[es]=Diálogos
+Name[fr]=Boîtes de dialogue
+Name[gl]=Diálogos
+Name[hu]=Párbeszédablakok
+Name[it]=Finestre di dialogo
+Name[ja]=
+Name[pt]=Diálogos
+Name[pt_BR]=
+Name[ru]=Диалоги
+Name[tr]=Diyaloglar
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop.in
index 66efbefbad..491045dbb6 100644
--- a/src/modules/conf_display/module.desktop.in
+++ b/src/modules/conf_display/module.desktop.in
@@ -1,28 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Screen
-Name[ca]=Pantalla
-Name[cs]=
-Name[de]=
-Name[eo]=
-Name[es]=Pantalla
-Name[fr]=Écran
-Name[gl]=Pantalla
-Name[hu]=
-Name[it]=Schermo
-Name[ja]=
-Name[pt]=Ecrã
-Name[pt_BR]=
-Name[ru]=Экран
-Name[tr]=
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-display
 Comment=Used to configure your screen.
 Comment[ca]=Configuració de la pantalla.
 Comment[cs]=
 Comment[de]=
-Comment[eo]=
+Comment[eo]=Agordi vian ekranon
 Comment[es]=Usado para configurar su pantalla.
 Comment[fr]=Paramétrage de l'écran.
 Comment[gl]=Usado para configurar a súa pantalla.
@@ -35,4 +16,24 @@ Comment[ru]=Используется для настройки экрана.
 Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=preferences-desktop-display
+Name=Screen
+Name[ca]=Pantalla
+Name[cs]=
+Name[de]=
+Name[eo]=Ekrano
+Name[es]=Pantalla
+Name[fr]=Écran
+Name[gl]=Pantalla
+Name[hu]=
+Name[it]=Schermo
+Name[ja]=
+Name[pt]=Ecrã
+Name[pt_BR]=
+Name[ru]=Экран
+Name[tr]=
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop.in
index 7ba3270d2c..373aeaef29 100644
--- a/src/modules/conf_interaction/module.desktop.in
+++ b/src/modules/conf_interaction/module.desktop.in
@@ -1,28 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Interaction
-Name[ca]=Interacció
-Name[cs]=
-Name[de]=
-Name[eo]=
-Name[es]=Interacción
-Name[fr]=
-Name[gl]=Interacción
-Name[hu]=
-Name[it]=Interazione
-Name[ja]=
-Name[pt]=Interação
-Name[pt_BR]=
-Name[ru]=Взаимодействие
-Name[tr]=
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_interaction
 Comment=Configure Mouse and Touch input.
 Comment[ca]=Configura les entrades de ratolí i tàctil.
 Comment[cs]=
 Comment[de]=
-Comment[eo]=
+Comment[eo]=Agodi musan kaj tuŝeblan enigon.
 Comment[es]=Configure el ratón y la pantalla táctil.
 Comment[fr]=Configure l'interface tactile et la souris.
 Comment[gl]=Configure o rato e a pantalla táctil.
@@ -35,4 +16,24 @@ Comment[ru]=Настройка мыши и сенсорного ввода.
 Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_interaction
+Name=Interaction
+Name[ca]=Interacció
+Name[cs]=
+Name[de]=
+Name[eo]=Interago
+Name[es]=Interacción
+Name[fr]=Interaction
+Name[gl]=Interacción
+Name[hu]=
+Name[it]=Interazione
+Name[ja]=
+Name[pt]=Interação
+Name[pt_BR]=
+Name[ru]=Взаимодействие
+Name[tr]=
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
index 42e26b6424..07d5f43c29 100644
--- a/src/modules/conf_intl/module.desktop.in
+++ b/src/modules/conf_intl/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Language
-Name[ca]=Idioma
-Name[cs]=Jazyk
-Name[de]=
-Name[eo]=Lingvo
-Name[es]=Idioma
-Name[fr]=Langue
-Name[gl]=Idioma
-Name[hu]=Nyelv
-Name[it]=Lingua
-Name[ja]=
-Name[pt]=Idioma
-Name[pt_BR]=
-Name[ru]=Язык
-Name[tr]=Dil
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-locale
 Comment=Used to select a default language.
 Comment[ca]=Permet seleccionar l'idioma predeterminat.
 Comment[cs]=Použit pro výběr výchozího jazyka.
@@ -32,7 +13,29 @@ Comment[ja]=
 Comment[pt]=Permite-lhe escolher o idioma do sistema
 Comment[pt_BR]=
 Comment[ru]=Используется для выбора языка системы по умолчанию.
+Comment[sr]=Користи се за избор подразумеваног језика.
 Comment[tr]=Öntanımlı dil seçmek için kullanılır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=preferences-desktop-locale
+Name=Language
+Name[ca]=Idioma
+Name[cs]=Jazyk
+Name[de]=
+Name[eo]=Lingvo
+Name[es]=Idioma
+Name[fr]=Langue
+Name[gl]=Idioma
+Name[hu]=Nyelv
+Name[it]=Lingua
+Name[ja]=
+Name[pt]=Idioma
+Name[pt_BR]=
+Name[ru]=Язык
+Name[sr]=Језик
+Name[tr]=Dil
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_keybindings/module.desktop.in b/src/modules/conf_keybindings/module.desktop.in
index 429bfe1d3c..fd71deb4e0 100644
--- a/src/modules/conf_keybindings/module.desktop.in
+++ b/src/modules/conf_keybindings/module.desktop.in
@@ -1,28 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Input Control Settings
-Name[ca]=Preferències dels dispositius d'entrada
-Name[cs]=
-Name[de]=
-Name[eo]=
-Name[es]=Preferencias de los dispositivos de entrada
-Name[fr]=Raccourcis des entrées
-Name[hu]=
-Name[gl]=Preferencias dos dispositivos de entrada
-Name[it]=Controllo dell'input
-Name[ja]=
-Name[pt]=Definições de inserção
-Name[pt_BR]=
-Name[ru]=Настройки управления вводом
-Name[tr]=
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-keyboard-shortcuts
 Comment=Key, Mouse and Button control settings
 Comment[ca]=Configuracions del teclat, ratolí i botons.
 Comment[cs]=
 Comment[de]=
-Comment[eo]=
+Comment[eo]=Agordoj de klavoj, musoj kaj butonoj
 Comment[es]=Configuraciones del ratón, teclado y botones.
 Comment[fr]=Paramètres de contrôle des touches, boutons et souris.
 Comment[hu]=Configuracións do rato, teclado e botóns.
@@ -34,4 +15,24 @@ Comment[ru]=Настройки управления мышью, клавишам
 Comment[tr]=
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=preferences-desktop-keyboard-shortcuts
+Name=Input Control Settings
+Name[ca]=Preferències dels dispositius d'entrada
+Name[cs]=
+Name[de]=
+Name[eo]=Agordoj de kontrolo de enigo
+Name[es]=Preferencias de los dispositivos de entrada
+Name[fr]=Raccourcis des entrées
+Name[gl]=Preferencias dos dispositivos de entrada
+Name[hu]=
+Name[it]=Controllo dell'input
+Name[ja]=
+Name[pt]=Definições de inserção
+Name[pt_BR]=
+Name[ru]=Настройки управления вводом
+Name[tr]=
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop.in
index 78bcc1c5a0..f40eac9a36 100644
--- a/src/modules/conf_menus/module.desktop.in
+++ b/src/modules/conf_menus/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Menu Settings
-Name[ca]=Preferències del menú
-Name[cs]=Volby menu
-Name[de]=
-Name[eo]=Menuaj agordoj
-Name[es]=Opciones de menú
-Name[fr]=Paramétrage du menu
-Name[gl]=Preferencias do menú
-Name[hu]=Menü beállítások
-Name[it]=Impostazioni menù
-Name[ja]=
-Name[pt]=Definições do menu
-Name[pt_BR]=
-Name[ru]=Настройки меню
-Name[tr]=Menü Ayarları
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_menus
 Comment=Configures menu behavior.
 Comment[ca]=Configura el comportament del menú.
 Comment[cs]=Volby chování menu.
@@ -35,4 +16,24 @@ Comment[ru]=Конфигурация настроек меню.
 Comment[tr]=Menü davranışını yapılandırır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_menus
+Name=Menu Settings
+Name[ca]=Preferències del menú
+Name[cs]=Volby menu
+Name[de]=
+Name[eo]=Agordoj de menuo
+Name[es]=Opciones de menú
+Name[fr]=Paramétrage du menu
+Name[gl]=Preferencias do menú
+Name[hu]=Menü beállítások
+Name[it]=Impostazioni menù
+Name[ja]=
+Name[pt]=Definições do menu
+Name[pt_BR]=
+Name[ru]=Настройки меню
+Name[tr]=Menü Ayarları
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop.in
index 78b3382b65..d0085fbe38 100644
--- a/src/modules/conf_paths/module.desktop.in
+++ b/src/modules/conf_paths/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Search Directories
-Name[ca]=Directoris de cerca
-Name[cs]=Adresáře k hledání
-Name[de]=
-Name[eo]=Dosierujoj de serĉo
-Name[es]=Directorios de búsqueda
-Name[fr]=Recherche de dossiers
-Name[gl]=Directorios de búsqueda
-Name[hu]=Könyvtárak
-Name[it]=Percorsi di ricerca
-Name[ja]=
-Name[pt]=Diretórios de pesquisa
-Name[pt_BR]=
-Name[ru]=Каталоги поиска
-Name[tr]=Aranacak Dizinler
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_paths
 Comment=Specifies the Enlightenment search paths and default directories.
 Comment[ca]=Especifica les rutes de cerca de l'Enlightenment i els directoris predeterminats.
 Comment[cs]=Určuje výchozí složky Enlightenment a cesty k hledání témat aj.
@@ -35,4 +16,24 @@ Comment[ru]=Позволяет указать стандартные катал�
 Comment[tr]=Enlightenment aranacak yollar ve öntanımlı dizinleri belirtir.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_paths
+Name=Search Directories
+Name[ca]=Directoris de cerca
+Name[cs]=Adresáře k hledání
+Name[de]=
+Name[eo]=Dosierujoj de serĉo
+Name[es]=Directorios de búsqueda
+Name[fr]=Recherche de dossiers
+Name[gl]=Directorios de búsqueda
+Name[hu]=Könyvtárak
+Name[it]=Percorsi di ricerca
+Name[ja]=
+Name[pt]=Diretórios de pesquisa
+Name[pt_BR]=
+Name[ru]=Каталоги поиска
+Name[tr]=Aranacak Dizinler
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop.in
index 47bcb788a0..e4b4aa9b09 100644
--- a/src/modules/conf_performance/module.desktop.in
+++ b/src/modules/conf_performance/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Performance
-Name[ca]=Rendiment
-Name[cs]=Výkon
-Name[de]=
-Name[eo]=Rendimento
-Name[es]=Rendimiento
-Name[fr]=Performance
-Name[gl]=Rendemento
-Name[hu]=Teljesítmény
-Name[it]=Prestazioni
-Name[ja]=
-Name[pt]=Desempenho
-Name[pt_BR]=
-Name[ru]=Быстродействие
-Name[tr]=Performans
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_performance
 Comment=Used to configure certain performance related items as frame rates and cache settings.
 Comment[ca]=Per a configurar certes característiques de rendiment, com ara quadres per segon o paràmetres de memòria cau.
 Comment[cs]=Použit k nastavení framerate, cache aj.
@@ -32,7 +13,29 @@ Comment[ja]=
 Comment[pt]=Permite-lhe configurar alguns itens relacionados com o desempenho do computador
 Comment[pt_BR]=
 Comment[ru]=Используется для конфигурации быстродействия, типа частоты кадров и настроек кэширования.
+Comment[sr]=Користи се за подешавање одређених ставки везаних за брзину извршавања, учесталост освежавања приказа и поставке прихватне меморије.
 Comment[tr]=Kare oranı ve önbellek ayarları gibi performans ile ilgili öğeleri yapılandırır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_performance
+Name=Performance
+Name[ca]=Rendiment
+Name[cs]=Výkon
+Name[de]=
+Name[eo]=Rendimento
+Name[es]=Rendimiento
+Name[fr]=Performance
+Name[gl]=Rendemento
+Name[hu]=Teljesítmény
+Name[it]=Prestazioni
+Name[ja]=
+Name[pt]=Desempenho
+Name[pt_BR]=
+Name[ru]=Быстродействие
+Name[sr]=Учинковитост
+Name[tr]=Performans
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_randr/module.desktop.in b/src/modules/conf_randr/module.desktop.in
index c794cae911..3f3a499598 100644
--- a/src/modules/conf_randr/module.desktop.in
+++ b/src/modules/conf_randr/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Settings - Screen Setup
-Name[ca]=Resolució de pantalla
-Name[cs]=Nastavení - rozlišení obrazovky
-Name[de]=Konfiguration - Bildschirm
-Name[eo]=Agordo - Ekrandistingivo
-Name[es]=Configuración - Resolución de pantalla
-Name[fr]=Affichage
-Name[gl]=Configuración da pantalla
-Name[hu]=Beállítások - Képernyő felbontása
-Name[it]=Monitor
-Name[ja]=
-Name[pt]=Configuração de ecrã
-Name[pt_BR]=
-Name[ru]=Настройка экрана
-Name[tr]=Ayarlar - Ekran Çözünürlüğü
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_randr
 Comment=Used to configure your screen's resolution.
 Comment[ca]=Per a configurar la resolució del monitor.
 Comment[cs]=Použit k nastavení rozlišení obrazovky.
@@ -35,4 +16,24 @@ Comment[ru]=Используется для настройки разрешен�
 Comment[tr]=Ekranınızın çözünürlüğünü yapılandırır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_randr
+Name=Settings - Screen Setup
+Name[ca]=Resolució de pantalla
+Name[cs]=Nastavení - rozlišení obrazovky
+Name[de]=Konfiguration - Bildschirm
+Name[eo]=Agordo - Ekrandistingivo
+Name[es]=Configuración - Resolución de pantalla
+Name[fr]=Affichage
+Name[gl]=Configuración da pantalla
+Name[hu]=Beállítások - Képernyő felbontása
+Name[it]=Monitor
+Name[ja]=
+Name[pt]=Configuração de ecrã
+Name[pt_BR]=
+Name[ru]=Настройка экрана
+Name[tr]=Ayarlar - Ekran Çözünürlüğü
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop.in
index 40f7a7a355..89c70d9138 100644
--- a/src/modules/conf_shelves/module.desktop.in
+++ b/src/modules/conf_shelves/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Shelves
-Name[ca]=Panells
-Name[cs]=Panely
-Name[de]=
-Name[eo]=Bretoj
-Name[es]=Contenedores
-Name[fr]=Racks
-Name[gl]=Paneis
-Name[hu]=Polcok
-Name[it]=Mensole
-Name[ja]=
-Name[pt]=Painéis
-Name[pt_BR]=
-Name[ru]=Полки
-Name[tr]=Raflar
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_shelves
 Comment=Shelf configuration dialog.
 Comment[ca]=Interfície de configuració dels panells.
 Comment[cs]=Dialog nastavení panelů.
@@ -35,4 +16,24 @@ Comment[ru]=Диалог конфигурации полки.
 Comment[tr]=Raf yapılandırma diyaloğu.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_shelves
+Name=Shelves
+Name[ca]=Panells
+Name[cs]=Panely
+Name[de]=
+Name[eo]=Bretoj
+Name[es]=Contenedores
+Name[fr]=Racks
+Name[gl]=Paneis
+Name[hu]=Polcok
+Name[it]=Mensole
+Name[ja]=
+Name[pt]=Painéis
+Name[pt_BR]=
+Name[ru]=Полки
+Name[tr]=Raflar
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop.in
index 8ed7b033c7..0f18c4a48e 100644
--- a/src/modules/conf_theme/module.desktop.in
+++ b/src/modules/conf_theme/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Theme
-Name[ca]=Tema
-Name[cs]=Téma
-Name[de]=
-Name[eo]=Etoso
-Name[es]=Tema
-Name[fr]=Thème
-Name[gl]=Tema
-Name[hu]=Téma
-Name[it]=Temi
-Name[ja]=
-Name[pt]=Tema
-Name[pt_BR]=
-Name[ru]=Тема
-Name[tr]=Tema
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-theme
 Comment=Used to configure your theme preferences.
 Comment[ca]=Permet configurar les preferències del tema.
 Comment[cs]=Použit k nastavení vašeho tématu.
@@ -35,4 +16,24 @@ Comment[ru]=Используется для настройки темы.
 Comment[tr]=Tema seçimlerinizi yapılandırmakta kullanılır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=preferences-desktop-theme
+Name=Theme
+Name[ca]=Tema
+Name[cs]=Téma
+Name[de]=
+Name[eo]=Etoso
+Name[es]=Tema
+Name[fr]=Thème
+Name[gl]=Tema
+Name[hu]=Téma
+Name[it]=Temi
+Name[ja]=
+Name[pt]=Tema
+Name[pt_BR]=
+Name[ru]=Тема
+Name[tr]=Tema
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_wallpaper2/module.desktop.in b/src/modules/conf_wallpaper2/module.desktop.in
index d90ef9864b..9545533e3f 100644
--- a/src/modules/conf_wallpaper2/module.desktop.in
+++ b/src/modules/conf_wallpaper2/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Wallpaper 2
-Name[ca]=Fons d'escriptori
-Name[cs]=Pozadí plochy
-Name[de]=
-Name[eo]=Tapeto
-Name[es]=Fondo de pantalla
-Name[fr]=Fond d'écran 2
-Name[gl]=Fondo de escritorio 2
-Name[hu]=Háttérkép
-Name[it]=Sfondo 2
-Name[ja]=
-Name[pt]=Papel de parede 2
-Name[pt_BR]=
-Name[ru]=Обои 2
-Name[tr]=Duvarkağıdı 2
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=preferences-desktop-wallpaper
 Comment=Used to pick a wallpaper.
 Comment[ca]=Permet seleccionar el fons d'escriptori.
 Comment[cs]=Použit k volbě pozadí.
@@ -35,4 +16,24 @@ Comment[ru]=Используется для выбора обоев.
 Comment[tr]=Duvarkağıdı seçiminde kullanılır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=preferences-desktop-wallpaper
+Name=Wallpaper 2
+Name[ca]=Fons d'escriptori
+Name[cs]=Pozadí plochy
+Name[de]=
+Name[eo]=Tapeto
+Name[es]=Fondo de pantalla
+Name[fr]=Fond d'écran 2
+Name[gl]=Fondo de escritorio 2
+Name[hu]=Háttérkép
+Name[it]=Sfondo 2
+Name[ja]=
+Name[pt]=Papel de parede 2
+Name[pt_BR]=
+Name[ru]=Обои 2
+Name[tr]=Duvarkağıdı 2
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop.in
index 07fd3ecdcf..b44af35079 100644
--- a/src/modules/conf_window_manipulation/module.desktop.in
+++ b/src/modules/conf_window_manipulation/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Window Manipulation
-Name[ca]=Manipulació de finestres
-Name[cs]=Manipulace s okny
-Name[de]=
-Name[eo]=Manipulado de fenestroj
-Name[es]=Manipulación de ventanas
-Name[fr]=Manipulation des fenêtres
-Name[gl]=Manipulación de xanelas
-Name[hu]=Ablak műveletek
-Name[it]=Manipolazione finestre
-Name[ja]=
-Name[pt]=Manipulação de janelas
-Name[pt_BR]=
-Name[ru]=Манипуляции с окном
-Name[tr]=Pencere Manipülasyonu
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_winmanip
 Comment=Configures window raise, resistance, and maximize policies.
 Comment[ca]=Configura les regles per a la pujada, la resistència i la maximització de les finestres.
 Comment[cs]=Nasavení odolnosti okna, maximalizace aj.
@@ -35,4 +16,24 @@ Comment[ru]=Позволяет настроить политику подъем�
 Comment[tr]=Pencere yükseltmesi, direnci ve ekranı kaplama kurallarını yapılandırır.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-conf_winmanip
+Name=Window Manipulation
+Name[ca]=Manipulació de finestres
+Name[cs]=Manipulace s okny
+Name[de]=
+Name[eo]=Manipulado de fenestroj
+Name[es]=Manipulación de ventanas
+Name[fr]=Manipulation des fenêtres
+Name[gl]=Manipulación de xanelas
+Name[hu]=Ablak műveletek
+Name[it]=Manipolazione finestre
+Name[ja]=
+Name[pt]=Manipulação de janelas
+Name[pt_BR]=
+Name[ru]=Манипуляции с окном
+Name[tr]=Pencere Manipülasyonu
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop.in
index 2c43df5d32..d71f068bcf 100644
--- a/src/modules/conf_window_remembers/module.desktop.in
+++ b/src/modules/conf_window_remembers/module.desktop.in
@@ -1,18 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Window Remembers
-Name[ca]=Memòria de les finestres
-Name[cs]=Paměť
-Name[eo]=Fesnestraj memoroj
-Name[es]=Recordatorio de ventanas
-Name[fr]=Mémorisations des fenêtres
-Name[gl]=Recordatorio de xanelas
-Name[hu]=Ablak emlékek
-Name[it]=Ricordi finestre
-Name[pt]=Memorização de janelas
-Name[ru]=Запоминание окон
-Name[tr]=Pencere Hatırlamaları
-Icon=e-module-conf_window_remembers
 Comment=Delete existing window remembers.
 Comment[ca]=Elimina l'opció de recordar de les finestres.
 Comment[cs]=K vymazání existujících zapamatovaných vlastností oken.
@@ -24,5 +10,22 @@ Comment[hu]=Meglévő ablak emlékek törlése.
 Comment[it]=Rimuove le impostazioni da ricordare delle finestre.
 Comment[pt]=Apagar memorização das janelas
 Comment[ru]=Удаление запомненных настроек окон.
+Comment[sr]=Брише сачуване упамћене прозоре
 Comment[tr]=Mevcut pencere hatırlamalarını sil.
+Encoding=UTF-8
+Icon=e-module-conf_window_remembers
+Name=Window Remembers
+Name[ca]=Memòria de les finestres
+Name[cs]=Paměť
+Name[eo]=Fenestraj memoroj
+Name[es]=Recordatorio de ventanas
+Name[fr]=Mémorisations des fenêtres
+Name[gl]=Recordatorio de xanelas
+Name[hu]=Ablak emlékek
+Name[it]=Ricordi finestre
+Name[pt]=Memorização de janelas
+Name[ru]=Запоминание окон
+Name[sr]=Памћење прозора
+Name[tr]=Pencere Hatırlamaları
+Type=Link
 X-Enlightenment-ModuleType=settings
diff --git a/src/modules/connman/module.desktop.in b/src/modules/connman/module.desktop.in
index 8531e2bf7c..72fcbc14d1 100644
--- a/src/modules/connman/module.desktop.in
+++ b/src/modules/connman/module.desktop.in
@@ -1,5 +1,19 @@
 [Desktop Entry]
-Type=Link
+Comment=Control Wifi and wired networks as a user.
+Comment[ca]=Gestió de xarxes cablejades i sense fils com a usuari.
+Comment[cs]=Nastavení wifi a drátových sítí jako uživatel.
+Comment[de]=Drahtlose und kabelgebundene Nezwerke als Nutzer verwalten
+Comment[eo]=Por kontroli sendratajn kaj dratajn retojn kiel uzanto.
+Comment[es]=Controle las redes inalámbricas o cableadas como usuario.
+Comment[fr]=Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur.
+Comment[gl]=Controle as redes sen fíos ou cableadas como usuario.
+Comment[hu]=Wifi és vezetékes hálózatok kezelését teszi lehetővé.
+Comment[it]=Controlla le reti wireless e cablate come utente.
+Comment[pt]=Permite-lhe controlar as redes com e sem fios
+Comment[ru]=Управление проводной и wifi сетями на пользовательском уровне.
+Comment[tr]=Kablolu ve kablosuz ağ bağlantısını ayarlar.
+Encoding=UTF-8
+Icon=e-module-connman
 Name=Connection Manager
 Name[ca]=Gestor de connexions
 Name[cs]=Správce připojení
@@ -13,18 +27,5 @@ Name[it]=Gestore connessioni
 Name[pt]=Gestor de ligações
 Name[ru]=Менеджер подключений
 Name[tr]=Bağlantı Yöneticisi
-Icon=e-module-connman
-Comment=Control Wifi and wired networks as a user.
-Comment[ca]=Gestió de xarxes cablejades i sense fils com a usuari.
-Comment[cs]=Nastavení wifi a drátových sítí jako uživatel.
-Comment[de]=Drahtlose und kabelgebundene Nezwerke als Nutzer verwalten
-Comment[eo]=Por kontroli sendratajn kaj dratajn retojn kiel uzanto.
-Comment[es]=Controle las redes inalámbricas o cableadas como usuario. 
-Comment[fr]=Permet de contrôler les réseaux Wifi et câblés en tant qu'utilisateur.
-Comment[gl]=Controle as redes sen fíos ou cableadas como usuario.
-Comment[hu]=Wifi és vezetékes hálózatok kezelését teszi lehetővé.
-Comment[it]=Controlla le reti wireless e cablate come utente.
-Comment[pt]=Permite-lhe controlar as redes com e sem fios
-Comment[ru]=Управление проводной и wifi сетями на пользовательском уровне.
-Comment[tr]=Kablolu ve kablosuz ağ bağlantısını ayarlar.
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop.in
index 765f13061c..3aa664b0d3 100644
--- a/src/modules/cpufreq/module.desktop.in
+++ b/src/modules/cpufreq/module.desktop.in
@@ -1,15 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Cpufreq
-Name[ca]=Freqüència de la CPU
-Name[cs]=Frekvence procesoru
-Name[eo]=Ĉeforgana ofteco
-Name[fr]=FréqCPU
-Name[hu]=Processzor frekvencia
-Name[pt]=Frequência do cpu
-Name[ru]=Частота процессора
-Name[tr]=İşlemci ölçekleme
-Icon=e-module-cpufreq
 Comment=Gadget to monitor and change the CPU frequency.
 Comment[ca]=Mòdul per a monitoritzar i canviar la freqüència de la CPU.
 Comment[cs]=Gadget pro monitorování a změnu frekvence CPU.
@@ -27,4 +16,16 @@ Comment[ru]=Гаджет для отображения и смены часто�
 Comment[tr]=İşlemci frekansını değiştiren ve izleyen bir araç.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-cpufreq
+Name=Cpufreq
+Name[ca]=Freqüència de la CPU
+Name[cs]=Frekvence procesoru
+Name[eo]=Ĉeforgana ofteco
+Name[fr]=FréqCPU
+Name[hu]=Processzor frekvencia
+Name[pt]=Frequência do cpu
+Name[ru]=Частота процессора
+Name[tr]=İşlemci ölçekleme
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop.in
index 6fea6fa351..f634d92c36 100644
--- a/src/modules/everything/module.desktop.in
+++ b/src/modules/everything/module.desktop.in
@@ -1,27 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Everything (Starter)
-Name[ca]=Everything (Llançador)
-Name[cs]=
-Name[de]=
-Name[eo]=
-Name[es]=Everything (Lanzador)
-Name[fr]=Omni
-Name[gl]=Everything (Iniciador)
-Name[hu]=
-Name[it]=Everything
-Name[ja]=
-Name[pt]=Everything (Lançador)
-Name[pt_BR]=
-Name[ru]=Всё (Стартер)
-Name[tr]=Everything (Başlatıcı)
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-everything
 Comment=The run command module provides an application launcher dialog.
 Comment[ca]=El mòdul d'executar comandes ofereix un diàleg per a llançar aplicacions.
 Comment[cs]=Poskytuje dialog pro spuštění aplikací.
-Comment[de]=
+Comment[de]=Der Ausführen-Befehl stellt einen Anwendungsstarter zur Verfügung.
+Comment[el]=Το άρθρωμα της εκτέλεση εντολής παρέχει ένα παράθυρο διαλόγου εκτέλεσης εφαρμογής.
 Comment[eo]=La modulo de lanĉo de komandoj provizas dialogon de lanĉilo de aplikaĵoj.
 Comment[es]=El módulo de ejecutar comandos provee un diálogo para ejecutar aplicaciones.
 Comment[fr]=Lanceur d'applications et explorateur de fichiers à vocation universelle.
@@ -35,4 +17,24 @@ Comment[ru]=Модуль выполнения команд предоставл�
 Comment[tr]=Komut çalıştırma modülü uygulamaları başlatmak için diyalog sunar.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-everything
+Name=Everything (Starter)
+Name[ca]=Everything (Llançador)
+Name[cs]=
+Name[de]=
+Name[eo]=Ĉio (lanĉilo)
+Name[es]=Everything (Lanzador)
+Name[fr]=Omni
+Name[gl]=Everything (Iniciador)
+Name[hu]=
+Name[it]=Everything
+Name[ja]=
+Name[pt]=Everything (Lançador)
+Name[pt_BR]=
+Name[ru]=Всё (Стартер)
+Name[tr]=Everything (Başlatıcı)
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop.in
index e34f861e6c..01f9a22b77 100644
--- a/src/modules/fileman/module.desktop.in
+++ b/src/modules/fileman/module.desktop.in
@@ -1,23 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=EFM (Starter)
-Name[ca]=EFM (Llançador)
-Name[cs]=
-Name[de]=EFM (Starter)
-Name[eo]=
-Name[es]=EFM (Lanzador)
-Name[fr]=File manager
-Name[gl]=EFM (Iniciador)
-Name[hu]=
-Name[it]=EFM
-Name[ja]=
-Name[pt]=Gestor de ficheiros EFM
-Name[pt_BR]=
-Name[ru]=EFM (Стартер)
-Name[tr]=EFM (Başlatıcı)
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-fileman
 Comment=Enlightenment's integrated file manager.
 Comment[ca]=Administrador de fitxers integrat a l'Enlightenment.
 Comment[cs]=Integrovaný správce souborů v Enlightenment.
@@ -32,7 +13,29 @@ Comment[ja]=
 Comment[pt]=O gestor de ficheiros do Enlightenment.
 Comment[pt_BR]=
 Comment[ru]=Встроенный в Enlightenment файловый менеджер.
+Comment[sr]=Уграђени управник датотека Просвећења.
 Comment[tr]=Enlightenment'nin dahili pencere yöneticisi.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-fileman
+Name=EFM (Starter)
+Name[ca]=EFM (Llançador)
+Name[cs]=
+Name[de]=EFM (Starter)
+Name[eo]=Enlightenment dosieradministrilo (lanĉilo)
+Name[es]=EFM (Lanzador)
+Name[fr]=File manager
+Name[gl]=EFM (Iniciador)
+Name[hu]=
+Name[it]=EFM
+Name[ja]=
+Name[pt]=Gestor de ficheiros EFM
+Name[pt_BR]=
+Name[ru]=EFM (Стартер)
+Name[sr]=УДП (покретач)
+Name[tr]=EFM (Başlatıcı)
+Name[zh_CN]=
+Name[zh_TW]=
+Type=Link
 X-Enlightenment-ModuleType=files
diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop.in
index ab5e599258..6dc21a5d4c 100644
--- a/src/modules/fileman_opinfo/module.desktop.in
+++ b/src/modules/fileman_opinfo/module.desktop.in
@@ -1,18 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=EFM Operation Info
-Name[ca]=Informació de les operacions de l'EFM
-Name[cs]=EFM Informace o operaci
-Name[de]=EFM-Operationsinfo
-Name[eo]=Aktualaj operacioj en EFM
-Name[es]=Información de las operaciones de EFM
-Name[fr]=Informations EFM
-Name[gl]=Información das operacións de EFM
-Name[it]=Informazioni operazioni EFM
-Name[pt]=Informação das operações do EFM
-Name[ru]=Информация о работе EFM
-Name[tr]=EFM İşlem Bilgisi
-Icon=e-module-fileman_opinfo
 Comment=Can be placed on the desktop or in a shelf.
 Comment[ca]=Es pot col·locar a l'escriptori o en un panell.
 Comment[cs]=Může být na ploše nebo v panelu.
@@ -25,4 +11,19 @@ Comment[it]=Può essere messo sul desktop o su una mensola.
 Comment[pt]=Pode ser colocado na área de trabalho ou no painel
 Comment[ru]=Можно разместить на столе или в полке.
 Comment[tr]=Masaüstüne ya da rafa yerleşebilir.
+Encoding=UTF-8
+Icon=e-module-fileman_opinfo
+Name=EFM Operation Info
+Name[ca]=Informació de les operacions de l'EFM
+Name[cs]=EFM Informace o operaci
+Name[de]=EFM-Operationsinfo
+Name[eo]=Informo de operacioj en EDA
+Name[es]=Información de las operaciones de EFM
+Name[fr]=Informations EFM
+Name[gl]=Información das operacións de EFM
+Name[it]=Informazioni operazioni EFM
+Name[pt]=Informação das operações do EFM
+Name[ru]=Информация о работе EFM
+Name[tr]=EFM İşlem Bilgisi
+Type=Link
 X-Enlightenment-ModuleType=files
diff --git a/src/modules/gadman/module.desktop.in b/src/modules/gadman/module.desktop.in
index 05acaf8a13..581dd63091 100644
--- a/src/modules/gadman/module.desktop.in
+++ b/src/modules/gadman/module.desktop.in
@@ -1,21 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Gadgets
-Name[ca]=Ginys
-Name[cs]=Gadgety
-Name[de]=Helferlein
-Name[eo]=Akcesoraĵoj
-Name[hu]=Bigyók az asztalon
-Name[it]=Gestore gadget
-Name[ru]=Гаджеты
-Name[tr]=Araçlar
-Icon=e-module-gadman
-X-Enlightenment-ModuleType=core
 Comment=Module to manage gadgets on the desktop.
 Comment[ca]=Mòdul per a administrar els ginys de l'escriptori.
 Comment[cs]=Modul pro správu gadgetů na ploše.
 Comment[de]=Verwaltet die Helferlein auf dem Desktop.
-Comment[eo]=
+Comment[eo]=Modulo por administri akcesoraĵojn en la labortablo.
 Comment[es]=Módulo para administrar los gadgets en el escritorio.
 Comment[fr]=Module de gestion des gadgets sur le bureau.
 Comment[gl]=Módulo para xestionar os gadgets no escritorio.
@@ -24,3 +12,17 @@ Comment[it]=Modulo per la gestione dei gadget sul desktop.
 Comment[pt]=Módulo para fazer a gestão dos "gadgets"
 Comment[ru]=Модуль для управления гаджетами на рабочем столе.
 Comment[tr]=Masaüstündeki araçları yöneten modül.
+Encoding=UTF-8
+Icon=e-module-gadman
+Name=Gadgets
+Name[ca]=Ginys
+Name[cs]=Gadgety
+Name[de]=Helferlein
+Name[eo]=Akcesoraĵoj
+Name[fr]=Gadgets
+Name[hu]=Bigyók az asztalon
+Name[it]=Gestore gadget
+Name[ru]=Гаджеты
+Name[tr]=Araçlar
+Type=Link
+X-Enlightenment-ModuleType=core
diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop.in
index df9ab0c37c..4d12aee901 100644
--- a/src/modules/ibar/module.desktop.in
+++ b/src/modules/ibar/module.desktop.in
@@ -1,13 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=IBar
-Name[ca]=IBar
-Name[cs]=Lišta spouštěčů
-Name[de]=IBar
-Name[eo]=Breto IBar
-Name[ru]=IBar
-Icon=e-module-ibar
-X-Enlightenment-ModuleType=utils
 Comment=Iconic application launcher.
 Comment[ca]=Barra d'icones per a executar aplicacions.
 Comment[cs]=Lišta se spouštěči.
@@ -25,3 +16,14 @@ Comment[ru]=Меню запуска приложений, отображение
 Comment[tr]=Uygulama başlatıcı.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-ibar
+Name=IBar
+Name[ca]=IBar
+Name[cs]=Lišta spouštěčů
+Name[de]=IBar
+Name[eo]=Breto IBar
+Name[fr]=IBar
+Name[ru]=IBar
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop.in
index 418cf42469..f7f9f156ec 100644
--- a/src/modules/ibox/module.desktop.in
+++ b/src/modules/ibox/module.desktop.in
@@ -1,12 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=IBox
-Name[ca]=IBox
-Name[de]=IBox
-Name[eo]=Breto IBox
-Name[ru]=IBox
-Icon=e-module-ibox
-X-Enlightenment-ModuleType=utils
 Comment=A home for your iconified applications.
 Comment[ca]=Un contenidor per a les aplicacions minimitzades.
 Comment[cs]=Zde se zobrazují všechny minimalizované aplikace.
@@ -24,3 +16,13 @@ Comment[ru]=Место для отображения иконок свёрнут
 Comment[tr]=Simge durumundaki uygulamalarınızın yuvası.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-ibox
+Name=IBox
+Name[ca]=IBox
+Name[de]=IBox
+Name[eo]=Breto IBox
+Name[fr]=IBox
+Name[ru]=IBox
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/illume-bluetooth/module.desktop.in b/src/modules/illume-bluetooth/module.desktop.in
index 2e8e687d4c..7249bde6cf 100644
--- a/src/modules/illume-bluetooth/module.desktop.in
+++ b/src/modules/illume-bluetooth/module.desktop.in
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Bluetooth
-Icon=e-module-illume-bluetooth
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-bluetooth
+Name=Illume-Bluetooth
+Name[eo]=Bludento Illume
+Name[fr]=Bluetooth Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-home-toggle/module.desktop.in b/src/modules/illume-home-toggle/module.desktop.in
index 5d257d1315..585edd4be6 100644
--- a/src/modules/illume-home-toggle/module.desktop.in
+++ b/src/modules/illume-home-toggle/module.desktop.in
@@ -1,8 +1,10 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Home-Toggle
-Icon=e-module-illume-home-toggle
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-home-toggle
+Name=Illume-Home-Toggle
+Name[eo]=Baskulilo de hejmo Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-home/module.desktop.in b/src/modules/illume-home/module.desktop.in
index 6bb27d27bb..e464aa2290 100644
--- a/src/modules/illume-home/module.desktop.in
+++ b/src/modules/illume-home/module.desktop.in
@@ -1,8 +1,12 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Home
-Icon=e-module-illume-home
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-home
+Name=Illume-Home
+Name[eo]=Illume-Hejmo
+Name[fr]=Accueil Illume
+Name[sr]=Домаћа додирна
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-indicator/module.desktop.in b/src/modules/illume-indicator/module.desktop.in
index 43e58f3ba2..06276eac02 100644
--- a/src/modules/illume-indicator/module.desktop.in
+++ b/src/modules/illume-indicator/module.desktop.in
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Indicator
-Icon=e-module-illume-indicator
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-indicator
+Name=Illume-Indicator
+Name[eo]=Illume-Indikilo
+Name[fr]=Indicateur Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-kbd-toggle/module.desktop.in b/src/modules/illume-kbd-toggle/module.desktop.in
index b359fdcc85..80a3e76af0 100644
--- a/src/modules/illume-kbd-toggle/module.desktop.in
+++ b/src/modules/illume-kbd-toggle/module.desktop.in
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Keyboard-Toggle
-Icon=e-module-illume-kbd-toggle
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-kbd-toggle
+Name=Illume-Keyboard-Toggle
+Name[eo]=Baskulo de klavaro Illume
+Name[fr]=Bascule clavier Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-keyboard/module.desktop.in b/src/modules/illume-keyboard/module.desktop.in
index f9ce697686..ebb8bd5485 100644
--- a/src/modules/illume-keyboard/module.desktop.in
+++ b/src/modules/illume-keyboard/module.desktop.in
@@ -1,8 +1,11 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Keyboard
-Icon=e-module-illume-keyboard
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-keyboard
+Name=Illume-Keyboard
+Name[eo]=Illume-Klavaro
+Name[fr]=Clavier Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-mode-toggle/module.desktop.in b/src/modules/illume-mode-toggle/module.desktop.in
index 1a2224198c..303dd0aff2 100644
--- a/src/modules/illume-mode-toggle/module.desktop.in
+++ b/src/modules/illume-mode-toggle/module.desktop.in
@@ -1,8 +1,10 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Mode-Toggle
-Icon=e-module-illume-mode-toggle
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-mode-toggle
+Name=Illume-Mode-Toggle
+Name[eo]=Baskulilo de reĝimo Illume
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume-softkey/module.desktop.in b/src/modules/illume-softkey/module.desktop.in
index dd92124ac2..d8a92f7dc6 100644
--- a/src/modules/illume-softkey/module.desktop.in
+++ b/src/modules/illume-softkey/module.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Illume-Softkey
-Icon=e-module-illume-softkey
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume-softkey
+Name=Illume-Softkey
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/illume2/module.desktop.in b/src/modules/illume2/module.desktop.in
index 1694a7929c..1403078c09 100644
--- a/src/modules/illume2/module.desktop.in
+++ b/src/modules/illume2/module.desktop.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Type=Link
-Name=Illume2
-Icon=e-module-illume2
-X-Enlightenment-ModuleType=mobile
 Comment=
 Comment[fr]=
 Comment[it]=
+Encoding=UTF-8
+Icon=e-module-illume2
+Name=Illume2
+Type=Link
+X-Enlightenment-ModuleType=mobile
diff --git a/src/modules/layout/module.desktop.in b/src/modules/layout/module.desktop.in
index 748f62054f..a8d87fe7c7 100644
--- a/src/modules/layout/module.desktop.in
+++ b/src/modules/layout/module.desktop.in
@@ -1,14 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Layout
-Name[ca]=Disposició
-Name[cs]=Rozvržení
-Name[de]=Anordnung
-Name[eo]=Aranĝo
-Name[hu]=Kimenet
-Name[tr]=Yerleşim
-Name[pt]=Disposição
-Icon=e-module-layout
 Comment=Used to enforce layout policies. Generally not applicable for a desktop PC.
 Comment[ca]=Permet definir la distribució a la pantalla. Generalment no és útil per a ordinadors de sobretaula.
 Comment[cs]=Použit k vynucení politiky rozvržení. Nepoužitelné na desktopovém PC.
@@ -25,3 +15,15 @@ Comment[pt_BR]=
 Comment[tr]=Yerleşim planını yapılandırır. Masaüstü bilgisayarlarda işlevi genellikle yoktur.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-layout
+Name=Layout
+Name[ca]=Disposició
+Name[cs]=Rozvržení
+Name[de]=Anordnung
+Name[eo]=Aranĝo
+Name[fr]=Disposition
+Name[hu]=Kimenet
+Name[pt]=Disposição
+Name[tr]=Yerleşim
+Type=Link
diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop.in
index 33189231d1..c85aa52fb2 100644
--- a/src/modules/mixer/module.desktop.in
+++ b/src/modules/mixer/module.desktop.in
@@ -1,17 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Mixer
-Name[ca]=Gestor del so
-Name[cs]=Ovládání hlasitosti
-Name[de]=Mixer
-Name[eo]=Sonmiksilo
-Name[es]=Mezclador
-Name[fr]=Mélangeur
-Name[gl]=Xestor de son
-Name[pt]=Gestor de som
-Name[ru]=Микшер
-Name[tr]=Karıştırıcı
-Icon=preferences-desktop-mixer
 Comment=A module to provide a mixer for changing volume.
 Comment[ca]=Mòdul que proporciona un controlador del volum del so.
 Comment[cs]=Modul pro ovládání hlasitosti.
@@ -24,4 +11,18 @@ Comment[it]=Un modulo che fornisce un mixer per regolare il volume.
 Comment[pt]=Um módulo que disponibiliza um controlo para alterar o volume
 Comment[ru]=Модуль для управления уровнями громкости.
 Comment[tr]=Sesi ayarlarmak için kullanılan karıştırıcı modülü.
+Encoding=UTF-8
+Icon=preferences-desktop-mixer
+Name=Mixer
+Name[ca]=Gestor del so
+Name[cs]=Ovládání hlasitosti
+Name[de]=Mixer
+Name[eo]=Sonmiksilo
+Name[es]=Mezclador
+Name[fr]=Mélangeur
+Name[gl]=Xestor de son
+Name[pt]=Gestor de som
+Name[ru]=Микшер
+Name[tr]=Karıştırıcı
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/msgbus/module.desktop.in b/src/modules/msgbus/module.desktop.in
index c9510a02aa..964d255817 100644
--- a/src/modules/msgbus/module.desktop.in
+++ b/src/modules/msgbus/module.desktop.in
@@ -1,5 +1,6 @@
 [Desktop Entry]
-Type=Link
+Encoding=UTF-8
+Icon=e-module-msgbus
 Name=DBus Extension
 Name[ca]=Extensió DBus
 Name[cs]=DBus rozšíření
@@ -17,5 +18,5 @@ Name[ru]=Расширение DBus
 Name[tr]=DBus Uzantısı
 Name[zh_CN]=
 Name[zh_TW]=
-Icon=e-module-msgbus
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/notification/module.desktop.in b/src/modules/notification/module.desktop.in
index f18e87265e..f80e689a0c 100644
--- a/src/modules/notification/module.desktop.in
+++ b/src/modules/notification/module.desktop.in
@@ -1,17 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Notification
-Name[ca]=Notificació
-Name[cs]=Notifikace
-Name[de]=Benachrichtigungen
-Name[el]=Ειδοποίηση
-Name[eo]=Sciigo
-Name[es]=Notificación
-Name[gl]=Notificación
-Name[hu]=Értesítések
-Name[pt]=Notificação
-Name[ru]=Уведомления
-Icon=e-module-notification
 Comment=notification-daemon alternative.<br>Popup if an event occur.
 Comment[ca]=Una alternativa a notification-daemon.<br>Mostrarà una finestra emergent si passa alguna cosa.
 Comment[cs]=Alternativa k notification-daemon.<br>Zobrazí bublinu při události.
@@ -25,4 +12,19 @@ Comment[hu]=notification-daemon alternatíva.<br>Egy esemény megtörténtét je
 Comment[it]=Alternativa a notification-daemon.<br>Mostra un popup al verificarsi di un evento.
 Comment[pt]=Uma alternativa ao notification-daemon.<br>Mostra alertas sobre eventos.
 Comment[ru]=Замена notification-daemon.<br>Показывает окно сообщения если происходит событие.
+Encoding=UTF-8
+Icon=e-module-notification
+Name=Notification
+Name[ca]=Notificació
+Name[cs]=Notifikace
+Name[de]=Benachrichtigungen
+Name[el]=Ειδοποίηση
+Name[eo]=Sciigo
+Name[es]=Notificación
+Name[fr]=Notification
+Name[gl]=Notificación
+Name[hu]=Értesítések
+Name[pt]=Notificação
+Name[ru]=Уведомления
+Type=Link
 X-Enlightenment-ModuleType=core
diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop.in
index c01aada53b..129dc7e16e 100644
--- a/src/modules/pager/module.desktop.in
+++ b/src/modules/pager/module.desktop.in
@@ -1,18 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Pager
-Name[ca]=Paginador
-Name[cs]=Přepínač ploch
-Name[de]=Pager
-Name[eo]=Tabulpaĝilo
-Name[es]=Paginador
-Name[gl]=Paxinador
-Name[hu]=Lapozó
-Name[pt]=Paginador
-Name[ru]=Пейджер
-Name[tr]=Sayfalayıcı
-Icon=e-module-pager
-X-Enlightenment-ModuleType=utils
 Comment=Gadget to allow you to visualize your virtual desktops and the windows they contain.
 Comment[ca]=Permet visualitzar els escriptoris virtuals i les finestres que contenen.
 Comment[cs]=Gadget pro zobrazení/přepínání virtuálních ploch a oken, které obsahují.
@@ -30,3 +16,19 @@ Comment[ru]=Гаджет для отображения виртуальных с
 Comment[tr]=Sanal masaüstlerini ve içerisindeki pencereleri görselleştirmenizi sağlayan araç.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-pager
+Name=Pager
+Name[ca]=Paginador
+Name[cs]=Přepínač ploch
+Name[de]=Pager
+Name[eo]=Paĝilo
+Name[es]=Paginador
+Name[fr]=Miniature des bureaux
+Name[gl]=Paxinador
+Name[hu]=Lapozó
+Name[pt]=Paginador
+Name[ru]=Пейджер
+Name[tr]=Sayfalayıcı
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/physics/module.desktop.in b/src/modules/physics/module.desktop.in
index b49a3e2440..d55d4ca73b 100644
--- a/src/modules/physics/module.desktop.in
+++ b/src/modules/physics/module.desktop.in
@@ -1,16 +1,21 @@
 [Desktop Entry]
-Type=Link
-Name=Physics
-Name[ca]=Física
-Name[es]=Física
-Name[gl]=Física
-Name[pt]=Física
-Name[ru]=Физика
-Icon=e-module-physics
 Comment=Enlightenment Physics Professor
 Comment[ca]=El professor de física de l'Enlightenment
+Comment[eo]=Profesoro de Enlightenment pri fiziko
 Comment[es]=El profesor de física de Enlightenment
+Comment[fr]=Professeur de physique pour Enlightenment
 Comment[gl]=O profesor de física de Enlightenment
 Comment[it]=Il professore di fisica di Enlightenment
 Comment[pt]=Professor de física do Enlightenment
+Encoding=UTF-8
+Icon=e-module-physics
+Name=Physics
+Name[ca]=Física
+Name[eo]=Fiziko
+Name[es]=Física
+Name[fr]=Physiques
+Name[gl]=Física
+Name[pt]=Física
+Name[ru]=Физика
+Type=Link
 X-Enlightenment-ModuleType=look
diff --git a/src/modules/quickaccess/module.desktop.in b/src/modules/quickaccess/module.desktop.in
index 53f3d266b9..c8547ee0f7 100644
--- a/src/modules/quickaccess/module.desktop.in
+++ b/src/modules/quickaccess/module.desktop.in
@@ -1,17 +1,21 @@
 [Desktop Entry]
-Type=Link
-Name=Quickaccess
-Name[ca]=Accés ràpid
-Name[es]=Acceso rápido
-Name[gl]=Acceso rápido
-Name[pt]=Acesso rápido
-Name[ru]=Быстрый доступ
-Icon=e-module-quickaccess
 Comment=Enlightenment Quickaccess Launcher
 Comment[ca]=Llançador de l'accés ràpid de l'Enlightenment
+Comment[eo]=Rapidatinga lanĉilo de Enlightenment
 Comment[es]=Lanzador del acceso rápido de Enlightenment
 Comment[gl]=Iniciador do acceso rápido de Enlightenment
 Comment[it]=Lanciatore ad accesso rapido di Enlightenment
 Comment[pt]=Acesso rápido do Enlightenment
 Comment[ru]=Модуль быстрого запуска для Enlightenment
+Encoding=UTF-8
+Icon=e-module-quickaccess
+Name=Quickaccess
+Name[ca]=Accés ràpid
+Name[eo]=Rapida atingo
+Name[es]=Acceso rápido
+Name[fr]=Accès rapide
+Name[gl]=Acceso rápido
+Name[pt]=Acesso rápido
+Name[ru]=Быстрый доступ
+Type=Link
 X-Enlightenment-ModuleType=launcher
diff --git a/src/modules/shot/module.desktop.in b/src/modules/shot/module.desktop.in
index c153e74233..0d15202f95 100644
--- a/src/modules/shot/module.desktop.in
+++ b/src/modules/shot/module.desktop.in
@@ -1,14 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Shot
-Name[ca]=Captura de pantalla
-Name[eo]=Ekrankopio
-Name[fr]=Capture d'écran
-Name[ko]=스크린샷
-Name[pt]=Capturas de ecrã
-Name[ru]=Снимок экрана
-Icon=e-module-shot
-X-Enlightenment-ModuleType=utils
 Comment=Simple screenshot+save/upload module
 Comment[ca]=Mòdul per a desar o compartir captures de pantalla.
 Comment[eo]=Simpla modulo por registri kaj kunhavigi ekrankopiojn.
@@ -19,3 +9,14 @@ Comment[it]=Semplice modulo per il salvataggio e l'upload di istantanee del desk
 Comment[ko]=간단한 스크린샷 저장/공유 모듈
 Comment[pt]=Módulo para capturar, gravar e enviar capturas de ecrã
 Comment[ru]=Модуль для сохранения/загрузки снимков экрана.
+Encoding=UTF-8
+Icon=e-module-shot
+Name=Shot
+Name[ca]=Captura de pantalla
+Name[eo]=Ekrankopio
+Name[fr]=Capture d'écran
+Name[ko]=스크린샷
+Name[pt]=Capturas de ecrã
+Name[ru]=Снимок экрана
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop.in
index 14f50ba8f1..e962f1e103 100644
--- a/src/modules/start/module.desktop.in
+++ b/src/modules/start/module.desktop.in
@@ -1,20 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Start
-Name[ca]=Inici
-Name[cs]=Start menu
-Name[de]=Startmenü
-Name[el]=Μενού εκκίνησης
-Name[eo]=Starto
-Name[es]=Inicio
-Name[fr]=Démarrer
-Name[gl]=Inicio
-Name[hu]=Start menü
-Name[pt]=Iniciar
-Name[ru]=Меню запуска
-Name[tr]=Başlat
-Icon=e-module-start
-X-Enlightenment-ModuleType=utils
 Comment=Enlightenment's "Start" button equivalent.
 Comment[ca]=L'equivalent al botó "Inici" a l'Enlightenment.
 Comment[cs]=Enlightenment Start menu.
@@ -33,3 +17,20 @@ Comment[ru]=Эквивалент кнопки "Пуск" для Enlightenment.
 Comment[tr]=Enlightenment'nin "Başlat" düğmesi eşdeğeri.
 Comment[zh_CN]=
 Comment[zh_TW]=
+Encoding=UTF-8
+Icon=e-module-start
+Name=Start
+Name[ca]=Inici
+Name[cs]=Start menu
+Name[de]=Startmenü
+Name[el]=Μενού εκκίνησης
+Name[eo]=Starto
+Name[es]=Inicio
+Name[fr]=Démarrer
+Name[gl]=Inicio
+Name[hu]=Start menü
+Name[pt]=Iniciar
+Name[ru]=Меню запуска
+Name[tr]=Başlat
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/syscon/module.desktop.in b/src/modules/syscon/module.desktop.in
index 2dd9f99c23..1adb5c65be 100644
--- a/src/modules/syscon/module.desktop.in
+++ b/src/modules/syscon/module.desktop.in
@@ -1,19 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=System Controls
-Name[ca]=Controls del sistema
-Name[cs]=Ovládací prvky
-Name[de]=Abmeldedialog
-Name[eo]=Kontroloj de sistemo
-Name[es]=Controles del sistema
-Name[fr]=Contrôles du système
-Name[gl]=Controis do sistema
-Name[hu]=Rendszer felügyelő
-Name[it]=Controlli di sistema
-Name[pt]=Controlos do sistema
-Name[ru]=Управление системой
-Name[tr]=Sistem Kontrolleri
-Icon=e-module-syscon
 Comment=This module provides a unified popup<br>dialog for all the system actions<br>in Enlightenment.
 Comment[ca]=Aquest mòdul proporciona una finestra emergent<br>unificada per a totes les accions del<br>sistema en l'Enlightenment.
 Comment[cs]=Poskytuje dialog pro všechny<br>systémové akce v Enlightenmentu.
@@ -27,4 +12,20 @@ Comment[it]=Questo modulo fornisce una finestra di dialogo popup<br>unificata pe
 Comment[pt]=Disponibiliza o acesso ao sistema de ações do Enlightenment
 Comment[ru]=Этот модуль обеспечивает единое<br>диалоговое окно для всех системных действий<br>в Enlightenment.
 Comment[tr]=Tüm sistem eylemleri için özelleştirilmiş<br>açılır pencere diyaloğu sunan Enlightenment modülü.
+Encoding=UTF-8
+Icon=e-module-syscon
+Name=System Controls
+Name[ca]=Controls del sistema
+Name[cs]=Ovládací prvky
+Name[de]=Abmeldedialog
+Name[eo]=Kontroloj de sistemo
+Name[es]=Controles del sistema
+Name[fr]=Contrôles du système
+Name[gl]=Controis do sistema
+Name[hu]=Rendszer felügyelő
+Name[it]=Controlli di sistema
+Name[pt]=Controlos do sistema
+Name[ru]=Управление системой
+Name[tr]=Sistem Kontrolleri
+Type=Link
 X-Enlightenment-ModuleType=core
diff --git a/src/modules/systray/module.desktop.in b/src/modules/systray/module.desktop.in
index c6db1b4555..e7ade6954a 100644
--- a/src/modules/systray/module.desktop.in
+++ b/src/modules/systray/module.desktop.in
@@ -1,18 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Systray
-Name[ca]=Àrea de notificacions
-Name[cs]=Upozorňovací oblast
-Name[de]=Systemleiste
-Name[el]=Ενδείξεις συστήματος
-Name[eo]=Taskopleto
-Name[es]=Bandeja del sistema
-Name[fr]=Zone de notification
-Name[gl]=Bandexa do sistema
-Name[pt]=Área de notificação
-Name[ru]=Системный лоток
-Name[tr]=Sistem Çekmecesi
-Icon=e-module-systray
 Comment=system tray that hold applications icons like Skype, Pidgin, Kopete and others.
 Comment[ca]=Zona que conté les icones d'aplicacions com Skype, Pidgin, Kopete i altres.
 Comment[cs]=spravuje aplikace jako Skype, Pidgin, Kopete a jiné.
@@ -26,4 +12,19 @@ Comment[it]=Un'area che contiene le icone di notifica di applicazioni come Skype
 Comment[pt]=Área de notificação que exibe os ícones de diversas aplicações
 Comment[ru]=Системный лоток содержащий значки приложений типа Skype, Pidgin, Kopete и других.
 Comment[tr]=Skype, Pidgin, Kopete ve diğerleri gibi uygulamaların simgelerini barındıran sistem çekmecesi.
+Encoding=UTF-8
+Icon=e-module-systray
+Name=Systray
+Name[ca]=Àrea de notificacions
+Name[cs]=Upozorňovací oblast
+Name[de]=Systemleiste
+Name[el]=Ενδείξεις συστήματος
+Name[eo]=Sistempleto
+Name[es]=Bandeja del sistema
+Name[fr]=Zone de notification
+Name[gl]=Bandexa do sistema
+Name[pt]=Área de notificação
+Name[ru]=Системный лоток
+Name[tr]=Sistem Çekmecesi
+Type=Link
 X-Enlightenment-ModuleType=utils
diff --git a/src/modules/tasks/module.desktop.in b/src/modules/tasks/module.desktop.in
index 7cc1877cab..eb713a84dd 100644
--- a/src/modules/tasks/module.desktop.in
+++ b/src/modules/tasks/module.desktop.in
@@ -1,15 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Tasks
-Name[ca]=Tasques
-Name[eo]=Taskoj
-Name[es]=Tareas
-Name[fr]=Tâches
-Name[gl]=Tarefas
-Name[pt]=Tarefas
-Name[ru]=Задачи
-Icon=e-module-tasks
-X-Enlightenment-ModuleType=utils
 Comment=Gadget to allow you to switch tasks
 Comment[ca]=Mòdul que permet el canvi entre tasques.
 Comment[eo]=Akcesoraĵo kiu permesas baskuli taskojn
@@ -19,3 +8,15 @@ Comment[gl]=Módulo que lle permite o troco de tarefas.
 Comment[it]=Gadget che permette di commutare tra i task.
 Comment[pt]=Módulo que lhe permite trocar entre tarefas
 Comment[ru]=Гаджет для переключения задач
+Encoding=UTF-8
+Icon=e-module-tasks
+Name=Tasks
+Name[ca]=Tasques
+Name[eo]=Taskoj
+Name[es]=Tareas
+Name[fr]=Tâches
+Name[gl]=Tarefas
+Name[pt]=Tarefas
+Name[ru]=Задачи
+Type=Link
+X-Enlightenment-ModuleType=utils
diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop.in
index fafd2c1282..dc1c4ac1b8 100644
--- a/src/modules/temperature/module.desktop.in
+++ b/src/modules/temperature/module.desktop.in
@@ -1,18 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Temperature
-Name[ca]=Temperatura
-Name[cs]=Teplota
-Name[de]=Temperatur
-Name[eo]=Temperaturo
-Name[es]=Temperatura
-Name[fr]=Température
-Name[gl]=Temperatura
-Name[hu]=Hőmérséklet
-Name[pt]=Temperatura
-Name[ru]=Температура
-Name[tr]=Sıcaklık
-Icon=e-module-temperature
 Comment=Temperature monitor.
 Comment[ca]=Monitor de la temperatura.
 Comment[cs]=Měřič teploty.
@@ -25,5 +11,22 @@ Comment[hu]=Egy hőmérséklet monitorozó modul.
 Comment[it]=Monitor per le temperature.
 Comment[pt]=Monitorizador de temperatura
 Comment[ru]=Измеряет и показывает температуру системы.
+Comment[sr]=Прати топлотне вредности.
 Comment[tr]=Sıcaklık izleyici.
+Encoding=UTF-8
+Icon=e-module-temperature
+Name=Temperature
+Name[ca]=Temperatura
+Name[cs]=Teplota
+Name[de]=Temperatur
+Name[eo]=Temperaturo
+Name[es]=Temperatura
+Name[fr]=Température
+Name[gl]=Temperatura
+Name[hu]=Hőmérséklet
+Name[pt]=Temperatura
+Name[ru]=Температура
+Name[sr]=Топлота
+Name[tr]=Sıcaklık
+Type=Link
 X-Enlightenment-ModuleType=system
diff --git a/src/modules/tiling/module.desktop.in b/src/modules/tiling/module.desktop.in
index 913f97b1c2..70d5c6d2fd 100644
--- a/src/modules/tiling/module.desktop.in
+++ b/src/modules/tiling/module.desktop.in
@@ -1,18 +1,21 @@
 [Desktop Entry]
-Type=Link
-Name=Tiling
-Name[ca]=Mosaic
-Name[es]=Mosaico
-Name[fr]=Pavage
-Name[gl]=Mosaico
-Name[ru]=Мозаичный режим
-Icon=e-module-tiling
 Comment=Positions/resizes your windows tilingly.
 Comment[ca]=Posiciona/redimensiona les finestres en mosaics.
+Comment[eo]=Poziciigi kaj regrandigi viajn fenestrojn kaheligante.
 Comment[es]=Posicione/redimensione sus ventanas en mosaicos.
 Comment[fr]=Place/Redimensionne les fenêtres sans les superposer.
 Comment[gl]=Posicione/redimensione as súas xanelas en mosaicos.
 Comment[it]=Posiziona/ridimensiona le finestre disponendole in griglia.
 Comment[pt]=Posiciona/ajusta as janelas em mosaicos
 Comment[ru]=Мозаичный режим расположения окон
+Encoding=UTF-8
+Icon=e-module-tiling
+Name=Tiling
+Name[ca]=Mosaic
+Name[eo]=Kaheligado
+Name[es]=Mosaico
+Name[fr]=Pavage
+Name[gl]=Mosaico
+Name[ru]=Мозаичный режим
+Type=Link
 X-Enlightenment-ModuleType=core
diff --git a/src/modules/winlist/module.desktop.in b/src/modules/winlist/module.desktop.in
index 894f4e876a..939ccf9c2c 100644
--- a/src/modules/winlist/module.desktop.in
+++ b/src/modules/winlist/module.desktop.in
@@ -1,20 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=Window Switcher
-Name[ca]=Alternador de finestres
-Name[cs]=Přepínač oken
-Name[de]=Fensterwechsel-Liste
-Name[el]=Λίστα εναλλαγής παραθύρων
-Name[eo]=Interŝanĝilo de fenestroj
-Name[es]=Conmutador de ventanas
-Name[fr]=Liste de commutation
-Name[gl]=Alternador de xanelas
-Name[hu]=Ablak lista/váltó
-Name[it]=Commutatore finestre
-Name[pt]=Alternador de janelas
-Name[ru]=Список переключения окон
-Name[tr]=Pencere Değiştirici Listesi
-Icon=e-module-winlist
 Comment=A module to show the list of client applications presently running.
 Comment[ca]=Un mòdul que mostra la llista d'aplicacions que s'estan executant.
 Comment[cs]=Modul pro zobrazení seznamu běžících aplikací.
@@ -28,5 +12,24 @@ Comment[hu]=A modul megmutatja az éppen futó alkalmazások ablakainak listáj�
 Comment[it]=Un modulo che mostra un elenco delle applicazioni in esecuzione.
 Comment[pt]=Módulo que exibe a lista de aplicações abertas
 Comment[ru]=Модуль для показа списка запущенных приложений (список клиентов).
+Comment[sr]=Једница која показује списак тренутно покренутих клијентских програма.
 Comment[tr]=Mevcut çalışan istemci uygulamaların listesini gösteren modül.
+Encoding=UTF-8
+Icon=e-module-winlist
+Name=Window Switcher
+Name[ca]=Alternador de finestres
+Name[cs]=Přepínač oken
+Name[de]=Fensterwechsel-Liste
+Name[el]=Λίστα εναλλαγής παραθύρων
+Name[eo]=Interŝanĝilo de fenestroj
+Name[es]=Conmutador de ventanas
+Name[fr]=Liste de commutation
+Name[gl]=Alternador de xanelas
+Name[hu]=Ablak lista/váltó
+Name[it]=Commutatore finestre
+Name[pt]=Alternador de janelas
+Name[ru]=Список переключения окон
+Name[sr]=Измењивач прозора
+Name[tr]=Pencere Değiştirici Listesi
+Type=Link
 X-Enlightenment-ModuleType=core
diff --git a/src/modules/wizard/data/desktop/home.desktop b/src/modules/wizard/data/desktop/home.desktop
index 1eab30db1b..e64a986005 100644
--- a/src/modules/wizard/data/desktop/home.desktop
+++ b/src/modules/wizard/data/desktop/home.desktop
@@ -1,20 +1,22 @@
 [Desktop Entry]
-Name=Home
-Name[eo]=Hejmo
-Name[es]=Carpeta personal
-Name[gl]=Cartafol persoal
-Name[pt]=Pasta pessoal
-Name[ru]=Домашний каталог
 Comment=The Directory containing all your personal files
 Comment[eo]=La dosierujo enhavante viajn proprajn dosieroj
 Comment[es]=El directorio que contiene todos sus archivos personales
 Comment[fr]=Le dossier contenant vos fichiers personnels
 Comment[gl]=O directorio que contén tódolos seus ficheiros persoais
 Comment[it]=La directory contenente i vostri file personali
-Comment[pt]=O diretório dos ficheiros do utilizador
+Comment[pt]=O diretório com os ficheiros do utilizador
 Comment[ru]=Каталог содержащий ваши личные файлы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:$HOME
+Encoding=UTF-8
 Icon=user-home
+Name=Home
+Name[eo]=Hejmo
+Name[es]=Carpeta personal
+Name[fr]=Accueil
+Name[gl]=Cartafol persoal
+Name[pt]=Pasta pessoal
+Name[ru]=Домашний каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:$HOME
+X-Enlightenment-Type=Mount
diff --git a/src/modules/wizard/data/desktop/root.desktop b/src/modules/wizard/data/desktop/root.desktop
index e9726590c1..3a55c3d8f9 100644
--- a/src/modules/wizard/data/desktop/root.desktop
+++ b/src/modules/wizard/data/desktop/root.desktop
@@ -1,17 +1,19 @@
 [Desktop Entry]
-Name=Root
-Name[eo]=Radiko
-Name[ru]=Корневой каталог
 Comment=The Root Filesystem base
 Comment[eo]=La radika dosiersistemo
 Comment[es]=El sistema de archivos root
 Comment[fr]=Le système de fichiers à la base
 Comment[gl]=O sistema de ficheiros root
 Comment[it]=Il filesystem principale
-Comment[pt]=Sistema de ficheiros root
+Comment[pt]=O sistema de ficheiros root
 Comment[ru]=Корень файловой системы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:/
+Encoding=UTF-8
 Icon=computer
+Name=Root
+Name[eo]=Radiko
+Name[fr]=Dossier racine
+Name[ru]=Корневой каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:/
+X-Enlightenment-Type=Mount
diff --git a/src/modules/wizard/data/desktop/tmp.desktop b/src/modules/wizard/data/desktop/tmp.desktop
index 766dcd3cfa..72c2e0733f 100644
--- a/src/modules/wizard/data/desktop/tmp.desktop
+++ b/src/modules/wizard/data/desktop/tmp.desktop
@@ -1,8 +1,4 @@
 [Desktop Entry]
-Name=Temp
-Name[eo]=Dumtempaj
-Name[pt]=Temporários
-Name[ru]=Временный каталог
 Comment=Temporary files
 Comment[eo]=Dumtempaj dosieroj
 Comment[es]=Archivos temporales
@@ -11,8 +7,14 @@ Comment[gl]=Ficheiros temporais
 Comment[it]=File temporanei
 Comment[pt]=Ficheiros temporários
 Comment[ru]=Временные файлы
-Type=Link
-X-Enlightenment-Type=Mount
-URL=file:/tmp
+Encoding=UTF-8
 Icon=user-temp
+Name=Temp
+Name[eo]=Dumtempaj
+Name[fr]=Temporaires
+Name[pt]=Temporários
+Name[ru]=Временный каталог
 NotShowIn=GNOME;KDE;LXDE;ROX;XFCE;
+Type=Link
+URL=file:/tmp
+X-Enlightenment-Type=Mount
diff --git a/src/modules/wizard/data/extra_desktops/mplayer.desktop b/src/modules/wizard/data/extra_desktops/mplayer.desktop
index 6c28157e94..9956c6b5ae 100644
--- a/src/modules/wizard/data/extra_desktops/mplayer.desktop
+++ b/src/modules/wizard/data/extra_desktops/mplayer.desktop
@@ -1,21 +1,26 @@
 [Desktop Entry]
-Type=Application
-Name=MPlayer
-GenericName=Movie Player
-GenericName[eo]=Ludilo de videoj
-GenericName[es]=Reproductor de vídeo
-GenericName[gl]=Reprodutor de vídeo
-GenericName[pt]=Reprodutor multimédia
-GenericName[ru]=Видеоплеер
+Categories=AudioVideo;Player;
 Comment=Watch movies and videos
 Comment[eo]=Por spekti filmojn kaj videojn
 Comment[es]=Para ver películas y vídeos
+Comment[fr]=Regarder des films et vidéos
 Comment[gl]=Para ver películas e vídeos
 Comment[it]=Per guardare filmati e video
 Comment[pt]=Ver filmes e ouvir músicas
 Comment[ru]=Просмотр фильмов и видео
+Encoding=UTF-8
 Exec=mplayer %U
+GenericName=Movie Player
+GenericName[eo]=Ludilo de videoj
+GenericName[es]=Reproductor de vídeo
+GenericName[fr]=Lecteur de films
+GenericName[gl]=Reprodutor de vídeo
+GenericName[pt]=Reprodutor multimédia
+GenericName[ru]=Видеоплеер
 Icon=video_player
-StartupWMClass=MPlayer
-Categories=AudioVideo;Player;
 MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
+Name=MPlayer
+Name[eo]=MPlayer
+Name[fr]=MPlayer
+StartupWMClass=MPlayer
+Type=Application
diff --git a/src/modules/wizard/data/extra_desktops/xterm.desktop b/src/modules/wizard/data/extra_desktops/xterm.desktop
index f29ccd1c08..f0bf49a563 100644
--- a/src/modules/wizard/data/extra_desktops/xterm.desktop
+++ b/src/modules/wizard/data/extra_desktops/xterm.desktop
@@ -1,17 +1,22 @@
 [Desktop Entry]
-Type=Application
-Name=XTerm
-GenericName=Terminal
-GenericName[eo]=Terminalo
-GenericName[ru]=Терминал
+Categories=Utility;TerminalEmulator;System;
 Comment=Run commands in a shell
 Comment[eo]=Lanĉi komandojn en ĉelo
 Comment[es]=Ejecute comandos en una consola
+Comment[fr]=Lancer des commandes dans le shell
 Comment[gl]=Execute comandos nunha consola
 Comment[it]=Esegue comandi in una shell
 Comment[pt]=Execução de comandos na consola
 Comment[ru]=Запуск команд в командной оболочке
+Encoding=UTF-8
 Exec=xterm
+GenericName=Terminal
+GenericName[eo]=Terminalo
+GenericName[fr]=Console
+GenericName[ru]=Терминал
 Icon=xterm
+Name=XTerm
+Name[eo]=XTerm
+Name[fr]=XTerm
 StartupWMClass=XTerm
-Categories=Utility;TerminalEmulator;System;
+Type=Application
diff --git a/src/modules/wizard/module.desktop.in b/src/modules/wizard/module.desktop.in
index a3d32b8c17..9e140dc3f0 100644
--- a/src/modules/wizard/module.desktop.in
+++ b/src/modules/wizard/module.desktop.in
@@ -1,19 +1,4 @@
 [Desktop Entry]
-Type=Link
-Name=First Run Wizard
-Name[ca]=Assistent inicial
-Name[cs]=Průvodce prvním spuštěním
-Name[de]=Assistent zum erstmaligen Einrichten
-Name[eo]=Asistanto de unua lanĉo
-Name[es]=Asistente del primer inicio
-Name[fr]=Assistant de prise en main
-Name[gl]=Asistente do primeiro inicio
-Name[hu]=Első indítás varázsló
-Name[it]=Wizard prima esecuzione
-Name[pt]=Assistente
-Name[ru]=Мастер первого запуска
-Name[tr]=İlk Açılış Sihirbazı
-Icon=e-module-wizard
 Comment=<title>First Run Wizard</title><br>The first run wizard will help configure E, when E is started for the first time.<br><urgent>WARNING!!! DO NOT USE!!!</urgent>
 Comment[ca]=<title>Assistent inicial</title><br>Aquest assistent us ajuda a configurar E quan s'inicia per primera vegada.<br><urgent>ATENCIÓ!!! NO UTILITZAR!!!</urgent>
 Comment[cs]=<title>Průvodce prvním spuštěním</title><br>Průvodce, který pomůže nastavit Enlightenment při prvním spuštění.<br><urgent>VAROVÁNÍ!!! NEPOUŽÍVEJTE!!! Aktivován pouze při prvním spuštění!</urgent>
@@ -27,4 +12,20 @@ Comment[it]=<title>Wizard prima esecuzione</title><br>Wizard che aiuta a configu
 Comment[pt]=<title>Assistente</title><br>Este assistente ajuda-o a configurar o E na primeira vez que é iniciado.<br><urgent>AVISO!!! NÃO DEVE SER UTILIZADO!!!</urgent>
 Comment[ru]=<title>Мастер первого запуска</title><br>Этот модуль поможет сконфигурировать Enlightenment при запуске в первый раз.<br><urgent>ВНИМАНИЕ!!! НЕ ИСПОЛЬЗОВАТЬ!!!</urgent>
 Comment[tr]=<title>İlk Açılış Sihirbazı</title><br>Enlightenment ilk açıldığında onu yapılandırmakta kullanılan bir ilk açılış sihirbazı.<br><urgent>UYARI!!! KULLANMAYIN!!!</urgent>
+Encoding=UTF-8
+Icon=e-module-wizard
+Name=First Run Wizard
+Name[ca]=Assistent inicial
+Name[cs]=Průvodce prvním spuštěním
+Name[de]=Assistent zum erstmaligen Einrichten
+Name[eo]=Asistanto de unua lanĉo
+Name[es]=Asistente del primer inicio
+Name[fr]=Assistant de prise en main
+Name[gl]=Asistente do primeiro inicio
+Name[hu]=Első indítás varázsló
+Name[it]=Wizard prima esecuzione
+Name[pt]=Assistente
+Name[ru]=Мастер первого запуска
+Name[tr]=İlk Açılış Sihirbazı
+Type=Link
 X-Enlightenment-ModuleType=config
diff --git a/src/modules/wl_drm/module.desktop b/src/modules/wl_drm/module.desktop
index 890ccdc673..b834260a39 100644
--- a/src/modules/wl_drm/module.desktop
+++ b/src/modules/wl_drm/module.desktop
@@ -1,12 +1,16 @@
 [Desktop Entry]
-Type=Link
-Name=Wayland Drm
-Icon=e-module-wl_drm
 Comment=Enlightenment DRM Composite Manager
 Comment[ca]=Administrador de composició DRM de l'Enlightenment
 Comment[eo]=Administrilo de kunmetaĵo Enlightenment DRM
 Comment[es]=Administrador de composición DRM de Enlightenment
+Comment[fr]=Gestionnaire Composite avec DRM de Enlightenment
 Comment[gl]=Xestor de composición DRM de Enlightenment
 Comment[it]=Composite manager DRM di Enlightenment
 Comment[pt]=Gestor de composição Enlightenment DRM
+Encoding=UTF-8
+Icon=e-module-wl_drm
+Name=Wayland Drm
+Name[eo]=Mastrumado de ciferecaj rajtoj   de Wayland
+Name[fr]=Gestion des droits numériques Wayland
+Type=Link
 X-Enlightenment-ModuleType=look
diff --git a/src/modules/wl_screenshot/module.desktop b/src/modules/wl_screenshot/module.desktop
index 24e2e3acb8..46d2d54b95 100644
--- a/src/modules/wl_screenshot/module.desktop
+++ b/src/modules/wl_screenshot/module.desktop
@@ -1,17 +1,20 @@
 [Desktop Entry]
-Type=Link
-Name=Wayland Screenshot
-Name[ca]=Wayland Capturador de pantalla
-Name[eo]=Ekrankopiilo de Wayland
-Name[es]=Wayland Capturador de pantalla
-Name[gl]=Wayland Capturador de pantalla
-Name[pt]=Wayland - Captura de ecrã
-Icon=e-module-wl_screenshot.edj
 Comment=Enlightenment Wayland Screenshot Module
 Comment[ca]=Mòdul de l'Enlightenment per a capturar la pantalla de Wayland
 Comment[eo]=Modulo de Enlightenment por ekrankopii en Wayland
 Comment[es]=Módulo de Enlightenment para capturar la pantalla en Wayland
+Comment[fr]=Module de capture d'écran Wayland pour Enlightenment
 Comment[gl]=Módulo de Enlightenment para capturar a pantalla en Wayland
 Comment[it]=Modulo di Enlightenment per screenshot in Wayland
-Comment[pt]=Módulo de captura de ecrã 
+Comment[pt]=Módulo de captura de ecrã
+Encoding=UTF-8
+Icon=e-module-wl_screenshot.edj
+Name=Wayland Screenshot
+Name[ca]=Wayland Capturador de pantalla
+Name[eo]=Ekrankopiilo de Wayland
+Name[es]=Wayland Capturador de pantalla
+Name[fr]=Copie d'écran de Wayland
+Name[gl]=Wayland Capturador de pantalla
+Name[pt]=Wayland - Captura de ecrã
+Type=Link
 X-Enlightenment-ModuleType=look
diff --git a/src/modules/wl_shell/module.desktop b/src/modules/wl_shell/module.desktop
index c4eb416471..e1571604e2 100644
--- a/src/modules/wl_shell/module.desktop
+++ b/src/modules/wl_shell/module.desktop
@@ -1,10 +1,13 @@
 [Desktop Entry]
-Type=Link
-Name=Wayland Shell
-Name[eo]=Ĉelo de Wayland
-Icon=e-module-wl_shell
 Comment=Enlightenment Wayland Shell
 Comment[ca]=Shell de l'Enlightenment per a Wayland
 Comment[eo]=Ĉelo de Enlightenment por Wayland
+Comment[fr]=Shell Wayland pour Enlightenment
 Comment[it]=Shell di Enlightenment per Wayland
+Encoding=UTF-8
+Icon=e-module-wl_shell
+Name=Wayland Shell
+Name[eo]=Ĉelo de Wayland
+Name[fr]=Shell Wayland
+Type=Link
 X-Enlightenment-ModuleType=look
diff --git a/src/modules/xkbswitch/module.desktop.in b/src/modules/xkbswitch/module.desktop.in
index e4557375f6..57663f2f34 100644
--- a/src/modules/xkbswitch/module.desktop.in
+++ b/src/modules/xkbswitch/module.desktop.in
@@ -1,19 +1,22 @@
 [Desktop Entry]
-Type=Link
-Name=Keyboard
-Name[ca]=Teclat
-Name[es]=Teclado
-Name[fr]=Clavier
-Name[gl]=Teclado
-Name[pt]=Teclado
-Name[ru]=Клавиатура
-Icon=preferences-desktop-keyboard
-X-Enlightenment-ModuleType=utils
 Comment=Keyboard layout configuration and switcher
 Comment[ca]=Configuració i commutació de les disposicions del teclat.
+Comment[eo]=Agordo de klavara arango kaj interŝanĝilo
 Comment[es]=Configuración y conmutador de las disposiciones del teclado.
 Comment[fr]=Pour configurer et basculer l'agencement du clavier.
 Comment[gl]=Configuración e alteración das disposicións do teclado.
 Comment[it]=Per configurare e commutare il layout di tastiera.
 Comment[pt]=Configuração e alteração dos esquemas de teclado
 Comment[ru]=Настройка и переключение раскладки клавиатуры
+Encoding=UTF-8
+Icon=preferences-desktop-keyboard
+Name=Keyboard
+Name[ca]=Teclat
+Name[eo]=Klavaro
+Name[es]=Teclado
+Name[fr]=Clavier
+Name[gl]=Teclado
+Name[pt]=Teclado
+Name[ru]=Клавиатура
+Type=Link
+X-Enlightenment-ModuleType=utils