99 files changed, 708 insertions, 726 deletions

diff --git a/apps/1Pim/addressbook.desktop b/apps/1Pim/addressbook.desktop
index 23c5e95..c8bcd72 100644
--- a/apps/1Pim/addressbook.desktop
+++ b/apps/1Pim/addressbook.desktop
@@ -1,23 +1,21 @@
 [Desktop Entry]
-Categories = 
-Comment = An Address Book Program
-Comment[da] = Adressebog med kontaktpersoner, adresser, telefonnumre m.m.
-Comment[es] = Una libreta de direcciones
-Comment[fr] = Un répertoire
-Exec = addressbook
-File = 
-Icon = addressbook/AddressBook
-MimeType = text/x-vCard
-Name = Contacts
-Name[da] = Adressebog
-Name[de] = Adressbuch
-Name[es] = Contactos
-Name[fr] = Répertoire
-Name[hu] = Címtár
-Name[it] = Rubrica
-Name[ko] = 주소록
-Name[no] = Adressebok
-Name[pt] = Contactos
-Name[pt_BR] = Contactos
-Name[zh_TW] = 地址簿
-Type = 1Pim
+Exec=addressbook
+Icon=addressbook/AddressBook
+MimeType=text/x-vCard
+Type=1Pim
+Name=Contacts
+Comment=An Address Book Program
+Name[da]=Adressebog
+Comment[da]=Adressebog med kontaktpersoner, adresser, telefonnumre m.m.
+Name[de]=Adressbuch
+Name[es]=Contactos
+Comment[es]=Una libreta de direcciones
+Name[fr]=Répertoire
+Comment[fr]=Un répertoire
+Name[hu]=Címtár
+Name[it]=Rubrica
+Name[ko]=주소록
+Name[no]=Adressebok
+Name[pt]=Contactos
+Name[pt_BR]=Contactos
+Name[zh_TW]=地址簿
diff --git a/apps/1Pim/datebook.desktop b/apps/1Pim/datebook.desktop
index 991dc01..0655cb5 100644
--- a/apps/1Pim/datebook.desktop
+++ b/apps/1Pim/datebook.desktop
@@ -1,23 +1,21 @@
 [Desktop Entry]
-Categories = 
-Comment = A Calendar and Scheduling Program
-Comment[da] = Et kalender og planlægnings program
-Comment[de] = Ein Terminkalender
-Comment[es] = Un calendario y planificador
-Exec = datebook
-File = 
-Icon = datebook/DateBook
-Name = Calendar
-Name[da] = Kalender
-Name[de] = Termine
-Name[es] = Calendario
-Name[fr] = Agenda
-Name[hu] = Naptár
-Name[it] = Agenda
-Name[ko] = 일정관리
-Name[no] = Avtalebok
-Name[pt] = Calendário
-Name[pt_BR] = Calendário
-Name[zh_TW] = 行事歷
-Type = 1Pim
-comment[fr] = Un calendrier et planificateur de tâches
+Exec=datebook
+Icon=datebook/DateBook
+Type=1Pim
+Name=Calendar
+Comment=A Calendar and Scheduling Program
+Name[da]=Kalender
+Comment[da]=Et kalender og planlægnings program
+Name[de]=Termine
+Comment[de]=Ein Terminkalender
+Name[es]=Calendario
+Comment[es]=Un calendario y planificador
+comment[fr]=Un calendrier et planificateur de tâches
+Name[fr]=Agenda
+Name[hu]=Naptár
+Name[it]=Agenda
+Name[ko]=일정관리
+Name[no]=Avtalebok
+Name[pt]=Calendário
+Name[pt_BR]=Calendário
+Name[zh_TW]=行事歷
diff --git a/apps/1Pim/drawpad.desktop b/apps/1Pim/drawpad.desktop
index f0c41aa..7cc025a 100644
--- a/apps/1Pim/drawpad.desktop
+++ b/apps/1Pim/drawpad.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Comment=A Note Taking Program
-Comment[es]=Un programa para tomar notas
-Comment[da]=Et program til at tage noter med
-Comment[fr]=Un programme pour prendre des notes (post-it)
 Exec=drawpad
 Icon=drawpad/DrawPad
 Type=Application
 Name=DrawPad
+Comment=A Note Taking Program
+Name[da]=Tegneblok
+Comment[da]=Et program til at tage noter med
 Name[de]=Schmierzettel
-Name[pt]=Bloco Rabiscos
 Name[es]=Pizarra
+Comment[es]=Un programa para tomar notas
+Name[fr]=Post-It
+Comment[fr]=Un programme pour prendre des notes (post-it)
 Name[it]=DrawPad
-Name[zh_TW]=小畫家
 Name[ko]=그림판
-Name[da]=Tegneblok
-Name[fr]=Post-It
+Name[pt]=Bloco Rabiscos
+Name[zh_TW]=小畫家
diff --git a/apps/1Pim/mail.desktop b/apps/1Pim/mail.desktop
index 4c11ab7..bf4ef99 100644
--- a/apps/1Pim/mail.desktop
+++ b/apps/1Pim/mail.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Name=E-Mail
 Exec=mail
-Type=Application
 Icon=mail/desktopicon
+Type=Application
+Name=E-Mail
+Name[es]=Correo-e
+Name[fr]=Courrier
+Name[it]=Posta
+Name[ko]=이메일
 Name[pt]=E-Mail
 Comment[pt]=Leitor de E-Mail
 Name[pt_BR]=E-Mail
 Comment[pt_BR]=Leitor de E-Mail
-Name[es]=Correo-e
-Name[it]=Posta
 Name[zh_TW]=電郵
-Name[ko]=이메일
-Name[fr]=Courrier
diff --git a/apps/1Pim/mailit.desktop b/apps/1Pim/mailit.desktop
index 8f53e30..02df816 100644
--- a/apps/1Pim/mailit.desktop
+++ b/apps/1Pim/mailit.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=Mail-it
 Exec=mailit
-Type=Application
 Icon=mailit/desktopicon
+Type=Application
+Name=Mail-it
 Name[pt]=E-Mail
 Comment[pt]=Leitor de E-Mail
 Name[pt_BR]=E-Mail
-Comment[pt_BR]=Leitor de E-Mail
\ No newline at end of file
+Comment[pt_BR]=Leitor de E-Mail
diff --git a/apps/1Pim/osearch.desktop b/apps/1Pim/osearch.desktop
index ce834b3..fad63fa 100644
--- a/apps/1Pim/osearch.desktop
+++ b/apps/1Pim/osearch.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Comment=Seach you data
 Exec=osearch
 Icon=osearch/OSearch
 Type=Application
 Name=search
+Comment=Seach you data
 Name[de]=suchen
 Name[pt]=Procura
-Name[pt_BR]=Procura
 Comment[pt]=Procure os dados
-Comment[pt_BR]=Procure os dados
\ No newline at end of file
+Name[pt_BR]=Procura
+Comment[pt_BR]=Procure os dados
diff --git a/apps/1Pim/textedit.desktop b/apps/1Pim/textedit.desktop
index fe41462..ecac7c2 100644
--- a/apps/1Pim/textedit.desktop
+++ b/apps/1Pim/textedit.desktop
@@ -1,26 +1,25 @@
 [Desktop Entry]
-Comment=A Text Editing Program
-Comment[es]=Un editor de textos
-Comment[da]=Et tekst redigerings program
-Comment[fr]=Un éditeur de texte
-Comment[pt]=Editor de texto
-Comment[pt_BR]=Editor de textos
 Exec=textedit
 Icon=textedit/TextEditor
-Type=Application
 MimeType=text/plain
+Type=Application
 Name=Text Editor
-Name[pt_BR]=Editor de Textos
-Name[no]=Teksteditor
+Comment=A Text Editing Program
+Name[da]=Teksteditor
+Comment[da]=Et tekst redigerings program
 Name[de]=Texteditor
+Name[es]=Editor
+Comment[es]=Un editor de textos
+Name[fr]=Editeur
+Comment[fr]=Un éditeur de texte
+Name[hu]=Szöveg- szerkesztõ
 Name[it]=Blocco Note
 Name[ja]=テキストエディタ
-Name[zh_CN]=文本编辑器
-Name[zh_TW]=文字編輯器
 Name[ko]=텍스트 편집기
-Name[hu]=Szöveg- szerkesztõ
+Name[no]=Teksteditor
 Name[pt]=Editor Texto
-Name[es]=Editor
-Name[da]=Teksteditor
-Name[fr]=Editeur
-
+Comment[pt]=Editor de texto
+Name[pt_BR]=Editor de Textos
+Comment[pt_BR]=Editor de textos
+Name[zh_CN]=文本编辑器
+Name[zh_TW]=文字編輯器
diff --git a/apps/1Pim/today.desktop b/apps/1Pim/today.desktop
index 014f639..ae67f48 100644
--- a/apps/1Pim/today.desktop
+++ b/apps/1Pim/today.desktop
@@ -1,20 +1,20 @@
 [Desktop Entry]
-Comment=Today App
-Comment[es]=Aplicación Hoy
-Comment[da]=Viser en oversigt over dagens begivenheder
-Comment[fr]=Application "Aujourd'hui"
-Comment[pt]=Aplicação "Hoje"
-Comment[pt_BR]=Aplicação "Hoje"
 Exec=today
 Icon=today/today_icon
 Type=Application
 Name=Today
-Name[pt_BR]=Hoje
+Comment=Today App
+Name[da]=Idag
+Comment[da]=Viser en oversigt over dagens begivenheder
 Name[de]=Heute
-Name[pt]=Hoje
 Name[es]=Hoy
+Comment[es]=Aplicación Hoy
+Name[fr]=Aujourd'hui
+Comment[fr]=Application "Aujourd'hui"
 Name[it]=Oggi
-Name[zh_TW]=Today
 Name[ko]=오늘
-Name[da]=Idag
-Name[fr]=Aujourd'hui
+Name[pt]=Hoje
+Comment[pt]=Aplicação "Hoje"
+Name[pt_BR]=Hoje
+Comment[pt_BR]=Aplicação "Hoje"
+Name[zh_TW]=Today
diff --git a/apps/1Pim/todo.desktop b/apps/1Pim/todo.desktop
index 3f55719..5bb8baf 100644
--- a/apps/1Pim/todo.desktop
+++ b/apps/1Pim/todo.desktop
@@ -1,25 +1,23 @@
 [Desktop Entry]
-Categories =
-Comment = A Todo List Program
-Comment[da] = Et program til styring af opgaver
-Comment[de] = Ein Programm zur Verwaltung von Aufgaben
-Comment[es] = Un programa de lista de tareas
-Comment[fr] = Un programme de liste de tâches
-Comment[pt] = Gestor de tarefas
-Comment[pt_BR] = Gerenciador de afazeres
-Exec = todolist
-File =
-Icon = todo/TodoList
-Name = Todo List
-Name[da] = Opgaveliste
-Name[de] = Aufgaben
-Name[es] = Tareas
-Name[fr] = Tâches
-Name[hu] = Feladatok
-Name[it] = Impegni
-Name[ko] = 할일 목록
-Name[no] = Oppgaveliste
-Name[pt] = Tarefas
-Name[pt_BR] = Afazeres
-Name[zh_TW] = 待辦事項
-Type = 1Pim
+Exec=todolist
+Icon=todo/TodoList
+Type=1Pim
+Name=Todo List
+Comment=A Todo List Program
+Name[da]=Opgaveliste
+Comment[da]=Et program til styring af opgaver
+Name[de]=Aufgaben
+Comment[de]=Ein Programm zur Verwaltung von Aufgaben
+Name[es]=Tareas
+Comment[es]=Un programa de lista de tareas
+Name[fr]=Tâches
+Comment[fr]=Un programme de liste de tâches
+Name[hu]=Feladatok
+Name[it]=Impegni
+Name[ko]=할일 목록
+Name[no]=Oppgaveliste
+Name[pt]=Tarefas
+Comment[pt]=Gestor de tarefas
+Name[pt_BR]=Afazeres
+Comment[pt_BR]=Gerenciador de afazeres
+Name[zh_TW]=待辦事項
diff --git a/apps/Applications/advancedfm.desktop b/apps/Applications/advancedfm.desktop
index 91b9c09..2af403b 100644
--- a/apps/Applications/advancedfm.desktop
+++ b/apps/Applications/advancedfm.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment = An advanced file manager program
-Comment[es]=Un gestor de ficheros avanzado
+Exec=advancedfm
+File=advancedfm
+Icon=advancedfm/FileBrowser
+Type=Application
+Name=File Manager
+Comment=An advanced file manager program
+Name[da]=Filstyring
 Comment[da]=Et advanceret filstyringsprogram
-Comment[fr]=Un programme de gestion avancée de fichier
-Exec = advancedfm
-File = advancedfm
-Icon = advancedfm/FileBrowser
-Name = File Manager
-Type = Application
-Name[pt]=Gestor Ficheiros
-Name[es]=Gestor Ficheros
 Name[de]=Dateimanager
+Name[es]=Gestor Ficheros
+Comment[es]=Un gestor de ficheros avanzado
+Name[fr]=Gestion de fichier
+Comment[fr]=Un programme de gestion avancée de fichier
 Name[it]=Gestione File
