82 files changed, 140 insertions, 14 deletions

diff --git a/apps/1Pim/addressbook.desktop b/apps/1Pim/addressbook.desktop
index 609becb..be06271 100644
--- a/apps/1Pim/addressbook.desktop
+++ b/apps/1Pim/addressbook.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=An Address Book Program
+Comment[es]=Una libreta de direcciones
 Exec=addressbook
 Icon=AddressBook
 Type=Application
 Name=Contacts
diff --git a/apps/1Pim/datebook.desktop b/apps/1Pim/datebook.desktop
index e36dba9..2253064 100644
--- a/apps/1Pim/datebook.desktop
+++ b/apps/1Pim/datebook.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Calendar and Scheduling Program
+Comment[es]=Un calendario y planificador
 Exec=datebook
 Icon=DateBook
 Type=Application
 Name=Calendar
diff --git a/apps/1Pim/drawpad.desktop b/apps/1Pim/drawpad.desktop
index 222eb70..3575235 100644
--- a/apps/1Pim/drawpad.desktop
+++ b/apps/1Pim/drawpad.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Note Taking Program
+Comment[es]=Un programa para tomar notas
 Exec=drawpad
 Icon=drawpad/DrawPad
 Type=Application
 Name=DrawPad
diff --git a/apps/1Pim/textedit.desktop b/apps/1Pim/textedit.desktop
index 04fa938..87c2de7 100644
--- a/apps/1Pim/textedit.desktop
+++ b/apps/1Pim/textedit.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Text Editing Program
+Comment[es]=Un editor de textos
 Exec=textedit
 Icon=TextEditor
 Type=Application
 MimeType=text/plain
diff --git a/apps/1Pim/today.desktop b/apps/1Pim/today.desktop
index 36db65c..de77219 100644
--- a/apps/1Pim/today.desktop
+++ b/apps/1Pim/today.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Today App
+Comment[es]=Aplicación Hoy
 Exec=today
 Icon=today/today_icon
 Type=Application
 Name=Today
diff --git a/apps/1Pim/todo.desktop b/apps/1Pim/todo.desktop
index 6b2e17f..f030ad1 100644
--- a/apps/1Pim/todo.desktop
+++ b/apps/1Pim/todo.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Todo List Program
+Comment[es]=Un programa de lista de tareas
 Exec=todolist
 Icon=TodoList
 Type=Application
 Name=Todo List
diff --git a/apps/Applications/advancedfm.desktop b/apps/Applications/advancedfm.desktop
index 72b30f8..7f5d770 100644
--- a/apps/Applications/advancedfm.desktop
+++ b/apps/Applications/advancedfm.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment = An advanced file manager program
+Comment[es]=Un gestor de ficheros avanzado
 Exec = advancedfm
 File = advancedfm
 Icon = advancedfm/FileBrowser
 Name = AdvancedFM
diff --git a/apps/Applications/calculator.desktop b/apps/Applications/calculator.desktop
index 052ef8f..ee89c42 100644
--- a/apps/Applications/calculator.desktop
+++ b/apps/Applications/calculator.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Calculator Program
+Comment[es]=Calculadora científica y conversor de unidades
 Exec=calculator
 Icon=calc/Calculator
 Type=Application
 Name=Calculator
diff --git a/apps/Applications/checkbook.desktop b/apps/Applications/checkbook.desktop
index e11a5cc..e32a93b 100644
--- a/apps/Applications/checkbook.desktop
+++ b/apps/Applications/checkbook.desktop
@@ -1,9 +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]=Checkbook
+Name[es]=Chequera
diff --git a/apps/Applications/clock.desktop b/apps/Applications/clock.desktop
index e477245..c32c7b3 100644
--- a/apps/Applications/clock.desktop
+++ b/apps/Applications/clock.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Clock Program
+Comment[es]=Reloj, cronómetro y despertador
 Exec=clock
 Icon=Clock
 Type=Application
 Name=Clock
diff --git a/apps/Applications/embeddedkonsole.desktop b/apps/Applications/embeddedkonsole.desktop
index a2b9e16..e1ddf5d 100644
--- a/apps/Applications/embeddedkonsole.desktop
+++ b/apps/Applications/embeddedkonsole.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Terminal Window
+Comment[es]=Una ventana de terminal
 Exec=embeddedkonsole
 Icon=Terminal
 Type=Application
 Name=Konsole
