# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1377346118 -10800
# Node ID 256340cc43f616d784e64a43e219e205e2d75747
# Parent  7c9b407649255717cbb81e61b2a15942df8ccd7b
For some predefined .desktop files: validate, fix, add Russian translations

diff -r 7c9b40764925 -r 256340cc43f6 aterm/stuff/aterm.desktop
--- a/aterm/stuff/aterm.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/aterm/stuff/aterm.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -27,5 +27,5 @@
 GenericName[zh_CN]=终端程序
 GenericName[zh_TW]=終端機程式
 Exec=aterm
-Icon=xterm
-Categories=Utility;X-Terminal;
+Icon=terminal
+Categories=System;TerminalEmulator;
diff -r 7c9b40764925 -r 256340cc43f6 beaver/stuff/beaver.desktop
--- a/beaver/stuff/beaver.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/beaver/stuff/beaver.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -6,7 +6,6 @@
 Name[zh_CN]=Beaver代码编辑器
 Exec=beaver %F
 Icon=beaver
-Terminal=false
 StartupNotify=true
-Categories=Development;
+Categories=Development;Building;
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
diff -r 7c9b40764925 -r 256340cc43f6 calculator/stuff/calculator.desktop
--- a/calculator/stuff/calculator.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/calculator/stuff/calculator.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -5,6 +5,5 @@
 Name[ru]=Калькулятор Fox
 Name[zh_CN]=Fox计算器
 Exec=calculator
-Terminal=false
 Icon=calculator
-Categories=Utility;
+Categories=Utility;Calculator;
diff -r 7c9b40764925 -r 256340cc43f6 clex/stuff/clex.desktop
--- a/clex/stuff/clex.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/clex/stuff/clex.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -2,7 +2,6 @@
 Type=Application
 Name=Clex File Manager
 Name[ru]=Файловый менеджер Clex
-Exec=clex
-Terminal=true
+Exec=terminal -e clex
 Icon=clex
-Categories=System;
+Categories=ConsoleOnly;System;FileTools;FileManager;
diff -r 7c9b40764925 -r 256340cc43f6 epdfview/stuff/epdfview.desktop
--- a/epdfview/stuff/epdfview.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/epdfview/stuff/epdfview.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -4,7 +4,7 @@
 Name[es]=ePDFView Visor PDF
 Name[fr]=ePDFView Visionneur PDF
 Name[pt]=ePDFView Visualizador de PDF
-Name[ru]=Просмотрщик PDF ePDFView
+Name[ru]=Просмотр PDF ePDFView
 Name[zh_CN]=PDF浏览器
 GenericName=PDF viewer
 GenericName[es]=Visor PDF
@@ -15,6 +15,5 @@
 Comment[zh_CN]=轻量级PDF浏览器
 Exec=epdfview %f
 Icon=epdfview
-Terminal=false
-Categories=Viewer;Office;
+Categories=GTK;Office;Viewer;
 MimeType=application/pdf;
diff -r 7c9b40764925 -r 256340cc43f6 galculator/stuff/galculator.desktop
--- a/galculator/stuff/galculator.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/galculator/stuff/galculator.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.0
+Type=Application
 Name=Galculator
 Name[fr]=Calculatrice scientifique
 Name[pt]=Calculadora Científica
@@ -13,13 +13,11 @@
 Comment[pl]=Wykonaj proste lub naukowe obliczenia
 Comment[pt]=Executa cálculos simples e científicos
 Comment[pt_BR]=Executa cálculos simples e científicos
+Comment[ru]=Выполняйте простые и инженерные вычисления
 Comment[sk]=Kalkulačka na jednoduché i vedecké výpočty
 Comment[sv]=Genomför enkla och vetenskapliga beräkningar
-Comment[zh_CN]=科学计算器
 Comment[zh_TW]=進行簡單和科學的計算
 Exec=galculator
 Icon=galculator
-Terminal=false
-Type=Application
-Categories=Utility;
+Categories=Utility;Calculator;
 StartupNotify=true