-Name[zh_TW]=進階檔案總管
 Name[ko]=발달된 파일 관리자
-Name[da]=Filstyring
-Name[fr]=Gestion de fichier
+Name[pt]=Gestor Ficheiros
+Name[zh_TW]=進階檔案總管
diff --git a/apps/Applications/calculator.desktop b/apps/Applications/calculator.desktop
index dfa59c5..20cd7e1 100644
--- a/apps/Applications/calculator.desktop
+++ b/apps/Applications/calculator.desktop
@@ -1,21 +1,21 @@
 [Desktop Entry]
-Comment=A Calculator Program
-Comment[es]=Calculadora científica y conversor de unidades
-Comment[da]=Et lommeregner program
-Comment[fr]=Calculatrice scientifique et de conversion d'unité
 Exec=calculator
 Icon=calc/Calculator
 Type=Application
 Name=Calculator
-Name[pt_BR]=Calculadora
-Name[no]=Kalkulator
+Comment=A Calculator Program
+Name[da]=Lommeregner
+Comment[da]=Et lommeregner program
 Name[de]=Taschen rechner
-Name[ja]=電卓
+Name[es]=Calculadora
+Comment[es]=Calculadora científica y conversor de unidades
+Name[fr]=Calculatrice
+Comment[fr]=Calculatrice scientifique et de conversion d'unité
 Name[hu]=Számológép
 Name[it]=Calcolatrice
+Name[ja]=電卓
+Name[ko]=계산기
+Name[no]=Kalkulator
 Name[pt]=Calculadora
-Name[es]=Calculadora
+Name[pt_BR]=Calculadora
 Name[zh_TW]=計算機
-Name[ko]=계산기
-Name[da]=Lommeregner
-Name[fr]=Calculatrice
diff --git a/apps/Applications/camera.desktop b/apps/Applications/camera.desktop
index 26cc119..faecab9 100644
--- a/apps/Applications/camera.desktop
+++ b/apps/Applications/camera.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Comment = A Camera Program
-Comment[de] = Ein Kamera-Programm
-Exec = opiecam
-File = opiecam
-Icon = camera/cam
-Name = OpieCam
-Type = Application
-Name[de]= Kamera
-
+Exec=opiecam
+File=opiecam
+Icon=camera/cam
+Type=Application
+Name=OpieCam
+Comment=A Camera Program
+Name[de]=Kamera
+Comment[de]=Ein Kamera-Programm
diff --git a/apps/Applications/checkbook.desktop b/apps/Applications/checkbook.desktop
index c5a8283..660b361 100644
--- a/apps/Applications/checkbook.desktop
+++ b/apps/Applications/checkbook.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Comment=A Checkbook Program
-Comment[es]=Programa que gestiona el talonario de cheques
 Exec=checkbook
 Icon=checkbook/checkbook
 Type=Application
 Name=Checkbook
-Name[zh_TW]=Checkbook
-Name[ko]=돈정리
-Name[it]=Nota Spese
+Comment=A Checkbook Program
 Name[es]=Chequera
+Comment[es]=Programa que gestiona el talonario de cheques
+Name[it]=Nota Spese
+Name[ko]=돈정리
+Name[zh_TW]=Checkbook
diff --git a/apps/Applications/clock.desktop b/apps/Applications/clock.desktop
index a21d26c..2eb44f1 100644
--- a/apps/Applications/clock.desktop
+++ b/apps/Applications/clock.desktop
@@ -1,21 +1,21 @@
 [Desktop Entry]
-Comment=A Clock Program
-Comment[es]=Reloj, cronómetro y despertador
-Comment[da]=Et ur, stopur og alarm program
-Comment[fr]=Montre et chronomètre
 Exec=clock
 Icon=Clock
 Type=Application
 Name=Clock
-Name[pt_BR]=Relgio
-Name[no]=Klokke
+Comment=A Clock Program
+Name[da]=Ur
+Comment[da]=Et ur, stopur og alarm program
 Name[de]=Uhr
-Name[ja]=時計
+Name[es]=Reloj
+Comment[es]=Reloj, cronómetro y despertador
+Name[fr]=Montre
+Comment[fr]=Montre et chronomètre
 Name[hu]=Óra
 Name[it]=Orologio
+Name[ja]=時計
+Name[ko]=시계
+Name[no]=Klokke
 Name[pt]=Relógio
-Name[es]=Reloj
+Name[pt_BR]=Relgio
 Name[zh_TW]=時鐘
-Name[ko]=시계
-Name[da]=Ur
-Name[fr]=Montre
diff --git a/apps/Applications/embeddedkonsole.desktop b/apps/Applications/embeddedkonsole.desktop
index ccc7f5e..0beb373 100644
--- a/apps/Applications/embeddedkonsole.desktop
+++ b/apps/Applications/embeddedkonsole.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=A Terminal Window
-Comment[es]=Una ventana de terminal
-Comment[da]=Et terminalvindue
 Exec=embeddedkonsole
 Icon=konsole/Terminal
 Type=Application
 Name=Konsole
+Comment=A Terminal Window
+Name[da]=Terminal
+Comment[da]=Et terminalvindue
 Name[de]=Kommando zeile
+Name[es]=Terminal
+Comment[es]=Una ventana de terminal
 Name[hu]=Terminál
 Name[it]=Terminale
+Name[ko]=콘솔
 Name[pt]=Terminal
-Name[es]=Terminal
 Name[zh_TW]=終端機
-Name[ko]=콘솔
-Name[da]=Terminal
diff --git a/apps/Applications/euroconv.desktop b/apps/Applications/euroconv.desktop
index 012d26e..56d1da6 100644
--- a/apps/Applications/euroconv.desktop
+++ b/apps/Applications/euroconv.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Comment=An Euro converter
-Comment[fr]=Un convertisseur Euro
 Exec=euroconv
 Icon=euroconv/euroconv
 Type=Application
 Name=Euroconv
-Name[fr]=Euroconv
+Comment=An Euro converter
 Name[de]=Euroconv
-
+Name[fr]=Euroconv
+Comment[fr]=Un convertisseur Euro
diff --git a/apps/Applications/filebrowser.desktop b/apps/Applications/filebrowser.desktop
index f5e3662..64058e5 100644
--- a/apps/Applications/filebrowser.desktop
+++ b/apps/Applications/filebrowser.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Comment = A File Manager Program
-Comment[es]=Un programa gestor de ficheros
-Exec = filebrowser
-File = ../apps/Applications/filebrowser
-Icon = filebrowser/FileBrowser
-Name = File Manager
-Name[pt_BR] = Gerenciador de Arquivos
+Exec=filebrowser
+File=../apps/Applications/filebrowser
+Icon=filebrowser/FileBrowser
+Type=Application
+Name=File Manager
+Comment=A File Manager Program
 Name[de]=Datei Manager
-Name[no] = Filviser
-Type = Application
+Name[es]=Gestor Ficheros
+Comment[es]=Un programa gestor de ficheros
 Name[hu]=Intézõ
 Name[it]=Gestione File
+Name[ko]=파일 관리자
+Name[no]=Filviser
 Name[pt]=Gestor Ficheiros
-Name[es]=Gestor Ficheros
+Name[pt_BR]=Gerenciador de Arquivos
 Name[zh_TW]=檔案總管
-Name[ko]=파일 관리자
diff --git a/apps/Applications/gsmtool.desktop b/apps/Applications/gsmtool.desktop
index 40c057d..411fba2 100644
--- a/apps/Applications/gsmtool.desktop
+++ b/apps/Applications/gsmtool.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=A GSM Phone Utility
-Comment[es]=Utilidad de teléfono GSM
 Exec=gsmtool
 Icon=gsmtool/gsmtool
 Type=Application
 Name=GSM Tool
-Name[pt]=Utilitário GSM
+Comment=A GSM Phone Utility
 Name[de]=GSM-Werkzeug
 Name[es]=Teléfono GSM
+Comment[es]=Utilidad de teléfono GSM
 Name[it]=Utilit�GSM
-Name[zh_TW]=GSM 工具
 Name[ko]=GSM 전화기 유틸
+Name[pt]=Utilitário GSM
+Name[zh_TW]=GSM 工具
diff --git a/apps/Applications/helpbrowser.desktop b/apps/Applications/helpbrowser.desktop
index e21830d..701adc8 100644
--- a/apps/Applications/helpbrowser.desktop
+++ b/apps/Applications/helpbrowser.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=A HTML Help Browser Program
-Comment[es]=Navegador de ayuda en HTML
 Exec=helpbrowser
 Icon=helpbrowser/HelpBrowser
 Type=Application
 Name=Help Browser
-Name[pt_BR] = Navegador de Ajuda
-Name[no]=Hjelp
+Comment=A HTML Help Browser Program
 Name[de]=Hilfe
+Name[es]=Ayuda
+Comment[es]=Navegador de ayuda en HTML
 Name[hu]=Segítség
 Name[it]=Aiuto
+Name[ko]=도움말 브라우져
+Name[no]=Hjelp
 Name[pt]=Ajuda
-Name[es]=Ayuda
+Name[pt_BR]=Navegador de Ajuda
 Name[zh_TW]=求助
-Name[ko]=도움말 브라우져
diff --git a/apps/Applications/keypebble.desktop b/apps/Applications/keypebble.desktop
index f7cd03a..e31eeaa 100644
--- a/apps/Applications/keypebble.desktop
+++ b/apps/Applications/keypebble.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=Virtual Network Computing (VNC) Viewer
-Comment[es]=Visor de Virtual Network Computing (VNC)
 Exec=keypebble
 Icon=vnc/vnc
 Type=Application
 Name=VNC Viewer
-Name[pt_BR]=Cliente VNC
+Comment=Virtual Network Computing (VNC) Viewer
 Name[de]=VNC Client
-Name[pt]=Ecrâ Remoto
 Name[es]=Visor VNC
+Comment[es]=Visor de Virtual Network Computing (VNC)
 Name[it]=Client VNC
-Name[zh_TW]=VNC 客戶端
 Name[ko]=VNC 뷰어
+Name[pt]=Ecrâ Remoto
+Name[pt_BR]=Cliente VNC
+Name[zh_TW]=VNC 客戶端
diff --git a/apps/Applications/mediaplayer.desktop b/apps/Applications/mediaplayer.desktop
index cfa19c5..bb1eced 100644
--- a/apps/Applications/mediaplayer.desktop
+++ b/apps/Applications/mediaplayer.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=A Media Player
-Comment[es]=Reproductor de ficheros multimedia
-Comment[pt]=Leitor de ficheiros multimédia
-Comment[pt_BR]=Leitor de ficheiros multimédia
 Exec=opieplayer2
 Icon=opieplayer2/MPEGPlayer
-Type=Application
 MimeType=audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-ogg;video/x-ogm;video/x-ms-asf;video/quicktime;video/mpeg;video/x-msvideo;playlist/plain;
 MimeTypeIcons=Sound;Sound;Sound;Sound;MPEGPlayer;MPEGPlayer;MPEGPlayer;MPEGPlayer;MPEGPlayer;opieplayer2/playlist2
+Type=Application
 Name=Opie Media Player
-Name[ko]=오삐 미디어 플레이어
-Name[it]=Media Player
+Comment=A Media Player
 Name[de]=Media Player
 Name[es]=Multimedia
+Comment[es]=Reproductor de ficheros multimedia
 Name[fr]=Lecteur multimédia
+Name[it]=Media Player
+Name[ko]=오삐 미디어 플레이어
 Name[pt]=Leitor multimédia
-Name[pt_BR]=Leitor multimédia
\ No newline at end of file
+Comment[pt]=Leitor de ficheiros multimédia
+Name[pt_BR]=Leitor multimédia
+Comment[pt_BR]=Leitor de ficheiros multimédia
diff --git a/apps/Applications/mobilemsg.desktop b/apps/Applications/mobilemsg.desktop
index 3a7e034..296c628 100644
--- a/apps/Applications/mobilemsg.desktop
+++ b/apps/Applications/mobilemsg.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-Comment=Mobile Messaging
-Comment[es]=Mensajería móvil
-Comment[pt]=Mensagens móveis
-Comment[pt_BR]=Mensagens móveis
 Exec=mobilemsg
 Icon=mobilemsg/mobilemsg
 Type=Application
 Name=Mobile Messaging
-Name[pt_BR]=Mensagens Móveis
-Name[pt]=Mensagens Móveis
+Comment=Mobile Messaging
 Name[es]=Mensajería Móvil
+Comment[es]=Mensajería móvil
 Name[it]=SMS
-Name[zh_TW]=手電訊息
 Name[ko]=모바일 메신져
+Name[pt]=Mensagens Móveis
+Comment[pt]=Mensagens móveis
+Name[pt_BR]=Mensagens Móveis
+Comment[pt_BR]=Mensagens móveis
+Name[zh_TW]=手電訊息
diff --git a/apps/Applications/odict.desktop b/apps/Applications/odict.desktop
index f000927..cf2f462 100644
--- a/apps/Applications/odict.desktop
+++ b/apps/Applications/odict.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=A dictionary lookup application
-Comment[es]=Una aplicación de búsqueda en diccionario
-Comment[pt]=Dicionário
-Comment[pt_BR]=Dicionário
 Exec=odict
 Icon=odict/odict
 Type=Application
 Name=ODict
