From 827175f787ec420e9261699c4c0b740c4b554f89 Mon Sep 17 00:00:00 2001
From: Albom <Albom@kolibrios.org>
Date: Thu, 13 Dec 2012 07:04:17 +0000
Subject: [PATCH] File associations for kfar and kfm in data and programs
 folders merged.

git-svn-id: svn://kolibrios.org@3103 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/eng/File Managers/eolite.ini |  1 -
 data/eng/File Managers/kfar.ini   | 18 +++++++++---------
 data/eng/File Managers/kfm.ini    | 22 ++++++++++++++++------
 data/rus/File Managers/eolite.ini |  1 -
 data/rus/File Managers/kfar.ini   | 16 ++++++++--------
 data/rus/File Managers/kfm.ini    | 22 ++++++++++++++++------
 programs/fs/kfar/trunk/kfar.ini   |  9 ++++++---
 programs/fs/kfm/trunk/kfm.ini     | 11 ++++++++---
 8 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/data/eng/File Managers/eolite.ini b/data/eng/File Managers/eolite.ini
index 4fd8834f8b..3f6445f56d 100644
--- a/data/eng/File Managers/eolite.ini	
+++ b/data/eng/File Managers/eolite.ini	
@@ -28,7 +28,6 @@ mht=/sys/HTMLv
 fb2=/sys/HTMLv
 rtf=/sys/RtfRead
 obj=/sys/develop/cObj
-sna=/sys/e80
 nes=/sys/games/fceu
 xm=/sys/media/AC97SND
 wav=/sys/media/AC97SND
diff --git a/data/eng/File Managers/kfar.ini b/data/eng/File Managers/kfar.ini
index d5848a1973..6edf269c41 100644
--- a/data/eng/File Managers/kfar.ini	
+++ b/data/eng/File Managers/kfar.ini	
@@ -5,23 +5,20 @@ ini=/sys/TinyPad
 txt=/sys/TinyPad
 jpg=/sys/media/kiv
 jpeg=/sys/media/kiv
+jpe=/sys/media/kiv
 gif=/sys/media/kiv; ViewGraph,MenuAnimage
-wav=/sys/media/AC97SND
-mp3=/sys/media/AC97SND
-xm=/sys/media/AC97SND
-mid=/sys/media/MIDAMP
+ico=/sys/media/kiv
 bmp=/sys/media/kiv; ViewGraph,MenuAnimage
 png=/sys/media/kiv
-ico=/sys/media/kiv
 cur=/sys/media/kiv
 pcx=/sys/media/kiv
-xcf=/sys/media/kiv
 pbm=/sys/media/kiv
 pgm=/sys/media/kiv
 pnm=/sys/media/kiv
 tif=/sys/media/kiv
 tiff=/sys/media/kiv
 wbmp=/sys/media/kiv
+xcf=/sys/media/kiv
 rtf=/sys/RtfRead
 3ds=/sys/3d/view3ds
 lif=/sys/demos/life2
@@ -29,14 +26,17 @@ skn=/sys/desktop
 m3u=/sys/media/listplay
 lap=/sys/media/listplay
 asf=/sys/media/listplay
+wav=/sys/media/AC97SND
+mp3=/sys/media/AC97SND
+xm=/sys/media/AC97SND
+mid=/sys/media/MIDAMP
 cvs=/sys/graph
 obj=/sys/develop/cObj
-nes=/sys/fceu
-sna=/sys/e80
 htm=/sys/HTMLv
 html=/sys/HTMLv
 fb2=/sys/HTMLv
-
+mht=/sys/HTMLv
+kla=/sys/games/klavisha
 
 [Menu]
 AsmMenu1=&Edit,/sys/TinyPad
diff --git a/data/eng/File Managers/kfm.ini b/data/eng/File Managers/kfm.ini
index dc8c6c4505..f3dcdd7450 100644
--- a/data/eng/File Managers/kfm.ini	
+++ b/data/eng/File Managers/kfm.ini	
@@ -2,6 +2,7 @@ start
 <>icons_associations
 asm 0004
 inc 0004
+mac 0004
 txt 0003
 rtf 0003
 ini 0003
@@ -25,6 +26,7 @@ j2c 0006
 bmp 0006
 dib 0006
 rle 0006
+pbm 0006
 wbm 0006
 wbmp 0006
 xbm 0006
@@ -61,6 +63,7 @@ pix 0006
 pict 0006
 pct 0006
 pic 0006
+pgm 0006
 pef 0006
 pcd 0006
 iff 0006
@@ -103,6 +106,7 @@ wlz 0005
 exe 0008
 com 0008
 bat 0008
+sh 0008
 7z 0009
 rar 0009
 zip 0009
@@ -124,6 +128,8 @@ uu 0009
 xxe 0009
 z 0009
 dat 0010
+dbg 0010
+mgb 0010
 ttf 0012
 ttc 0012
 chr 0012
@@ -139,20 +145,19 @@ skn 0017
 <>files_associations
 asm /sys/tinypad
 inc /sys/tinypad
