32 files changed, 234 insertions, 240 deletions

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