diff -r 7c9b40764925 -r 256340cc43f6 geany/stuff/geany.desktop
--- a/geany/stuff/geany.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/geany/stuff/geany.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=Geany IDE
 Name[fr]=EDI Geany
 Name[pt]=IDE Geany
 Exec=geany %F
-Icon=/usr/share/pixmaps/geany.png
-Terminal=false
+Icon=geany
 Categories=GTK;Development;IDE;
 MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
 StartupNotify=true
diff -r 7c9b40764925 -r 256340cc43f6 gparted/stuff/gparted.desktop
--- a/gparted/stuff/gparted.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/gparted/stuff/gparted.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=GParted Partition Editor
 Name[es]=Editor de particiones GParted
 Name[fi]=GParted levyosioiden muokkain
@@ -7,9 +7,8 @@
 Name[hu]=GParted partíciószerkesztő
 Name[it]=Editor di partizioni GParted
 Name[pt]=GParted Editor de Partições
+Name[ru]=Редактор разделов GParted
 Name[zh_CN]=GParted分区编辑工具
-Exec=tazbox su "gparted"
+Exec=tazbox su gparted
 Icon=gparted
-Terminal=false
-Type=Application
-Categories=GNOME;Application;System;
+Categories=GTK;System;Filesystem;
diff -r 7c9b40764925 -r 256340cc43f6 hardinfo/stuff/hardinfo.desktop
--- a/hardinfo/stuff/hardinfo.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/hardinfo/stuff/hardinfo.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=System Information
 Name[fr]=Informations système
 Name[pt_BR]=Informações e Testes do Sistema
+Name[ru]=Информация о системе
 Exec=hardinfo
 Icon=hardinfo
-Terminal=false
-Type=Application
 StartupNotify=true
 Categories=System
diff -r 7c9b40764925 -r 256340cc43f6 isomaster/stuff/isomaster.desktop
--- a/isomaster/stuff/isomaster.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/isomaster/stuff/isomaster.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,12 +1,11 @@
 [Desktop Entry]
+Type=Application
 Name=ISO Master
 GenericName=CD image editor
 GenericName[fr]=Editeur d'images ISO
 Comment=Graphical CD image editor for reading, modifying and writing ISO images
 Exec=isomaster
-Terminal=false
+Icon=isomaster
 StartupNotify=true
-Type=Application
-Categories=Utility;
+Categories=Utility;FileTools;
 MimeType=application/x-iso
-Icon=isomaster
diff -r 7c9b40764925 -r 256340cc43f6 leafpad/stuff/leafpad.desktop
--- a/leafpad/stuff/leafpad.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/leafpad/stuff/leafpad.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Leafpad Text editor
 Name[fr]=Editeur de texte Leafpad
 Name[pt]=Leafpad Editor de Texto
+Name[ru]=Текстовый редактор Leafpad
 Name[zh_CN]=Leafpad文本编辑器
 Exec=leafpad %f
 Icon=leafpad
-Terminal=false
-Type=Application
-MimeType=text/plain
 Categories=GTK;Utility;TextEditor;
+MimeType=text/plain;
diff -r 7c9b40764925 -r 256340cc43f6 lxlauncher/stuff/lxlauncher.desktop
--- a/lxlauncher/stuff/lxlauncher.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/lxlauncher/stuff/lxlauncher.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,9 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Desktop Launcher
 Name[fr]=Lanceur de bureau
 Exec=lxlauncher
 Icon=application-x-executable
-Terminal=false
-Type=Application
-Categories=Application;Utility;
+Categories=Utility;
diff -r 7c9b40764925 -r 256340cc43f6 lxtask/stuff/lxtask.desktop
--- a/lxtask/stuff/lxtask.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/lxtask/stuff/lxtask.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,16 +1,17 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Task Manager
 Name[fr]=Gestionnaire de tâches
 Name[pt]=Gerenciador de Processos
+Name[ru]=Диспетчер задач
 Name[zh_TW]=工作管理員