+Comment=A dictionary lookup application
 Name[de]=Wörterbuch
 Name[es]=Diccionario
+Comment[es]=Una aplicación de búsqueda en diccionario
 Name[fr]=Dictionnaire
 Name[pt]=Dicionário
-Name[pt_BR]=Dicionário
\ No newline at end of file
+Comment[pt]=Dicionário
+Name[pt_BR]=Dicionário
+Comment[pt_BR]=Dicionário
diff --git a/apps/Applications/opie-console.desktop b/apps/Applications/opie-console.desktop
index c7ea17f..bb8ff90 100644
--- a/apps/Applications/opie-console.desktop
+++ b/apps/Applications/opie-console.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=Terminal app
-Comment[es]=Aplicación de terminal
-Comment[pt]=Linha de comando
-Comment[pt_BR]=Linha de comando
 Exec=opie-console
 Icon=console/console
 Type=Application
 Name=Opie Terminal
+Comment=Terminal app
 Name[es]=Consola
+Comment[es]=Aplicación de terminal
 Name[pt]=Consola
-Name[pt_BR]=Consola
\ No newline at end of file
+Comment[pt]=Linha de comando
+Name[pt_BR]=Consola
+Comment[pt_BR]=Linha de comando
diff --git a/apps/Applications/opie-reader.desktop b/apps/Applications/opie-reader.desktop
index 36f6558..8029c61 100644
--- a/apps/Applications/opie-reader.desktop
+++ b/apps/Applications/opie-reader.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=An E-Text Reader
-Comment[es]=Un lector de libros electrónicos
-Comment[pt]=Leitor de livros electrónicos
-Comment[pt_BR]=Leitor de livros electronicos
+CanFastLoad=1
 Exec=reader
 Icon=opie-reader/uqtreader
 Type=Application
 Name=Opie Reader
-CanFastLoad=1
+Comment=An E-Text Reader
 Name[es]=Lector Libros-e
-Name[zh_TW]=Opie Reader
-Name[ko]=오삐 책읽기
+Comment[es]=Un lector de libros electrónicos
 Name[it]=Opie Reader
+Name[ko]=오삐 책읽기
 Name[pt]=Leitor Livros
+Comment[pt]=Leitor de livros electrónicos
 Name[pt_BR]=Visualizador Livros
+Comment[pt_BR]=Leitor de livros electronicos
+Name[zh_TW]=Opie Reader
diff --git a/apps/Applications/opie-sheet.desktop b/apps/Applications/opie-sheet.desktop
index 1f97a89..fd595fe 100644
--- a/apps/Applications/opie-sheet.desktop
+++ b/apps/Applications/opie-sheet.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=Spreadsheet Application
-Comment[es]=Aplicación de hoja de cálculo
-Comment[pt]=Folha de cálculo
-Comment[pt_BR]=Folha de cálculo
 Exec=sheetqt
 Icon=opie-sheet/sheetqt
+MimeType=application/sheet-qt
 Type=Application
 Name=Opie Sheet
-MimeType=application/sheet-qt
-Name[es]=Hoja Cálculo
+Comment=Spreadsheet Application
 Name[de]=Tabellenkalkulation
+Name[es]=Hoja Cálculo
+Comment[es]=Aplicación de hoja de cálculo
+Name[fr]=Tableur
 Name[it]=Foglio di Calcolo
-Name[zh_TW]=Opie Sheet
 Name[ko]=스프레드시트
-Name[fr]=Tableur
 Name[pt]=Folha de Cálculo
-Name[pt_BR]=Folha de Cálculo
\ No newline at end of file
+Comment[pt]=Folha de cálculo
+Name[pt_BR]=Folha de Cálculo
+Comment[pt_BR]=Folha de cálculo
+Name[zh_TW]=Opie Sheet
diff --git a/apps/Applications/opie-write.desktop b/apps/Applications/opie-write.desktop
index f773754..65b428e 100644
--- a/apps/Applications/opie-write.desktop
+++ b/apps/Applications/opie-write.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=A Rich Text Editing Program
-Comment[es]=Un completo editor de textos
 Exec=opie-write
 Icon=opie-write/opie-write
 Type=Application
 Name=opie-write
+Comment=A Rich Text Editing Program
 Name[es]=Opie-Write
+Comment[es]=Un completo editor de textos
 Name[pt]=Editor Texto
-Name[pt_BR]=Editor Textos
 Comment[pt]=Editor de texto
-Comment[pt_BR]=Editor de textos
\ No newline at end of file
+Name[pt_BR]=Editor Textos
+Comment[pt_BR]=Editor de textos
diff --git a/apps/Applications/opieftp.desktop b/apps/Applications/opieftp.desktop
index 49df539..a0fa57d 100644
--- a/apps/Applications/opieftp.desktop
+++ b/apps/Applications/opieftp.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=An Ftp Client
-Comment[es]=Cliente de File Transfer Protocol (FTP)
-Comment[pt]=Cliente de FTP
-Comment[pt_BR]=Cliente de FTP
 Exec=opieftp
 Icon=opieftp/opieftp
 Type=Application
 Name=OpieFtp
-Name[pt]=Cliente FTP
+Comment=An Ftp Client
+Name[de]=FTP-Werkzeug
 Name[es]=Cliente FTP
+Comment[es]=Cliente de File Transfer Protocol (FTP)
 Name[it]=Client FTP
-Name[de]=FTP-Werkzeug
-Name[zh_TW]=FTP 檔案傳送
 Name[ko]=Ftp 클라이언트
-Name[pt_BR]=Cliente FTP
\ No newline at end of file
+Name[pt]=Cliente FTP
+Comment[pt]=Cliente de FTP
+Name[pt_BR]=Cliente FTP
+Comment[pt_BR]=Cliente de FTP
+Name[zh_TW]=FTP 檔案傳送
diff --git a/apps/Applications/opieirc.desktop b/apps/Applications/opieirc.desktop
index 10fc3c0..82d2bc5 100644
--- a/apps/Applications/opieirc.desktop
+++ b/apps/Applications/opieirc.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=An IRC Client
-Comment[es]=Un cliente de Internet Relay Chat (IRC)
-Comment[pt]=Cliente de IRC
-Comment[pt_BR]=Cliente de IRC
 Exec=opieirc
 Icon=opieirc/opieirc
 Type=Application
 Name=OpieIRC
+Comment=An IRC Client
 Name[es]=Opie IRC
+Comment[es]=Un cliente de Internet Relay Chat (IRC)
 Name[pt]=IRC
-Name[pt_BR]=IRC
\ No newline at end of file
+Comment[pt]=Cliente de IRC
+Name[pt_BR]=IRC
+Comment[pt_BR]=Cliente de IRC
diff --git a/apps/Applications/opiemail.desktop b/apps/Applications/opiemail.desktop
index a1a44a8..370248a 100644
--- a/apps/Applications/opiemail.desktop
+++ b/apps/Applications/opiemail.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=An EMail Client
-Comment[es]=Cliente de correo electrónico
-Comment[pt]=Cliente de email
-Comment[pt_BR]=Cliente de email
 Exec=opiemail
 Icon=opiemail/opiemail
 Type=Application
 Name=EMail
-Name[pt]=E-Mail
-Name[pt_BR]=E-Mail
+Comment=An EMail Client
 Name[de]=EMail
 Name[es]=Correo-e
+Comment[es]=Cliente de correo electrónico
 Name[it]=Posta
-Name[zh_TW]=電子郵件
 Name[ko]=이메일
+Name[pt]=E-Mail
+Comment[pt]=Cliente de email
+Name[pt_BR]=E-Mail
+Comment[pt_BR]=Cliente de email
+Name[zh_TW]=電子郵件
diff --git a/apps/Applications/opieplayer.desktop b/apps/Applications/opieplayer.desktop
index 0b11a0e..5da2197 100644
--- a/apps/Applications/opieplayer.desktop
+++ b/apps/Applications/opieplayer.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Comment=A Media Playback Program
-Comment[es]=Reproductor multimedia
-Comment[pt]=Reproductor multimédia
-Comment[pt_BR]=Reproductor multimédia
 Exec=opieplayer
 Icon=opieplayer/MPEGPlayer
-Type=Application
 MimeType=audio/mpeg;video/mpeg;audio/x-mpegurl;audio/x-wav;application/x-shockwave-flash;playlist/plain;audio/x-mpegurl;audio/x-mod
 MimeTypeIcons=SoundPlayer;MPEGPlayer;SoundPlayer;Sound;Sound;mpegplayer/playlist2
+Type=Application
 Name=Opie Player
-Name[pt]=Multimédia
-Name[pt_BR]=Multimédia
+Comment=A Media Playback Program
 Name[es]=Multimedia
+Comment[es]=Reproductor multimedia
 Name[it]=OpiePlayer
-Name[zh_TW]=Opie播放器
 Name[ko]=오삐 재생기
+Name[pt]=Multimédia
+Comment[pt]=Reproductor multimédia
+Name[pt_BR]=Multimédia
+Comment[pt_BR]=Reproductor multimédia
+Name[zh_TW]=Opie播放器
diff --git a/apps/Applications/opierec.desktop b/apps/Applications/opierec.desktop
index 8e30645..5aa6f92 100644
--- a/apps/Applications/opierec.desktop
+++ b/apps/Applications/opierec.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Comment[pt] = Gravador de Som
-Comment[pt_BR] = Gravador de Som
-Exec = opierec
-Icon = opierec/Opierec
-Type = Application
-Name = OpieRecord
-Name[pt] = Gravador
-Name[pt_BR] = Gravador
\ No newline at end of file
+Exec=opierec
+Icon=opierec/Opierec
+Type=Application
+Name=OpieRecord
+Name[pt]=Gravador
+Comment[pt]=Gravador de Som
+Name[pt_BR]=Gravador
+Comment[pt_BR]=Gravador de Som
diff --git a/apps/Applications/oxygen.desktop b/apps/Applications/oxygen.desktop
index 32808c7..cf5485d 100644
--- a/apps/Applications/oxygen.desktop
+++ b/apps/Applications/oxygen.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=A chemistry Application
-Comment[es]=Una aplicación de química
-Comment[pt]=Aplicação de química
-Comment[pt_BR]=Aplicação de química
 Exec=oxygen
 Icon=oxygen/oxygen
 Type=Application
 Name=Oxygen
+Comment=A chemistry Application
 Name[de]=Perioden system
 Name[es]=Tabla Periódica
+Comment[es]=Una aplicación de química
 Name[pt]=Tabela Periódica
-Name[pt_BR]=Tabela Periódica
\ No newline at end of file
+Comment[pt]=Aplicação de química
+Name[pt_BR]=Tabela Periódica
+Comment[pt_BR]=Aplicação de química
diff --git a/apps/Applications/qashmoney.desktop b/apps/Applications/qashmoney.desktop
index e144c5d..a276662 100644
--- a/apps/Applications/qashmoney.desktop
+++ b/apps/Applications/qashmoney.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
-Comment=QashMoney, budget software for the Z
 Exec=qashmoney
 Icon=qashmoney.png
-Name=QashMoney
 Terminal=false
 Type=Application
+Name=QashMoney
+Comment=QashMoney, budget software for the Z
 Name[pt]=Gestor Dinheiro
-Name[pt_BR]=Gestor Dinheiro
 Comment[pt]=Gestor de Dinheiro
-Comment[pt_BR]=Gestor de Dinheiro
\ No newline at end of file
+Name[pt_BR]=Gestor Dinheiro
+Comment[pt_BR]=Gestor de Dinheiro
diff --git a/apps/Applications/qpdf.desktop b/apps/Applications/qpdf.desktop
index 15b3693..244fe03 100644
--- a/apps/Applications/qpdf.desktop
+++ b/apps/Applications/qpdf.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=PDF Viewer
-Comment[es]=Visor de ficheros en Portable Document Format (PDF)
-Comment[fr]=Visualisateur de fichier PDF (Portable Document Format)
-Comment[pt]=Visualizador de ficheiros PDF
-Comment[pt_BR]=Visualizador de ficheiros PDF
 Exec=qpdf
 Icon=qpdf/qpdf_icon
-Type=Application
 MimeType=application/pdf
+Type=Application
 Name=PDF Viewer
+Comment=PDF Viewer
 Name[de]=PDF Betrachter
-Name[pt]=Leitor PDF
 Name[es]=Visor PDF
+Comment[es]=Visor de ficheros en Portable Document Format (PDF)
+Name[fr]=Lecteur PDF
+Comment[fr]=Visualisateur de fichier PDF (Portable Document Format)
 Name[it]=Lettore PDF
-Name[zh_TW]=PDF瀏覽器
 Name[ko]=PDF 뷰어