+mac /sys/tinypad
+dbg /sys/tinypad
 txt /sys/tinypad
 ini /sys/tinypad
 log /sys/tinypad
 dat /sys/tinypad
 inf /sys/tinypad
 bat /sys/tinypad
+sh /sys/tinypad
 jpg /sys/media/kiv
 jpeg /sys/media/kiv
 jpe /sys/media/kiv
 gif /sys/media/kiv
-wav /sys/media/ac97snd
-mp3 /sys/media/ac97snd
-xm /sys/media/ac97snd
-mid /sys/media/midamp
 bmp /sys/media/kiv
 png /sys/media/kiv
 ico /sys/media/kiv
@@ -165,6 +170,10 @@ pnm /sys/media/kiv
 tif /sys/media/kiv
 tiff /sys/media/kiv
 wbmp /sys/media/kiv
+wav /sys/media/ac97snd
+mp3 /sys/media/ac97snd
+xm /sys/media/ac97snd
+mid /sys/media/midamp
 rtf /sys/rtfread
 3ds /sys/3d/view3ds
 lif /sys/demos/life2
@@ -184,12 +193,13 @@ lap /sys/media/listplay
 asf /sys/media/listplay
 cvs /sys/graph
 obj /sys/develop/cObj
-nes /sys/fceu
-sna /sys/e80
 htm /sys/HTMLv
 html /sys/HTMLv
+mht /sys/HTMLv
 fb2 /sys/HTMLv
 kla /sys/games/klavisha
+bin /sys/develop/heed
+mgb /sys/develop/heed
 <>end
 
 <>files_association1
diff --git a/data/rus/File Managers/eolite.ini b/data/rus/File Managers/eolite.ini
index 4fd8834f8b..3f6445f56d 100644
--- a/data/rus/File Managers/eolite.ini	
+++ b/data/rus/File Managers/eolite.ini	
@@ -28,7 +28,6 @@ mht=/sys/HTMLv
 fb2=/sys/HTMLv
 rtf=/sys/RtfRead
 obj=/sys/develop/cObj
-sna=/sys/e80
 nes=/sys/games/fceu
 xm=/sys/media/AC97SND
 wav=/sys/media/AC97SND
diff --git a/data/rus/File Managers/kfar.ini b/data/rus/File Managers/kfar.ini
index fe86177359..95bcd529be 100644
--- a/data/rus/File Managers/kfar.ini	
+++ b/data/rus/File Managers/kfar.ini	
@@ -5,23 +5,20 @@ ini=/sys/TinyPad
 txt=/sys/TinyPad
 jpg=/sys/media/kiv
 jpeg=/sys/media/kiv
+jpe=/sys/media/kiv
 gif=/sys/media/kiv; ViewGraph,MenuAnimage
-wav=/sys/media/AC97SND
-mp3=/sys/media/AC97SND
-xm=/sys/media/AC97SND
-mid=/sys/media/MIDAMP
+ico=/sys/media/kiv
 bmp=/sys/media/kiv; ViewGraph,MenuAnimage
 png=/sys/media/kiv
-ico=/sys/media/kiv
 cur=/sys/media/kiv
 pcx=/sys/media/kiv
-xcf=/sys/media/kiv
 pbm=/sys/media/kiv
 pgm=/sys/media/kiv
 pnm=/sys/media/kiv
 tif=/sys/media/kiv
 tiff=/sys/media/kiv
 wbmp=/sys/media/kiv
+xcf=/sys/media/kiv
 rtf=/sys/RtfRead
 3ds=/sys/3d/view3ds
 lif=/sys/demos/life2
@@ -29,13 +26,16 @@ skn=/sys/desktop
 m3u=/sys/media/listplay
 lap=/sys/media/listplay
 asf=/sys/media/listplay
+wav=/sys/media/AC97SND
+mp3=/sys/media/AC97SND
+xm=/sys/media/AC97SND
+mid=/sys/media/MIDAMP
 cvs=/sys/graph
 obj=/sys/develop/cObj
-nes=/sys/fceu
-sna=/sys/e80
 htm=/sys/HTMLv
 html=/sys/HTMLv
 fb2=/sys/HTMLv
+mht=/sys/HTMLv
 kla=/sys/games/klavisha
 
 [Menu]
diff --git a/data/rus/File Managers/kfm.ini b/data/rus/File Managers/kfm.ini
index dc8c6c4505..f3dcdd7450 100644
--- a/data/rus/File Managers/kfm.ini	
+++ b/data/rus/File Managers/kfm.ini	
@@ -2,6 +2,7 @@ start
 <>icons_associations
 asm 0004
 inc 0004
+mac 0004
 txt 0003
 rtf 0003
 ini 0003
@@ -25,6 +26,7 @@ j2c 0006
 bmp 0006
 dib 0006
 rle 0006
+pbm 0006
 wbm 0006
 wbmp 0006
 xbm 0006
@@ -61,6 +63,7 @@ pix 0006
 pict 0006
 pct 0006
 pic 0006
+pgm 0006
 pef 0006
 pcd 0006
 iff 0006
@@ -103,6 +106,7 @@ wlz 0005
 exe 0008
 com 0008
 bat 0008