+GenericName=Process manager
+GenericName[ru]=Менеджер процессов
+GenericName[zh_TW]=工作管理員
 Comment=Manage running processes
+Comment[ru]=Управление запущенными процессами
 Comment[zh_TW]=管理執行中的程式
-GenericName=Process manager
-GenericName=工作管理員
 Exec=lxtask
 Icon=lxtask
-Terminal=false
 StartupNotify=true
-Type=Application
-Categories=Application;System;Utility;
+Categories=GTK;System;Monitor;
diff -r 7c9b40764925 -r 256340cc43f6 mc/stuff/mc.desktop
--- a/mc/stuff/mc.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/mc/stuff/mc.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Midnight Commander
-Exec=xterm -e '/usr/bin/mc'
+Exec=terminal -e /usr/bin/mc
 Icon=computer
-Type=Application
-Categories=Utility;Terminal;
+Categories=ConsoleOnly;Utility;FileTools;
diff -r 7c9b40764925 -r 256340cc43f6 mtpaint/stuff/applications/mtpaint-grab.desktop
--- a/mtpaint/stuff/applications/mtpaint-grab.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/mtpaint/stuff/applications/mtpaint-grab.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -5,6 +5,5 @@
 Name[pt]=Captura de Screenshots
 Name[ru]=Снимок экрана
 Exec=mtpaint -s
-Terminal=false
 Icon=camera-photo
-Categories=Graphics;
+Categories=Utility;
diff -r 7c9b40764925 -r 256340cc43f6 mtpaint/stuff/applications/mtpaint.desktop
--- a/mtpaint/stuff/applications/mtpaint.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/mtpaint/stuff/applications/mtpaint.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -10,7 +10,6 @@
 Comment[fr]=Créer et modifier des images
 Comment[ru]=Создавайте пиксельную графику и редактируйте цифровые фотографии
 Exec=mtpaint %F
-Terminal=false
 Icon=mtpaint
-Categories=Graphics;
+Categories=GTK;Graphics;2DGraphics;RasterGraphics;
 MimeType=image/bmp;image/x-bmp;image/x-ms-bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/x-pcx;image/png;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/svg;image/svg+xml;image/x-tga;image/tiff;image/xbm;image/x-xbm;image/x-xbitmap;image/xpm;image/x-xpm;image/x-xpixmap;
diff -r 7c9b40764925 -r 256340cc43f6 nano/stuff/nano.desktop
--- a/nano/stuff/nano.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/nano/stuff/nano.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -6,7 +6,6 @@
 Comment=Advanced text editor
 Comment[fr]=Editeur de texte avançé
 Comment[ru]=Консольный текстовый редактор
-Exec=/usr/bin/terminal -e nano
+Exec=terminal -e nano
 Icon=nano
-Terminal=false
-Categories=Utility;TextEditor;
+Categories=ConsoleOnly;Utility;TextEditor;
diff -r 7c9b40764925 -r 256340cc43f6 obconf/stuff/obconf.desktop
--- a/obconf/stuff/obconf.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/obconf/stuff/obconf.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,16 +1,15 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Name=Openbox Configuration Manager
 Name[fr]=Configuration d'Openbox
 Name[pt]=Configurações do Openbox
+Name[ru]=Менеджер параметров Openbox
 Name[zh_TW]=Openbox 組態管理器
 Comment=Openbox configuration manager
 Comment[fr]=Gestionnaire de préférences pour Openbox
 Comment[zh_TW]=管理 Openbox 組態設定
+StartupNotify=true
+Exec=obconf %f
 Icon=obconf
-Exec=obconf %f
-Categories=Settings;DesktopSettings;GTK;
-MimeType=application/x-openbox-theme
-StartupNotify=true
-Terminal=false
+Categories=GTK;Settings;DesktopSettings;
+MimeType=application/x-openbox-theme;
diff -r 7c9b40764925 -r 256340cc43f6 obmenu/stuff/obmenu.desktop
--- a/obmenu/stuff/obmenu.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/obmenu/stuff/obmenu.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,13 +1,13 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Name=Openbox Menu Editor
 Name[fr]=Openbox editor de menu