diff --git a/apps/Applications/filebrowser.desktop b/apps/Applications/filebrowser.desktop
index 55cdce0..f5e3662 100644
--- a/apps/Applications/filebrowser.desktop
+++ b/apps/Applications/filebrowser.desktop
@@ -1,6 +1,7 @@
 [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
diff --git a/apps/Applications/gsmtool.desktop b/apps/Applications/gsmtool.desktop
index 3421b11..40c057d 100644
--- a/apps/Applications/gsmtool.desktop
+++ b/apps/Applications/gsmtool.desktop
@@ -1,12 +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
 Name[de]=GSM-Werkzeug
-Name[es]=Herramientas GSM
-Name[it]=Utilit� GSM
+Name[es]=Teléfono GSM
+Name[it]=Utilit�GSM
 Name[zh_TW]=GSM 工具
 Name[ko]=GSM 전화기 유틸
diff --git a/apps/Applications/helpbrowser.desktop b/apps/Applications/helpbrowser.desktop
index 8fb3564..e21830d 100644
--- a/apps/Applications/helpbrowser.desktop
+++ b/apps/Applications/helpbrowser.desktop
@@ -1,6 +1,7 @@
 [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
diff --git a/apps/Applications/keypebble.desktop b/apps/Applications/keypebble.desktop
index d509c00..f7cd03a 100644
--- a/apps/Applications/keypebble.desktop
+++ b/apps/Applications/keypebble.desktop
@@ -1,6 +1,7 @@
 [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
diff --git a/apps/Applications/mediaplayer.desktop b/apps/Applications/mediaplayer.desktop
index 853346b..164a012 100644
--- a/apps/Applications/mediaplayer.desktop
+++ b/apps/Applications/mediaplayer.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Media Player
+Comment[es]=Reproductor de ficheros multimedia
 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;
@@ -8,4 +9,5 @@ MimeTypeIcons=SoundPlayer;Sound;SoundPlayer;SoundPlayer;MPEGPlayer;MPEGPlayer;MP
 Name=Opie Media Player
 Name[ko]=오삐 미디어 플레이어
 Name[it]=Media Player
 Name[de]=Media Player
+Name[es]=Multimedia
diff --git a/apps/Applications/mobilemsg.desktop b/apps/Applications/mobilemsg.desktop
index 39f84f7..0c2d09e 100644
--- a/apps/Applications/mobilemsg.desktop
+++ b/apps/Applications/mobilemsg.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Mobile Messaging
+Comment[es]=Mensajería móvil
 Exec=mobilemsg
 Icon=mobilemsg/mobilemsg
 Type=Application
 Name=Mobile Messaging
diff --git a/apps/Applications/opie-console.desktop b/apps/Applications/opie-console.desktop
index ecf3ed3..b8ac70b 100644
--- a/apps/Applications/opie-console.desktop
+++ b/apps/Applications/opie-console.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=Terminal app
+Comment[es]=Aplicación de terminal
 Exec=opie-console
 Icon=console/console
 Type=Application
 Name=Opie Terminal
+Name[es]=Consola
diff --git a/apps/Applications/opie-reader.desktop b/apps/Applications/opie-reader.desktop
index 016c8a4..b0590c2 100644
--- a/apps/Applications/opie-reader.desktop
+++ b/apps/Applications/opie-reader.desktop
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Comment=An E-Text Reader
+Comment[es]=Un lector de libros electrónicos
 Exec=reader
 Icon=opie-reader/uqtreader
 Type=Application
 Name=Opie Reader (Unicode)
 CanFastLoad=1
-Name[es]=Lector Opie
+Name[es]=Lector Libros-e
 Name[zh_TW]=Opie Reader
 Name[ko]=오삐 책읽기
 Name[it]=Opie Reader
diff --git a/apps/Applications/opie-sheet.desktop b/apps/Applications/opie-sheet.desktop
index c1aa2a3..39216d7 100644
--- a/apps/Applications/opie-sheet.desktop
+++ b/apps/Applications/opie-sheet.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Spreadsheet Application
+Comment[es]=Aplicación de hoja de cálculo
 Exec=sheetqt
 Icon=opie-sheet/sheetqt
 Type=Application
 Name=Opie Sheet
diff --git a/apps/Applications/opieftp.desktop b/apps/Applications/opieftp.desktop
index 9504bf1..85d0158 100644
--- a/apps/Applications/opieftp.desktop
+++ b/apps/Applications/opieftp.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=An Ftp Client
+Comment[es]=Cliente de File Transfer Protocol (FTP)
 Exec=opieftp
 Icon=opieftp/opieftp
 Type=Application
 Name=OpieFtp
diff --git a/apps/Applications/opieirc.desktop b/apps/Applications/opieirc.desktop
index 49796cd..a9da09e 100644
--- a/apps/Applications/opieirc.desktop
+++ b/apps/Applications/opieirc.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=An IRC Client
+Comment[es]=Un cliente de Internet Relay Chat (IRC)
 Exec=opieirc
 Icon=opieirc/opieirc
 Type=Application
 Name=OpieIRC
+Name[es]=Opie IRC
diff --git a/apps/Applications/opiemail.desktop b/apps/Applications/opiemail.desktop
index e126f10..603ac56 100644
--- a/apps/Applications/opiemail.desktop
+++ b/apps/Applications/opiemail.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=An EMail Client
+Comment[es]=Cliente de correo electrónico
 Exec=opiemail
 Icon=opiemail/opiemail
 Type=Application
 Name=EMail
diff --git a/apps/Applications/opieplayer.desktop b/apps/Applications/opieplayer.desktop
index 6d576cc..42d6dcc 100644
--- a/apps/Applications/opieplayer.desktop
+++ b/apps/Applications/opieplayer.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Media Playback Program
+Comment[es]=Reproductor multimedia
 Exec=opieplayer
 Icon=opieplayer/MPEGPlayer
 Type=Application
 MimeType=audio/mpeg;video/mpeg;audio/x-wav;application/x-shockwave-flash;playlist/plain;audio/x-mpegurl;audio/x-mod
diff --git a/apps/Applications/oxygen.desktop b/apps/Applications/oxygen.desktop
index 030df81..9f8f324 100644
--- a/apps/Applications/oxygen.desktop
+++ b/apps/Applications/oxygen.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Comment=A chemistry Application
+Comment[es]=Una aplicación de química
 Exec=oxygen
 Icon=oxygen/oxygen
 Type=Application
 Name=Oxygen
 Name[de]=Periodensystem
+Name[es]=Tabla Periódica
diff --git a/apps/Applications/qpdf.desktop b/apps/Applications/qpdf.desktop
index d2fa2ba..1399f7d 100644
--- a/apps/Applications/qpdf.desktop
+++ b/apps/Applications/qpdf.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=PDF Viewer
+Comment[es]=Visor de ficheros en Portable Document Format (PDF)
 Exec=qpdf
 Icon=qpdf/qpdf_icon
 Type=Application
 MimeType=application/pdf
diff --git a/apps/Applications/remote.desktop b/apps/Applications/remote.desktop
index 704e74d..27bc650 100644
--- a/apps/Applications/remote.desktop
+++ b/apps/Applications/remote.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Remote App
+Comment[es]=Aplicación de control remoto
 Exec=remote
 Icon=remote/remote
 Type=Application
 Name=Remote
diff --git a/apps/Applications/showimg.desktop b/apps/Applications/showimg.desktop
index 2160fbb..d962cd3 100644
--- a/apps/Applications/showimg.desktop
+++ b/apps/Applications/showimg.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Categories = 
+Categories =
 Comment = An Image Viewer
+Comment[es]=Un visor de imágenes
 Exec = showimg
 File = 
 Icon = imageviewer/ImageViewer
 MimeType = image/*
diff --git a/apps/Applications/spreadsheet.desktop b/apps/Applications/spreadsheet.desktop
index be32fa8..9b48a34 100644
--- a/apps/Applications/spreadsheet.desktop
+++ b/apps/Applications/spreadsheet.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Spread Sheet Program
+Comment[es]=Un programa de hoja de cálculo
 Exec=spreadsheet
 Icon=Spreadsheet
 Type=Application
 MimeType=application/x-qpe-ss
diff --git a/apps/Applications/sysinfo.desktop b/apps/Applications/sysinfo.desktop
index 85b60f1..745a5d5 100644
--- a/apps/Applications/sysinfo.desktop
+++ b/apps/Applications/sysinfo.desktop
@@ -5,8 +5,9 @@ Name[no]=Systeminfo
 Name[de]=Systeminfos
 Exec=sysinfo
 Type=Application
 Comment=System Information
+Comment[es]=Info Sistema
 Icon=SystemInfo
 Name[hu]=Rendszerinfó
 Name[it]=Sistema
 Name[pt]=Sistema
diff --git a/apps/Applications/tableviewer.desktop b/apps/Applications/tableviewer.desktop
index 3f54f81..de99908 100644
--- a/apps/Applications/tableviewer.desktop
+++ b/apps/Applications/tableviewer.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
 Comment=A table/database viewer
+Comment[es]=Visor de tablas y bases de datos
 Exec=tableviewer
 Type=Application
 Name=Table Viewer
 Name[pt_BR]=Visualizador de Tabelas
 Name[hu]=Adatbázis nézõ
 Name[it]=DB Viewer
 Name[de]=Tabellen betrachter
-Name[pt]=Base Dados
+Name[pt]=Visor BD
 Name[es]=Visor Base Datos
 Name[zh_TW]=資料庫檢視
 Name[ko]=테이블 뷰어
diff --git a/apps/Games/bounce.desktop b/apps/Games/bounce.desktop
index a93e36c..02bb154 100644
--- a/apps/Games/bounce.desktop
+++ b/apps/Games/bounce.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
 Type=Application
 Exec=bounce
 Icon=bounce/bounce
-Comment=A JezzGame 
+Comment=A JezzGame
+Comment[es]=El juego Jezz
 Name=Bounce
 Name[de]=Bounce
+Name[es]=Rebote
diff --git a/apps/Games/buzzword.desktop b/apps/Games/buzzword.desktop
index 778f093..c3e622b 100644
--- a/apps/Games/buzzword.desktop
+++ b/apps/Games/buzzword.desktop
@@ -2,5 +2,7 @@
 Type=Application
 Exec=buzzword
 Icon=buzzword/buzzword
 Comment=A buzzword bingo
+Comment[es]=Un bingo de palabras técnicas
 Name=buZzword
+Name[es]=buZzword
diff --git a/apps/Games/fifteen.desktop b/apps/Games/fifteen.desktop
index a73635e..53c5a36 100644
--- a/apps/Games/fifteen.desktop
+++ b/apps/Games/fifteen.desktop
@@ -1,12 +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
-Name[es]=15 Piezas
+Name[es]=Quince Piezas
 Name[it]=Gioco del 15
-Name[de]=F�nfzehn
+Name[de]=Fnfzehn
 Name[zh_TW]=Fifteen Pieces
 Name[ko]=십오 조각
diff --git a/apps/Games/go.desktop b/apps/Games/go.desktop
index ba77006..1e555b3 100644
--- a/apps/Games/go.desktop
+++ b/apps/Games/go.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Board Strategy Game
+Comment[es]=Juego de estategia de tablero
 Exec=go
 Icon=go/Go
 Type=Application
 Name=Go
diff --git a/apps/Games/kbill.desktop b/apps/Games/kbill.desktop
index 7a1151d..4b20dca 100644
--- a/apps/Games/kbill.desktop
+++ b/apps/Games/kbill.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Hit Bill
+Comment[es]=Pégale a Bill
 Exec=kbill
 Icon=kbill/kbill
 Type=Application
 Name=kbill
diff --git a/apps/Games/kcheckers.desktop b/apps/Games/kcheckers.desktop
index 99ff271..0c507b3 100644
--- a/apps/Games/kcheckers.desktop
+++ b/apps/Games/kcheckers.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Ckeckers Game
+Comment[es]=El juego de las Damas
 Exec=kcheckers
 Icon=kcheckers/KCheckers
 Type=Application
 Name=KCheckers
diff --git a/apps/Games/mindbreaker.desktop b/apps/Games/mindbreaker.desktop
index 487f110..0d2f44b 100644
--- a/apps/Games/mindbreaker.desktop
+++ b/apps/Games/mindbreaker.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Code Breaking Game
+Comment[es]=Juego de romper códigos
 Exec=mindbreaker
 Icon=mindbreaker/Mindbreaker
 Type=Application
 Name=Mindbreaker
diff --git a/apps/Games/minesweep.desktop b/apps/Games/minesweep.desktop
index 7825df5..83dc7ba 100644
--- a/apps/Games/minesweep.desktop
+++ b/apps/Games/minesweep.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Find the mines
+Comment[es]=Busca las minas
 Exec=minesweep
 Icon= minesweep/MineHunt
 Type=Application
 Name=Mine Hunt
diff --git a/apps/Games/nethack.desktop b/apps/Games/nethack.desktop
index 012ba81..47a0baa 100644
--- a/apps/Games/nethack.desktop
+++ b/apps/Games/nethack.desktop
@@ -1,8 +1,9 @@
 [Desktop Entry]
 CanFastload = 0
 Categories = 
 Comment = Classic Dungeon Adventure Game
+Comment[es]=Clásico juego de mazmorras
 Exec = nethack
 Icon = nethack/nethack
 Name = NetHack
 Type = Games
diff --git a/apps/Games/parashoot.desktop b/apps/Games/parashoot.desktop
index cf25899..e668bb1 100644
--- a/apps/Games/parashoot.desktop
+++ b/apps/Games/parashoot.desktop
@@ -1,12 +1,13 @@
 [Desktop Entry]
 Comment=A Parachute Attack Game
+Comment[es]=Un juego de ataque de paracaidistas
 Exec=parashoot
 Icon=parashoot/ParaShoot
 Type=Application
 Name=ParaShoot
 Name[no]=Fallskjerm
-Name[de]=Fallschirmj�ger
+Name[de]=Fallschirmj�er
 Name[hu]=Védd a bázist
 Name[pt]=Pára-Quedas
 Name[es]=Paracas
 Name[it]=ParaShoot
diff --git a/apps/Games/patience.desktop b/apps/Games/patience.desktop
index 9d26951..3bea229 100644
--- a/apps/Games/patience.desktop
+++ b/apps/Games/patience.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Game of Patience
+Comment[es]=Juego de paciencia
 Exec=patience
 Icon=cards/Solitaire
 Type=Application
 Name=Patience
diff --git a/apps/Games/qasteroids.desktop b/apps/Games/qasteroids.desktop
index fabd597..9ad813f 100644
--- a/apps/Games/qasteroids.desktop
+++ b/apps/Games/qasteroids.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Shoot the rocks
+Comment[es]=Dispare a las rocas
 Exec=qasteroids
 Icon=qasteroids/Asteroids
 Type=Application
 Name=Asteroids
diff --git a/apps/Games/snake.desktop b/apps/Games/snake.desktop
index 376c6a9..9bef6a7 100644
--- a/apps/Games/snake.desktop
+++ b/apps/Games/snake.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Snake Game
+Comment[es]=El juego de la serpiente
 Exec=snake
 Icon=snake/Snake
 Type=Application
 Name=Snake
diff --git a/apps/Games/tetrix.desktop b/apps/Games/tetrix.desktop
index 843e4ae..898f939 100644
--- a/apps/Games/tetrix.desktop
+++ b/apps/Games/tetrix.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A Block Stacking Game
+Comment[es]=Un juego de apilar bloques
 Exec=tetrix
 Icon=tetrix/Tetrix
 Type=Application
 Name=Tetrix
diff --git a/apps/Games/tictac.desktop b/apps/Games/tictac.desktop
index 81e0ab0..21ddfe1 100644
--- a/apps/Games/tictac.desktop
+++ b/apps/Games/tictac.desktop
@@ -9,4 +9,6 @@ Name[es]=Tic Tac
 Name[de]=Tic Tac To
 Name[it]=Tris
 Name[zh_TW]=Tictac
 Name[ko]=틱택토
+Comment=Tic Tac Toe game
+Comment[es]=Juego del Tic Tac Toe
diff --git a/apps/Games/wordgame.desktop b/apps/Games/wordgame.desktop
index 5dce0ff..d56e41c 100644
--- a/apps/Games/wordgame.desktop
+++ b/apps/Games/wordgame.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A word arranging game
+Comment[es]=Juego de organizar palabras
 Exec=wordgame
 Icon=wordgame/WordGame
 Type=Application
 Name=Word Game
diff --git a/apps/Opie-SH/diskfree.desktop b/apps/Opie-SH/diskfree.desktop
index e1234c8..2bf68cc 100644
--- a/apps/Opie-SH/diskfree.desktop
+++ b/apps/Opie-SH/diskfree.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=diskfree.sh
 Icon=opie-sh-scripts/diskfree
 Name=Disk Free
+Name[es]=Espacio Libre
+Comment=Frontend to df (show space left on mountpoints)
+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 e10bd71..31bf532 100644
--- a/apps/Opie-SH/filesystem_mounter.desktop
+++ b/apps/Opie-SH/filesystem_mounter.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=filesystem_mounter.sh
 Icon=opie-sh-scripts/fsmounter
 Name=Filesystem Mounter
+Name[es]=Montador
+Comment=Frontend to mount/unmount filesystems
+Comment[es]=Interfaz para montar/desmontar sistemas de ficheros
diff --git a/apps/Opie-SH/hostlist.desktop b/apps/Opie-SH/hostlist.desktop
index 9e27a3f..836c7a1 100644
--- a/apps/Opie-SH/hostlist.desktop
+++ b/apps/Opie-SH/hostlist.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=hostlist
+Comment[es]=Listado de hosts
 Exec=hostlist.sh
 Icon=opie-sh-scripts/hostlist
 Type=Application
 Name=Hostlist
+Name[es]=Máquinas
diff --git a/apps/Opie-SH/killproc.desktop b/apps/Opie-SH/killproc.desktop
index e49f42b..e41438d 100644
--- a/apps/Opie-SH/killproc.desktop
+++ b/apps/Opie-SH/killproc.desktop
@@ -2,4 +2,5 @@
 Type=Application
 Exec=killproc.sh
 Icon=opie-sh-scripts/killproc
 Name=Process Killer
+Name[es]=Mataprocesos
diff --git a/apps/Opie-SH/launcher_refresh.desktop b/apps/Opie-SH/launcher_refresh.desktop
index b3c340e..857c57a 100644
--- a/apps/Opie-SH/launcher_refresh.desktop
+++ b/apps/Opie-SH/launcher_refresh.desktop
@@ -3,4 +3,7 @@ Comment=launcher_refresh
 Exec=launcher_refresh.sh
 Icon=opie-sh-scripts/launcher_refresh
 Type=Application
 Name=Launcher Refresh
+Name[es]=Refresca Lanzador
+Comment=Refresh the launcher so that new installed applications appear
+Comment[es]=Refresca el lanzador (aparecen aplicaciones recién instaladas)
diff --git a/apps/Opie-SH/logviewer.desktop b/apps/Opie-SH/logviewer.desktop
index cf2ede2..456deb5 100644
--- a/apps/Opie-SH/logviewer.desktop
+++ b/apps/Opie-SH/logviewer.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=logviewer.sh
 Icon=opie-sh-scripts/logviewer
 Name=Log Viewer
+Name[es]=Visor Registros
+Comment=Frontend to viewing logfiles
+Comment[es]=Interfaz para ver los ficheros de registro
diff --git a/apps/Opie-SH/opie-sh-wavelanchooser.desktop b/apps/Opie-SH/opie-sh-wavelanchooser.desktop
index ea5b93a..2f9c1a3 100644
--- a/apps/Opie-SH/opie-sh-wavelanchooser.desktop
+++ b/apps/Opie-SH/opie-sh-wavelanchooser.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=WLAN Chooser
+Comment[es]=Elija red inalámbrica
 Exec=wavelanchooser.sh
 Icon=opie-sh-scripts/qtwavelan
 Type=Application
 Name=WLAN Chooser
+Name[es]=Red Inalámbrica
diff --git a/apps/Opie-SH/opie-sh.desktop b/apps/Opie-SH/opie-sh.desktop
index b5869a7..cbd155c 100644
--- a/apps/Opie-SH/opie-sh.desktop
+++ b/apps/Opie-SH/opie-sh.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=opie-sh-howto
+Comment[es]=Cómo del Opie Shell
 Exec=opie-sh-howto.sh
 Icon=opie-sh/opie-sh
 Type=Application
 Name=opie-sh HowTo
diff --git a/apps/Opie-SH/rsyncme.desktop b/apps/Opie-SH/rsyncme.desktop
index ad663eb..2c6fcb9 100644
--- a/apps/Opie-SH/rsyncme.desktop
+++ b/apps/Opie-SH/rsyncme.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=rsync helper
+Comment[es]=Asistente del sincronizador remoto (rsync)
 Exec=rsyncme.sh
 Icon=opie-sh-scripts/rsyncme
 Type=Application
 Name=RSYNC Helper
+Name[es]=Rsync
diff --git a/apps/Opie-SH/service_manager.desktop b/apps/Opie-SH/service_manager.desktop
index 6e75096..268e7b4 100644
--- a/apps/Opie-SH/service_manager.desktop
+++ b/apps/Opie-SH/service_manager.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=service_manager.sh
 Icon=opie-sh-scripts/service_manager
 Name=Service Manager
+Name[es]=Gestor Servicios
+Comment=Frontend to start/stop init scripts
+Comment[es]=Interfaz para iniciar/parar guiones de inicio
diff --git a/apps/Opie-SH/stowctrl.desktop b/apps/Opie-SH/stowctrl.desktop
index 9b1334c..6d26608 100644
--- a/apps/Opie-SH/stowctrl.desktop
+++ b/apps/Opie-SH/stowctrl.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=Start/Stop stowaway keyboard
+Comment[es]=Activa/desactiva teclado Stowaway
 Exec=stowctrl.sh
 Icon=stowctrl/stowctrl
 Type=Application
 Name=Stowaway Control
+Name[es]=Control Stowaway
diff --git a/apps/Opie-SH/usbnetctrl.desktop b/apps/Opie-SH/usbnetctrl.desktop
index d1c6af6..96d2443 100644
--- a/apps/Opie-SH/usbnetctrl.desktop
+++ b/apps/Opie-SH/usbnetctrl.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=usbnetctrl.sh
 Icon=opie-sh-scripts/usbnetctrl
 Name=USBNET Control
+Name[es]=USBNet
+Comment=Frontend to start/stop usbnet
+Comment[es]=Interfaz para iniciar/parar usbnet
diff --git a/apps/Settings/Appearance.desktop b/apps/Settings/Appearance.desktop
index fec8117..f524238 100644
--- a/apps/Settings/Appearance.desktop
+++ b/apps/Settings/Appearance.desktop
@@ -12,4 +12,6 @@ Name[it]=Aspetto
 Name[pt]=Aparência
 Name[es]=Apariencia
 Name[zh_TW]=外觀
 Name[ko]=테마
+Comment=Appearance settings dialog
+Comment[es]=Diálogo de configuración de la apariencia
diff --git a/apps/Settings/Calibrate.desktop b/apps/Settings/Calibrate.desktop
index 985b9b6..f5b75c6 100644
--- a/apps/Settings/Calibrate.desktop
+++ b/apps/Settings/Calibrate.desktop
@@ -12,4 +12,6 @@ Name[it]=Calibrazione
 Name[pt]=Recalibrar
 Name[es]=Calibrar
 Name[zh_TW]=筆尖定住
 Name[ko]=화면 측정
+Comment=Utility for screen calibration
+Comment[es]=Utilidad para recalibrar el puntero en pantalla
diff --git a/apps/Settings/Language.desktop b/apps/Settings/Language.desktop
index d0f2992..a02d900 100644
--- a/apps/Settings/Language.desktop
+++ b/apps/Settings/Language.desktop
@@ -12,4 +12,6 @@ Name[it]=Lingue
 Name[pt]=Linguagem
 Name[es]=Idioma
 Name[zh_TW]=語言
 Name[ko]=언어
+Comment=Language settings dialog
+Comment[es]=Diálogo de configuración del idioma
diff --git a/apps/Settings/Launcher.desktop b/apps/Settings/Launcher.desktop
index cd73b9f..d750c2c 100644
--- a/apps/Settings/Launcher.desktop
+++ b/apps/Settings/Launcher.desktop
@@ -2,4 +2,7 @@
 Type=Application
 Exec=launchersettings
 Icon=launchersettings/Launcher
 Name=Launcher
+Name[es]=Lanzador
+Comment=Launcher settings dialog
+Comment[es]=Configuración del lanzador de aplicaciones
diff --git a/apps/Settings/Security.desktop b/apps/Settings/Security.desktop
index 6b9c157..d68d6a8 100644
--- a/apps/Settings/Security.desktop
+++ b/apps/Settings/Security.desktop
@@ -9,4 +9,6 @@ Name[pt_BR]=Seguranca
 Name[pt]=Segurança
 Name[es]=Seguridad
 Name[zh_TW]=保密
 Name[ko]=보안
+Comment=Security settings dialog
+Comment[es]=Diálogo de configuración de seguridad
diff --git a/apps/Settings/Sound.desktop b/apps/Settings/Sound.desktop
index a207e9d..eff8476 100644
--- a/apps/Settings/Sound.desktop
+++ b/apps/Settings/Sound.desktop
@@ -4,9 +4,11 @@ Exec=sound
 Icon=Sound
 Name=Vmemo Settings
 Name[pt_BR]=Som
 Name[pt]=Som
-Name[es]=Sonido
+Name[es]=Grabadora
 Name[it]=Audio
 Name[de]=Audio
 Name[zh_TW]=聲效
 Name[ko]=소리
+Comment=Sound settings dialog
+Comment[es]=Configuración de la grabadora de voz
diff --git a/apps/Settings/appskey.desktop b/apps/Settings/appskey.desktop
index 31358f2..db7cbc0 100644
--- a/apps/Settings/appskey.desktop
+++ b/apps/Settings/appskey.desktop
@@ -1,13 +1,14 @@
 [Desktop Entry]
 Comment=Set Application Key
+Comment[es]=Aplicaciones que lanzan las teclas rápidas
 Exec=appskey
 Icon=AppsKey/CustomizeKeys
 Type=Application
 Name=Application Key
 CanFastload=0
 Name[de]=Anwendungs tasten
 Name[pt]=Botões
-Name[es]=Teclas Rápidas
+Name[es]=Botones
 Name[it]=Pulsanti
 Name[zh_TW]=程式鍵
 Name[ko]=실행단추
diff --git a/apps/Settings/aqpkg.desktop b/apps/Settings/aqpkg.desktop
index 4a55dff..9ced63f 100644
--- a/apps/Settings/aqpkg.desktop
+++ b/apps/Settings/aqpkg.desktop
@@ -4,4 +4,7 @@ Exec=aqpkg
 MimeType=application/ipkg
 MimeTypeIcons=aqpkg/ipkg
 Icon=aqpkg/aqpkg
 Name=AQPkg
+Name[es]=AQPkg
+Comment=A Package Manager
+Comment[es]=Un gestor de paquetes de software
diff --git a/apps/Settings/backup.desktop b/apps/Settings/backup.desktop
index 598b0f5..e50b8d2 100644
--- a/apps/Settings/backup.desktop
+++ b/apps/Settings/backup.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=Backup and Restore Utility
+Comment[es]=Utilidad de copia de seguridad y recuperación
 Exec=backup
 Icon=backup/backupandrestore
 Type=Settings
 Name=Backup And Restore
+Name[es]=Copia de Seguridad
diff --git a/apps/Settings/bluetooth-manager.desktop b/apps/Settings/bluetooth-manager.desktop
index 32af92a..cb90ae9 100644
--- a/apps/Settings/bluetooth-manager.desktop
+++ b/apps/Settings/bluetooth-manager.desktop
@@ -1,10 +1,12 @@
 [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
 Name[de]=Bluetooth
+Name[es]=Bluetooth
diff --git a/apps/Settings/citytime.desktop b/apps/Settings/citytime.desktop
index 843181f..090754f 100644
--- a/apps/Settings/citytime.desktop
+++ b/apps/Settings/citytime.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=A World Clock and Time Zone Editor
+Comment[es]=Un reloj mundial y editor de zona horaria
 Exec=citytime
 Icon=citytime/CityTime
 Type=Application
 Name=City Time
@@ -10,7 +11,7 @@ Name[de]=Weltzeituhr
 Name[ja]=世界時計
 Name[hu]=Idõzóna
 Name[it]=Fuso Orario
 Name[pt]=Fusos Horários
-Name[es]=Hora Mundial
+Name[es]=Reloj Mundial
 Name[zh_TW]=世界時間
 Name[ko]=세계시간
diff --git a/apps/Settings/confedit.desktop b/apps/Settings/confedit.desktop
index d359451..1cc195f 100644
--- a/apps/Settings/confedit.desktop
+++ b/apps/Settings/confedit.desktop
@@ -1,6 +1,7 @@
 [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
diff --git a/apps/Settings/formatter.desktop b/apps/Settings/formatter.desktop
index 4385f40..90f489b 100644
--- a/apps/Settings/formatter.desktop
+++ b/apps/Settings/formatter.desktop
@@ -1,10 +1,12 @@
 [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
 Name[de]=Formatieren
+Name[es]=Formateador
diff --git a/apps/Settings/medium.desktop b/apps/Settings/medium.desktop
index de6b0e2..6aa160b 100644
--- a/apps/Settings/medium.desktop
+++ b/apps/Settings/medium.desktop
@@ -5,7 +5,9 @@ Icon=mediummount/mediummount
 Name=Medium Mount
 Name[pt]=Montar Média
 Name[es]=Montar Medio
 Name[it]=Monta/Smonta
-Name[de]=Ger�t einbinden
+Name[de]=Ger� einbinden
 Name[zh_TW]=媒體掛卸
 Name[ko]=미디어 마운트
+Comment=Configure app for the medium mounter
+Comment[es]=Aplicación para montar medios
diff --git a/apps/Settings/netsetup.desktop b/apps/Settings/netsetup.desktop
index 2ef6320..519ae59 100644
--- a/apps/Settings/netsetup.desktop
+++ b/apps/Settings/netsetup.desktop
@@ -9,4 +9,6 @@ Name[it]=PPP
 Name[pt]=Rede
 Name[es]=Red
 Name[zh_TW]=網絡
 Name[ko]=네트워크 설정
+Comment=Network setup
+Comment[es]=Configuración de la red
diff --git a/apps/Settings/netsystemtime.desktop b/apps/Settings/netsystemtime.desktop
index 95aa0e0..a1c44a7 100644
--- a/apps/Settings/netsystemtime.desktop
+++ b/apps/Settings/netsystemtime.desktop
@@ -1,10 +1,12 @@
 [Desktop Entry]
 Comment=Set date and time from network
+Comment[es]=Fije la hora por el Network Time Protocol (NTP)
 Exec=systemtime
 Icon=DateTime
 Type=Application
 Name=Date/Time
 Name[zh_TW]=網絡時間
 Name[ko]=네트워크로 시간 설정
 Name[it]=Data e Ora
 Name[de]=Datum
+Name[es]=Hora NTP
diff --git a/apps/Settings/networksettings.desktop b/apps/Settings/networksettings.desktop
index a55eac8..dae0fff 100644
--- a/apps/Settings/networksettings.desktop
+++ b/apps/Settings/networksettings.desktop
@@ -9,4 +9,6 @@ Name[it]=PPP
 Name[pt]=Rede
 Name[es]=Red
 Name[zh_TW]=網絡
 Name[ko]=네트워크 설정
+Comment=Network setup tool
+Comment[es]=Herramienta de configuración de la red
diff --git a/apps/Settings/networksetup.desktop b/apps/Settings/networksetup.desktop
index a55eac8..dae0fff 100644
--- a/apps/Settings/networksetup.desktop
+++ b/apps/Settings/networksetup.desktop
@@ -9,4 +9,6 @@ Name[it]=PPP
 Name[pt]=Rede
 Name[es]=Red
 Name[zh_TW]=網絡
 Name[ko]=네트워크 설정
+Comment=Network setup tool
+Comment[es]=Herramienta de configuración de la red
diff --git a/apps/Settings/oipkg.desktop b/apps/Settings/oipkg.desktop
index 471a9d8..71b6e55 100644
--- a/apps/Settings/oipkg.desktop
+++ b/apps/Settings/oipkg.desktop
@@ -8,7 +8,9 @@ Name[pt_BR]=Adicionar/Remover Software
 Name[hu]=Csomag- kezelõ
 Name[de]=Software
 Name[it]=Gestione Applicazioni
 Name[pt]=Aplicações
-Name[es]=Gestor de Paquetes
+Name[es]=Paquetes Software
 Name[zh_TW]=程式
 Name[ko]=패케지 관리자
+Comment=A GUI front-end to ipkg
+Comment[es]=Interfaz de ipkg
diff --git a/apps/Settings/sshkeys.desktop b/apps/Settings/sshkeys.desktop
index 8c8eb91..75cda7c 100644
--- a/apps/Settings/sshkeys.desktop
+++ b/apps/Settings/sshkeys.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=Manage SSH keys
+Comment[es]=Gestor de claves del Secure Shell Protocol (SSH)
 Exec=sshkeys
 Icon=sshkeys/sshkeys
 Type=Application
 Name=SSH Keys
+Name[es]=Claves SSH
diff --git a/apps/Settings/tabmanager.desktop b/apps/Settings/tabmanager.desktop
index ce4c47f..4db8017 100644
--- a/apps/Settings/tabmanager.desktop
+++ b/apps/Settings/tabmanager.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Tab Managing Tool
+Comment[es]=Herramienta para gestionar las etiquetas superiores
 Exec=tabmanager
 Icon=tabmanager/tabmanager
 Type=Settings
 Name=Tab Manager
diff --git a/apps/Settings/usermanager.desktop b/apps/Settings/usermanager.desktop
index c6dc2cb..a5c4240 100644
--- a/apps/Settings/usermanager.desktop
+++ b/apps/Settings/usermanager.desktop
@@ -1,6 +1,8 @@
 [Desktop Entry]
 Comment=User Manager
+Comment[es]=Gestor de usuarios
 Exec=usermanager
 Icon=usermanager/usermanager.png
 Type=Setting
 Name=User Manager
+Name[es]=Gestor Usuarios
diff --git a/apps/Settings/wlansetup.desktop b/apps/Settings/wlansetup.desktop
index b55137e..e64841a 100644
--- a/apps/Settings/wlansetup.desktop
+++ b/apps/Settings/wlansetup.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Comment=Wireless LAN Setup
+Comment[es]=Configuración de red inalámbrica
 Exec=wlansetup
 Icon=wlansetup/wlan
 Type=Settings
 Name=Wireless LAN Setup