diff -urN oo_1.0_src/solenv/inc/lang.mk oo_1.0_src-et/solenv/inc/lang.mk
--- oo_1.0_src/solenv/inc/lang.mk	Tue Aug  7 13:11:39 2001
+++ oo_1.0_src-et/solenv/inc/lang.mk	Sat May  4 13:04:43 2002
@@ -89,6 +89,7 @@
 greek$(LANG_GUI)=-CHARSET_microsoft-cp1253
 turk$(LANG_GUI)=-CHARSET_microsoft-cp1254
 korean$(LANG_GUI)=-CHARSET_UTF8
+est$(LANG_GUI)=-CHARSET_microsoft-cp1257
 extern$(LANG_GUI)=-CHARSET_UTF8
 
 .ELSE			# "$(USE_NEW_RSC)" != ""
@@ -279,6 +280,10 @@
 RSCLANG=CATALAN ($IBM_PC_850)
 LANGEXT=37
 .ENDIF
+.IF "$(solarlang)" == "est"
+RSCLANG=ESTONIAN ($IBM_PC_850)
+LANGEXT=77
+.ENDIF
 .IF "$(solarlang)" == "extern"
 RSCLANG=EXTERN ($UTF8)
 LANGEXT=99
diff -urN oo_1.0_src/solenv/inc/postset.mk oo_1.0_src-et/solenv/inc/postset.mk
--- oo_1.0_src/solenv/inc/postset.mk	Fri Sep 28 14:12:06 2001
+++ oo_1.0_src-et/solenv/inc/postset.mk	Sat May  4 13:04:43 2002
@@ -295,6 +295,20 @@
 iso_37=ca
 .ENDIF 
 
+.IF "$(RES_EST)"!="" || "$(give_me_all_languages)"!=""
+alllangext+=77
+est$(LANG_GUI)*=$(default$(LANG_GUI))
+cmd_est:=est 77 -lgESTONIAN $(IBM_PC_850) $(est$(LANG_GUI))
+lang_77=est
+longlang_77=estonian
+langext_77=77
+rsclang_77=-lgESTONIAN $(IBM_PC_850)
+rescharset_77=$(est$(LANG_GUI))
+RCLANGFLAGS_77+= -d ESTONIAN
+iso_77=et
+.ENDIF 
+
+
 .IF "$(RES_FINN)"!="" || "$(give_me_all_languages)"!=""
 alllangext+=35
 finn$(LANG_GUI)*=$(default$(LANG_GUI))
diff -urN oo_1.0_src/tools/source/rc/resmgr.cxx oo_1.0_src-et/tools/source/rc/resmgr.cxx
--- oo_1.0_src/tools/source/rc/resmgr.cxx	Tue Apr 16 14:05:21 2002
+++ oo_1.0_src-et/tools/source/rc/resmgr.cxx	Sat May  4 13:05:03 2002
@@ -1229,7 +1229,8 @@
 
             case LANGUAGE_CATALAN:
                 return "37";
-
+            case LANGUAGE_ESTONIAN:
+                return "77";
             default:
                 return "99";
         }
diff -urN oo_1.0_src/transex3/inc/export.hxx oo_1.0_src-et/transex3/inc/export.hxx
--- oo_1.0_src/transex3/inc/export.hxx	Tue Jul 31 15:12:25 2001
+++ oo_1.0_src-et/transex3/inc/export.hxx	Sat May  4 13:05:37 2002
@@ -187,11 +187,15 @@
 #define CATALAN_ISO				"ca"
 #define CATALAN_INDEX				28
 
+#define ESTONIAN				77
+#define ESTONIAN_ISO				"et"
+#define ESTONIAN_INDEX				29
+
 // special language for l10n framework
 #define EXTERN					99
-#define EXTERN_INDEX				29
+#define EXTERN_INDEX				30
 