+Name[ru]=Редактор меню Openbox
 Comment=Edits Openbox menus
 Comment[fr]=Openbox edite les menus
+Comment[ru]=Правка меню Openbox
+StartupNotify=true
+Exec=obmenu
 Icon=mnu48
-Exec=obmenu
-Categories=Settings;DesktopSettings;GTK;
-MimeType=application/x-openbox-theme
-StartupNotify=true
-Terminal=false
+Categories=GTK;Settings;DesktopSettings;
+MimeType=application/x-openbox-theme;
diff -r 7c9b40764925 -r 256340cc43f6 openbox-imlib2/stuff/xsessions/openbox.desktop
--- a/openbox-imlib2/stuff/xsessions/openbox.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/openbox-imlib2/stuff/xsessions/openbox.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -2,5 +2,6 @@
 Encoding=UTF-8
 Type=XSession
 Name=OpenBox Session
+Name[ru]=Сеанс OpenBox
 Icon=openbox
 Exec=openbox-session
diff -r 7c9b40764925 -r 256340cc43f6 openbox/stuff/xsessions/openbox.desktop
--- a/openbox/stuff/xsessions/openbox.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/openbox/stuff/xsessions/openbox.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -2,5 +2,6 @@
 Encoding=UTF-8
 Type=XSession
 Name=OpenBox Session
+Name[ru]=Сеанс OpenBox
 Icon=openbox
 Exec=openbox-session
diff -r 7c9b40764925 -r 256340cc43f6 parcellite/stuff/parcellite.desktop
--- a/parcellite/stuff/parcellite.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/parcellite/stuff/parcellite.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Parcellite Clipboard Manager
 Name[pt]=Gerenciador da Área de Transferência
+Name[ru]=Менеджер буфера обмена Parcellite
+Exec=parcellite
 Icon=parcellite
-Exec=parcellite
-Terminal=false
-Type=Application
-Categories=GTK;GNOME;Application;Utility;
+Categories=GTK;Utility;TextTools;
diff -r 7c9b40764925 -r 256340cc43f6 pcmanfm-legacy/stuff/applications/pcmanfm-pref.desktop
--- a/pcmanfm-legacy/stuff/applications/pcmanfm-pref.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/pcmanfm-legacy/stuff/applications/pcmanfm-pref.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,11 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Desktop Wallpaper
 Name[fr]=Fond d'écran
-Name[ru]=Обои рабочего стола
+Name[ru]=Фон рабочего стола
 Name[zh_CN]=桌面壁纸
 Exec=pcmanfm --show-pref=3
 Icon=preferences-desktop-wallpaper
-Terminal=false
-Type=Application
 Categories=Settings;DesktopSettings;
diff -r 7c9b40764925 -r 256340cc43f6 pcmanfm-legacy/stuff/applications/pcmanfm.desktop
--- a/pcmanfm-legacy/stuff/applications/pcmanfm.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/pcmanfm-legacy/stuff/applications/pcmanfm.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=PCMan File Manager
 Name[fr]=Gestionnaire de fichiers
 Name[pt]=Gerenciador de Arquivos
@@ -9,7 +9,6 @@
 Exec=pcmanfm %F
 Icon=pcmanfm
 StartupNotify=true
-Type=Application
 Terminal=false
-MimeType=x-directory/normal;inode/directory;
-Categories=Application;System;Utility;Core;GTK;
+MimeType=inode/directory;
+Categories=GTK;Core;System;FileTools;FileManager;
diff -r 7c9b40764925 -r 256340cc43f6 pcmanfm/stuff/applications/pcmanfm-pref.desktop
--- a/pcmanfm/stuff/applications/pcmanfm-pref.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/pcmanfm/stuff/applications/pcmanfm-pref.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Desktop Wallpaper
 Name[fr]=Fond d'écran