-Name[fr]=Lecteur PDF
+Name[pt]=Leitor PDF
+Comment[pt]=Visualizador de ficheiros PDF
+Comment[pt_BR]=Visualizador de ficheiros PDF
+Name[zh_TW]=PDF瀏覽器
diff --git a/apps/Applications/remote.desktop b/apps/Applications/remote.desktop
index 065d0f7..05f8468 100644
--- a/apps/Applications/remote.desktop
+++ b/apps/Applications/remote.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-Comment=Remote App
-Comment[es]=Aplicación de control remoto
-Comment[pt]=Aplicação de controlo remoto
-Comment[pt_BR]=Aplicação de controlo remoto
 Exec=remote
 Icon=remote/remote
 Type=Application
 Name=Remote
-Name[pt]=Controlo Remoto
-Name[pt_BR]=Controlo Remoto
+Comment=Remote App
 Name[es]=Control Remoto
+Comment[es]=Aplicación de control remoto
 Name[it]=Telecomando
-Name[zh_TW]=遙控器
 Name[ko]=리모트
+Name[pt]=Controlo Remoto
+Comment[pt]=Aplicação de controlo remoto
+Name[pt_BR]=Controlo Remoto
+Comment[pt_BR]=Aplicação de controlo remoto
+Name[zh_TW]=遙控器
diff --git a/apps/Applications/showimg.desktop b/apps/Applications/showimg.desktop
index c29ae67..ffbe715 100644
--- a/apps/Applications/showimg.desktop
+++ b/apps/Applications/showimg.desktop
@@ -1,20 +1,18 @@
 [Desktop Entry]
