From 7c44e9f887c1381b7fad7b324d83148a8dda1161 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Thu, 22 Sep 2011 07:53:30 +0000
Subject: [PATCH] slovarik and calendar windows headers fixes

git-svn-id: svn://kolibrios.org@2221 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/other/slovarik/SLOVARIK.ASM        | 25 +++++++++------------
 programs/system/calendar/trunk/calendar.asm | 10 ++++-----
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/programs/other/slovarik/SLOVARIK.ASM b/programs/other/slovarik/SLOVARIK.ASM
index e74f06bc0b..738a28a420 100644
--- a/programs/other/slovarik/SLOVARIK.ASM
+++ b/programs/other/slovarik/SLOVARIK.ASM
@@ -104,16 +104,10 @@ pusha
 	mov eax,0
 	mov ebx,30*65536+400
 	mov ecx,30*65536+170
-	mov edx,0x03cccccc
-	mov edi,0x00777777
+	mov edx,0x14cccccc
+	mov edi,win_header
 	int 0x40
 
-	mov eax,4
-	mov ebx,8*65536+8
-	mov ecx,0xf0ffffff
-	mov edx,win_header
-	mov esi,win_header_l-win_header;8
-	int 0x40
 
 	mov eax,4
 	mov ebx,10*65536+41
@@ -122,23 +116,23 @@ pusha
 	mov esi,txtWord_l-txtWord ; 6
 	int 0x40
 
-	mov eax,4
+	;mov eax,4
 	mov ebx,10*65536+67
-	mov ecx,0x00000000
+	;mov ecx,0x00000000
 	mov edx,txtVariants
 	mov esi,txtVariants_l-txtVariants ;9
 	int 0x40
 
-	mov eax,4
+	;mov eax,4
 	mov ebx,10*65536+91
-	mov ecx,0x00000000
+	;mov ecx,0x00000000
 	mov edx,txtTranslate
 	mov esi,txtTranslate_l-txtTranslate ;8
 	int 0x40
 
-	mov eax,4
+	;mov eax,4
 	mov ebx,10*65536+115
-	mov ecx,0x00000000
+	;mov ecx,0x00000000
 	mov edx,txtTranscript
 	mov esi,txtTranscript_l-txtTranscript ;9
 	int 0x40
@@ -149,6 +143,7 @@ pusha
 	mov edx,3
 	mov esi,0x00dddddd
 	int 0x40
+	
 	mov eax,4
 	mov ebx,168*65536+142
 	mov ecx,0x00000000
@@ -723,7 +718,7 @@ ret
 
 
 win_header:
-db 'Словарик'
+db 'Словарик', 0
 win_header_l:
 
 tr_not_found_text:
diff --git a/programs/system/calendar/trunk/calendar.asm b/programs/system/calendar/trunk/calendar.asm
index f357942183..591f9c965c 100644
--- a/programs/system/calendar/trunk/calendar.asm
+++ b/programs/system/calendar/trunk/calendar.asm
@@ -1056,15 +1056,15 @@ Fkeys	  db 210,211,212,213,214,215,216,217,208,209,228,159
 
 title: 	 ; строка заголовка
 if lang eq ru
-     db   'КАЛЕНДАРЬ',0
+     db   'Календарь',0
 else if lang eq ge
-     db   'KALENDER',0
+     db   'Kalender',0
 else if lang eq fr
-     db   'CALENDRIER',0
+     db   'Calendrier',0
 else if lang eq et
-     db   'KALENDER',0
+     db   'Kalender',0
 else
-     db   'CALENDAR',0
+     db   'Calendar',0
 end if
 
 if SKIP eq 0