+Name[ru]=Фон рабочего стола
 Name[zh_CN]=桌面壁纸
 Exec=pcmanfm --desktop-pref
 Icon=preferences-desktop-wallpaper
-Terminal=false
-Type=Application
 Categories=Settings;DesktopSettings;
diff -r 7c9b40764925 -r 256340cc43f6 pcmanfm/stuff/applications/pcmanfm.desktop
--- a/pcmanfm/stuff/applications/pcmanfm.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/pcmanfm/stuff/applications/pcmanfm.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,14 +1,13 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=PCMan File Manager
 Name[fr]=Gestionnaire de fichiers
 Name[pt]=Gerenciador de Arquivos
+Name[ru]=Файловый менеджер PCMan
 Name[zh_CN]=PCMan 文件管理器
 Name[zh_TW]=PCMan 檔案管理程式
 Exec=pcmanfm %F
 Icon=pcmanfm
 StartupNotify=true
-Type=Application
-Terminal=false
-MimeType=x-directory/normal;inode/directory;
-Categories=Application;System;Utility;Core;GTK;
+MimeType=inode/directory;
+Categories=GTK;System;FileTools;FileManager;
diff -r 7c9b40764925 -r 256340cc43f6 sakura/receipt
--- a/sakura/receipt	Fri Aug 23 18:59:48 2013 +0000
+++ b/sakura/receipt	Sat Aug 24 15:08:38 2013 +0300
@@ -5,30 +5,31 @@
 CATEGORY="utilities"
 SHORT_DESC="Lightweight GTK+/vte Terminal"
 MAINTAINER="pankso@slitaz.org"
+LICENSE=""
+WEB_SITE="http://www.pleyades.net/david/projects/sakura"
+TARBALL="$PACKAGE-$VERSION.tar.bz2"
+WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
+
 DEPENDS="gtk+ vte xorg-libXdamage"
 BUILD_DEPENDS="gtk+-dev vte-dev gettext cmake wget"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.pleyades.net/david/projects/sakura"
-WGET_URL="https://launchpad.net/sakura/trunk/$VERSION/+download/$TARBALL"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	sed -i 's/terminal-tango.svg/terminal-tango.png/' src/sakura.c &&
 	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . &&
 	sed -i 's/$/ -lncurses/' CMakeFiles/sakura.dir/link.txt &&
 	sed -i 's/-u//' CMakeLists.txt &&
 	sed -i 's/-u//' CMakeFiles/man.dir/build.make &&
 	make &&
-	make DESTDIR=$PWD/_pkg install
+	make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/pixmaps
-	cp -a $_pkg/usr/bin $fs/usr
+	cp -a $install/usr/bin $fs/usr
 	cp $stuff/terminal-tango.png $fs/usr/share/pixmaps/
 }
 
diff -r 7c9b40764925 -r 256340cc43f6 sakura/stuff/sakura.desktop
--- a/sakura/stuff/sakura.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/sakura/stuff/sakura.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Sakura Terminal
+Name[ru]=Терминал Sakura
 Exec=sakura
 Icon=terminal-tango
-Type=Application
-Categories=GTK;Utility;TerminalEmulator;
+Categories=GTK;System;TerminalEmulator;
 StartupNotify=true
diff -r 7c9b40764925 -r 256340cc43f6 spacefm/stuff/applications/spacefm-desktop-pref.desktop
--- a/spacefm/stuff/applications/spacefm-desktop-pref.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/spacefm/stuff/applications/spacefm-desktop-pref.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=SpaceFM Desktop configuration
 Name[fr]=Configuration du bureau SpaceFM
+Name[ru]=Параметры рабочего стола SpaceFM
 Exec=spacefm --desktop-pref
 Icon=preferences-desktop-wallpaper
-Terminal=false
-Type=Application
 Categories=Settings;DesktopSettings;