-Categories =
-Comment = An Image Viewer
+Exec=showimg
+Icon=imageviewer/ImageViewer
+MimeType=image/*
+Type=Applications
+Name=Image Viewer
+Comment=An Image Viewer
+Name[de]=Bildbetrachter
+Name[es]=Visor Imágenes
 Comment[es]=Un visor de imágenes
+Name[hu]=Nézõke
+Name[it]=Visualizza Immagini
+Name[ko]=이미지 뷰어
+Name[pt]=Visualizador Imagens
 Comment[pt]=Um visualizador de imagens
+Name[pt_BR]=Visualizador de Imagens
 Comment[pt_BR]=Um visualizador de imagens
-Exec = showimg
-File =
-Icon = imageviewer/ImageViewer
-MimeType = image/*
-Name = Image Viewer
-Name[de] = Bildbetrachter
-Name[es] = Visor Imágenes
-Name[hu] = Nézõke
-Name[it] = Visualizza Immagini
-Name[ko] = 이미지 뷰어
-Name[pt] = Visualizador Imagens
-Name[pt_BR] = Visualizador de Imagens
-Name[zh_TW] = 圖檔檢視
-Type = Applications
+Name[zh_TW]=圖檔檢視
diff --git a/apps/Applications/tableviewer.desktop b/apps/Applications/tableviewer.desktop
index 5846718..0ea3317 100644
--- a/apps/Applications/tableviewer.desktop
+++ b/apps/Applications/tableviewer.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=A table/database viewer
-Comment[es]=Visor de tablas y bases de datos
-Comment[pt]=Visualizador de bases de dados
-Comment[pt_BR]=Visualizador de tabelas
 Exec=tableviewer
 Type=Application
 Name=Table Viewer
-Name[pt_BR]=Visualizador de Tabelas
+Comment=A table/database viewer
+Name[de]=Tabellen betrachter
+Name[es]=Visor Base Datos
+Comment[es]=Visor de tablas y bases de datos
 Name[hu]=Adatbázis nézõ
 Name[it]=DB Viewer
-Name[de]=Tabellen betrachter
+Name[ko]=테이블 뷰어
 Name[pt]=Visualizador Base Dados
-Name[es]=Visor Base Datos
+Comment[pt]=Visualizador de bases de dados
+Name[pt_BR]=Visualizador de Tabelas
+Comment[pt_BR]=Visualizador de tabelas
 Name[zh_TW]=資料庫檢視
-Name[ko]=테이블 뷰어
diff --git a/apps/Applications/tinykate.desktop b/apps/Applications/tinykate.desktop
index 6cdb29a..5c20b16 100644
--- a/apps/Applications/tinykate.desktop
+++ b/apps/Applications/tinykate.desktop
@@ -1,15 +1,13 @@
 [Desktop Entry]
-Categories =
-Comment = A texteditor with syntax highlighting
+Exec=tinykate
+Icon=tinykate/tinykate
+MimeType=text/*
+Type=Applications
+Name=TinyKATE
+Comment=A texteditor with syntax highlighting
+Name[es]=MiniKate
 Comment[es]=Un editor de textos con resaltado sintáctico
+Name[pt]=Mini Kate
 Comment[pt]=Um editor de texto com sintaxe a cores
+Name[pt_BR]=Mini Kate
 Comment[pt_BR]=Um editor de texto com sintaxe a cores
-Exec = tinykate
-File =
-Icon = tinykate/tinykate
-Name = TinyKATE
-MimeType = text/*
-Type = Applications
-Name[es]=MiniKate
-Name[pt]=Mini Kate
-Name[pt_BR]=Mini Kate
\ No newline at end of file
diff --git a/apps/Applications/ubrowser.desktop b/apps/Applications/ubrowser.desktop
index b3c2145..8c3c41d 100644
--- a/apps/Applications/ubrowser.desktop
+++ b/apps/Applications/ubrowser.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=Web Browser
 Exec=ubrowser
 Icon=ubrowser/ubrowser
-Type=Application
-Name=uBrowser
 MimeType=text/html
 MimeTypeIcons=ubrowser/ubrowser
+Type=Application
+Name=uBrowser
+Comment=Web Browser
 Name[pt]=Navegador WWW
-Name[pt_BR]=Navegador WWW
 Comment[pt]=Navegador WWW
+Name[pt_BR]=Navegador WWW
 Comment[pt_BR]=Navegador WWW
diff --git a/apps/Applications/wellenreiter.desktop b/apps/Applications/wellenreiter.desktop
index 879dd90..1af0dab 100644
--- a/apps/Applications/wellenreiter.desktop
+++ b/apps/Applications/wellenreiter.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-Comment = A WaveLAN Sniffer
-Comment[de]= Ein krasser WaveLAN Sniffer
-Comment[es]=Un olfateador (sniffer) de redes inalámbricas
-Comment[pt]=Um analizador de pacotes de redes sem fios
-Comment[pt_BR]=Um analizador de pacotes de redes sem fios
-Exec = wellenreiter
-File = wellenreiter
-Icon = wellenreiter/appicon-trans
-Name = Wellenreiter
-Type = Application
+Exec=wellenreiter
+File=wellenreiter
+Icon=wellenreiter/appicon-trans
+Type=Application
+Name=Wellenreiter
+Comment=A WaveLAN Sniffer
 Name[de]=Wellenreiter
+Comment[de]=Ein krasser WaveLAN Sniffer
 Name[es]=Rastreador Inalámbrico
+Comment[es]=Un olfateador (sniffer) de redes inalámbricas
 Name[pt]=Analizador Redes sem Fios
+Comment[pt]=Um analizador de pacotes de redes sem fios
 Name[pt_BR]=Analizador Redes sem Fios
+Comment[pt_BR]=Um analizador de pacotes de redes sem fios
diff --git a/apps/Games/backgammon.desktop b/apps/Games/backgammon.desktop
index a61be25..b22f40f 100644
--- a/apps/Games/backgammon.desktop
+++ b/apps/Games/backgammon.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Comment=Backgammon
 Exec=backgammon
 Icon=backgammon/backgammon
 Type=Application
 Name=BackGammon
+Comment=Backgammon
diff --git a/apps/Games/bounce.desktop b/apps/Games/bounce.desktop
index 02bb154..b4278e0 100644
--- a/apps/Games/bounce.desktop
+++ b/apps/Games/bounce.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Type=Application
 Exec=bounce
 Icon=bounce/bounce
-Comment=A JezzGame
-Comment[es]=El juego Jezz
+Type=Application
 Name=Bounce
+Comment=A JezzGame
 Name[de]=Bounce
 Name[es]=Rebote
+Comment[es]=El juego Jezz
diff --git a/apps/Games/buzzword.desktop b/apps/Games/buzzword.desktop
index c3e622b..ab826a5 100644
--- a/apps/Games/buzzword.desktop
+++ b/apps/Games/buzzword.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Type=Application
 Exec=buzzword
 Icon=buzzword/buzzword
-Comment=A buzzword bingo
-Comment[es]=Un bingo de palabras técnicas
+Type=Application
 Name=buZzword
+Comment=A buzzword bingo
 Name[es]=buZzword
+Comment[es]=Un bingo de palabras técnicas
diff --git a/apps/Games/fifteen.desktop b/apps/Games/fifteen.desktop
index 53c5a36..f1c7f8e 100644
--- a/apps/Games/fifteen.desktop
+++ b/apps/Games/fifteen.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=Fifteen Pieces Strategy Game
-Comment[es]=Juego de estrategia de las 15 piezas
 Exec=fifteen
 Icon=fifteen/Fifteen
 Type=Application
 Name=Fifteen Pieces
-Name[pt]=Puzzle
+Comment=Fifteen Pieces Strategy Game
+Name[de]=Fnfzehn
 Name[es]=Quince Piezas
+Comment[es]=Juego de estrategia de las 15 piezas
 Name[it]=Gioco del 15
-Name[de]=Fnfzehn
-Name[zh_TW]=Fifteen Pieces
 Name[ko]=십오 조각
+Name[pt]=Puzzle
+Name[zh_TW]=Fifteen Pieces
diff --git a/apps/Games/go.desktop b/apps/Games/go.desktop
index 1e555b3..8d39573 100644
--- a/apps/Games/go.desktop
+++ b/apps/Games/go.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=A Board Strategy Game
-Comment[es]=Juego de estategia de tablero
 Exec=go
 Icon=go/Go
 Type=Application
 Name=Go
-Name[pt]=Go
-Name[es]=Go
+Comment=A Board Strategy Game
 Name[de]=Go
+Name[es]=Go
+Comment[es]=Juego de estategia de tablero
 Name[it]=Go
-Name[zh_TW]=圍棋
 Name[ko]=바둑
+Name[pt]=Go
+Name[zh_TW]=圍棋
diff --git a/apps/Games/kbill.desktop b/apps/Games/kbill.desktop
index 4b20dca..b6a92c0 100644
--- a/apps/Games/kbill.desktop
+++ b/apps/Games/kbill.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=Hit Bill
-Comment[es]=Pégale a Bill
 Exec=kbill
 Icon=kbill/kbill
 Type=Application
 Name=kbill
-Name[pt]=kBill
+Comment=Hit Bill
+Name[de]=kBill
 Name[es]=kBill
+Comment[es]=Pégale a Bill
 Name[it]=kBill
-Name[de]=kBill
-Name[zh_TW]=kbill
 Name[ko]=kBill
+Name[pt]=kBill
+Name[zh_TW]=kbill
diff --git a/apps/Games/kcheckers.desktop b/apps/Games/kcheckers.desktop
index 56489d3..0a29f38 100644
--- a/apps/Games/kcheckers.desktop
+++ b/apps/Games/kcheckers.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=A Ckeckers Game
-Comment[es]=El juego de las Damas
 Exec=kcheckers
 Icon=kcheckers/KCheckers
 Type=Application
 Name=KCheckers
-Name[pt_BR]=Damas
-Name[pt]=Damas
+Comment=A Ckeckers Game
+Name[de]=KCheckers
 Name[es]=Damas
+Comment[es]=El juego de las Damas
 Name[it]=KCheckers (Dama)
-Name[zh_TW]=KCheckers
 Name[ko]=KCheckers
-Name[de]=KCheckers
+Name[pt]=Damas
+Name[pt_BR]=Damas
+Name[zh_TW]=KCheckers
diff --git a/apps/Games/kpacman.desktop b/apps/Games/kpacman.desktop
index ae612ee..0f664d5 100644
--- a/apps/Games/kpacman.desktop
+++ b/apps/Games/kpacman.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Type=Application
 Exec=kpacman
 Icon=kpacman/kpacman
+Type=Application
 Name=Kpacman
 Name[de]=Kpacman
+Name[es]=Kpacman
 Name[it]=Kpacman (Pac Man)
+Name[ko]=K팩맨
 Name[pt]=Pac Man
 Name[pt_BR]=Pac Man
-Name[es]=Kpacman
 Name[zh_TW]=食鬼
-Name[ko]=K팩맨
diff --git a/apps/Games/mindbreaker.desktop b/apps/Games/mindbreaker.desktop
index de0aaa5..515542b 100644
--- a/apps/Games/mindbreaker.desktop
+++ b/apps/Games/mindbreaker.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=A Code Breaking Game
-Comment[es]=Juego de romper códigos
-Comment[pt]=Jogo de mastermind
-Comment[pt_BR]=Jogo de mastermind
 Exec=mindbreaker
 Icon=mindbreaker/Mindbreaker
 Type=Application
 Name=Mindbreaker
-Name[pt]=Mastermind
-Name[pt_BR]=Mastermind
+Comment=A Code Breaking Game
+Name[de]=Mindbreaker
 Name[es]=Rompecabezas
+Comment[es]=Juego de romper códigos
 Name[it]=MindBreaker (Mastermind)
-Name[de]=Mindbreaker
-Name[zh_TW]=智慧棋
 Name[ko]=마인드 브레이커
+Name[pt]=Mastermind
+Comment[pt]=Jogo de mastermind
+Name[pt_BR]=Mastermind
+Comment[pt_BR]=Jogo de mastermind
+Name[zh_TW]=智慧棋
diff --git a/apps/Games/minesweep.desktop b/apps/Games/minesweep.desktop
index 8aa72e1..020be13 100644
--- a/apps/Games/minesweep.desktop
+++ b/apps/Games/minesweep.desktop
@@ -1,20 +1,20 @@
 [Desktop Entry]
-Comment=Find the mines
-Comment[es]=Busca las minas
-Comment[pt]=Procura as minas
-Comment[pt_BR]=Caça as minas
 Exec=minesweep
-Icon= minesweep/MineHunt
+Icon=minesweep/MineHunt
 Type=Application
 Name=Mine Hunt
-Name[pt_BR]=Caça-Minas
-Name[no]=Minesøk
+Comment=Find the mines
 Name[de]=Minenjagd
-Name[ja]=マインスィープ
+Name[es]=Busca Minas
+Comment[es]=Busca las minas
+Name[fr]=Démineur
 Name[hu]=Aknakeresõ
 Name[it]=Campo Minato
+Name[ja]=マインスィープ
+Name[ko]=지뢰
+Name[no]=Minesøk
 Name[pt]=Minas
-Name[es]=Busca Minas
+Comment[pt]=Procura as minas
+Name[pt_BR]=Caça-Minas
+Comment[pt_BR]=Caça as minas
 Name[zh_TW]=踩地雷
-Name[ko]=지뢰
-Name[fr]=Démineur
diff --git a/apps/Games/nethack.desktop b/apps/Games/nethack.desktop
index e5e39df..6b16516 100644
--- a/apps/Games/nethack.desktop
+++ b/apps/Games/nethack.desktop
@@ -1,18 +1,17 @@
 [Desktop Entry]
-CanFastload = 0
-Categories = 
-Comment = Classic Dungeon Adventure Game
+CanFastload=0
+Exec=nethack
+Icon=nethack/nethack
+Type=Games
+Name=NetHack
+Comment=Classic Dungeon Adventure Game
+Name[de]=NetHack
+Name[es]=NetHack
 Comment[es]=Clásico juego de mazmorras
-Comment[pt]=Jogo clássico RPG de masmorras
-Comment[pt_BR]=Jogo clássico RPG de masmorras
-Exec = nethack
-Icon = nethack/nethack
-Name = NetHack
-Type = Games
+Name[it]=NetHack
+Name[ko]=네트핵
 Name[pt]=RPG NetHack
+Comment[pt]=Jogo clássico RPG de masmorras
 Name[pt_BR]=RPG NetHack
-Name[es]=NetHack
-Name[it]=NetHack
-Name[de]=NetHack
+Comment[pt_BR]=Jogo clássico RPG de masmorras
 Name[zh_TW]=NetHack
-Name[ko]=네트핵
diff --git a/apps/Games/parashoot.desktop b/apps/Games/parashoot.desktop
index 3244867..3892a57 100644
--- a/apps/Games/parashoot.desktop
+++ b/apps/Games/parashoot.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=A Parachute Attack Game
-Comment[es]=Un juego de ataque de paracaidistas
-Comment[pt]=Jogo do ataque de paraquedistas
-Comment[pt_BR]=Jogo do ataque de paraquedistas
 Exec=parashoot
 Icon=parashoot/ParaShoot
 Type=Application
 Name=ParaShoot
-Name[no]=Fallskjerm
+Comment=A Parachute Attack Game
 Name[de]=Fallschirmjäger
+Name[es]=Paracas
+Comment[es]=Un juego de ataque de paracaidistas
 Name[hu]=Védd a bázist
+Name[it]=ParaShoot
+Name[ko]=낙하쏘기
+Name[no]=Fallskjerm
 Name[pt]=Pára-Quedas
+Comment[pt]=Jogo do ataque de paraquedistas
 Name[pt_BR]=Pára-Quedas
-Name[es]=Paracas
-Name[it]=ParaShoot
+Comment[pt_BR]=Jogo do ataque de paraquedistas
 Name[zh_TW]=ParaShoot
-Name[ko]=낙하쏘기
diff --git a/apps/Games/patience.desktop b/apps/Games/patience.desktop
index 30a8360..1d6e02f 100644
--- a/apps/Games/patience.desktop
+++ b/apps/Games/patience.desktop
@@ -1,19 +1,19 @@
 [Desktop Entry]
-Comment=A Game of Patience
-Comment[es]=Juego de paciencia
-Comment[pt]=Jogo do solitário
-Comment[pt_BR]=Jogo da paciencia
 Exec=patience
 Icon=cards/Solitaire
 Type=Application
 Name=Patience
-Name[pt_BR]=Paciencia
-Name[no]=Kabal
+Comment=A Game of Patience
 Name[de]=Patience
-Name[ja]=ソリティア
+Name[es]=Paciencia
+Comment[es]=Juego de paciencia
 Name[hu]=Passziánsz
 Name[it]=Solitario
+Name[ja]=ソリティア
+Name[ko]=카드놀이
+Name[no]=Kabal
 Name[pt]=Solitário
-Name[es]=Paciencia
+Comment[pt]=Jogo do solitário
+Name[pt_BR]=Paciencia
+Comment[pt_BR]=Jogo da paciencia
 Name[zh_TW]=接龍
-Name[ko]=카드놀이
diff --git a/apps/Games/qasteroids.desktop b/apps/Games/qasteroids.desktop
index d954e1e..697c161 100644
--- a/apps/Games/qasteroids.desktop
+++ b/apps/Games/qasteroids.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=Shoot the rocks
-Comment[es]=Dispare a las rocas
-Comment[pt]=Dispare contra as rochas
-Comment[pt_BR]=Dispare contra as rochas
 Exec=qasteroids
 Icon=qasteroids/Asteroids
 Type=Application
 Name=Asteroids
-Name[hu]=Asteroids
+Comment=Shoot the rocks
 Name[de]=Asteroiden
-Name[pt]=Asteróides
-Name[pt_BR]=Asteróides
 Name[es]=Asteroides
+Comment[es]=Dispare a las rocas
+Name[fr]=Astéroïdes
+Name[hu]=Asteroids
 Name[it]=Asteroids
-Name[zh_TW]=Asteroids
 Name[ko]=아스트로이드
-Name[fr]=Astéroïdes
+Name[pt]=Asteróides
+Comment[pt]=Dispare contra as rochas
+Name[pt_BR]=Asteróides
+Comment[pt_BR]=Dispare contra as rochas
+Name[zh_TW]=Asteroids
diff --git a/apps/Games/sfcave-sdl.desktop b/apps/Games/sfcave-sdl.desktop
index c1fe6ff..c51f46b 100644
--- a/apps/Games/sfcave-sdl.desktop
+++ b/apps/Games/sfcave-sdl.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Type=Application
 Exec=sfcave_sdl
 Icon=sfcave-sdl
+Type=Application
+Name=SFCave-SDL
 Comment=Fly the dot though the cave avoiding the walls
+Name[es]=La Pulga
 Comment[es]=Haga saltar la pulga en la cueva evitanto las paredes
+Name[pt]=Pulga
 Comment[pt]=Faça saltar a pulga na cave, evitando as paredes
+Name[pt_BR]=Pulga
 Comment[pt_BR]=Faça saltar a pulga na cave, evitando as paredes
-Name=SFCave-SDL
-Name[es]=La Pulga
-Name[pt]=Pulga
-Name[pt_BR]=Pulga
\ No newline at end of file
diff --git a/apps/Games/sfcave.desktop b/apps/Games/sfcave.desktop
index abccb05..a35a980 100644
--- a/apps/Games/sfcave.desktop
+++ b/apps/Games/sfcave.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Type=Application
 Exec=sfcave
 Icon=sfcave/sfcave
+Type=Application
+Name=SFCave
 Comment=Fly the dot though the cave avoiding the walls
+Name[es]=La Pulga
 Comment[es]=Haga saltar la pulga en la cueva evitanto las paredes
+Name[pt]=A Pulga
 Comment[pt]=Faça saltar a pulga na cave, evitando as paredes
+Name[pt_BR]=A Pulga
 Comment[pt_BR]=Faça saltar a pulga na cave, evitando as paredes
-Name=SFCave
-Name[es]=La Pulga
-Name[pt]=A Pulga
-Name[pt_BR]=A Pulga
\ No newline at end of file
diff --git a/apps/Games/snake.desktop b/apps/Games/snake.desktop
index c0396bb..b9fc2eb 100644
--- a/apps/Games/snake.desktop
+++ b/apps/Games/snake.desktop
@@ -1,19 +1,19 @@
 [Desktop Entry]
-Comment=A Snake Game
-Comment[es]=El juego de la serpiente
-Comment[pt]=O jogo da cobra
-Comment[pt_BR]=O jogo da cobra
 Exec=snake
 Icon=snake/Snake
 Type=Application
 Name=Snake
-Name[pt_BR]=Cobra
-Name[no]=Slange
+Comment=A Snake Game
 Name[de]=Schlange
+Name[es]=Serpiente
+Comment[es]=El juego de la serpiente
+Name[fr]=Serpent
 Name[hu]=Kígyó
 Name[it]=Snake
+Name[ko]=스네이크
+Name[no]=Slange
 Name[pt]=Cobra
-Name[es]=Serpiente
+Comment[pt]=O jogo da cobra
+Name[pt_BR]=Cobra
+Comment[pt_BR]=O jogo da cobra
 Name[zh_TW]=貪食蛇
-Name[ko]=스네이크
-Name[fr]=Serpent
diff --git a/apps/Games/tetrix.desktop b/apps/Games/tetrix.desktop
index c261a43..2f3f860 100644
--- a/apps/Games/tetrix.desktop
+++ b/apps/Games/tetrix.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Comment=A Block Stacking Game
-Comment[es]=Un juego de apilar bloques
-Comment[pt]=Jogo Tetris
-Comment[pt_BR]=Jogo Tetris
 Exec=tetrix
 Icon=tetrix/Tetrix
 Type=Application
 Name=Tetrix
+Comment=A Block Stacking Game
+Name[de]=Tetris
+Name[es]=Tetrix
+Comment[es]=Un juego de apilar bloques
+Name[it]=Tetrix (Tetris)
 Name[ja]=テトリックス
+Name[ko]=테트릭스
 Name[pt]=Tetris
+Comment[pt]=Jogo Tetris
 Name[pt_BR]=Tetris
-Name[es]=Tetrix
-Name[it]=Tetrix (Tetris)
-Name[de]=Tetris
+Comment[pt_BR]=Jogo Tetris
 Name[zh_TW]=俄羅斯方塊
-Name[ko]=테트릭스
diff --git a/apps/Games/tictac.desktop b/apps/Games/tictac.desktop
index 4b2e2a4..28ae7b5 100644
--- a/apps/Games/tictac.desktop
+++ b/apps/Games/tictac.desktop
@@ -3,14 +3,14 @@ Exec=tictac
 Icon=tictac/Tictac
 Type=Application
 Name=Tictac
-Name[pt_BR]=Jogo da Velha
-Name[pt]=Jogo da Velha
-Name[es]=Tic Tac
+Comment=Tic Tac Toe game
 Name[de]=Tic Tac To
+Name[es]=Tic Tac
+Comment[es]=Juego del Tic Tac Toe
 Name[it]=Tic Tac (Tris)
-Name[zh_TW]=Tictac
 Name[ko]=틱택토
-Comment=Tic Tac Toe game
-Comment[es]=Juego del Tic Tac Toe
+Name[pt]=Jogo da Velha
 Comment[pt]=Jogo da Velha
-Comment[pt_BR]=Jogo da Velha
\ No newline at end of file
+Name[pt_BR]=Jogo da Velha
+Comment[pt_BR]=Jogo da Velha
+Name[zh_TW]=Tictac
diff --git a/apps/Games/wordgame.desktop b/apps/Games/wordgame.desktop
index 0705b5e..1327c81 100644
--- a/apps/Games/wordgame.desktop
+++ b/apps/Games/wordgame.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Comment=A word arranging game
-Comment[es]=Juego de organizar palabras
-Comment[pt]=Jogo de palavras cruzadas
-Comment[pt_BR]=Jogo de palavras cruzadas
 Exec=wordgame
 Icon=wordgame/WordGame
 Type=Application
 Name=Word Game
-Name[pt_BR]=Palavras Cruzadas
-Name[no]=Kryss-Ord
+Comment=A word arranging game
 Name[de]=Wortspiel
+Name[es]=Crucigrama
+Comment[es]=Juego de organizar palabras
 Name[hu]=Szójáték
 Name[it]=Scarabeo
+Name[ko]=글자 놀이
+Name[no]=Kryss-Ord
 Name[pt]=Palavras Cruzadas
-Name[es]=Crucigrama
+Comment[pt]=Jogo de palavras cruzadas
+Name[pt_BR]=Palavras Cruzadas
+Comment[pt_BR]=Jogo de palavras cruzadas
 Name[zh_TW]=文字遊戲
-Name[ko]=글자 놀이
diff --git a/apps/Opie-SH/diskfree.desktop b/apps/Opie-SH/diskfree.desktop
index 2bf68cc..61b1fac 100644
--- a/apps/Opie-SH/diskfree.desktop
+++ b/apps/Opie-SH/diskfree.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Type=Application
 Exec=diskfree.sh
 Icon=opie-sh-scripts/diskfree
+Type=Application
 Name=Disk Free
-Name[es]=Espacio Libre
 Comment=Frontend to df (show space left on mountpoints)
+Name[es]=Espacio Libre
 Comment[es]=Interfaz de df (muestra espacio libre en puntos de montaje)
diff --git a/apps/Opie-SH/filesystem_mounter.desktop b/apps/Opie-SH/filesystem_mounter.desktop
index 31bf532..a2c15b1 100644
--- a/apps/Opie-SH/filesystem_mounter.desktop
+++ b/apps/Opie-SH/filesystem_mounter.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Type=Application
 Exec=filesystem_mounter.sh
 Icon=opie-sh-scripts/fsmounter
+Type=Application
 Name=Filesystem Mounter
-Name[es]=Montador
 Comment=Frontend to mount/unmount filesystems
+Name[es]=Montador
 Comment[es]=Interfaz para montar/desmontar sistemas de ficheros
diff --git a/apps/Opie-SH/hostlist.desktop b/apps/Opie-SH/hostlist.desktop
index 836c7a1..82841ba 100644
--- a/apps/Opie-SH/hostlist.desktop
+++ b/apps/Opie-SH/hostlist.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Comment=hostlist
-Comment[es]=Listado de hosts
 Exec=hostlist.sh
 Icon=opie-sh-scripts/hostlist
 Type=Application
 Name=Hostlist
+Comment=hostlist
 Name[es]=Máquinas
+Comment[es]=Listado de hosts
diff --git a/apps/Opie-SH/killproc.desktop b/apps/Opie-SH/killproc.desktop
index e41438d..85b51f7 100644
--- a/apps/Opie-SH/killproc.desktop
+++ b/apps/Opie-SH/killproc.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Type=Application
 Exec=killproc.sh
 Icon=opie-sh-scripts/killproc
+Type=Application
 Name=Process Killer
 Name[es]=Mataprocesos
diff --git a/apps/Opie-SH/launcher_refresh.desktop b/apps/Opie-SH/launcher_refresh.desktop
index 739bcf9..9ae2c93 100644
--- a/apps/Opie-SH/launcher_refresh.desktop
+++ b/apps/Opie-SH/launcher_refresh.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Comment=launcher_refresh
 Exec=launcher_refresh.sh
 Icon=opie-sh-scripts/launcher_refresh
 Type=Application
@@ -7,4 +6,3 @@ Name=Launcher Refresh
 Comment=Refresh the launcher so that new installed applications appear
 Name[es]=Refresca Lanzador
 Comment[es]=Refresca el lanzador (aparecen aplicaciones recién instaladas)
-Name[pt]=
\ No newline at end of file
diff --git a/apps/Opie-SH/logviewer.desktop b/apps/Opie-SH/logviewer.desktop
index b435415..fb6cd40 100644
--- a/apps/Opie-SH/logviewer.desktop
+++ b/apps/Opie-SH/logviewer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Type=Application
 Exec=logviewer.sh
 Icon=opie-sh-scripts/logviewer
+Type=Application
 Name=Log Viewer
 Comment=Frontend to viewing logfiles
 Name[es]=Visor Registros
@@ -9,4 +9,4 @@ Comment[es]=Interfaz para ver los ficheros de registro
 Name[pt]=Visualizador de logs
 Comment[pt]=Visualizador de logs
 Name[pt_BR]=Visualizador de logs
-Comment[pt_BR]=Visualizador de logs
\ No newline at end of file
+Comment[pt_BR]=Visualizador de logs
diff --git a/apps/Opie-SH/opie-sh-wavelanchooser.desktop b/apps/Opie-SH/opie-sh-wavelanchooser.desktop
index 33e1621..6f1bae2 100644
--- a/apps/Opie-SH/opie-sh-wavelanchooser.desktop
+++ b/apps/Opie-SH/opie-sh-wavelanchooser.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=WLAN Chooser
-Comment[es]=Elija red inalámbrica
-Comment[pt]=Escolha a rede sem fios
-Comment[pt_BR]=Escolha a rede sem fios
 Exec=wavelanchooser.sh
 Icon=opie-sh-scripts/qtwavelan
 Type=Application
 Name=WLAN Chooser
+Comment=WLAN Chooser
 Name[es]=Red Inalámbrica
+Comment[es]=Elija red inalámbrica
 Name[pt]=Rede sem Fios
-Name[pt_BR]=Rede sem Fios
\ No newline at end of file
+Comment[pt]=Escolha a rede sem fios
+Name[pt_BR]=Rede sem Fios
+Comment[pt_BR]=Escolha a rede sem fios
diff --git a/apps/Opie-SH/opie-sh.desktop b/apps/Opie-SH/opie-sh.desktop
index 89121b9..78cd815 100644
--- a/apps/Opie-SH/opie-sh.desktop
+++ b/apps/Opie-SH/opie-sh.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=opie-sh-howto
-Comment[es]=Cómo del Opie Shell
-Comment[pt]=Documentação "How-To" do Opie Shell
-Comment[pt_BR]=Documentação "How-To" do Opie Shell
 Exec=opie-sh-howto.sh
 Icon=opie-sh/opie-sh
 Type=Application
 Name=opie-sh HowTo
+Comment=opie-sh-howto
+Name[es]=Cómo Opie-Sh
+Comment[es]=Cómo del Opie Shell
+Name[ko]=오삐-sh 하우투
 Name[pt]=Documentação Opie Shell
+Comment[pt]=Documentação "How-To" do Opie Shell
 Name[pt_BR]=Documentação Opie Shell
-Name[es]=Cómo Opie-Sh
+Comment[pt_BR]=Documentação "How-To" do Opie Shell
 Name[zh_TW]=Opie-sh HowTo
-Name[ko]=오삐-sh 하우투
diff --git a/apps/Opie-SH/rsyncme.desktop b/apps/Opie-SH/rsyncme.desktop
index d50a44f..806d8e0 100644
--- a/apps/Opie-SH/rsyncme.desktop
+++ b/apps/Opie-SH/rsyncme.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=rsync helper
-Comment[es]=Asistente del sincronizador remoto (rsync)
-Comment[pt]=Assistente do sincronizador remoto (RSync)
-Comment[pt_BR]=Assistente do sincronizador remoto (RSync)
 Exec=rsyncme.sh
 Icon=opie-sh-scripts/rsyncme
 Type=Application
 Name=RSYNC Helper
+Comment=rsync helper
 Name[es]=Rsync
+Comment[es]=Asistente del sincronizador remoto (rsync)
 Name[pt]=RSync
-Name[pt_BR]=RSync
\ No newline at end of file
+Comment[pt]=Assistente do sincronizador remoto (RSync)
+Name[pt_BR]=RSync
+Comment[pt_BR]=Assistente do sincronizador remoto (RSync)
diff --git a/apps/Opie-SH/service_manager.desktop b/apps/Opie-SH/service_manager.desktop
index 4b0696d..133f446 100644
--- a/apps/Opie-SH/service_manager.desktop
+++ b/apps/Opie-SH/service_manager.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Type=Application
 Exec=service_manager.sh
 Icon=opie-sh-scripts/service_manager
+Type=Application
 Name=Service Manager
-Name[es]=Gestor Servicios
-Name[pt]=Gestor Serviços
-Name[pt_BR]=Gerenciador Serviços
 Comment=Frontend to start/stop init scripts
+Name[es]=Gestor Servicios
 Comment[es]=Interfaz para iniciar/parar guiones de inicio
+Name[pt]=Gestor Serviços
 Comment[pt]=Interface para gerir os serviços
+Name[pt_BR]=Gerenciador Serviços
 Comment[pt_BR]=Interface para gerenciar os serviços
diff --git a/apps/Opie-SH/stowctrl.desktop b/apps/Opie-SH/stowctrl.desktop
index 7b91d1b..997b44b 100644
--- a/apps/Opie-SH/stowctrl.desktop
+++ b/apps/Opie-SH/stowctrl.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=Start/Stop stowaway keyboard
-Comment[es]=Activa/desactiva teclado Stowaway
-Comment[pt]=Gestor teclado Stowaway
-Comment[pt_BR]=Gerenciador teclado Stowaway
 Exec=stowctrl.sh
 Icon=stowctrl/stowctrl
 Type=Application
 Name=Stowaway Control
+Comment=Start/Stop stowaway keyboard
 Name[es]=Control Stowaway
+Comment[es]=Activa/desactiva teclado Stowaway
 Name[pt]=Teclado Stowaway
-Name[pt_BR]=Teclado Stowaway
\ No newline at end of file
+Comment[pt]=Gestor teclado Stowaway
+Name[pt_BR]=Teclado Stowaway
+Comment[pt_BR]=Gerenciador teclado Stowaway
diff --git a/apps/Opie-SH/usbnetctrl.desktop b/apps/Opie-SH/usbnetctrl.desktop
index ca1c2ad..ca33efa 100644
--- a/apps/Opie-SH/usbnetctrl.desktop
+++ b/apps/Opie-SH/usbnetctrl.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Type=Application
 Exec=usbnetctrl.sh
 Icon=opie-sh-scripts/usbnetctrl
+Type=Application
 Name=USBNET Control
-Name[es]=USBNet
-Name[pt]=Rede USB
-Name[pt_BR]=Rede USB
 Comment=Frontend to start/stop usbnet
+Name[es]=USBNet
 Comment[es]=Interfaz para iniciar/parar usbnet
+Name[pt]=Rede USB
 Comment[pt]=Interface para gerir a rede USB
+Name[pt_BR]=Rede USB
 Comment[pt_BR]=Interface para gerir a rede USB
diff --git a/apps/Settings/Appearance.desktop b/apps/Settings/Appearance.desktop
index e242a99..8dd0fdb 100644
--- a/apps/Settings/Appearance.desktop
+++ b/apps/Settings/Appearance.desktop
@@ -1,20 +1,20 @@
 [Desktop Entry]
-Type=Application
 Exec=appearance
 Icon=appearance/Appearance
+Type=Application
 Name=Appearance
-Name[pt_BR]=Aparencia
-Name[sl]=Prikaz
-Name[no]=Utseende
+Comment=Appearance settings dialog
+Name[da]=Udseende
+Comment[da]=Ændre farver, udseende, skrifttyper m.m.
 Name[de]=Erscheinungs bild
+Name[es]=Apariencia
+Comment[es]=Diálogo de configuración de la apariencia
+Name[fr]=Apparence
 Name[hu]=Megjelenés
 Name[it]=Aspetto
+Name[ko]=테마
+Name[no]=Utseende
 Name[pt]=Aparência
-Name[es]=Apariencia
+Name[pt_BR]=Aparencia
+Name[sl]=Prikaz
 Name[zh_TW]=外觀
-Name[ko]=테마
-Name[da]=Udseende
-Name[fr]=Apparence
-Comment=Appearance settings dialog
-Comment[es]=Diálogo de configuración de la apariencia
-Comment[da]=Ændre farver, udseende, skrifttyper m.m.
diff --git a/apps/Settings/Button.desktop b/apps/Settings/Button.desktop
index e2cb8f2..ed4a336 100644
--- a/apps/Settings/Button.desktop
+++ b/apps/Settings/Button.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Comment=Set Application Key
-Comment[es]=Aplicaciones que lanzan las teclas rápidas
-Comment[da]=Ændre program taster.
+CanFastload=0
 Exec=buttonsettings
 Icon=buttonsettings/Button
 Type=Application
 Name=Button
-CanFastload=0
+Comment=Set Application Key
+Name[da]=Tast
+Comment[da]=Ændre program taster.
 Name[de]=Anwendungs tasten
-Name[pt]=Botões
 Name[es]=Botones
+Comment[es]=Aplicaciones que lanzan las teclas rápidas
+Name[fr]=Boutons
 Name[it]=Pulsanti
-Name[zh_TW]=程式鍵
 Name[ko]=실행단추
-Name[da]=Tast
-Name[fr]=Boutons
+Name[pt]=Botões
+Name[zh_TW]=程式鍵
diff --git a/apps/Settings/Calibrate.desktop b/apps/Settings/Calibrate.desktop
index f55fe43..27338dc 100644
--- a/apps/Settings/Calibrate.desktop
+++ b/apps/Settings/Calibrate.desktop
@@ -1,21 +1,21 @@
 [Desktop Entry]
-Type=Application
 Exec=calibrate
 Icon=Calibrate
+Type=Application
 Name=Recalibrate
-Name[pt_BR]=Recalibrar
+Comment=Utility for screen calibration
+Name[da]=Rekalibrering
+Comment[da]=Værktøj til skærm kalibrering
 Name[de]=Kalibrieren
-Name[sl]=Kalibracija
-Name[no]=Kalibrer
+Name[es]=Calibrar
+Comment[es]=Utilidad para recalibrar el puntero en pantalla
+Name[fr]=Calibration
+Comment[fr]=Outil de calibration de l'écran tactile
 Name[hu]=Kalibráció
 Name[it]=Calibrazione
+Name[ko]=화면 측정
+Name[no]=Kalibrer
 Name[pt]=Recalibrar
-Name[es]=Calibrar
+Name[pt_BR]=Recalibrar
+Name[sl]=Kalibracija
 Name[zh_TW]=筆尖定住
-Name[ko]=화면 측정
-Name[da]=Rekalibrering
-Name[fr]=Calibration
-Comment=Utility for screen calibration
-Comment[es]=Utilidad para recalibrar el puntero en pantalla
-Comment[da]=Værktøj til skærm kalibrering
-Comment[fr]=Outil de calibration de l'écran tactile
diff --git a/apps/Settings/Language.desktop b/apps/Settings/Language.desktop
index 77a3c9d..564c3af 100644
--- a/apps/Settings/Language.desktop
+++ b/apps/Settings/Language.desktop
@@ -1,22 +1,22 @@
 [Desktop Entry]
-Type=Application
 Exec=language
 Icon=Language
+Type=Application
 Name=Language
 Comment=Language settings dialog
-Name[no]=Språk
-Name[sl]=Jezik
+Name[da]=Sprog
+Comment[da]=Sprog indstillinger
 Name[de]=Sprache
+Name[es]=Idioma
+Comment[es]=Diálogo de configuración del idioma
+Name[fr]=Langue
 Name[hu]=Nyelv
 Name[it]=Lingue
+Name[ko]=언어
+Name[no]=Språk
 Name[pt]=Idioma
 Comment[pt]=Configuração do idioma
 Name[pt_BR]=Idioma
 Comment[pt_BR]=Configuração do idioma
-Name[es]=Idioma
-Comment[es]=Diálogo de configuración del idioma
+Name[sl]=Jezik
 Name[zh_TW]=語言
-Name[ko]=언어
-Name[da]=Sprog
-Comment[da]=Sprog indstillinger
-Name[fr]=Langue
diff --git a/apps/Settings/Launcher.desktop b/apps/Settings/Launcher.desktop
index b817eee..c5a6292 100644
--- a/apps/Settings/Launcher.desktop
+++ b/apps/Settings/Launcher.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Type=Application
 Exec=launchersettings
 Icon=launchersettings/Launcher
+Type=Application
 Name=Launcher
 Comment=Refresh the launcher so that new installed applications appear
 Name[es]=Lanzador
 Comment[es]=Configuración del lanzador de aplicaciones
 Name[fr]=Lanceur d'applications
-Name[pt]=
\ No newline at end of file
diff --git a/apps/Settings/Light.desktop b/apps/Settings/Light.desktop
index d1c91d8..51ae27a 100644
--- a/apps/Settings/Light.desktop
+++ b/apps/Settings/Light.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Type=Application
 Exec=light-and-power
 Icon=lightandpower/Light
+Type=Application
 Name=Light & Power
-Name[no]=Lys
+Name[da]=Lys & Strøm
 Name[de]=Helligkeit
+Name[es]=Luz y Energía
+Name[fr]=Luminosité et énergie
 Name[hu]=Fényerõ
 Name[it]=Risparmio Energetico
+Name[ko]=백라이트와 전기절약
+Name[no]=Lys
 Name[pt]=Iluminação e Energia
 Comment[pt]=Controla a iluminação e a energia
 Name[pt_BR]=Iluminacao e Energia
 Comment[pt_BR]=Controla a iluminação e a energia
-Name[es]=Luz y Energía
 Name[zh_TW]=光暗設定
-Name[ko]=백라이트와 전기절약
-Name[da]=Lys & Strøm
-Name[fr]=Luminosité et énergie
diff --git a/apps/Settings/Rotation.desktop b/apps/Settings/Rotation.desktop
index fa9d081..b0c4f76 100644
--- a/apps/Settings/Rotation.desktop
+++ b/apps/Settings/Rotation.desktop
@@ -1,20 +1,20 @@
 [Desktop Entry]
-Type=Application
 Exec=rotation
 Icon=Rotation
+Type=Application
 Name=Rotation
-Name[pt_BR]=Rotação
-Name[no]=Rotasjon
+Comment=Allows the display to be rotated
 Name[de]=Rotation
-Name[hu]=Forgatás
-Name[it]=Rotazione
-Name[pt]=Rodar Ecrâ
 Name[es]=Rotación
-Name[zh_TW]=方向設定
-Name[ko]=화면 돌리기
-Name[fr]=Rotation
-Comment=Allows the display to be rotated
 Comment[es]=Permite rotar la pantalla
+Name[fr]=Rotation
 Comment[fr]=Changer l'orientation de l'affichage
+Name[hu]=Forgatás
+Name[it]=Rotazione
+Name[ko]=화면 돌리기
+Name[no]=Rotasjon
+Name[pt]=Rodar Ecrâ
 Comment[pt]=Rodar a orientação do ecrâ
-Comment[pt_BR]=Rodar a orientação do ecrâ
\ No newline at end of file
+Name[pt_BR]=Rotação
+Comment[pt_BR]=Rodar a orientação do ecrâ
+Name[zh_TW]=方向設定
diff --git a/apps/Settings/Security.desktop b/apps/Settings/Security.desktop
index c365e16..86fb1db 100644
--- a/apps/Settings/Security.desktop
+++ b/apps/Settings/Security.desktop
@@ -1,19 +1,19 @@
 [Desktop Entry]
-Type=Application
 Exec=security
 Icon=security/Security
+Type=Application
 Name=Security
+Comment=Security settings dialog
+Name[da]=Sikkerhed
+Comment[da]=Sikkerheds indstillinger
 Name[de]=Sicherheits einstellungen
-Name[it]=Sicurezza
-Name[pt_BR]=Seguranca
-Name[pt]=Segurança
 Name[es]=Seguridad
-Name[zh_TW]=保密
-Name[ko]=보안
-Name[da]=Sikkerhed
-Name[fr]=Sécurité
-Comment=Security settings dialog
 Comment[es]=Diálogo de configuración de seguridad
-Comment[da]=Sikkerheds indstillinger
+Name[fr]=Sécurité
+Name[it]=Sicurezza
+Name[ko]=보안
+Name[pt]=Segurança
 Comment[pt]=Configuração de segurança
-Comment[pt_BR]=Configuração de segurança
\ No newline at end of file
+Name[pt_BR]=Seguranca
+Comment[pt_BR]=Configuração de segurança
+Name[zh_TW]=保密
diff --git a/apps/Settings/Sound.desktop b/apps/Settings/Sound.desktop
index 628c383..23af15d 100644
--- a/apps/Settings/Sound.desktop
+++ b/apps/Settings/Sound.desktop
@@ -1,17 +1,17 @@
 [Desktop Entry]
-Type=Application
 Exec=sound
 Icon=Sound
+Type=Application
 Name=Vmemo Settings
-Name[pt_BR]=Som
-Name[pt]=Som
+Comment=Sound settings dialog
+Name[de]=Audio
 Name[es]=Grabadora
+Comment[es]=Configuración de la grabadora de voz
+Name[fr]=Sons
 Name[it]=Audio
-Name[de]=Audio
-Name[zh_TW]=聲效
 Name[ko]=소리
-Name[fr]=Sons
-Comment=Sound settings dialog
-Comment[es]=Configuración de la grabadora de voz
+Name[pt]=Som
 Comment[pt]=Configuração do som
-Comment[pt_BR]=Configuração do som
\ No newline at end of file
+Name[pt_BR]=Som
+Comment[pt_BR]=Configuração do som
+Name[zh_TW]=聲效
diff --git a/apps/Settings/aqpkg.desktop b/apps/Settings/aqpkg.desktop
index 8dfb09d..f206f35 100644
--- a/apps/Settings/aqpkg.desktop
+++ b/apps/Settings/aqpkg.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Type=Application
 Exec=aqpkg
+Icon=aqpkg/aqpkg
 MimeType=application/ipkg
 MimeTypeIcons=aqpkg/ipkg
-Icon=aqpkg/aqpkg
+Type=Application
 Name=Packages
-Name[es]=AQPkg
-Name[da]=Pakker
 Comment=A Package Manager
-Comment[es]=Un gestor de paquetes de software
+Name[da]=Pakker
 Comment[da]=Pakkestyring. Installation, opgradering, afinstallering m.m.
+Name[es]=AQPkg
+Comment[es]=Un gestor de paquetes de software
 Comment[fr]=Un gestionnaire de paquetages logiciels
diff --git a/apps/Settings/backup.desktop b/apps/Settings/backup.desktop
index 55daf98..b766491 100644
--- a/apps/Settings/backup.desktop
+++ b/apps/Settings/backup.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-Comment=Backup and Restore Utility
-Comment[es]=Utilidad de copia de seguridad y recuperación
-Comment[da]=Sikkerhedskopiering og gendannelse fra sikkerhedskopi
 Exec=backup
 Icon=backup/backupandrestore
 Type=Settings
 Name=Backup And Restore
-Name[es]=Copia de Seguridad
+Comment=Backup and Restore Utility
 Name[da]=Sikkerheds kopiering
-Name[it]=Backup e Restore
+Comment[da]=Sikkerhedskopiering og gendannelse fra sikkerhedskopi
+Name[es]=Copia de Seguridad
+Comment[es]=Utilidad de copia de seguridad y recuperación
 Name[fr]=Sauvegarde et restauration
+Name[it]=Backup e Restore
diff --git a/apps/Settings/bluetooth-manager.desktop b/apps/Settings/bluetooth-manager.desktop
index 37c255c..5fb74a8 100644
--- a/apps/Settings/bluetooth-manager.desktop
+++ b/apps/Settings/bluetooth-manager.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=Bluetooth Setup
-Comment[es]=Configuración Bluetooth
 Exec=bluetooth-manager
 Icon=opietooth/bluetooth-manager
 Type=Settings
 Name=Bluetooth Manager
-Name[zh_TW]=BlueTooth 管理員
-Name[ko]=블루투스 관리자
-Name[it]=Bluetooth
+Comment=Bluetooth Setup
 Name[de]=Bluetooth
 Name[es]=Bluetooth
+Comment[es]=Configuración Bluetooth
 Name[fr]=Bluetooth
+Name[it]=Bluetooth
+Name[ko]=블루투스 관리자
+Name[zh_TW]=BlueTooth 管理員
diff --git a/apps/Settings/citytime.desktop b/apps/Settings/citytime.desktop
index c8e7b8a..1e06090 100644
--- a/apps/Settings/citytime.desktop
+++ b/apps/Settings/citytime.desktop
@@ -1,20 +1,20 @@
 [Desktop Entry]
-Comment=A World Clock and Time Zone Editor
-Comment[es]=Un reloj mundial y editor de zona horaria
-Comment[da]=Et verdensur og tidszone indstiller
 Exec=citytime
 Icon=citytime/CityTime
 Type=Application
 Name=City Time
-Name[pt_BR]=Hora Local
-Name[no]=Verdensur
+Comment=A World Clock and Time Zone Editor
+Name[da]=Verdensur
+Comment[da]=Et verdensur og tidszone indstiller
 Name[de]=Weltzeituhr
-Name[ja]=世界時計
+Name[es]=Reloj Mundial
+Comment[es]=Un reloj mundial y editor de zona horaria
+Name[fr]=Zone horaire
 Name[hu]=Idõzóna
 Name[it]=Fuso Orario
+Name[ja]=世界時計
+Name[ko]=세계시간
+Name[no]=Verdensur
 Name[pt]=Fusos Horários
-Name[es]=Reloj Mundial
+Name[pt_BR]=Hora Local
 Name[zh_TW]=世界時間
-Name[ko]=세계시간
-Name[da]=Verdensur
-Name[fr]=Zone horaire
diff --git a/apps/Settings/confedit.desktop b/apps/Settings/confedit.desktop
index 6f32fd7..250f711 100644
--- a/apps/Settings/confedit.desktop
+++ b/apps/Settings/confedit.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Comment=Edit the ~/Settings/*.conf files
-Comment[es]=Edite los ficheros ~/Settings/*.conf
 Exec=confedit
 Icon=confedit/confedit
 Type=Application
 Name=Conf File Editor
+Comment=Edit the ~/Settings/*.conf files
+Name[de]=Konfiguration
 Name[es]=Editor Configuración
+Comment[es]=Edite los ficheros ~/Settings/*.conf
+Name[fr]=Editeur de configuration
 Name[it]=Settaggi
-Name[de]=Konfiguration
-Name[zh_TW]=編輯設定檔
 Name[ko]=설정파일 편집기
-Name[fr]=Editeur de configuration
+Name[zh_TW]=編輯設定檔
diff --git a/apps/Settings/formatter.desktop b/apps/Settings/formatter.desktop
index 19662de..4233720 100644
--- a/apps/Settings/formatter.desktop
+++ b/apps/Settings/formatter.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=A disk formatting utility
-Comment[es]=Utilidad para formatear discos
 Exec=formatter
 Icon=formatter/devices
 Type=Application
 Name=Formatter
-Name[zh_TW]=Formatter
-Name[ko]=포맷기
-Name[it]=Formatter
+Comment=A disk formatting utility
 Name[de]=Formatieren
 Name[es]=Formateador
+Comment[es]=Utilidad para formatear discos
 Name[fr]=Formattage
 Comment[fr]=Formattage de disques, cartes, etc.
+Name[it]=Formatter
+Name[ko]=포맷기
+Name[zh_TW]=Formatter
diff --git a/apps/Settings/medium.desktop b/apps/Settings/medium.desktop
index 488d68c..a9b9a91 100644
--- a/apps/Settings/medium.desktop
+++ b/apps/Settings/medium.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Type=Application
 Exec=mediummount
 Icon=mediummount/mediummount
+Type=Application
 Name=Medium Mount
-Name[pt]=Montar Média
-Name[pt_BR]=Montar Média
+Comment=Configure app for the medium mounter
+Name[da]=Medie montering
+Comment[da]=Indstillinger for montering af medier
+Name[de]=Gerät einbinden
 Name[es]=Montar Medio
+Comment[es]=Aplicación para montar medios
 Name[it]=Monta/Smonta
-Name[de]=Gerät einbinden
-Name[zh_TW]=媒體掛卸
 Name[ko]=미디어 마운트
-Name[da]=Medie montering
-Comment=Configure app for the medium mounter
-Comment[es]=Aplicación para montar medios
-Comment[da]=Indstillinger for montering af medier
+Name[pt]=Montar Média
 Comment[pt]=Aplicação para montar médias
-Comment[pt_BR]=Aplicação para montar médias
\ No newline at end of file
+Name[pt_BR]=Montar Média
+Comment[pt_BR]=Aplicação para montar médias
+Name[zh_TW]=媒體掛卸
diff --git a/apps/Settings/netsystemtime.desktop b/apps/Settings/netsystemtime.desktop
index 7e5adc0..276df4f 100644
--- a/apps/Settings/netsystemtime.desktop
+++ b/apps/Settings/netsystemtime.desktop
@@ -1,19 +1,19 @@
 [Desktop Entry]
-Comment=Set date and time from network
-Comment[es]=Fije la hora por el Network Time Protocol (NTP)
-Comment[da]=Indstil dato og tid manuelt eller via NTP
-Comment[pt]=Configura a data e hora via rede (NTP)
-Comment[pt_BR]=Configura a data e hora via rede (NTP)
 Exec=systemtime
 Icon=netsystemtime/DateTime
 Type=Application
 Name=Date/Time
-Name[zh_TW]=網絡時間
-Name[ko]=네트워크로 시간 설정
-Name[it]=Data e Ora
+Comment=Set date and time from network
+Name[da]=Dato/Tid
+Comment[da]=Indstil dato og tid manuelt eller via NTP
 Name[de]=Datum
 Name[es]=Hora NTP
-Name[da]=Dato/Tid
+Comment[es]=Fije la hora por el Network Time Protocol (NTP)
 Name[fr]=Date et heure
+Name[it]=Data e Ora
+Name[ko]=네트워크로 시간 설정
 Name[pt]=Data e Hora
-Name[pt_BR]=Data e Hora
\ No newline at end of file
+Comment[pt]=Configura a data e hora via rede (NTP)
+Name[pt_BR]=Data e Hora
+Comment[pt_BR]=Configura a data e hora via rede (NTP)
+Name[zh_TW]=網絡時間
diff --git a/apps/Settings/networksettings.desktop b/apps/Settings/networksettings.desktop
index e9844b8..9dd5194 100644
--- a/apps/Settings/networksettings.desktop
+++ b/apps/Settings/networksettings.desktop
@@ -3,15 +3,15 @@ Exec=networksettings
 Icon=Network/PPPConnect
 Type=Application
 Name=Network
-Name[pt_BR]=Rede
+Comment=Configure The Network settings using this tool.
+Name[da]=Netværk
 Name[de]=Netzwerk
-Name[it]=Rete
-Name[pt]=Rede
 Name[es]=Red
-Name[zh_TW]=網絡
-Name[ko]=네트워크 설정
-Name[da]=Netværk
-Comment=Configure The Network settings using this tool.
 Comment[es]=Configure la red con esta herramienta
+Name[it]=Rete
+Name[ko]=네트워크 설정
+Name[pt]=Rede
 Comment[pt]=Configuração da rede
-Comment[pt_BR]=Configuração da rede
\ No newline at end of file
+Name[pt_BR]=Rede
+Comment[pt_BR]=Configuração da rede
+Name[zh_TW]=網絡
diff --git a/apps/Settings/oipkg.desktop b/apps/Settings/oipkg.desktop
index 736452f..c3dcee0 100644
--- a/apps/Settings/oipkg.desktop
+++ b/apps/Settings/oipkg.desktop
@@ -1,19 +1,19 @@
 [Desktop Entry]
-Type=Application
 Exec=oipkg
-MimeType=application/ipkg
 Icon=oipkg/oipkg
+MimeType=application/ipkg
+Type=Application
 Name=Software
-Name[pt_BR]=Adicionar/Remover Software
-Name[hu]=Csomag- kezelõ
+Comment=A GUI front-end to ipkg
 Name[de]=Software
-Name[it]=Gestione Applicazioni
-Name[pt]=Aplicações
 Name[es]=Paquetes Software
-Name[zh_TW]=程式
-Name[ko]=패케지 관리자
-Comment=A GUI front-end to ipkg
 Comment[es]=Interfaz de ipkg
 Comment[fr]=Un gestionnaire de paquetages logiciels
+Name[hu]=Csomag- kezelõ
+Name[it]=Gestione Applicazioni
+Name[ko]=패케지 관리자
+Name[pt]=Aplicações
 Comment[pt]=Gestão de aplicações
-Comment[pt_BR]=Gestão de aplicações
\ No newline at end of file
+Name[pt_BR]=Adicionar/Remover Software
+Comment[pt_BR]=Gestão de aplicações
+Name[zh_TW]=程式
diff --git a/apps/Settings/quit.desktop b/apps/Settings/quit.desktop
index 8403845..934ccce 100644
--- a/apps/Settings/quit.desktop
+++ b/apps/Settings/quit.desktop
@@ -1,18 +1,18 @@
 [Desktop Entry]
-Type=Application
 Exec=shutdown
 Icon=Shutdown
+Type=Application
 Name=Shutdown
-Name[pt_BR]=Desligar
-Name[no]=Skru av
+Name[da]=Luk ned
 Name[de]=Beenden
-Name[it]=Spegnimento
-Name[hu]=Leállítás
-Name[pt]=Desligar
 Name[es]=Apagar
-Name[zh_TW]=關機
-Name[ko]=종료
-Name[da]=Luk ned
 Name[fr]=Extinction et redémarrage
+Name[hu]=Leállítás
+Name[it]=Spegnimento
+Name[ko]=종료
+Name[no]=Skru av
+Name[pt]=Desligar
 Comment[pt]=Desligar do OPIE
-Comment[pt_BR]=Desligar do OPIE
\ No newline at end of file
+Name[pt_BR]=Desligar
+Comment[pt_BR]=Desligar do OPIE
+Name[zh_TW]=關機
diff --git a/apps/Settings/sshkeys.desktop b/apps/Settings/sshkeys.desktop
index 2127e73..7c31264 100644
--- a/apps/Settings/sshkeys.desktop
+++ b/apps/Settings/sshkeys.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=Manage SSH keys
-Comment[es]=Gestor de claves del Secure Shell Protocol (SSH)
-Comment[pt]=Gestor de chaves SSH
-Comment[pt_BR]=Gerenciador de chaves SSH
 Exec=sshkeys
 Icon=sshkeys/sshkeys
 Type=Application
 Name=SSH Keys
+Comment=Manage SSH keys
 Name[es]=Claves SSH
-Name[it]=Chiavi SSH
+Comment[es]=Gestor de claves del Secure Shell Protocol (SSH)
 Name[fr]=Cl� SSH
+Name[it]=Chiavi SSH
 Name[pt]=Chaves SSH
-Name[pt_BR]=Chaves SSH
\ No newline at end of file
+Comment[pt]=Gestor de chaves SSH
+Name[pt_BR]=Chaves SSH
+Comment[pt_BR]=Gerenciador de chaves SSH
diff --git a/apps/Settings/sysinfo.desktop b/apps/Settings/sysinfo.desktop
index e56f8ed..4864292 100644
--- a/apps/Settings/sysinfo.desktop
+++ b/apps/Settings/sysinfo.desktop
@@ -1,18 +1,17 @@
 [Desktop Entry]
-Name=System Info
-Name[pt_BR]=Informações do Sistema
-Name[pt]=Informações do sistema
-Name[no]=Systeminfo
-Name[de]=Systeminfos
-Name[fr]=Informations Système
 Exec=sysinfo
+Icon=sysinfo/SystemInfo
 Type=Application
+Name=System Info
 Comment=System Information
+Name[de]=Systeminfos
+Name[es]=Info Sistema
 Comment[es]=Info Sistema
-Icon=sysinfo/SystemInfo
+Name[fr]=Informations Système
 Name[hu]=Rendszerinfó
 Name[it]=Sistema
+Name[ko]=시스템정보
+Name[no]=Systeminfo
 Name[pt]=Sistema
-Name[es]=Info Sistema
+Name[pt_BR]=Informações do Sistema
 Name[zh_TW]=系統資訊
-Name[ko]=시스템정보
diff --git a/apps/Settings/tabmanager.desktop b/apps/Settings/tabmanager.desktop
index 1bbaff6..7c4f284 100644
--- a/apps/Settings/tabmanager.desktop
+++ b/apps/Settings/tabmanager.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=Tab Managing Tool
-Comment[es]=Herramienta para gestionar las etiquetas superiores
-Comment[pt]=Gestor de pastas
-Comment[pt_BR]=Gerenciador de pastas
 Exec=tabmanager
 Icon=tabmanager/tabmanager
 Type=Settings
 Name=Tab Manager
-Name[pt]=Pastas
-Name[pt_BR]=Pastas
+Comment=Tab Managing Tool
 Name[es]=Gestor Etiquetas
+Comment[es]=Herramienta para gestionar las etiquetas superiores
+Name[fr]=Onglets
 Name[it]=Gestione Tab
-Name[zh_TW]=Tab Manager
 Name[ko]=탭 관리자
-Name[fr]=Onglets
+Name[pt]=Pastas
+Comment[pt]=Gestor de pastas
+Name[pt_BR]=Pastas
+Comment[pt_BR]=Gerenciador de pastas
+Name[zh_TW]=Tab Manager
diff --git a/apps/Settings/usermanager.desktop b/apps/Settings/usermanager.desktop
index 4d1df0c..ea5cffe 100644
--- a/apps/Settings/usermanager.desktop
+++ b/apps/Settings/usermanager.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
-Comment=User Manager
-Comment[es]=Gestor de usuarios
-Comment[pt]=Gestor de utilizadores
-Comment[pt_BR]=Gestor de usuários
 Exec=usermanager
 Icon=usermanager/usermanager
 Type=Setting
 Name=User Manager
+Comment=User Manager
 Name[es]=Gestor Usuarios
-Name[it]=Gestione Utenti
+Comment[es]=Gestor de usuarios
 Name[fr]=Utilisateurs
+Name[it]=Gestione Utenti
 Name[pt]=Utilizadores
-Name[pt_BR]=Usuários
\ No newline at end of file
+Comment[pt]=Gestor de utilizadores
+Name[pt_BR]=Usuários
+Comment[pt_BR]=Gestor de usuários
diff --git a/apps/Settings/wlansetup.desktop b/apps/Settings/wlansetup.desktop
index 033e917..ef2418b 100644
--- a/apps/Settings/wlansetup.desktop
+++ b/apps/Settings/wlansetup.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
-Comment=Wireless LAN Setup
-Comment[es]=Configuración de red inalámbrica
-Comment[pt]=Configuração da rede sem fios
-Comment[pt_BR]=Configuração da rede sem fios
 Exec=wlansetup
 Icon=wlansetup/wlan
 Type=Settings
 Name=Wireless LAN Setup
-Name[pt]=Rede Sem Fios
-Name[pt_BR]=Rede Sem Fios
+Comment=Wireless LAN Setup
 Name[es]=Red Inalámbrica
+Comment[es]=Configuración de red inalámbrica
+Name[fr]=R�eau sans fil
 Name[it]=Rete Wireless
-Name[zh_TW]=無線上網設定
 Name[ko]=무선랜 설정
-Name[fr]=R�eau sans fil
+Name[pt]=Rede Sem Fios
+Comment[pt]=Configuração da rede sem fios
+Name[pt_BR]=Rede Sem Fios
+Comment[pt_BR]=Configuração da rede sem fios
+Name[zh_TW]=無線上網設定
diff --git a/example/example.desktop b/example/example.desktop
index f1e6f06..6dc1115 100644
--- a/example/example.desktop
+++ b/example/example.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Comment=An Example Program
 Exec=example
 Icon=Example
 Type=Application
 Name=Example
+Comment=An Example Program