-#define LANGUAGES					30
+#define LANGUAGES					31
 
 #define LANGUAGE_ALLOWED( n )  (( n != 0xFFFF ) && ( Export::LanguageAllowed( Export::LangId[ n ] )) && 													\
 							   (( Export::LangId[ n ] == 01 ) || ( Export::LangId[ n ] == 03 ) || ( Export::LangId[ n ] == 07 ) || 	\
@@ -201,7 +205,7 @@
 								( Export::LangId[ n ] == 48 ) || ( Export::LangId[ n ] == 49 ) || ( Export::LangId[ n ] == 55 ) || 	\
 								( Export::LangId[ n ] == 81 ) || ( Export::LangId[ n ] == 82 ) || ( Export::LangId[ n ] == 86 ) || 	\
 								( Export::LangId[ n ] == 88 ) || ( Export::LangId[ n ] == 90 ) || ( Export::LangId[ n ] == 96 ) || 	\
-								( Export::LangId[ n ] == 00 ) || ( Export::LangId[ n ] == 99 )))
+								( Export::LangId[ n ] == 77 ) || ( Export::LangId[ n ] == 00 ) || ( Export::LangId[ n ] == 99 )))
 
 #define GERMAN_LIST_LINE_INDEX 	LANGUAGES
 #define LIST_REFID				(GERMAN_LIST_LINE_INDEX+1)
diff -urN oo_1.0_src/transex3/source/export.cxx oo_1.0_src-et/transex3/source/export.cxx
--- oo_1.0_src/transex3/source/export.cxx	Fri Oct 19 12:20:01 2001
+++ oo_1.0_src-et/transex3/source/export.cxx	Sat May  4 13:05:37 2002
@@ -1253,6 +1253,8 @@
 		return HEBREW_INDEX;
 	else if ( sLang == "CATALAN" )
 		return CATALAN_INDEX;
+        else if ( sLang == "ESTONIAN" )
+                return ESTONIAN_INDEX;
 	else if ( sLang == "EXTERN" )
 		return EXTERN_INDEX;
 
diff -urN oo_1.0_src/transex3/source/export2.cxx oo_1.0_src-et/transex3/source/export2.cxx
--- oo_1.0_src/transex3/source/export2.cxx	Mon Oct 15 16:46:07 2001
+++ oo_1.0_src-et/transex3/source/export2.cxx	Sat May  4 13:05:37 2002
@@ -144,6 +144,7 @@
 	ARABIC,
 	HEBREW,
 	CATALAN,
+	ESTONIAN,
 	EXTERN
 };
 
@@ -191,6 +192,7 @@
 		case ARABIC: return RTL_TEXTENCODING_MS_1256;
 		case HEBREW: return RTL_TEXTENCODING_MS_1255;
 		case CATALAN: return RTL_TEXTENCODING_MS_1252;
+		case ESTONIAN: return RTL_TEXTENCODING_MS_1257;
 		case EXTERN: return RTL_TEXTENCODING_UTF8;
 	}
 	return 0xFFFF;
@@ -299,6 +301,7 @@
 		case ARABIC_INDEX: return ARABIC_ISO;
 		case HEBREW_INDEX: return HEBREW_ISO;
 		case CATALAN_INDEX: return CATALAN_ISO;
+		case ESTONIAN_INDEX: return ESTONIAN_ISO;
 		case EXTERN_INDEX: return sIsoCode99;
 	}
 	return "";
@@ -424,6 +427,7 @@
 	"arabic",
 	"hebrew",
 	"catalan",
+	"estonian",
 	"extern"
 };
 
diff -urN oo_1.0_src/transex3/source/merge.cxx oo_1.0_src-et/transex3/source/merge.cxx
--- oo_1.0_src/transex3/source/merge.cxx	Mon May 28 14:38:01 2001
+++ oo_1.0_src-et/transex3/source/merge.cxx	Sat May  4 13:05:37 2002
@@ -412,6 +412,7 @@
 		case ARABIC: return ARABIC_INDEX;
 		case HEBREW: return HEBREW_INDEX;
 		case CATALAN: return CATALAN_INDEX;
+		case ESTONIAN: return ESTONIAN_INDEX;
 		case EXTERN: return EXTERN_INDEX;
 	}
 	return 0xFFFF;