diff -r 7c9b40764925 -r 256340cc43f6 suggested-applications/stuff/applications/chat.desktop
--- a/suggested-applications/stuff/applications/chat.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/suggested-applications/stuff/applications/chat.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Chat
+Name[ru]=Чат
+Comment=Install applications for chatting
+Comment[ru]=Установить приложения для чата
+Exec=default-app pidgin --install "pidgin skype"
 Icon=internet-group-chat
-Exec=default-app pidgin --install "pidgin skype"
-Type=Application
-Categories=Internet;Network;
+Categories=Network;
diff -r 7c9b40764925 -r 256340cc43f6 suggested-applications/stuff/applications/editimage.desktop
--- a/suggested-applications/stuff/applications/editimage.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/suggested-applications/stuff/applications/editimage.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Edit Images
+Name[ru]=Правка изображений
+Comment=Install applications for image edit
+Comment[ru]=Установить приложения для правки изображений
+Exec=default-app gimp --install "gimp inkscape"
 Icon=applications-graphics
-Exec=default-app gimp --install "gimp inkscape"
-Type=Application
 Categories=Graphics;
diff -r 7c9b40764925 -r 256340cc43f6 suggested-applications/stuff/applications/watchvideo.desktop
--- a/suggested-applications/stuff/applications/watchvideo.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/suggested-applications/stuff/applications/watchvideo.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Watch Video
+Name[ru]=Смотреть видео
+Comment=Install applications for image edit
+Comment[ru]=Установить приложения для просмотра видео
+Exec=default-app gmplayer --install "mplayer-svn get-flash-plugin gecko-mediaplayer"
 Icon=applications-multimedia
-Exec=default-app gmplayer --install "mplayer-svn get-flash-plugin gecko-mediaplayer"
-Type=Application
-Categories=Multimedia;AudioVideo;Audio;Player;
+Categories=AudioVideo;Video;Player;
diff -r 7c9b40764925 -r 256340cc43f6 suggested-applications/stuff/applications/writedoc.desktop
--- a/suggested-applications/stuff/applications/writedoc.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/suggested-applications/stuff/applications/writedoc.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Write documents
+Name[ru]=Правка документов
+Comment=Install applications for image edit
+Comment[ru]=Установить приложения для правки документов
+Exec=default-app abiword --install "abiword abiword-plugins gnumeric"
 Icon=text-editor
-Exec=default-app abiword --install "abiword abiword-plugins gnumeric"
-Type=Application
 Categories=Office;
diff -r 7c9b40764925 -r 256340cc43f6 suggested-applications/stuff/default-app
--- a/suggested-applications/stuff/default-app	Fri Aug 23 18:59:48 2013 +0000
+++ b/suggested-applications/stuff/default-app	Sat Aug 24 15:08:38 2013 +0300
@@ -3,26 +3,24 @@
 APP="$1"
 
 # Auto Install DEPENDS and/or SUGGESTED