+sh 0008
 7z 0009
 rar 0009
 zip 0009
@@ -124,6 +128,8 @@ uu 0009
 xxe 0009
 z 0009
 dat 0010
+dbg 0010
+mgb 0010
 ttf 0012
 ttc 0012
 chr 0012
@@ -139,20 +145,19 @@ skn 0017
 <>files_associations
 asm /sys/tinypad
 inc /sys/tinypad
+mac /sys/tinypad
+dbg /sys/tinypad
 txt /sys/tinypad
 ini /sys/tinypad
 log /sys/tinypad
 dat /sys/tinypad
 inf /sys/tinypad
 bat /sys/tinypad
+sh /sys/tinypad
 jpg /sys/media/kiv
 jpeg /sys/media/kiv
 jpe /sys/media/kiv
 gif /sys/media/kiv
-wav /sys/media/ac97snd
-mp3 /sys/media/ac97snd
-xm /sys/media/ac97snd
-mid /sys/media/midamp
 bmp /sys/media/kiv
 png /sys/media/kiv
 ico /sys/media/kiv
@@ -165,6 +170,10 @@ pnm /sys/media/kiv
 tif /sys/media/kiv
 tiff /sys/media/kiv
 wbmp /sys/media/kiv
+wav /sys/media/ac97snd
+mp3 /sys/media/ac97snd
+xm /sys/media/ac97snd
+mid /sys/media/midamp
 rtf /sys/rtfread
 3ds /sys/3d/view3ds
 lif /sys/demos/life2
@@ -184,12 +193,13 @@ lap /sys/media/listplay
 asf /sys/media/listplay
 cvs /sys/graph
 obj /sys/develop/cObj
-nes /sys/fceu
-sna /sys/e80
 htm /sys/HTMLv
 html /sys/HTMLv
+mht /sys/HTMLv
 fb2 /sys/HTMLv
 kla /sys/games/klavisha
+bin /sys/develop/heed
+mgb /sys/develop/heed
 <>end
 
 <>files_association1
diff --git a/programs/fs/kfar/trunk/kfar.ini b/programs/fs/kfar/trunk/kfar.ini
index 7b1dda7d47..2e4610c848 100644
--- a/programs/fs/kfar/trunk/kfar.ini
+++ b/programs/fs/kfar/trunk/kfar.ini
@@ -12,13 +12,13 @@ bmp=/sys/media/kiv; MenuKiv,MenuAnimage
 png=/sys/media/kiv
 cur=/sys/media/kiv
 pcx=/sys/media/kiv
+pbm=/sys/media/kiv
+pgm=/sys/media/kiv
+pnm=/sys/media/kiv
 tif=/sys/media/kiv
 tiff=/sys/media/kiv
 wbmp=/sys/media/kiv
 xcf=/sys/media/kiv
-pbm=/sys/media/kiv
-pgm=/sys/media/kiv
-pnm=/sys/media/kiv
 rtf=/sys/RtfRead
 3ds=/sys/3d/view3ds
 lif=/sys/demos/life2
@@ -28,12 +28,15 @@ lap=/sys/media/listplay
 asf=/sys/media/listplay
 wav=/sys/media/AC97SND
 mp3=/sys/media/AC97SND
+xm=/sys/media/AC97SND
 mid=/sys/media/MIDAMP
 cvs=/sys/graph
 obj=/sys/develop/cobj
 htm=/sys/HTMLv
 html=/sys/HTMLv
+fb2=/sys/HTMLv
 mht=/sys/HTMLv
+kla=/sys/games/klavisha
 
 [Menu]
 AsmMenu1=&Внешний редактор,/sys/TinyPad
diff --git a/programs/fs/kfm/trunk/kfm.ini b/programs/fs/kfm/trunk/kfm.ini
index 09c675d6ba..f3dcdd7450 100644
--- a/programs/fs/kfm/trunk/kfm.ini
+++ b/programs/fs/kfm/trunk/kfm.ini
@@ -41,6 +41,10 @@ tiff 0006
 xif 0006
 tga 0006
 pcx 0006
+pbm 0006
+pgm 0006
+pnm 0006
+xcf 0006
 dcx 0006
 ppm 0006
 psd 0006
@@ -159,13 +163,13 @@ png /sys/media/kiv
 ico /sys/media/kiv
 cur /sys/media/kiv
 pcx /sys/media/kiv
-tif /sys/media/kiv
-tiff /sys/media/kiv
-wbmp /sys/media/kiv
 xcf /sys/media/kiv
 pbm /sys/media/kiv
 pgm /sys/media/kiv
 pnm /sys/media/kiv
+tif /sys/media/kiv
+tiff /sys/media/kiv
+wbmp /sys/media/kiv
 wav /sys/media/ac97snd
 mp3 /sys/media/ac97snd
 xm /sys/media/ac97snd
@@ -192,6 +196,7 @@ obj /sys/develop/cObj
 htm /sys/HTMLv
 html /sys/HTMLv
 mht /sys/HTMLv
+fb2 /sys/HTMLv
 kla /sys/games/klavisha
 bin /sys/develop/heed
 mgb /sys/develop/heed