-install()
-{
+install() {
 	TMPFILE="/tmp/installlist-$$"
 	#echo "pkgs to install: $1"
 	for pkg in $1 ; do
-	  	if [ ! -d /var/lib/tazpkg/installed/${pkg} ]; then
+		if [ ! -d /var/lib/tazpkg/installed/${pkg} ]; then
 			echo "$pkg" >> $TMPFILE
-		fi	
-	done 
-	
+		fi
+	done
+
 	if [ -f $TMPFILE ] ; then
 		xterm -geometry 80x16 -title "Installing Packages (Press ENTER to close)" \
 				-e "echo -e \"Installing packages as root. This option depends on \n `cat $TMPFILE`\" 
 				    subox \"tazpkg get-install-list $TMPFILE\"
 				    echo -e \"----\nPress ENTER to close and to proceed further...\"
 				    read i; exit 0;
-				"	
+				"
 		rm -f $TMPFILE
-	fi	
-	
+	fi
 }
 
 if [ "$2" == "--install" ] ; then
diff -r 7c9b40764925 -r 256340cc43f6 urxvt/stuff/urxvt.desktop
--- a/urxvt/stuff/urxvt.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/urxvt/stuff/urxvt.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Urxvt
 GenericName=Unicode Terminal
 Comment=Terminal emulator with unicode support
+Comment[ru]=Эмулятор терминала с поддержкой юникода
 Exec=urxvt -bg black -fg white -cr orange -pr green
 Icon=urxvt
-Type=Application
-Categories=Utility;Terminal;
+Categories=System;TerminalEmulator;
diff -r 7c9b40764925 -r 256340cc43f6 viewnior/stuff/viewnior.desktop
--- a/viewnior/stuff/viewnior.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/viewnior/stuff/viewnior.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Type=Application
 Name=Viewnior Elegant Image Viewer
 Name[da]=Viewnior Elegant Image Viewer
 Name[de]=Viewnior Eleganter Bildbetrachter
@@ -9,11 +10,9 @@
 Name[nl]=Viewnior Elegante Afbeeldingsviewer
 Name[pl]=Viewnior Elegancka przeglądarka obrazów
 Name[pt]=Viewnior Elegante Visualizador de Imagens
-Name[ru]=Viewnior Элегантная смотрелка картинок
+Name[ru]=Просмотр изображений Viewnior
 Exec=viewnior %F
 Icon=viewnior
 StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Graphics
+Categories=Graphics;Viewer;
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;
diff -r 7c9b40764925 -r 256340cc43f6 web-applications/stuff/applications/bitbucket.desktop
--- a/web-applications/stuff/applications/bitbucket.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/web-applications/stuff/applications/bitbucket.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=BitBucket Repositories
+Name[ru]=Репозитории BitBucket
+Exec=browser http://bitbucket.org/
 Icon=bitbucket
-Exec=browser http://bitbucket.org/
-Type=Application
-Categories=Development;
+Categories=Development;ProjectManagement;
diff -r 7c9b40764925 -r 256340cc43f6 web-applications/stuff/applications/jamendo.desktop
--- a/web-applications/stuff/applications/jamendo.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/web-applications/stuff/applications/jamendo.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,7 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Jamendo Music
+Name[ru]=Музыка на Jamendo
+TryExec=browser
+Exec=browser http://www.jamendo.com/
 Icon=jamendo
-Exec=browser http://www.jamendo.com/
-Type=Application
 Categories=AudioVideo;Audio;
diff -r 7c9b40764925 -r 256340cc43f6 web-applications/stuff/applications/twitter.desktop
--- a/web-applications/stuff/applications/twitter.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/web-applications/stuff/applications/twitter.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Twitter Micro-blogging
+Name[ru]=Микро-блоги Twitter
+TryExec=browser
 Exec=browser http://twitter.com/
 Icon=twitter
-Terminal=false
-Type=Application
-Categories=Application;Network;
+Categories=Network;InstantMessaging;
diff -r 7c9b40764925 -r 256340cc43f6 web-applications/stuff/applications/wikipedia.desktop
--- a/web-applications/stuff/applications/wikipedia.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/web-applications/stuff/applications/wikipedia.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,8 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=Wikipedia Encyclopedia
 Name[fr]=Encyclopédie Wikipedia
+Name[ru]=Википедия
+TryExec=browser
+Exec=browser http://www.wikipedia.org/
 Icon=wikipedia
-Exec=browser http://www.wikipedia.org/
-Type=Application
-Categories=Office;
+Categories=Office;Database;
diff -r 7c9b40764925 -r 256340cc43f6 xterm/stuff/xterm.desktop
--- a/xterm/stuff/xterm.desktop	Fri Aug 23 18:59:48 2013 +0000
+++ b/xterm/stuff/xterm.desktop	Sat Aug 24 15:08:38 2013 +0300
@@ -1,9 +1,8 @@
 [Desktop Entry]
-Encoding=UTF-8
+Type=Application
 Name=XTerm Terminal
 Name[fr]=Terminal Xterm
 Name[ru]=Терминал XTerm
 Exec=xterm -ls
 Icon=xterm
-Type=Application
-Categories=Utility;Terminal;
+Categories=System;TerminalEmulator;