diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index f88f38757d19..665da3d46850 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside2.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: obo $ $Date: 2002-07-09 15:08:00 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1410,19 +1410,19 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
     m_aSyntaxColors[TT_EOL] = aColor;
     StartListening(m_aColorConfig);
     m_aSyntaxColors[TT_IDENTIFIER]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICIDENTIFIER).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).nColor);
     m_aSyntaxColors[TT_NUMBER]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICNUMBER).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICNUMBER).nColor);
     m_aSyntaxColors[TT_STRING]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICSTRING).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICSTRING).nColor);
     m_aSyntaxColors[TT_COMMENT]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICCOMMENT).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICCOMMENT).nColor);
     m_aSyntaxColors[TT_ERROR]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICERROR).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICERROR).nColor);
     m_aSyntaxColors[TT_OPERATOR]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICOPERATOR).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICOPERATOR).nColor);
     m_aSyntaxColors[TT_KEYWORD]
-        = Color(m_aColorConfig.GetColorValue(svx::BASICKEYWORD).nColor);
+        = Color(m_aColorConfig.GetColorValue(svtools::BASICKEYWORD).nColor);
 
     Font aFont( GetFont() );
     Size aSz( aFont.GetSize() );
@@ -1636,33 +1636,33 @@ void ModulWindowLayout::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
         && (static_cast< SfxSimpleHint const & >(rHint).GetId()
             == SFX_HINT_COLORS_CHANGED))
     {
-        Color aColor(m_aColorConfig.GetColorValue(svx::BASICIDENTIFIER).
+        Color aColor(m_aColorConfig.GetColorValue(svtools::BASICIDENTIFIER).
                      nColor);
         bool bChanged = aColor != m_aSyntaxColors[TT_IDENTIFIER];
         m_aSyntaxColors[TT_IDENTIFIER] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICNUMBER).nColor);
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICNUMBER).nColor);
     if (bChanged || aColor != m_aSyntaxColors[TT_NUMBER])
             bChanged = true;
         m_aSyntaxColors[TT_NUMBER] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICSTRING).nColor);
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICSTRING).nColor);
         if (bChanged || aColor != m_aSyntaxColors[TT_STRING])
             bChanged = true;
         m_aSyntaxColors[TT_STRING] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICCOMMENT).
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICCOMMENT).
                        nColor);
         if (bChanged || aColor != m_aSyntaxColors[TT_COMMENT])
             bChanged = true;
         m_aSyntaxColors[TT_COMMENT] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICERROR).nColor);
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICERROR).nColor);
         if (bChanged || aColor != m_aSyntaxColors[TT_ERROR])
             bChanged = true;
         m_aSyntaxColors[TT_ERROR] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICOPERATOR).
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICOPERATOR).
                        nColor);
         if (bChanged || aColor != m_aSyntaxColors[TT_OPERATOR])
             bChanged = true;
         m_aSyntaxColors[TT_OPERATOR] = aColor;
-        aColor = Color(m_aColorConfig.GetColorValue(svx::BASICKEYWORD).
+        aColor = Color(m_aColorConfig.GetColorValue(svtools::BASICKEYWORD).
                        nColor);
         if (bChanged || aColor != m_aSyntaxColors[TT_KEYWORD])
             bChanged = true;
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 674242512234..7378650ab1c3 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside2.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: tbe $ $Date: 2002-09-09 15:16:03 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,8 +100,8 @@ class SvxSearchItem;
 #include "svtools/lstner.hxx"
 #endif
 
-#ifndef _SVX_COLORCFG_HXX
-#include "svx/colorcfg.hxx"
+#ifndef INCLUDED_SVTOOLS_COLORCFG_HXX
+#include <svtools/colorcfg.hxx>
 #endif
 
 #include <sfx2/progress.hxx>
@@ -498,7 +498,7 @@ private:
     ModulWindow * m_pModulWindow;
 
     Color m_aSyntaxColors[TT_KEYWORD + 1];
-    svx::ColorConfig m_aColorConfig;
+    svtools::ColorConfig m_aColorConfig;
 
     ImageList m_aImagesNormal;
     ImageList m_aImagesHighContrast;
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 71c6f19f4f81..184a98052e84 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basides1.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: tbe $ $Date: 2001-12-18 11:26:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1090,11 +1090,13 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
         if ( pCurWin )
         {
             SetWindow( pCurWin );
+            SfxObjectShell::SetWorkingDocument( pCurWin->GetShell() );
         }
         else
         {
             SetWindow( pModulLayout );
             GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW );
+            SfxObjectShell::SetWorkingDocument( NULL );
         }
         SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 );
         InvalidateBasicIDESlots();
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 54d2a4570509..326fa7863e93 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basidesh.src,v $
  *
- *  $Revision: 1.85 $
+ *  $Revision: 1.86 $
  *
- *  last change: $Author: sb $ $Date: 2002-12-06 16:39:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,7 +153,7 @@ String RID_STR_WRONGPASSWORD
     Text[ dutch ] = "Wachtwoord niet juist.";
     Text[ chinese_simplified ] = "密码无效。";
     Text[ greek ] = "���������� ������� ���������.";
-    Text[ korean ] = "암호가 옳지 않습니다.";
+    Text[ korean ] = "암호가 맞지 않습니다.";
     Text[ turkish ] = "Yanl�� �ifre";
     Text[ catalan ] = "Contrasenya incorrecta.";
     Text[ thai ] = "รหัสผ่านไม่ถูกต้อง";
@@ -225,7 +225,7 @@ String RID_STR_SOURCETOBIG
     Text [ swedish ] = "K�lltexten �r f�r stor och kan varken sparas eller kompileras.\nRadera n�gra kommentarer eller �verf�r n�gra metoder till en annan modul." ;
     Text [ danish ] = "Kildeteksten er for stor og kan hverken gemmes eller kompileres.\nSlet nogle kommentarer, eller overf�r nogle metoder til et andet modul." ;
     Text [ italian ] = "Il testo sorgente � troppo grande e non pu� essere n� compilato n� salvato\nCancellate alcuni commenti o  trasferite alcuni metodi in un altro modulo." ;
-    Text [ spanish ] = "El texto fuente es demasiado grande por lo que no se puede guardar o compilar.\nElimine algunos comentarios o transfiera algunos m�todos a otro m�dulo." ;
+    Text [ spanish ] = "El texto fuente es demasiado grande por lo que no se puede guardar o compilar.\nBorre algunos comentarios o transfiera algunos m�todos a otro m�dulo." ;
     Text [ french ] = "Le texte source est trop long : enregistrement et compilation impossibles.\nSupprimez des commentaires ou transf�rez des m�thodes dans un autre module." ;
     Text [ dutch ] = "De brontekst is te lang en kan niet worden opgeslagen of gecompileerd.\\Wis enkele opmerkingen of verplaats enkele methodes naar een andere module." ;
     Text [ portuguese_brazilian ] = "Der Quelltext ist zu gro? und kann weder gespeichert noch compiliert werden.\nL?chen Sie einige Kommentare oder ?ertragen Sie einige Methoden in ein anderes Modul." ;
@@ -239,7 +239,7 @@ String RID_STR_SOURCETOBIG
     Text[ dutch ] = "De brontekst is te lang en kan niet worden opgeslagen of gecompileerd.\\Wis enkele opmerkingen of verplaats enkele methodes naar een andere module.";
     Text[ chinese_simplified ] = "源文本太大，无法存盘和编译。\n请删除一些注解或者将几个方法转移到一个其他的模块之中。";
     Text[ greek ] = "��� ����� ������� �� ����� � ������������ ��� � ���������� ��� �������� ���������� ������ ����� ���������� ������.\n��������� ������ ������ � ����������� ��������� �������� �� ������ ���� ����������� ������.";
-    Text[ korean ] = "소스텍스트가 너무 커서 저장 또는 컴파일이 불가능합니다.\n일부 주석을 삭제하거나, 몇몇 메소드를 다른 모듈로 옮기십시오.";
+    Text[ korean ] = "원본 텍스트가 너무 커서 저장 또는 컴파일이 불가능합니다.\n일부 설명을 삭제하거나 몇몇 메소드를 다른 모듈로 옮기십시오.";
     Text[ turkish ] = "Kaynak metin uzunlu�u nedeniyle kaydedilemiyor ve derlenemiyor.\nBaz� a��klamalar� silin ya da baz� y�ntemleri ba�ka bir mod�le aktar�n.";
     Text[ catalan ] = "El text font �s massa gran i no es pot compilar ni desar.\n Suprimiu alguns dels comentaris o transferiu alguns m�todes a un altre m�dul.";
     Text[ finnish ] = "L�hdeteksti on liian pitk� eik� sit� voida koota tai tallentaa.\nPoista huomautuksia tai siirr� joitakin menetelmi� toiseen moduuliin.";
@@ -268,7 +268,7 @@ String RID_STR_ERROROPENSTORAGE
     Text[ dutch ] = "Fout bij openen van bestand.";
     Text[ chinese_simplified ] = "打开文件时发生错误。";
     Text[ greek ] = "������ ���� �� ������� ��� �������";
-    Text[ korean ] = "파일 열기시에 오류";
+    Text[ korean ] = "파일 여는 중 오류";
     Text[ turkish ] = "Dosyay� a�ma s�ras�nda hata";
     Text[ catalan ] = "S'ha produ�t un error en obrir el fitxer";
     Text[ finnish ] = "Tiedoston avaamisessa on ilmennyt virhe.";
@@ -296,7 +296,7 @@ String RID_STR_ERROROPENLIB
     Text[ dutch ] = "Fout bij laden van bibliotheek";
     Text[ chinese_simplified ] = "在装入程序库时发生错误。";
     Text[ greek ] = "������ ���� �� ������� ��� �����������";
-    Text[ korean ] = "라이브러리 로드에 오류";
+    Text[ korean ] = "라이브러리 로드 중 오류";
     Text[ turkish ] = "Kitapl��� y�kleme s�ras�nda hata";
     Text[ catalan ] = "S'ha produ�t un error en carregar la biblioteca";
     Text[ finnish ] = "Kirjaston lataamisessa on ilmennyt virhe.";
@@ -325,7 +325,7 @@ String RID_STR_NOLIBINSTORAGE
     Text[ dutch ] = "Het bestand bevat geen BASIC-bibliotheken";
     Text[ chinese_simplified ] = "这个文件没有 BASIC 程序库。";
     Text[ greek ] = "�� ������ ��� �������� ����������� ��� BASIC";
-    Text[ korean ] = "파일에는 어떤 BASIC 라이브러리도 포함되어 있지 않습니다";
+    Text[ korean ] = "파일에는 어떤 BASIC 라이브러리도 포함되어 있지 않습니다.";
     Text[ turkish ] = "Dosya BASIC kitapl�klar� i�ermiyor";
     Text[ catalan ] = "El fitxer no cont� cap biblioteca del BASIC";
     Text[ finnish ] = "Tiedostossa ei ole BASIC-kirjastoja.";
@@ -356,7 +356,7 @@ String RID_STR_BADSBXNAME
     Text[ dutch ] = "Ongeldige aanduiding";
     Text[ chinese_simplified ] = "无效的名称";
     Text[ greek ] = "�� �������� �����";
-    Text[ korean ] = "유효하지 않은 이름";
+    Text[ korean ] = "잘못된 이름";
     Text[ turkish ] = "Ge�ersiz ad";
     Text[ catalan ] = "El nom no �s v�lid";
     Text[ thai ] = "ชื่อไม่ถูกต้อง";
@@ -378,7 +378,7 @@ String RID_STR_LIBNAMETOLONG
     Text[ polish ] = "Nazwa biblioteki mo�e si� sk�ada� z maksymalnie 30 znak�w.";
     Text[ portuguese_brazilian ] = "The name of a library can only be 30 characters long.";
     Text[ japanese ] = "ライブラリ名の文字数は最高30文字までです。";
-    Text[ korean ] = "라이브러리 이름의 길이는 30자를 초과해서는 안됩니다.";
+    Text[ korean ] = "라이브러리 이름의 길이가 30자를 초과해서는 안됩니다.";
     Text[ chinese_simplified ] = "程序库名称最多只允许由30个字符组成。";
     Text[ chinese_traditional ] = "程式庫名稱最長不得超過30個字元。";
     Text[ arabic ] = "��� ��� ���� ��� ������� �� 30 �����.";
@@ -405,7 +405,7 @@ String RID_STR_ERRORCHOOSEMACRO
     Text[ polish ] = "Brak dost�pu do makr innych dokument�w.";
     Text[ portuguese_brazilian ] = "Macros from other documents are not accessible.";
     Text[ japanese ] = "ほかのドキュメントのマクロへはアクセスできません。";
-    Text[ korean ] = "다른 문서의 매크로를 액세스할 수 없습니다.";
+    Text[ korean ] = "다른 문서의 매크로에는 액세스할 수 없습니다.";
     Text[ chinese_simplified ] = "无法读取其它文档的宏。";
     Text[ chinese_traditional ] = "無法存取其他文件的巨集。";
     Text[ turkish ] = "Macros from other documents are not accessible.";
@@ -457,7 +457,7 @@ String RID_STR_REPLACELIB
     Text[ polish ] = "'XX' can't be replaced.";
     Text[ portuguese_brazilian ] = "'XX' can't be replaced.";
     Text[ japanese ] = "'XX' は置換できません。";
-    Text[ korean ] = "'XX'을(를) 교체할 수 없습니다.";
+    Text[ korean ] = "'XX'을(를) 바꿀 수 없습니다.";
     Text[ chinese_simplified ] = "无法更替 'XX'。";
     Text[ chinese_traditional ] = "無法代替 XX 。";
     Text[ turkish ] = "'XX' can't be replaced.";
@@ -483,7 +483,7 @@ String RID_STR_IMPORTNOTPOSSIBLE
     Text[ polish ] = "Import of 'XX' not possible.";
     Text[ portuguese_brazilian ] = "Import of 'XX' not possible.";
     Text[ japanese ] = "'XX' の追加はできません。";
-    Text[ korean ] = "'XX'을(를) 가져올 수 없습니다.";
+    Text[ korean ] = "'XX'을(를) 추가할 수 없습니다.";
     Text[ chinese_simplified ] = "无法增加 'XX' 。";
     Text[ chinese_traditional ] = "無法新增 XX 。";
     Text[ turkish ] = "Import of 'XX' not possible.";
@@ -509,7 +509,7 @@ String RID_STR_NOIMPORT
     Text[ polish ] = "'XX' was not imported.";
     Text[ portuguese_brazilian ] = "'XX' was not imported.";
     Text[ japanese ] = "'XX' はインポートされませんでした。";
-    Text[ korean ] = "'XX'을(를) 가져오지 않았습니다.";
+    Text[ korean ] = "'XX'을(를) 추가하지 않았습니다.";
     Text[ chinese_simplified ] = "没有增加 'XX' 。";
     Text[ chinese_traditional ] = "沒有增加 'XX' 。";
     Text[ turkish ] = "'XX' was not imported.";
@@ -535,7 +535,7 @@ String RID_STR_ENTERPASSWORD
     Text[ polish ] = "Enter password for 'XX'";
     Text[ portuguese_brazilian ] = "Enter password for 'XX'";
     Text[ japanese ] = "'XX' のパスワードを入力します";
-    Text[ korean ] = "'XX'의 암호를 입력하십시오";
+    Text[ korean ] = "'XX'의 암호를 입력하십시오.";
     Text[ chinese_simplified ] = "为 'XX' 键入密码。";
     Text[ chinese_traditional ] = "為 'XX' 鍵入密碼";
     Text[ turkish ] = "Enter password for 'XX'";
@@ -567,7 +567,7 @@ String RID_STR_SBXNAMEALLREADYUSED
     Text[ dutch ] = "Naam bestaat reeds";
     Text[ chinese_simplified ] = "名称已经存在。";
     Text[ greek ] = "�� ����� ���� ������� ���";
-    Text[ korean ] = "이름이 이미 있음";
+    Text[ korean ] = "이름이 이미 있습니다.";
     Text[ turkish ] = "Bu ad mevcut durumda";
     Text[ catalan ] = "El nom ja existeix";
     Text[ thai ] = "มีชื่ออยู่แล้ว";
@@ -596,7 +596,7 @@ String RID_STR_SBXNAMEALLREADYUSED2
     Text[ dutch ] = "Er bestaat reeds een object met deze naam.";
     Text[ chinese_simplified ] = "对象已经存在。";
     Text[ greek ] = "������� ��� ��� ����������� �� ���� �� �����";
-    Text[ korean ] = "같은 이름을 가진 개체가 이미 있음";
+    Text[ korean ] = "같은 이름을 가진 개체가 이미 있습니다.";
     Text[ turkish ] = "Bu ad� ta��yan bir nesne mevcut";
     Text[ catalan ] = "Ja hi ha un objecte amb el mateix nom";
     Text[ thai ] = "มีชื่อวัตถุเหมือนกันอยู่แล้ว";
@@ -624,7 +624,7 @@ String RID_STR_FILEEXISTS
     Text[ dutch ] = "Bestand ''XX' bestaat reeds";
     Text[ chinese_simplified ] = "文件 'XX' 已经存在。";
     Text[ greek ] = "�� ������ 'XX' ������� ���";
-    Text[ korean ] = "파일'XX' 은 (는) 이미 존재합니다";
+    Text[ korean ] = "'XX' 파일이 이미 있습니다.";
     Text[ turkish ] = "Dosya 'XX' mevcut durumda";
     Text[ catalan ] = "El fitxer 'XX' ja existeix";
     Text[ finnish ] = "Tiedosto XX on jo olemassa.";
@@ -713,7 +713,7 @@ String RID_STR_SEARCHNOTFOUND
     Text[ dutch ] = "Zoekbegrip niet gevonden.";
     Text[ chinese_simplified ] = "没有找到要搜寻条目";
     Text[ greek ] = "��� ������� � ���������� ����";
-    Text[ korean ] = "검색용어를 찾지 못했습니다";
+    Text[ korean ] = "검색 키를 찾지 못했습니다.";
     Text[ turkish ] = "Aranan terim bulunamad�";
     Text[ catalan ] = "La clau de cerca no s'ha trobat";
     Text[ thai ] = "ค้นหาคีย์ไม่พบ";
@@ -741,7 +741,7 @@ String RID_STR_SEARCHFROMSTART
     Text[ dutch ] = "Er is tot aan de laatste module gezocht. Wilt u het zoeken voortzetten vanaf de eerste module?";
     Text[ chinese_simplified ] = "已经搜寻至最后一个模块。要从第一个模块开始搜寻？";
     Text[ greek ] = "����������� � ��������� ��� �� ��������� ����������� ������. ������ �� ���������� � ��������� ��� �� ����� ����������� ������;";
-    Text[ korean ] = "마지막 모듈까지 찾았습니다. 처음 모듈에서 찾기를 계속하겠습니까?";
+    Text[ korean ] = "마지막 모듈까지 검색을 완료했습니다. 처음 모듈에서 검색을 계속하시겠습니까?";
     Text[ turkish ] = "Son mod�le kadar arama tamamland�? Aramaya ilk mod�lden devam etmek istiyor musunuz?";
     Text[ catalan ] = "S'ha completat la cerca fins a l'�ltim m�dul. Voleu continuar des del primer?";
     Text[ finnish ] = "Haku viimeisest� moduulista on valmis. Jatketaanko ensimm�isest� moduulista?";
@@ -771,7 +771,7 @@ String RID_STR_SEARCHREPLACES
     Text[ dutch ] = "Zoekbegrip XX keer vervangen";
     Text[ chinese_simplified ] = "替换搜寻条目 XX 次";
     Text[ greek ] = "� ���������� ���� ��������������� XX �����";
-    Text[ korean ] = "검색 용어를  XX번 대체했습니다";
+    Text[ korean ] = "검색 키를 XX번 바꿨습니다.";
     Text[ turkish ] = "Aranan terim XX kez de�i�tirildi";
     Text[ catalan ] = "La clau de cerca s'ha reempla�at XX vegades";
     Text[ thai ] = "ค้นหาคีย์แทนที่ XX ครั้ง";
@@ -798,7 +798,7 @@ String RID_STR_COULDNTREAD
     Text[ dutch ] = "Het bestand kan niet worden gelezen.";
     Text[ chinese_simplified ] = "无法读取文件。";
     Text[ greek ] = "��� ���� ������� �� ����� � �������� ��� �������";
-    Text[ korean ] = "파일을 읽지 못했습니다";
+    Text[ korean ] = "파일을 읽지 못했습니다.";
     Text[ turkish ] = "Dosya okunamad�";
     Text[ catalan ] = "El fitxer no s'ha pogut llegir";
     Text[ finnish ] = "Tiedoston lukeminen ei onnistunut.";
@@ -826,7 +826,7 @@ String RID_STR_COULDNTWRITE
     Text[ dutch ] = "Het bestand kan niet worden opgeslagen.";
     Text[ chinese_simplified ] = "无法存盘文件。";
     Text[ greek ] = "��� ���� ������ � ���������� ��� �������";
-    Text[ korean ] = "파일을 저장하지 못했습니다";
+    Text[ korean ] = "파일을 저장하지 못했습니다.";
     Text[ turkish ] = "Dosya kaydedilemedi";
     Text[ catalan ] = "El fitxer no s'ha pogut desar";
     Text[ finnish ] = "Tiedoston tallentaminen ei onnistunut.";
@@ -876,7 +876,7 @@ String RID_STR_CANNOTCHANGENAMEREFLIB
     Text [ portuguese_brazilian ] = "Der Name einer referenzierten Bibliothek kann nicht ge?ndert werden" ;
     Text [ portuguese ] = "� imposs�vel alterar o nome de uma biblioteca de refer�ncia." ;
     Text[ chinese_simplified ] = "无法更改引用程序库的名称。";
-    Text[ russian ] = "���������� �������� ��� ���������� �� ������� ������� ������.";
+    Text[ russian ] = "���������� �������� ��� ����������, �� ������� ������� ������.";
     Text[ polish ] = "Nazwy biblioteki, do kt�rej si� odwo�ano, nie mo�na zmieni�.";
     Text[ japanese ] = "参照先ライブラリ名の変更はできません。";
     Text[ chinese_traditional ] = "無法變更參照程式庫的名稱。";
@@ -912,7 +912,7 @@ String RID_STR_CANNOTUNLOADSTDLIB
     Text[ dutch ] = "De standaardbibliotheek kan niet worden gedeactiveerd.";
     Text[ chinese_simplified ] = "无法关闭标准程序库";
     Text[ greek ] = "��� ����� ������� �� ��������������� � ������ ����������";
-    Text[ korean ] = "기본 라이브러리는 비활성화할 수 없습니다.";
+    Text[ korean ] = "기본 라이브러리를 비활성화할 수 없습니다.";
     Text[ turkish ] = "Standart kitapl���n etkinli�i kald�r�l�maz.";
     Text[ catalan ] = "La biblioteca per defecte no es pot desactivar";
     Text[ finnish ] = "Oletuskirjaston k�yt�st� poisto ei onnistu.";
@@ -940,7 +940,7 @@ String RID_STR_GENERATESOURCE
     Text[ dutch ] = "Brontekst maken";
     Text[ chinese_simplified ] = "生成源文本";
     Text[ greek ] = "���������� �������� ����������";
-    Text[ korean ] = "소스텍스트 생성";
+    Text[ korean ] = "원본 텍스트 생성";
     Text[ turkish ] = "Kaynak kod olu�turuluyor";
     Text[ catalan ] = "S'est� generant la font";
     Text[ finnish ] = "Luodaan l�hde";
@@ -1010,7 +1010,7 @@ String RID_STR_QUERYDELMACRO
     Text [ ENGLISH ] = "Do you want to delete the macro XX ?" ;
     Text [ english_us ] = "Do you want to delete the macro XX ?" ;
     Text [ italian ] = "Volete eliminare la macro XX ?" ;
-    Text [ spanish ] = "�Desea eliminar la macro XX?" ;
+    Text [ spanish ] = "�Desea borrar la macro XX?" ;
     Text [ french ] = "Voulez-vous supprimer la macro XX ?" ;
     Text [ dutch ] = "Wilt u de macro XX wissen?" ;
     Text [ swedish ] = "Vill du radera makrot XX ?" ;
@@ -1026,7 +1026,7 @@ String RID_STR_QUERYDELMACRO
     Text[ dutch ] = "Wilt u de macro XX wissen?";
     Text[ chinese_simplified ] = "您要删除宏 XX ？";
     Text[ greek ] = "������ �� ��������� � ����������� ��;";
-    Text[ korean ] = "매크로XX을(를）삭제하겠습니까?";
+    Text[ korean ] = "매크로 XX을(를） 삭제하시겠습니까?";
     Text[ turkish ] = "XX makrosunu silmek istiyor musunuz?";
     Text[ catalan ] = "Voleu suprimir la macro XX?";
     Text[ finnish ] = "Haluatko poistaa makron XX?";
@@ -1040,7 +1040,7 @@ String RID_STR_QUERYDELDIALOG
     Text [ dutch ] = "Wilt u het dialoogvenster XX wissen?" ;
     Text [ english_us ] = "Do you want to delete the XX dialog?" ;
     Text [ italian ] = "Volete cancellare il dialogo XX ?" ;
-    Text [ spanish ] = "�Desea eliminar el di�logo XX?" ;
+    Text [ spanish ] = "�Desea borrar el di�logo XX?" ;
     Text [ french ] = "Voulez-vous supprimer la bo�te de dialogue XX ?" ;
     Text [ swedish ] = "Vill du radera dialogrutan XX?" ;
     Text [ danish ] = "Vil du slette dialogen XX?" ;
@@ -1055,7 +1055,7 @@ String RID_STR_QUERYDELDIALOG
     Text[ dutch ] = "Wilt u het dialoogvenster XX wissen?";
     Text[ chinese_simplified ] = "您要删除对话 XX ？";
     Text[ greek ] = "������ �� ��������� � �������� ��;";
-    Text[ korean ] = "대화상자XX을(를）삭제하겠습니까?";
+    Text[ korean ] = "대화 상자 XX을(를） 삭제하시겠습니까?";
     Text[ turkish ] = "XX diyalo�unu silmek istiyor musunuz?";
     Text[ catalan ] = "Voleu suprimir el di�leg XX?";
     Text[ finnish ] = "Haluatko poistaa valintaikkunan XX?";
@@ -1068,7 +1068,7 @@ String RID_STR_QUERYDELLIB
     Text [ ENGLISH ] = "Do you want to delete the libary XX" ;
     Text [ english_us ] = "Do you want to delete the XX library?" ;
     Text [ italian ] = "Volete eliminare la library XX ?" ;
-    Text [ spanish ] = "�Desea eliminar la biblioteca XX?" ;
+    Text [ spanish ] = "�Desea borrar la biblioteca XX?" ;
     Text [ french ] = "Voulez-vous supprimer la biblioth�que XX ?" ;
     Text [ dutch ] = "Wilt u de bibliotheek XX wissen?" ;
     Text [ swedish ] = "Vill du radera biblioteket XX ?" ;
@@ -1084,7 +1084,7 @@ String RID_STR_QUERYDELLIB
     Text[ dutch ] = "Wilt u de bibliotheek XX wissen?";
     Text[ chinese_simplified ] = "您要删除程序库 XX ？";
     Text[ greek ] = "������ �� ��������� � ���������� ��;";
-    Text[ korean ] = "라이브러리XX을(를) 삭제하겠습니까 ?";
+    Text[ korean ] = "라이브러리 XX을(를) 삭제하시겠습니까?";
     Text[ turkish ] = "XX kitapl���n� silmek istiyor musunuz?";
     Text[ catalan ] = "Voleu suprimir la biblioteca XX?";
     Text[ finnish ] = "Haluatko poistaa kirjaston XX?";
@@ -1097,7 +1097,7 @@ String RID_STR_QUERYDELLIBREF
     Text [ ENGLISH ] = "Do you want to delete the reference to the libary XX ?" ;
     Text [ english_us ] = "Do you want to delete the reference to the XX library?" ;
     Text [ italian ] = "Volete cancellare il riferimento alla library XX ?" ;
-    Text [ spanish ] = "�Desea eliminar la referencia a la biblioteca XX?" ;
+    Text [ spanish ] = "�Desea borrar la referencia a la biblioteca XX?" ;
     Text [ french ] = "Voulez-vous supprimer la r�f�rence � la biblioth�que XX ?" ;
     Text [ dutch ] = "Wilt u de verwijzing naar de bibliotheek XX wissen?" ;
     Text [ swedish ] = "Vill du radera referensen till biblioteket XX ?" ;
@@ -1113,7 +1113,7 @@ String RID_STR_QUERYDELLIBREF
     Text[ dutch ] = "Wilt u de verwijzing naar de bibliotheek XX wissen?";
     Text[ chinese_simplified ] = "您要删除程序库 XX 的引用？";
     Text[ greek ] = "������ �� ��������� � ������� ���� �� ���������� ��;";
-    Text[ korean ] = "라이브러리XX에 있는 참조를 삭제하겠습니까?";
+    Text[ korean ] = "라이브러리 XX로의 참조를 삭제하시겠습니까?";
     Text[ turkish ] = "XX kitapl���na ili�kin referans� silmek istiyor musunuz?";
     Text[ catalan ] = "Voleu suprimir la refer�ncia a la biblioteca XX?";
     Text[ finnish ] = "Haluatko poistaa viittauksen kirjastoon XX?";
@@ -1126,7 +1126,7 @@ String RID_STR_QUERYDELMODULE
     Text [ ENGLISH ] = "Do you want to delete the module XX ?" ;
     Text [ english_us ] = "Do you want to delete the XX module?" ;
     Text [ italian ] = "Volete cancellare il modulo XX ?" ;
-    Text [ spanish ] = "�Desea eliminar el m�dulo XX?" ;
+    Text [ spanish ] = "�Desea borrar el m�dulo XX?" ;
     Text [ french ] = "Voulez-vous supprimer le module XX ?" ;
     Text [ dutch ] = "Wilt u de module XX wissen?" ;
     Text [ swedish ] = "Vill du radera modulen XX ?" ;
@@ -1142,7 +1142,7 @@ String RID_STR_QUERYDELMODULE
     Text[ dutch ] = "Wilt u de module XX wissen?";
     Text[ chinese_simplified ] = "您要删除模块 XX ？";
     Text[ greek ] = "������ �� ��������� � ����������� ������ XX;";
-    Text[ korean ] = "모듈XX을(를) 삭제하겠습니까 ?";
+    Text[ korean ] = "모듈 XX을(를) 삭제하시겠습니까?";
     Text[ turkish ] = "XX mod�l�n� silmek istiyor musunuz?";
     Text[ catalan ] = "Voleu suprimir el m�dul XX?";
     Text[ finnish ] = "Haluatko poistaa moduulin XX?";
@@ -1170,7 +1170,7 @@ String RID_STR_OBJNOTFOUND
     Text[ dutch ] = "Object of methode niet gevonden.";
     Text[ chinese_simplified ] = "没有找到对象或方法。";
     Text[ greek ] = "��� ������� �� ����������� � � �������";
-    Text[ korean ] = "개체 또는 메소드를 찾지 못했습니다";
+    Text[ korean ] = "개체 또는 메소드를 찾지 못했습니다.";
     Text[ turkish ] = "Nesne ya da y�ntem bulunamad�";
     Text[ catalan ] = "No s'ha trobat l'objecte o el m�tode";
     Text[ finnish ] = "Objektia tai menetelm�� ei l�ytynyt.";
@@ -1257,7 +1257,7 @@ String RID_STR_COLUMN
     Text[ dutch ] = "Kolom";
     Text[ chinese_simplified ] = "列";
     Text[ greek ] = "��";
-    Text[ korean ] = "단";
+    Text[ korean ] = "열";
     Text[ turkish ] = "S�.";
     Text[ catalan ] = "Col";
     Text[ finnish ] = "Sar";
@@ -1345,7 +1345,7 @@ String RID_STR_CANNOTCLOSE
     Text[ dutch ] = "Het venster kan niet worden gesloten \ntijdens het uitvoeren van het BASIC-programma.";
     Text[ chinese_simplified ] = "在 BASIC 程序运行时\n无法关闭窗口。";
     Text[ greek ] = "��� ����� ������� �� �������� �� �������� \n���� �� �������� ��������� ��� ������������ BASIC.";
-    Text[ korean ] = "BASIC 프로그램이 진행되는 동안은 \n창을 닫을 수 없습니다.";
+    Text[ korean ] = "BASIC 프로그램이 진행되는 동안\n창을 닫을 수 없습니다.";
     Text[ turkish ] = "BASIC program� �al���rken\npencere kapat�lamaz.";
     Text[ catalan ] = "La finestra no es pot tancar mentre s'executa el BASIC.";
     Text[ thai ] = "ไม่สามารถปิดหน้าต่างขณะกำลังใช้งาน BASIC อยู่ได้";
@@ -1372,7 +1372,7 @@ String RID_STR_REPLACESTDLIB
     Text[ dutch ] = "De standaardbibliotheek kan niet worden vervangen.";
     Text[ chinese_simplified ] = "无法替换标准程序库。";
     Text[ greek ] = "��� ����� ������� �� �������������� � ������ ����������.";
-    Text[ korean ] = "기본 라이브러리는 대체할 수 없습니다.";
+    Text[ korean ] = "기본 라이브러리는 바꿀 수 없습니다.";
     Text[ turkish ] = "Standart kitapl�k de�i�tirilemez.";
     Text[ catalan ] = "La biblioteca per defecte no es pot reempla�ar.";
     Text[ finnish ] = "Oletuskirjaston korvaaminen ei onnistu.";
@@ -1402,7 +1402,7 @@ String RID_STR_REFNOTPOSSIBLE
     Text[ dutch ] = "Verwijzing naar ' XX' niet mogelijk.";
     Text[ chinese_simplified ] = "无法引用 'XX' 。";
     Text[ greek ] = "��� ����� ������ � ������� ��� 'XX' .";
-    Text[ korean ] = "'XX'에 대한 참조 불가능";
+    Text[ korean ] = "'XX'로의 참조가 불가능합니다.";
     Text[ turkish ] = "'XX' referans al�namaz.";
     Text[ catalan ] = "La refer�ncia a 'XX' no �s possible.";
     Text[ finnish ] = "Viittaus kohteeseen XX ei ole mahdollinen.";
@@ -1432,7 +1432,7 @@ String RID_STR_WATCHNAME
     Text[ dutch ] = "Controle";
     Text[ chinese_simplified ] = "查看";
     Text[ greek ] = "�����������";
-    Text[ korean ] = "감시자";
+    Text[ korean ] = "조사식";
     Text[ turkish ] = "�zleyici";
     Text[ catalan ] = "Mira";
     Text[ thai ] = "ดู";
@@ -1450,7 +1450,7 @@ String RID_STR_STACKNAME
     Text [ french ] = "Pile" ;
     Text [ swedish ] = "Kommandostack" ;
     Text [ dutch ] = "Opgeroepen stack" ;
-    Text [ spanish ] = "Pila de comandos" ;
+    Text [ spanish ] = "Pila" ;
     Text [ english_us ] = "Call Stack" ;
     Text[ chinese_simplified ] = "呼叫堆叠";
     Text[ russian ] = "���� �������";
@@ -1461,7 +1461,7 @@ String RID_STR_STACKNAME
     Text[ dutch ] = "Opgeroepen stack";
     Text[ chinese_simplified ] = "呼叫堆叠";
     Text[ greek ] = "������ �������";
-    Text[ korean ] = "콜 스택";
+    Text[ korean ] = "스택 호출";
     Text[ turkish ] = "Komut y���n�";
     Text[ catalan ] = "Crida la pila";
     Text[ thai ] = "คอลล์สแต็ค";
@@ -1548,7 +1548,7 @@ String RID_STR_STDDIALOGNAME
     Text[ dutch ] = "Dialoogvenster";
     Text[ chinese_simplified ] = "对话框";
     Text[ greek ] = "��������";
-    Text[ korean ] = "대화상자";
+    Text[ korean ] = "대화 상자";
     Text[ turkish ] = "Diyalog";
     Text[ catalan ] = "Di�leg";
     Text[ thai ] = "ไดอะล็อก";
@@ -1660,7 +1660,7 @@ String RID_STR_NEWDLG
     Text[ dutch ] = "Nieuw dialoogvenster";
     Text[ chinese_simplified ] = "新的对话框";
     Text[ greek ] = "���������� ��������";
-    Text[ korean ] = "새 대화상자";
+    Text[ korean ] = "새 대화 상자";
     Text[ turkish ] = "Yeni diyalog";
     Text[ catalan ] = "Di�leg nou";
     Text[ finnish ] = "Uusi valintaikkuna";
@@ -1776,7 +1776,7 @@ String RID_STR_WILLSTOPPRG
     Text[ dutch ] = "U moet uw programma na deze wijziging opnieuw opstarten.\nDoorgaan?";
     Text[ chinese_simplified ] = "更改之后您必须重新启动这个程序。\n您要继续吗？";
     Text[ greek ] = "���� ��� ���� ��� ������ �� ������ �� ���������� �� ��������� ����.\n��������;";
-    Text[ korean ] = "이 변경 후, 사용자의 프로그램을 다시 시작해야 합니다.\n계속하겠습니까?";
+    Text[ korean ] = "이 변경 후에 사용자의 프로그램을 다시 시작해야 합니다.\n계속하시겠습니까?";
     Text[ turkish ] = "Bu de�i�iklikten sonra program� yeniden ba�latman�z gerekir.\nDevam etmek istiyor musunuz?";
     Text[ catalan ] = "Haureu de reiniciar el programa despr�s d'aquesta edici�\nVoleu continuar?";
     Text[ finnish ] = "Ohjelma on k�ynnistett�v� uudelleen t�m�n muutoksen j�lkeen.\nJatketaanko?";
@@ -1804,7 +1804,7 @@ String RID_STR_SEARCHALLMODULES
     Text[ dutch ] = "Wilt u de tekst in alle actieve modules vervangen?";
     Text[ chinese_simplified ] = "要替换使用中的模块的全部文字？";
     Text[ greek ] = "�� �������������� �� ������� �� ���� ��� ��������� ������������ �������;";
-    Text[ korean ] = "활성화된 모든 모듈에서 텍스트를 대체하겠습니까?";
+    Text[ korean ] = "텍스트를 활성화된 모든 모듈에서 대체하시겠습니까? ";
     Text[ turkish ] = "Bu metin t�m etkin mod�llerde de�i�tirilsin mi?";
     Text[ catalan ] = "Voleu reempla�ar el text de tots els m�duls actius?";
     Text[ finnish ] = "Haluatko korvata tekstin kaikissa aktiivisissa moduuleissa?";
@@ -1830,7 +1830,7 @@ ImageButton RID_IMGBTN_REMOVEWATCH
     QuickHelpText [ ENGLISH ] = "Remove watch" ;
     QuickHelpText [ english_us ] = "Remove Watch" ;
     QuickHelpText [ italian ] = "Rimuovi controllo" ;
-    QuickHelpText [ spanish ] = "Eliminar observador" ;
+    QuickHelpText [ spanish ] = "Borrar observador" ;
     QuickHelpText [ french ] = "Supprimer le t�moin" ;
     QuickHelpText [ dutch ] = "Bewaker verwijderen" ;
     QuickHelpText [ danish ] = "Fjern observat�r" ;
@@ -1846,7 +1846,7 @@ ImageButton RID_IMGBTN_REMOVEWATCH
     QuickHelpText[ dutch ] = "Bewaker verwijderen";
     QuickHelpText[ chinese_simplified ] = "隐入查看";
     QuickHelpText[ greek ] = "��������� ����������";
-    QuickHelpText[ korean ] = "감시자 제거";
+    QuickHelpText[ korean ] = "조사식 제거";
     QuickHelpText[ turkish ] = "Remove Watch";
     QuickHelpText[ catalan ] = "Suprimeix l'observador";
     QuickHelpText[ finnish ] = "Poista kello";
@@ -1887,7 +1887,7 @@ String RID_STR_REMOVEWATCH
     Text[ dutch ] = "Controle:";
     Text[ chinese_simplified ] = "查看： ";
     Text[ greek ] = "�����������: ";
-    Text[ korean ] = "감시자: ";
+    Text[ korean ] = "조사식: ";
     Text[ turkish ] = "�zleyici: ";
     Text[ catalan ] = "Observador:";
     Text[ thai ] = "ดู:";
@@ -2276,7 +2276,7 @@ ToolBox RID_BASICIDE_OBJECTBAR
             Text[ dutch ] = "Stap voor stap";
             Text[ chinese_simplified ] = "单步";
             Text[ greek ] = "���� ����";
-            Text[ korean ] = "각각의 단계";
+            Text[ korean ] = "개별 단계";
             Text[ turkish ] = "Tek ad�m";
             Text[ catalan ] = "Pas simple";
             Text[ finnish ] = "Yksitt�inen vaihe";
@@ -2306,7 +2306,7 @@ ToolBox RID_BASICIDE_OBJECTBAR
             Text[ dutch ] = "Terugspringen";
             Text[ chinese_simplified ] = "返回一步";
             Text[ greek ] = "���� ����";
-            Text[ korean ] = "뒤로 건너뛰기";
+            Text[ korean ] = "뒤로 이동";
             Text[ turkish ] = "Geri ad�m";
             Text[ catalan ] = "Un pas enrere";
             Text[ finnish ] = "Edellinen vaihe";
@@ -2365,7 +2365,7 @@ ToolBox RID_BASICIDE_OBJECTBAR
             Text[ dutch ] = "Controle weergeven";
             Text[ chinese_simplified ] = "查看";
             Text[ greek ] = "�������� ����������";
-            Text[ korean ] = "감시자 표시";
+            Text[ korean ] = "조사식 추가";
             Text[ turkish ] = "�zleyici ekle";
             Text[ catalan ] = "Afegeix l'observador";
             Text[ finnish ] = "Lis�� seuranta";
@@ -2557,7 +2557,7 @@ ToolBox RID_BASICIDE_OBJECTBAR
             Text[ dutch ] = "Brontekst invoegen";
             Text[ chinese_simplified ] = "插入源文本";
             Text[ greek ] = "�������� �������� ����������";
-            Text[ korean ] = "소스텍스트 삽입";
+            Text[ korean ] = "원본 텍스트 삽입";
             Text[ turkish ] = "Kaynak metin ekle";
             Text[ catalan ] = "Insereix un text font";
             Text[ finnish ] = "Lis�� l�hdeteksti";
@@ -2584,7 +2584,7 @@ ToolBox RID_BASICIDE_OBJECTBAR
             Text[ russian ] = "��������� �������� ����� ���...";
             Text[ polish ] = "Zapisz tekst �r�d�owy jako...";
             Text[ japanese ] = "ソーステキストに名前をつけて保存...";
-            Text[ korean ] = "소스텍스트를 다른 이름으로 저장...";
+            Text[ korean ] = "원본 텍스트를 다른 이름으로 저장...";
             Text[ chinese_simplified ] = "源文本另存为...";
             Text[ chinese_traditional ] = "另存原始檔...";
             Text[ arabic ] = "��� �� ������ ����...";
@@ -2688,7 +2688,7 @@ Menu RID_POPUP_BRKPROPS
             Text[ dutch ] = "Eigenschappen...";
             Text[ chinese_simplified ] = "属性...";
             Text[ greek ] = "���������...";
-            Text[ korean ] = "등록정보...";
+            Text[ korean ] = "등록 정보...";
             Text[ turkish ] = "�zellikler...";
             Text[ catalan ] = "Propietats...";
             Text[ thai ] = "คุณสมบัติ...";
@@ -2703,7 +2703,7 @@ Menu RID_POPUP_BRKPROPS
     Text[ dutch ] = "Eigenschappen";
     Text[ chinese_simplified ] = "属性";
     Text[ greek ] = "���������";
-    Text[ korean ] = "등록정보";
+    Text[ korean ] = "등록 정보";
     Text[ turkish ] = "�zellikler";
     Text[ catalan ] = "Propietats";
     Text[ thai ] = "คุณสมบัติ";
@@ -2817,7 +2817,7 @@ Menu RID_POPUP_TABBAR
                         Text[ russian ] = "������ BASIC";
                         Text[ polish ] = "Modu� BASIC";
                         Text[ japanese ] = "BASIC モジュール";
-                        Text[ chinese_traditional ] = "BASIC 模塊";
+                        Text[ chinese_traditional ] = "BASIC 模組";
                         Text[ arabic ] = "����� BASIC ����";
                         Text[ dutch ] = "BASIC-module";
                         Text[ chinese_simplified ] = "BASIC 模块";
@@ -2852,7 +2852,7 @@ Menu RID_POPUP_TABBAR
                         Text[ dutch ] = "BASIC-dialoog";
                         Text[ chinese_simplified ] = "BASIC 对话框";
                         Text[ greek ] = "�������� BASIC";
-                        Text[ korean ] = "BASIC 대화상자";
+                        Text[ korean ] = "BASIC 대화 상자";
                         Text[ turkish ] = "BASIC diyalo�u";
                         Text[ catalan ] = "Di�leg del BASIC";
                         Text[ finnish ] = "BASIC-valintaikkuna";
@@ -2891,7 +2891,7 @@ Menu RID_POPUP_TABBAR
             Text [ french ] = "Supprimer" ;
             Text [ swedish ] = "Radera" ;
             Text [ dutch ] = "Verwijderen" ;
-            Text [ spanish ] = "Eliminar" ;
+            Text [ spanish ] = "Borrar" ;
             Text [ english_us ] = "Delete" ;
             /* ### ACHTUNG: Neuer Text in Resource? Modul oder Dialog l�schen : Modul oder Dialog l�schen */
             Text[ chinese_simplified ] = "删除";
@@ -2934,7 +2934,7 @@ Menu RID_POPUP_TABBAR
             Text[ dutch ] = "Naam wijzigen";
             Text[ chinese_simplified ] = "重命名";
             Text[ greek ] = "�����������";
-            Text[ korean ] = "이름 변경";
+            Text[ korean ] = "이름 바꾸기";
             Text[ turkish ] = "Yeniden adland�r";
             Text[ catalan ] = "Reanomena";
             Text[ thai ] = "เปลี่ยนชื่อ";
@@ -3128,7 +3128,7 @@ String RID_STR_QUERYREPLACEMACRO
     Text[ polish ] = "Do you want to overwrite the macro XX ?";
     Text[ portuguese_brazilian ] = "Do you want to overwrite the macro XX ?";
     Text[ japanese ] = "マクロ XX に上書きしますか。";
-    Text[ korean ] = "macro XX 를 대체하시겠습니까?";
+    Text[ korean ] = "macro XX 을(를) 덮어쓰시겠습니까?";
     Text[ chinese_simplified ] = "您要改写宏 XX ？";
     Text[ chinese_traditional ] = "您要覆寫 XX 巨集 ?";
     Text[ turkish ] = "Do you want to overwrite the macro XX ?";
@@ -3185,22 +3185,9 @@ Menu RID_BASICMENU
                         ITEM_FILE_SAVEDOCS
                     };
                     MenuItem
-                    {
-                        ITEM_FILE_MAIL_SENDDOC
-                    };
-                    MenuItem
                     {
                         ITEM_FILE_DOCTEMPLATE
                     };
-
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
-                    MenuItem
-                    {
-                        ITEM_FILE_DOCINFO
-                    };
                     MenuItem
                     {
                         Separator = TRUE ;
@@ -3321,18 +3308,6 @@ Menu RID_BASICMENU
             {
                 ItemList =
                 {
-                    MenuItem
-                    {
-                        ITEM_VIEW_EXPLORER
-                    };
-                    MenuItem
-                    {
-                        ITEM_VIEW_BROWSER
-                    };
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
                     MenuItem
                     {
                         Identifier = 22 ;
@@ -3341,7 +3316,7 @@ Menu RID_BASICMENU
                         Text [ english_us ] = "~Toolbars" ;
                         Text [ swedish ] = "S~ymbollister" ;
                         Text [ danish ] = "Ikonlin~jer" ;
-                        Text [ italian ] = "Barre dei simboli" ;
+                        Text [ italian ] = "~Barre dei simboli" ;
                         Text [ spanish ] = "Barras de ~s�mbolos" ;
                         Text [ french ] = "Barres d'~outils" ;
                         Text [ dutch ] = "~Werkbalken" ;
@@ -3368,7 +3343,7 @@ Menu RID_BASICMENU
                                     Text [ english_us ] = "Main ~Toolbar" ;
                                     Text [ swedish ] = "~Verktygslist" ;
                                     Text [ danish ] = "V�rkt�jslinje" ;
-                                    Text [ italian ] = "Barra degli strumenti" ;
+                                    Text [ italian ] = "Barra degli s~trumenti" ;
                                     Text [ spanish ] = "Barra de ~herramientas" ;
                                     Text [ french ] = "Barre d'~instruments" ;
                                     Text [ dutch ] = "Werk~tuigbalk" ;
@@ -3415,7 +3390,7 @@ Menu RID_BASICMENU
                                     Text[ russian ] = "������...";
                                     Text[ polish ] = "Edytuj...";
                                     Text[ japanese ] = "カスタマイズ(~Z)...";
-                                    Text[ chinese_traditional ] = "編輯(~Z)...";
+                                    Text[ chinese_traditional ] = "自訂(~Z)...";
                                     Text[ greek ] = "~�����������...";
                                     Text[ korean ] = "사용자 정의(~Z)...";
                                     Text[ arabic ] = "�����...";
@@ -3453,41 +3428,6 @@ Menu RID_BASICMENU
                     {
                         Separator = TRUE ;
                     };
-                    MenuItem
-                    {
-                        Identifier = SID_SOURCEVIEW ;
-                        HelpID = SID_SOURCEVIEW ;
-                        Text = "HTM~L-Quelltext" ;
-                        Text [ ENGLISH ] = "HTML source" ;
-                        Text [ dutch ] = "~HTML-brontekst" ;
-                        Text [ english_us ] = "HT~ML Source" ;
-                        Text [ italian ] = "Testo sorgente HTML" ;
-                        Text [ spanish ] = "Texto fuente ~HTML" ;
-                        Text [ french ] = "Texte source ~HTML" ;
-                        Text [ swedish ] = "HTM~L-k�lltext" ;
-                        Text [ danish ] = "HTML-kildetekst" ;
-                        Text [ portuguese ] = "Fonte ~HTML" ;
-                        Text [ portuguese_brazilian ] = "HTML-Quelltext" ;
-                        Text[ chinese_simplified ] = "HT~ML 源文本";
-                        Text[ russian ] = "�������� ����� HTM~L";
-                        Text[ polish ] = "Tekst �r�d�owy HTML";
-                        Text[ japanese ] = "HT~ML ソーステキスト";
-                        Text[ chinese_traditional ] = "HT~ML 原始檔";
-                        Text[ dutch ] = "~HTML-brontekst";
-                        Text[ chinese_simplified ] = "HT~ML 源文本";
-                        Text[ greek ] = "������� ���������� HTM~L";
-                        Text[ korean ] = "HT~ML 소스텍스트";
-                        Text[ arabic ] = "�� ���� HTML";
-                        Text[ turkish ] = "HTM~L kaynak kodu";
-                        Text[ language_user1 ] = " ";
-                        Text[ catalan ] = "Font HT~ML";
-                        Text[ finnish ] = "HT~ML-l�hde";
-                        Text[ thai ] = "แหล่ง HT~ML ";
-                    };
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
                     ITEM_VIEW_SCREENMODE
                 };
             };
@@ -3552,7 +3492,24 @@ Menu RID_BASICMENU
             Text[ catalan ] = "Ei~nes";
             Text[ thai ] = "เ~ครื่องมือ";
         };
-        ITEM_WINDOW_MENU
+        GLOBLMN_WINMN
+        {
+            ITEM_WINDOW_MDIWINDOWLIST
+            SubMenu = Menu
+            {
+                ItemList =
+                {
+                    MenuItem
+                    {
+                        ITEM_WINDOW_CLOSEWIN
+                    };
+                    MenuItem
+                    {
+                        Separator = TRUE ;
+                    };
+                };
+            };
+        };
         ITEM_HELP_MENU
     };
 };
@@ -3604,22 +3561,9 @@ Menu RID_BASICPLUGINMENU
                         ITEM_FILE_SAVEDOCS
                     };
                     MenuItem
-                    {
-                        ITEM_FILE_MAIL_SENDDOC
-                    };
-                    MenuItem
                     {
                         ITEM_FILE_DOCTEMPLATE
                     };
-
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
-                    MenuItem
-                    {
-                        ITEM_FILE_DOCINFO
-                    };
                     MenuItem
                     {
                         Separator = TRUE ;
@@ -3748,14 +3692,6 @@ Menu RID_BASICPLUGINMENU
             {
                 ItemList =
                 {
-                    MenuItem
-                    {
-                        ITEM_VIEW_BROWSER
-                    };
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
                     MenuItem
                     {
                         Identifier = 22 ;
@@ -3764,7 +3700,7 @@ Menu RID_BASICPLUGINMENU
                         Text [ english_us ] = "~Toolbars" ;
                         Text [ swedish ] = "S~ymbollister" ;
                         Text [ danish ] = "Ikonlin~jer" ;
-                        Text [ italian ] = "Barre dei simboli" ;
+                        Text [ italian ] = "Barr~e degli strumenti" ;
                         Text [ spanish ] = "Barras de ~s�mbolos" ;
                         Text [ french ] = "Barres d'~outils" ;
                         Text [ dutch ] = "~Werkbalken" ;
@@ -3791,7 +3727,7 @@ Menu RID_BASICPLUGINMENU
                                     Text [ english_us ] = "Main ~Toolbar" ;
                                     Text [ swedish ] = "~Verktygslist" ;
                                     Text [ danish ] = "~V�rkt�jslinje" ;
-                                    Text [ italian ] = "Barra degli strumenti" ;
+                                    Text [ italian ] = "Barra degli s~trumenti" ;
                                     Text [ spanish ] = "Barra de ~herramientas" ;
                                     Text [ french ] = "Barre d'~instruments" ;
                                     Text [ dutch ] = "Werk~tuigbalk" ;
@@ -3803,7 +3739,7 @@ Menu RID_BASICPLUGINMENU
                                     Text[ japanese ] = "標準ツールバー(~T)";
                                     Text[ chinese_traditional ] = "主工具列(~T)";
                                     Text[ greek ] = "������ �������~��";
-                                    Text[ korean ] = "도구 모음(~T)";
+                                    Text[ korean ] = "주 도구 모음(~T)";
                                     Text[ arabic ] = "���� �������";
                                     Text[ turkish ] = "Ana ara� �ubu�u";
                                     Text[ language_user1 ] = " ";
@@ -3876,41 +3812,6 @@ Menu RID_BASICPLUGINMENU
                     {
                         Separator = TRUE ;
                     };
-                    MenuItem
-                    {
-                        Identifier = SID_SOURCEVIEW ;
-                        HelpID = SID_SOURCEVIEW ;
-                        Text = "HTM~L-Quelltext" ;
-                        Text [ ENGLISH ] = "HTML source" ;
-                        Text [ dutch ] = "~HTML-brontekst" ;
-                        Text [ english_us ] = "HT~ML Source" ;
-                        Text [ italian ] = "Testo sorgente HTML" ;
-                        Text [ spanish ] = "Texto fuente ~HTML" ;
-                        Text [ french ] = "Texte source ~HTML" ;
-                        Text [ swedish ] = "HTM~L-k�lltext" ;
-                        Text [ danish ] = "HTML-kildetekst" ;
-                        Text [ portuguese ] = "Fonte ~HTML" ;
-                        Text [ portuguese_brazilian ] = "HTML-Quelltext" ;
-                        Text[ chinese_simplified ] = "HT~ML 源文本";
-                        Text[ russian ] = "�������� ����� HTM~L";
-                        Text[ polish ] = "Tekst �r�d�owy HTML";
-                        Text[ japanese ] = "HT~ML ソーステキスト";
-                        Text[ chinese_traditional ] = "HT~ML 原始檔";
-                        Text[ dutch ] = "~HTML-brontekst";
-                        Text[ chinese_simplified ] = "HT~ML 源文本";
-                        Text[ greek ] = "������� ���������� HTM~L";
-                        Text[ korean ] = "HT~ML 소스 텍스트(ㅡ)";
-                        Text[ arabic ] = "�� ���� HTML";
-                        Text[ turkish ] = "HTM~L kaynak kodu";
-                        Text[ language_user1 ] = " ";
-                        Text[ catalan ] = "Font HT~ML";
-                        Text[ finnish ] = "HT~ML-l�hde";
-                        Text[ thai ] = "แหล่ง HT~ML ";
-                    };
-                    MenuItem
-                    {
-                        Separator = TRUE ;
-                    };
                     ITEM_VIEW_SCREENMODE
                 };
             };
@@ -3975,9 +3876,31 @@ Menu RID_BASICPLUGINMENU
             Text[ catalan ] = "Ei~nes";
             Text[ thai ] = "เ~ครื่องมือ";
         };
-        ITEM_WINDOW_MENU
+        GLOBLMN_WINMN
+        {
+            ITEM_WINDOW_MDIWINDOWLIST
+            SubMenu = Menu
+            {
+                ItemList =
+                {
+                    MenuItem
+                    {
+                        ITEM_WINDOW_CLOSEWIN
+                    };
+                    MenuItem
+                    {
+                        Separator = TRUE ;
+                    };
+                };
+            };
+        };
         ITEM_HELP_MENU
     };
 };
 
 
+
+
+
+
+
diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src
index 69661ab65e1a..be611dde6fbe 100644
--- a/basctl/source/basicide/brkdlg.src
+++ b/basctl/source/basicide/brkdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: brkdlg.src,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 00:09:27 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,18 +105,19 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
         Text [ danish ] = "Ny" ;
         Text [ portuguese ] = "Novo" ;
         Text [ portuguese_brazilian ] = "Novo" ;
-        Text[ chinese_simplified ] = "�½�";
+        Text[ chinese_simplified ] = "新建";
         Text[ russian ] = "�������";
         Text[ polish ] = "Nowy";
-        Text[ japanese ] = "�V�K";
-        Text[ chinese_traditional ] = "�}�ҷs��";
+        Text[ japanese ] = "新規";
+        Text[ chinese_traditional ] = "開啟新檔";
         Text[ arabic ] = "����";
         Text[ greek ] = "����������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "새로 만들기";
         Text[ turkish ] = "Yeni";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nuevo";
+        Text[ catalan ] = "Nou";
         Text[ finnish ] = "Uusi";
+        Text[ thai ] = "ใหม่";
     };
     PushButton RID_PB_DEL
     {
@@ -129,24 +130,25 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
         Text [ dutch ] = "Wissen" ;
         Text [ english_us ] = "Delete" ;
         Text [ italian ] = "Elimina" ;
-        Text [ spanish ] = "Eliminar" ;
+        Text [ spanish ] = "Borrar" ;
         Text [ french ] = "Supprimer" ;
         Text [ swedish ] = "Radera" ;
         Text [ danish ] = "Slet" ;
         Text [ portuguese ] = "Eliminar" ;
         Text [ portuguese_brazilian ] = "L?chen" ;
-        Text[ chinese_simplified ] = "ɾ��";
+        Text[ chinese_simplified ] = "删除";
         Text[ russian ] = "�������";
         Text[ polish ] = "Usu�";
-        Text[ japanese ] = "�폜";
-        Text[ chinese_traditional ] = "�R��";
+        Text[ japanese ] = "削除";
+        Text[ chinese_traditional ] = "刪除";
         Text[ arabic ] = "���";
         Text[ greek ] = "��������";
-        Text[ korean ] = "����";
+        Text[ korean ] = "삭제";
         Text[ turkish ] = "Sil";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Eliminar";
+        Text[ catalan ] = "Suprimeix";
         Text[ finnish ] = "Poista";
+        Text[ thai ] = "ลบ";
     };
     CheckBox RID_CHKB_ACTIVE
     {
@@ -161,21 +163,22 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
         Text [ french ] = "Actif" ;
         Text [ dutch ] = "Actief" ;
         Text [ swedish ] = "Aktiv" ;
-        Text [ danish ] = "I/O aktiv" ;
+        Text [ danish ] = "Aktiv" ;
         Text [ portuguese_brazilian ] = "Aktiv" ;
         Text [ portuguese ] = "Activo" ;
-        Text[ chinese_simplified ] = "����";
-        Text[ russian ] = "��������";
+        Text[ chinese_simplified ] = "使用中";
+        Text[ russian ] = "���./����.";
         Text[ polish ] = "Aktywny";
-        Text[ japanese ] = "���";
-        Text[ chinese_traditional ] = "�ϥΤ�";
+        Text[ japanese ] = "アクティブ";
+        Text[ chinese_traditional ] = "使用中";
         Text[ arabic ] = "���";
         Text[ greek ] = "������";
-        Text[ korean ] = "Ȱ��";
+        Text[ korean ] = "활성";
         Text[ turkish ] = "Etkin";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Activo";
+        Text[ catalan ] = "Actiu";
         Text[ finnish ] = "Aktiivinen";
+        Text[ thai ] = "ใช้งานอยู่";
     };
     FixedText RID_FT_PASS
     {
@@ -186,24 +189,25 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
         Text [ english_us ] = "Pass Count:" ;
         Text [ portuguese_brazilian ] = "Durchlauf:" ;
         Text [ swedish ] = "Genomfl�de:" ;
-        Text [ danish ] = "Genneml�b:" ;
+        Text [ danish ] = "Glid igennem:" ;
         Text [ italian ] = "Passaggi:" ;
         Text [ spanish ] = "Adaptaci�n:" ;
         Text [ french ] = "Adaptation :" ;
         Text [ dutch ] = "Doorloop:" ;
         Text [ portuguese ] = "Ajuste:" ;
-        Text[ chinese_simplified ] = "��͸��";
-        Text[ russian ] = "��������:";
+        Text[ chinese_simplified ] = "穿透：";
+        Text[ russian ] = "���������:";
         Text[ polish ] = "Przebieg:";
-        Text[ japanese ] = "�ЂƂƂ�����s:";
-        Text[ chinese_traditional ] = "�L�{�G";
+        Text[ japanese ] = "ひととおり実行:";
+        Text[ chinese_traditional ] = "過程：";
         Text[ arabic ] = "���:";
         Text[ greek ] = "������� ���������:";
-        Text[ korean ] = "�����帣��:";
+        Text[ korean ] = "과정";
         Text[ turkish ] = "Pass count:";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Adaptaci�n:";
-        Text[ finnish ] = "Toistom��r�:";
+        Text[ catalan ] = "Recompte de passades:";
+        Text[ finnish ] = "Kertojen #:";
+        Text[ thai ] = "นับผ่าน:";
     };
     FixedText RID_FT_BRKPOINTS
     {
@@ -220,18 +224,19 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
         Text [ danish ] = "Pausepunkter" ;
         Text [ portuguese_brazilian ] = "Haltepunkte" ;
         Text [ portuguese ] = "Pontos de interrup��o" ;
-        Text[ chinese_simplified ] = "�жϵ�";
+        Text[ chinese_simplified ] = "中断点";
         Text[ russian ] = "����� ��������";
         Text[ polish ] = "Punkty przerwania";
-        Text[ japanese ] = "��ڰ��߲��";
-        Text[ chinese_traditional ] = "���_�I";
+        Text[ japanese ] = "ブレークポイント";
+        Text[ chinese_traditional ] = "中斷點";
         Text[ arabic ] = "���� �������";
         Text[ greek ] = "������ ������";
-        Text[ korean ] = "�ߴ���";
+        Text[ korean ] = "중단점";
         Text[ turkish ] = "Kesme noktalar�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Puntos de ruptura";
+        Text[ catalan ] = "Punts de ruptura";
         Text[ finnish ] = "Keskeytyspisteet";
+        Text[ thai ] = "จุดแบ่ง";
     };
     NumericField RID_FLD_PASS
     {
@@ -249,19 +254,33 @@ ModalDialog RID_BASICIDE_BREAKPOINTDLG
     Text [ danish ] = "Pausepunkter" ;
     Text [ portuguese_brazilian ] = "Haltepunkte" ;
     Text [ portuguese ] = "Pontos de interrup��o" ;
-    Text[ chinese_simplified ] = "�жϵ�";
+    Text[ chinese_simplified ] = "中断点";
     Text[ russian ] = "����� ��������";
     Text[ polish ] = "Punkty przerwania";
-    Text[ japanese ] = "��ڰ��߲��";
-    Text[ chinese_traditional ] = "���_�I";
+    Text[ japanese ] = "ブレークポイント";
+    Text[ chinese_traditional ] = "中斷點";
     Text[ arabic ] = "���� �������";
     Text[ greek ] = "������ ������";
-    Text[ korean ] = "�ߴ���";
+    Text[ korean ] = "중단점";
     Text[ turkish ] = "Kesme noktalar�";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Puntos de ruptura";
+    Text[ catalan ] = "Punts de ruptura";
     Text[ finnish ] = "Keskeytyspisteet";
+    Text[ thai ] = "จุดแบ่ง";
 };
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 69779a34d8de..ca8459c1af55 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: macrodlg.src,v $
  *
- *  $Revision: 1.47 $
+ *  $Revision: 1.48 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:25:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -191,7 +191,7 @@ ModalDialog RID_MACROCHOOSER
         Text[ chinese_traditional ] = "巨集的來源(~F)";
         Text[ arabic ] = "����� ��";
         Text[ greek ] = "����������� ���";
-        Text[ korean ] = "매크로 위치(~F)";
+        Text[ korean ] = "매크로 기록 위치(~F)";
         Text[ turkish ] = "Makro kayna��";
         Text[ catalan ] = "Macro ~des de";
         Text[ thai ] = "มาโคร~จาก";
@@ -341,7 +341,7 @@ ModalDialog RID_MACROCHOOSER
         Text[ chinese_traditional ] = "指定(~A)...";
         Text[ arabic ] = "�����...";
         Text[ greek ] = "������������...";
-        Text[ korean ] = "지정(~A)...";
+        Text[ korean ] = "할당(~A)...";
         Text[ turkish ] = "Ata...";
         Text[ catalan ] = "~Assigna...";
         Text[ thai ] = "~กำหนด...";
@@ -448,7 +448,7 @@ ModalDialog RID_MACROCHOOSER
         Text [ french ] = "Supprimer" ;
         Text [ swedish ] = "Ra~dera..." ;
         Text [ dutch ] = "~Wissen" ;
-        Text [ spanish ] = "~Eliminar..." ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ english_us ] = "~Delete" ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)...";
@@ -560,7 +560,7 @@ String RID_STR_BTNDEL
     Text [ french ] = "Supprimer" ;
     Text [ swedish ] = "Ra~dera..." ;
     Text [ dutch ] = "~Wissen" ;
-    Text [ spanish ] = "~Eliminar..." ;
+    Text [ spanish ] = "~Borrar" ;
     Text [ english_us ] = "~Delete" ;
     Text[ chinese_simplified ] = "删除(~D)";
     Text[ russian ] = "�������";
@@ -569,7 +569,7 @@ String RID_STR_BTNDEL
     Text[ chinese_traditional ] = "刪除(~D)";
     Text[ arabic ] = "���";
     Text[ greek ] = "��������";
-    Text[ korean ] = "제거(~D)...";
+    Text[ korean ] = "삭제(~D)";
     Text[ turkish ] = "Sil...";
     Text[ catalan ] = "~Suprimeix...";
     Text[ thai ] = "~ลบ";
@@ -714,3 +714,8 @@ String RID_STR_RECORD
     Text[ thai ] = "~ระเบียน";
 };
 
+
+
+
+
+
diff --git a/basctl/source/basicide/moduldlg.hrc b/basctl/source/basicide/moduldlg.hrc
index 2566c5909d4f..063bcb8530f5 100644
--- a/basctl/source/basicide/moduldlg.hrc
+++ b/basctl/source/basicide/moduldlg.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduldlg.hrc,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: sb $ $Date: 2002-07-03 15:50:51 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,6 +92,5 @@
 
 #define RID_FT_NEWLIB           40
 #define RID_ED_LIBNAME          41
-#define RID_CHKB_EXTRAFILE      42
 
 #endif  // _MODULDLG_HRC
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 84605e6c69d0..a6bf73cf5fcb 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduldlg.src,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: sb $ $Date: 2002-07-03 16:14:25 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,14 +74,14 @@ TabDialog RID_TD_ORGANIZE
     TEXT[ italian ] = "Gestione macro";
     TEXT[ portuguese_brazilian ] = "Gerenciar";
     TEXT[ portuguese ] = "Gerir macros";
-    TEXT[ danish ] = "Makroadministration";
+    TEXT[ danish ] = "Administrer makroer";
     TEXT[ french ] = "Gestion de macros";
     TEXT[ swedish ] = "Administrera makron";
     TEXT[ dutch ] = "Macro's beheren";
     TEXT[ spanish ] = "Administrar";
     TEXT[ english_us ] = "Macro Organizer";
     TEXT[ chinese_simplified ] = "管理宏";
-    TEXT[ russian ] = "������������ �������";
+    TEXT[ russian ] = "���������� ���������";
     TEXT[ polish ] = "Zarz�dzaj makrami";
     TEXT[ japanese ] = "マクロの管理";
     TEXT[ chinese_traditional ] = "管理巨集";
@@ -120,6 +120,7 @@ TabDialog RID_TD_ORGANIZE
                 Text[ korean ] = "모듈";
                 Text[ turkish ] = "Mod�ller";
                 Text[ catalan ] = "M�duls";
+                Text[ thai ] = "โมดูล";
             };
             PageItem
             {
@@ -146,6 +147,7 @@ TabDialog RID_TD_ORGANIZE
                 Text[ turkish ] = "Kitapl�klar";
                 Text[ catalan ] = "Biblioteques";
                 Text[ finnish ] = "Kirjastot";
+                Text[ thai ] = "ไลบรารี";
             };
         };
     };
@@ -153,7 +155,7 @@ TabDialog RID_TD_ORGANIZE
     Text [ english_us ] = "Macro Organizer" ;
     Text [ portuguese_brazilian ] = "Gerenciar" ;
     Text [ swedish ] = "Administrera makron" ;
-    Text [ danish ] = "Makroadministration" ;
+    Text [ danish ] = "Administrer makroer" ;
     Text [ italian ] = "Gestione macro" ;
     Text [ spanish ] = "Administrar" ;
     Text [ french ] = "Gestion de macros" ;
@@ -163,6 +165,7 @@ TabDialog RID_TD_ORGANIZE
     Text[ turkish ] = "Makrolar� y�net";
     Text[ catalan ] = "Organitzador de macros";
     Text[ finnish ] = "Makrojen j�rjestelyty�kalu";
+    Text[ thai ] = "ตัวจัดระเบียบมาโคร";
 };
 TabPage RID_TP_MODULS
 {
@@ -181,14 +184,14 @@ TabPage RID_TP_MODULS
         Text [ portuguese_brazilian ] = "M~?ulo/Di logo" ;
         Text [ portuguese ] = "M~�dulo/Di�logo" ;
         Text [ finnish ] = "M~oduuli/valintaikkuna" ;
-        Text [ danish ] = "Modul/Dialog" ;
+        Text [ danish ] = "M~odul/Dialog" ;
         Text [ french ] = "M~odule/bo�te de dialogue" ;
         Text [ swedish ] = "M~odul/dialog" ;
         Text [ dutch ] = "M~odule/dialoogvenster" ;
         Text [ spanish ] = "M�d~ulo/Di�logo" ;
         Text [ english_us ] = "M~odule/Dialog" ;
         Text[ chinese_simplified ] = "模块/对话框(~O)";
-        Text[ russian ] = "������/������";
+        Text[ russian ] = "������/������";
         Text[ polish ] = "Modu�/Dialog";
         Text[ japanese ] = "モジュール/ダイアログ(~O)";
         Text[ chinese_traditional ] = "模塊/對話方塊(~O)";
@@ -197,6 +200,7 @@ TabPage RID_TP_MODULS
         Text[ korean ] = "모듈/대화 상자(~O)";
         Text[ turkish ] = "Mod�l/diyalog";
         Text[ catalan ] = "M�dul/Di�leg";
+        Text[ thai ] = "โม~ดูล/ไดอะล็อก";
     };
     /*
     Edit RID_EDIT
@@ -247,13 +251,14 @@ TabPage RID_TP_MODULS
         TabStop = TRUE ;
         DefButton = TRUE ;
         Text[ arabic ] = "�����";
-        Text[ russian ] = "~������";
+        Text[ russian ] = "~��������";
         Text[ greek ] = "�����������";
         Text[ polish ] = "~Edytuj";
         Text[ japanese ] = "編集(~E)";
         Text[ korean ] = "편집(~E)";
         Text[ turkish ] = "D�zenle";
         Text[ catalan ] = "~Edita";
+        Text[ thai ] = "แ~ก้ไข";
     };
     CancelButton RID_PB_CLOSE
     {
@@ -294,6 +299,7 @@ TabPage RID_TP_MODULS
         Text[ korean ] = "닫기";
         Text[ turkish ] = "Kapat";
         Text[ catalan ] = "Tanca";
+        Text[ thai ] = "ปิด";
     };
     PushButton RID_PB_NEWMOD
     {
@@ -305,12 +311,12 @@ TabPage RID_TP_MODULS
         Text [ italian ] = "Nuovo ~modulo..." ;
         Text [ portuguese_brazilian ] = "~M?ulo novo" ;
         Text [ portuguese ] = "~Novo m�dulo..." ;
-        Text [ finnish ] = "Uusi ~moduuli" ;
-        Text [ danish ] = "Nyt modul..." ;
+        Text [ finnish ] = "Uusi ~moduuli..." ;
+        Text [ danish ] = "Nyt ~modul..." ;
         Text [ french ] = "Nouveau ~module..." ;
         Text [ swedish ] = "Ny ~modul..." ;
         Text [ dutch ] = "Nieuwe ~module..." ;
-        Text [ spanish ] = "Nuevo ~m�dulo..." ;
+        Text [ spanish ] = "~M�dulo nuevo..." ;
         Text [ english_us ] = "New ~Module..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "新建模块(~M)...";
@@ -323,6 +329,7 @@ TabPage RID_TP_MODULS
         Text[ korean ] = "새 모듈(~M)...";
         Text[ turkish ] = "Yeni mod�l...";
         Text[ catalan ] = "~M�dul nou...";
+        Text[ thai ] = "โ~มดูลใหม่...";
     };
     PushButton RID_PB_NEWDLG
     {
@@ -334,12 +341,12 @@ TabPage RID_TP_MODULS
         Text [ italian ] = "Nuovo dialo~go" ;
         Text [ portuguese_brazilian ] = "Di lo~go novo" ;
         Text [ portuguese ] = "Novo di�lo~go..." ;
-        Text [ finnish ] = "~Uusi valintaikkuna" ;
-        Text [ danish ] = "Ny dialog..." ;
-        Text [ french ] = "Nouveau ~dialogue" ;
+        Text [ finnish ] = "~Uusi valintaikkuna..." ;
+        Text [ danish ] = "Ny dialo~g..." ;
+        Text [ french ] = "Nouvelle bo�te de dialogue" ;
         Text [ swedish ] = "Ny dialo~g..." ;
-        Text [ dutch ] = "Nieuwe ~dialoog..." ;
-        Text [ spanish ] = "Nuevo di�lo~go..." ;
+        Text [ dutch ] = "Nieuw ~dialoogvenster..." ;
+        Text [ spanish ] = "Di�lo~go nuevo..." ;
         Text [ english_us ] = "~New Dialog..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "新建对话框(~N)...";
@@ -352,6 +359,7 @@ TabPage RID_TP_MODULS
         Text[ korean ] = "새 대화상자(~N)...";
         Text[ turkish ] = "Yeni diyalog...";
         Text[ catalan ] = "Di�leg ~nou...";
+        Text[ thai ] = "ไดอะล็อกใ~หม่...";
     };
     PushButton RID_PB_DELETE
     {
@@ -365,11 +373,11 @@ TabPage RID_TP_MODULS
         Text [ portuguese_brazilian ] = "~Apagar..." ;
         Text [ portuguese ] = "E~liminar..." ;
         Text [ finnish ] = "~Poista" ;
-        Text [ danish ] = "Slet..." ;
+        Text [ danish ] = "~Slet" ;
         Text [ french ] = "Supprimer" ;
         Text [ swedish ] = "Ra~dera..." ;
         Text [ dutch ] = "~Wissen" ;
-        Text [ spanish ] = "E~liminar..." ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ english_us ] = "~Delete" ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)";
@@ -379,9 +387,10 @@ TabPage RID_TP_MODULS
         Text[ chinese_traditional ] = "刪除(~D)...";
         Text[ arabic ] = "���";
         Text[ greek ] = "��������";
-        Text[ korean ] = "제거(~D)...";
+        Text[ korean ] = "삭제(~D)";
         Text[ turkish ] = "Sil...";
         Text[ catalan ] = "~Suprimeix...";
+        Text[ thai ] = "~ลบ";
     };
 };
 TabPage RID_TP_LIBS
@@ -398,14 +407,14 @@ TabPage RID_TP_LIBS
         Text [ ENGLISH ] = "Application/D~ocument" ;
         Text[ english_us ] = "Application/D~ocument";
         Text[ portuguese ] = "Aplica��o/D~ocumento";
-        Text[ russian ] = "����������/��������";
+        Text[ russian ] = "����������/��������";
         Text[ greek ] = "Application/D~ocument";
-        Text[ dutch ] = "Applicatie/D~ocument";
+        Text[ dutch ] = "Toepassing/D~ocument";
         Text[ french ] = "Application/D~ocument";
         Text[ spanish ] = "Aplicaci�n/D~ocumento";
-        Text[ finnish ] = "Application/D~ocument";
+        Text[ finnish ] = "Sovellus/Asia~kirja";
         Text[ italian ] = "Applicazione/D~ocumento";
-        Text[ danish ] = "Application/D~ocument";
+        Text[ danish ] = "Program/d~okument";
         Text[ swedish ] = "Till�mpning/d~okument";
         Text[ polish ] = "Aplikacja/D~okument";
         Text[ portuguese_brazilian ] = "Application/D~ocument";
@@ -415,7 +424,8 @@ TabPage RID_TP_LIBS
         Text[ chinese_traditional ] = "應用程式/文件(~O)";
         Text[ turkish ] = "Application/D~ocument";
         Text[ arabic ] = "Application/D~ocument";
-        Text[ catalan ] = "Application/D~ocument";
+        Text[ catalan ] = "Aplicaci�/D~ocument";
+        Text[ thai ] = "แอพพลิเคชั่น/เ~อกสาร";
     };
     ListBox RID_LB_BASICS
     {
@@ -437,7 +447,7 @@ TabPage RID_TP_LIBS
         Text [ spanish ] = "~Biblioteca" ;
         Text [ french ] = "Biblioth�~que" ;
         Text [ swedish ] = "Bibliote~k" ;
-        Text [ danish ] = "Bibliotek" ;
+        Text [ danish ] = "Bibliote~k" ;
         Text [ portuguese ] = "Bibliote~ca" ;
         Text [ portuguese_brazilian ] = "Bibliothe~k" ;
         Text[ chinese_simplified ] = "程序库(~L)";
@@ -451,6 +461,7 @@ TabPage RID_TP_LIBS
         Text[ turkish ] = "Kitapl�k";
         Text[ catalan ] = "~Biblioteca";
         Text[ finnish ] = "~Kirjasto";
+        Text[ thai ] = "ไ~ลบรารี";
     };
     Control RID_TRLBOX
     {
@@ -492,13 +503,14 @@ TabPage RID_TP_LIBS
         TabStop = TRUE ;
         DefButton = TRUE ;
         Text[ arabic ] = "�����";
-        Text[ russian ] = "~������";
+        Text[ russian ] = "~��������";
         Text[ greek ] = "�����������";
         Text[ polish ] = "~Edytuj";
         Text[ japanese ] = "編集(~E)";
         Text[ korean ] = "편집(~E)";
         Text[ turkish ] = "D�zenle";
         Text[ catalan ] = "~Edita";
+        Text[ thai ] = "แ~ก้ไข";
     };
     CancelButton RID_PB_CLOSE
     {
@@ -539,6 +551,7 @@ TabPage RID_TP_LIBS
         Text[ korean ] = "닫기";
         Text[ turkish ] = "Kapat";
         Text[ catalan ] = "Tanca";
+        Text[ thai ] = "ปิด";
     };
     PushButton RID_PB_PASSWORD
     {
@@ -550,8 +563,8 @@ TabPage RID_TP_LIBS
         Text [ italian ] = "~Password..." ;
         Text [ portuguese_brazilian ] = "~Senha..." ;
         Text [ portuguese ] = "~Senha..." ;
-        Text [ finnish ] = "~Salasana" ;
-        Text [ danish ] = "Adgangskode..." ;
+        Text [ finnish ] = "~Salasana..." ;
+        Text [ danish ] = "A~dgangskode..." ;
         Text [ french ] = "Mot de passe..." ;
         Text [ swedish ] = "L�s~enord..." ;
         Text [ dutch ] = "W~achtwoord..." ;
@@ -565,9 +578,10 @@ TabPage RID_TP_LIBS
         Text[ chinese_traditional ] = "密碼(~P)...";
         Text[ arabic ] = "���� ����...";
         Text[ greek ] = "������� ~���������";
-        Text[ korean ] = "패스워드(~P)...";
+        Text[ korean ] = "암호(~P)...";
         Text[ turkish ] = "�ifre...";
         Text[ catalan ] = "~Contrasenya...";
+        Text[ thai ] = "~รหัสผ่าน...";
     };
     PushButton RID_PB_NEWLIB
     {
@@ -582,13 +596,13 @@ TabPage RID_TP_LIBS
         Text [ french ] = "Nouveau..." ;
         Text [ dutch ] = "~Nieuw..." ;
         Text [ spanish ] = "~Nuevo..." ;
-        Text [ danish ] = "Ny..." ;
+        Text [ danish ] = "~Ny..." ;
         Text [ swedish ] = "~Nytt..." ;
-        Text [ finnish ] = "~Uusi" ;
+        Text [ finnish ] = "~Uusi..." ;
         Text [ english_us ] = "~New..." ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "新建(~N)...";
-        Text[ russian ] = "�������...";
+        Text[ russian ] = "����� ����������";
         Text[ polish ] = "Nowy...";
         Text[ japanese ] = "新規作成(~N)...";
         Text[ chinese_traditional ] = "新建(~N)...";
@@ -597,6 +611,7 @@ TabPage RID_TP_LIBS
         Text[ korean ] = "새로 만들기(~N)...";
         Text[ turkish ] = "Yeni...";
         Text[ catalan ] = "~Nou...";
+        Text[ thai ] = "ใ~หม่...";
     };
     PushButton RID_PB_APPEND
     {
@@ -608,10 +623,10 @@ TabPage RID_TP_LIBS
         Text [ dutch ] = "Toe~voegen..." ;
         Text [ english_us ] = "~Append..." ;
         Text [ italian ] = "Aggi~ungi..." ;
-        Text [ spanish ] = "~A�adir..." ;
+        Text [ spanish ] = "~Adjuntar..." ;
         Text [ french ] = "~Ajouter..." ;
         Text [ swedish ] = "L�gg ~till..." ;
-        Text [ danish ] = "Tilf�j..." ;
+        Text [ danish ] = "Til~f�j..." ;
         Text [ portuguese_brazilian ] = "Hin~zuf?en..." ;
         Text [ portuguese ] = "~Adicionar..." ;
         Text[ chinese_simplified ] = "新增(~A)...";
@@ -624,7 +639,8 @@ TabPage RID_TP_LIBS
         Text[ korean ] = "추가(~A)...";
         Text[ turkish ] = "Ekle...";
         Text[ catalan ] = "~Afegeix...";
-        Text[ finnish ] = "~Liit�";
+        Text[ finnish ] = "~Liit�...";
+        Text[ thai ] = "~ผนวก...";
     };
     PushButton RID_PB_DELETE
     {
@@ -638,11 +654,11 @@ TabPage RID_TP_LIBS
         Text [ portuguese_brazilian ] = "~Apagar..." ;
         Text [ portuguese ] = "E~liminar..." ;
         Text [ finnish ] = "~Poista" ;
-        Text [ danish ] = "Slet..." ;
+        Text [ danish ] = "~Slet" ;
         Text [ french ] = "Supprimer" ;
         Text [ swedish ] = "Ra~dera..." ;
         Text [ dutch ] = "~Wissen" ;
-        Text [ spanish ] = "Elim~inar..." ;
+        Text [ spanish ] = "~Borrar" ;
         Text [ english_us ] = "~Delete" ;
         TabStop = TRUE ;
         Text[ chinese_simplified ] = "删除(~D)";
@@ -652,9 +668,10 @@ TabPage RID_TP_LIBS
         Text[ chinese_traditional ] = "刪除(~D)...";
         Text[ arabic ] = "���";
         Text[ greek ] = "��������";
-        Text[ korean ] = "삭제(~D)...";
+        Text[ korean ] = "삭제(~D)";
         Text[ turkish ] = "Sil...";
         Text[ catalan ] = "~Suprimeix...";
+        Text[ thai ] = "~ลบ";
     };
 };
 ModalDialog RID_DLG_LIBS
@@ -717,6 +734,7 @@ ModalDialog RID_DLG_LIBS
         Text[ turkish ] = "Se�enekler";
         Text[ catalan ] = "Opcions";
         Text[ finnish ] = "Asetukset";
+        Text[ thai ] = "ตัวเลือก";
     };
     CheckBox RID_CB_REF
     {
@@ -729,11 +747,11 @@ ModalDialog RID_DLG_LIBS
         Text [ english_us ] = "Insert as reference (read-only)" ;
         Text [ portuguese_brazilian ] = "Referenzen (nur lesen)" ;
         Text [ swedish ] = "Infoga som referens (bara l�sning)" ;
-        Text [ danish ] = "Inds�t som reference (skrivebeskyttet)" ;
+        Text [ danish ] = "Inds�t som reference (kun l�se)" ;
         Text [ italian ] = "Inserisci come riferimento (sola lettura)" ;
-        Text [ spanish ] = "Insertar como referencia (solo leer)" ;
+        Text [ spanish ] = "Insertar como referencia (s�lo lectura)" ;
         Text [ french ] = "Ins�rer comme r�f�rence (lecture seule)" ;
-        Text [ dutch ] = "Als verwijzing invoegen (alleen lezen)" ;
+        Text [ dutch ] = "Als verwijzing invoegen (alleen-lezen)" ;
         Text [ portuguese ] = "Inserir como refer�ncia (s� leitura)" ;
         Text[ chinese_simplified ] = "当作引用插入(只读)";
         Text[ russian ] = "�������� ��� ������ (������ ��� ������)";
@@ -742,10 +760,11 @@ ModalDialog RID_DLG_LIBS
         Text[ chinese_traditional ] = "當作參照插入(唯讀)";
         Text[ arabic ] = "����� ����� (������� ���)";
         Text[ greek ] = "�������� �� ������� (���� ��� ��������)";
-        Text[ korean ] = "참조로서 삽입 (읽기 전용)";
+        Text[ korean ] = "참조로 삽입(읽기 전용)";
         Text[ turkish ] = "Referans olarak ekle (salt okunur)";
         Text[ catalan ] = "Insereix com a refer�ncia (nom�s de lectura)";
-        Text[ finnish ] = "Lis�� viite (vain luku)";
+        Text[ finnish ] = "Lis�� viittaus (vain luku)";
+        Text[ thai ] = "แทรกเป็นการอ้างอิง (อ่านอย่างเดียว)";
     };
     CheckBox RID_CB_REPL
     {
@@ -757,7 +776,7 @@ ModalDialog RID_DLG_LIBS
         Text [ english_us ] = "Replace existing libraries" ;
         Text [ portuguese_brazilian ] = "Bibliotheken ersetzen" ;
         Text [ swedish ] = "Ers�tt existerande bibliotek" ;
-        Text [ danish ] = "Erstat de eksisterende biblioteker" ;
+        Text [ danish ] = "Erstat eksisterende biblioteker" ;
         Text [ italian ] = "Sostituisci library esistenti" ;
         Text [ spanish ] = "Reemplazar bibliotecas existentes" ;
         Text [ french ] = "Remplacer les biblioth�ques existantes" ;
@@ -773,6 +792,7 @@ ModalDialog RID_DLG_LIBS
         Text[ turkish ] = "Mevcut kitapl��� de�i�tir";
         Text[ catalan ] = "Reempla�a les biblioteques existents";
         Text[ finnish ] = "Korvaa nykyiset kirjastot";
+        Text[ thai ] = "แทนที่ไลบรารีที่มีอยู่";
     };
 };
 ModalDialog RID_DLG_NEWLIB
@@ -804,7 +824,7 @@ ModalDialog RID_DLG_NEWLIB
         Text [ english_us ] = "~Name:" ;
         Text [ portuguese_brazilian ] = "~Name:" ;
         Text [ swedish ] = "~Namn:" ;
-        Text [ danish ] = "Navn:" ;
+        Text [ danish ] = "~Navn:" ;
         Text [ italian ] = "~Nome:" ;
         Text [ spanish ] = "~Nombre:" ;
         Text [ french ] = "~Nom :" ;
@@ -821,6 +841,7 @@ ModalDialog RID_DLG_NEWLIB
         Text[ turkish ] = "Ad:";
         Text[ catalan ] = "~Nom:";
         Text[ finnish ] = "~Nimi:";
+        Text[ thai ] = "~ชื่อ:";
     };
     Edit RID_ED_LIBNAME
     {
@@ -829,35 +850,6 @@ ModalDialog RID_DLG_NEWLIB
         Size = MAP_APPFONT ( 92 , 12 ) ;
         TabStop = TRUE ;
     };
-    CheckBox RID_CHKB_EXTRAFILE
-    {
-        Pos = MAP_APPFONT ( 6 , 37 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
-        TabStop = TRUE ;
-        Text = "~Separate Datei anlegen" ;
-        Text [ English ] = "~Separate Datei anlegen" ;
-        Text [ portuguese ] = "~Criar ficheiro separado" ;
-        Text [ english_us ] = "~Create separate file" ;
-        Text [ portuguese_brazilian ] = "~Separate Datei anlegen" ;
-        Text [ swedish ] = "Skapa ~separat fil" ;
-        Text [ danish ] = "Opret separat fil" ;
-        Text [ italian ] = "~Crea file distinto" ;
-        Text [ spanish ] = "Crear archivo ~separado" ;
-        Text [ french ] = "~Cr�er un fichier distinct" ;
-        Text [ dutch ] = "~Apart bestand maken" ;
-        Hide = TRUE ;
-        Text[ chinese_simplified ] = "建立一个另外的文件(~C)";
-        Text[ russian ] = "������� ��������� ����";
-        Text[ polish ] = "Utw�rz oddzielny plik";
-        Text[ japanese ] = "別のファイルを作成(~C)";
-        Text[ chinese_traditional ] = "另開啟新檔(~C)";
-        Text[ arabic ] = "����� ��� �����";
-        Text[ greek ] = "���������� ������~���� �������";
-        Text[ korean ] = "별도 파일 작성(~C)";
-        Text[ turkish ] = "Ayr� dosya olu�tur";
-        Text[ catalan ] = "Crea un fitxer ~separat";
-        Text[ finnish ] = "~Luo erillinen tiedosto";
-    };
 };
 
 
@@ -878,6 +870,11 @@ ModalDialog RID_DLG_NEWLIB
 
 
 
+
+
+
+
+
 
 
 
diff --git a/basctl/source/basicide/moptions.src b/basctl/source/basicide/moptions.src
index 39d2d355fffd..5c1ee24dd5ba 100644
--- a/basctl/source/basicide/moptions.src
+++ b/basctl/source/basicide/moptions.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moptions.src,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: kz $ $Date: 2001-11-16 23:34:59 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,8 @@ ModalDialog RID_MACROOPTIONS
         Text[ korean ] = "설명";
         Text[ turkish ] = "A��klama";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Descripci�n";
+        Text[ catalan ] = "Descripci�";
+        Text[ thai ] = "คำอธิบาย";
     };
     MultiLineEdit RID_ME_DESCR
     {
@@ -161,20 +162,21 @@ ModalDialog RID_MACROOPTIONS
         Text [ danish ] = "Hj�lp-information" ;
         Text [ french ] = "Informations - Aide" ;
         Text [ swedish ] = "Hj�lp-information" ;
-        Text [ dutch ] = "Help informatie" ;
-        Text [ spanish ] = "Informaciones - Ayuda" ;
+        Text [ dutch ] = "Help-informatie" ;
+        Text [ spanish ] = "Informaci�n sobre la Ayuda" ;
         Text [ english_us ] = "Help information" ;
         Text[ chinese_simplified ] = "帮助信息";
-        Text[ russian ] = "�������-����������";
+        Text[ russian ] = "���������� ����������";
         Text[ polish ] = "Pomoc - Informacje";
-        Text[ japanese ] = "ﾍﾙﾌﾟ情報";
+        Text[ japanese ] = "ヘルプ情報";
         Text[ chinese_traditional ] = "說明資訊";
         Text[ arabic ] = "������� �� ��������";
         Text[ greek ] = "����������� ��������";
         Text[ korean ] = "도움말 정보";
         Text[ turkish ] = "Yard�m bilgileri";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Informaciones - Ayuda";
+        Text[ catalan ] = "Informacions - Ajuda";
+        Text[ thai ] = "ข้อมูลช่วยเหลือ";
     };
     FixedText RID_FT_HELPID
     {
@@ -191,20 +193,21 @@ ModalDialog RID_MACROOPTIONS
         Text [ danish ] = "Hj�lp-identifikation" ;
         Text [ french ] = "ID de l'aide" ;
         Text [ swedish ] = "Hj�lp-identifikation" ;
-        Text [ dutch ] = "Help ID" ;
-        Text [ spanish ] = "Identificaci�n de ayuda" ;
+        Text [ dutch ] = "Help-ID" ;
+        Text [ spanish ] = "Identificaci�n de la Ayuda" ;
         Text [ english_us ] = "Help ID" ;
         Text[ chinese_simplified ] = "帮助标志";
-        Text[ russian ] = "ID �������";
+        Text[ russian ] = "ID �������";
         Text[ polish ] = "Pomoc - Identyfikacja";
-        Text[ japanese ] = "ﾍﾙﾌﾟID";
+        Text[ japanese ] = "ヘルプID";
         Text[ chinese_traditional ] = "說明識別符";
         Text[ arabic ] = "����� ��������";
         Text[ greek ] = "��������� ��������";
         Text[ korean ] = "도움말 ID";
         Text[ turkish ] = "Yard�m tan�t�c�s�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Identificaci�n de ayuda";
+        Text[ catalan ] = "Identificador d'ajuda";
+        Text[ thai ] = "ID ช่วยเหลือ";
     };
     NumericField RID_NF_HELPID
     {
@@ -232,19 +235,20 @@ ModalDialog RID_MACROOPTIONS
         Text [ french ] = "Nom du fichier de l'aide" ;
         Text [ swedish ] = "Hj�lp-filnamn" ;
         Text [ dutch ] = "Help-bestandsnaam" ;
-        Text [ spanish ] = "Nombre del archivo de ayuda" ;
+        Text [ spanish ] = "Nombre del archivo de la Ayuda" ;
         Text [ english_us ] = "Help file name" ;
         Text[ chinese_simplified ] = "帮助文件名";
-        Text[ russian ] = "��� ����� �������";
+        Text[ russian ] = "��� ����� �������";
         Text[ polish ] = "Pomoc - Nazwa pliku";
-        Text[ japanese ] = "ﾍﾙﾌﾟのﾌｧｲﾙ名";
+        Text[ japanese ] = "ヘルプのファイル名";
         Text[ chinese_traditional ] = "說明檔案名稱";
         Text[ arabic ] = "��� ��� ��������";
         Text[ greek ] = "����� ������� ��������";
         Text[ korean ] = "도움말 파일 이름";
         Text[ turkish ] = "Yard�m dosyas� ad�";
         Text[ language_user1 ] = " ";
-        Text[ catalan ] = "Nombre del archivo de ayuda";
+        Text[ catalan ] = "Nom del fitxer d'ajuda";
+        Text[ thai ] = "ชื่อแฟ้มช่วยเหลือ";
     };
     Edit RID_ED_HELPNAME
     {
@@ -263,7 +267,8 @@ ModalDialog RID_MACROOPTIONS
     Text[ korean ] = "설명";
     Text[ turkish ] = "A��klama";
     Text[ language_user1 ] = " ";
-    Text[ catalan ] = "Descripci�n";
+    Text[ catalan ] = "Descripci�";
+    Text[ thai ] = "คำอธิบาย";
 };
 
 
@@ -276,3 +281,5 @@ ModalDialog RID_MACROOPTIONS
 
 
 
+
+
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index f9615fa4b00c..e730b98b4bb1 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objdlg.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: gt $ $Date: 2002-09-02 06:27:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -277,3 +277,5 @@ FloatingWindow RID_BASICIDE_OBJCAT
     Text[ catalan ] = "Objectes";
     Text[ thai ] = "วัตถุ";
 };
+
+
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
index 413340c4535e..438db8fd3c80 100644
--- a/basctl/source/basicide/tbxctl.src
+++ b/basctl/source/basicide/tbxctl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxctl.src,v $
  *
- *  $Revision: 1.39 $
+ *  $Revision: 1.40 $
  *
- *  last change: $Author: tbe $ $Date: 2002-05-08 17:00:21 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,7 +104,7 @@ FloatingWindow RID_TBXCONTROLS
         Text[ turkish ] = "Komut alanlar�";
         Text[ language_user1 ] = " ";
         Text[ catalan ] = "Controls";
-        Text[ finnish ] = "Ohjaimet";
+        Text[ finnish ] = "Ohjausobjektit";
         Text[ thai ] = "ตัวควบคุม";
     };
     Text[ chinese_simplified ] = "控制";
@@ -118,7 +118,7 @@ FloatingWindow RID_TBXCONTROLS
     Text[ turkish ] = "Komut alanlar�";
     Text[ language_user1 ] = " ";
     Text[ catalan ] = "Controls";
-    Text[ finnish ] = "Ohjaimet";
+    Text[ finnish ] = "Ohjausobjektit";
     Text[ thai ] = "ตัวควบคุม";
 };
 ToolBox RID_TOOLBOX
@@ -141,7 +141,7 @@ ToolBox RID_TOOLBOX
             Text [ french ] = "Bouton" ;
             Text [ dutch ] = "Knop" ;
             Text [ swedish ] = "Kommandoknapp" ;
-            Text [ danish ] = "Kommandoknap" ;
+            Text [ danish ] = "Knap" ;
             Text [ portuguese ] = "Bot�o" ;
             Text [ portuguese_brazilian ] = "CommandButton" ;
             /* ### ACHTUNG: Neuer Text in Resource? CommandButton einf�gen : CommandButton einf�gen */
@@ -177,7 +177,7 @@ ToolBox RID_TOOLBOX
             Text [ portuguese_brazilian ] = "CheckBox" ;
             /* ### ACHTUNG: Neuer Text in Resource? CheckBox einf�gen : CheckBox einf�gen */
             Text[ chinese_simplified ] = "复选框";
-            Text[ russian ] = "���� ������";
+            Text[ russian ] = "������";
             Text[ polish ] = "Pole wyboru";
             Text[ japanese ] = "チェックボックス";
             Text[ chinese_traditional ] = "核取方塊";
@@ -203,22 +203,22 @@ ToolBox RID_TOOLBOX
             Text [ french ] = "Champ d'�tiquette" ;
             Text [ dutch ] = "Titelveld" ;
             Text [ swedish ] = "Etikettf�lt" ;
-            Text [ danish ] = "Etiket" ;
+            Text [ danish ] = "Etiketfelt" ;
             Text [ portuguese ] = "Campo de etiqueta" ;
             Text [ portuguese_brazilian ] = "Label" ;
             /* ### ACHTUNG: Neuer Text in Resource? Label einf�gen : Label einf�gen */
             Text[ chinese_simplified ] = "标签字段";
-            Text[ russian ] = "�������";
+            Text[ russian ] = "���� �������";
             Text[ polish ] = "Pole etykiety";
             Text[ japanese ] = "図表番号ボックス";
             Text[ chinese_traditional ] = "標籤欄位";
             Text[ arabic ] = "����� �����";
             Text[ greek ] = "����� ���������";
-            Text[ korean ] = "캡션 필드";
+            Text[ korean ] = "레이블 필드";
             Text[ turkish ] = "Etiket";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Etiqueta";
-            Text[ finnish ] = "Nimi�kentt�";
+            Text[ finnish ] = "Selitekentt�";
             Text[ thai ] = "เขตข้อมูลป้ายชื่อ";
         };
         ToolBoxItem
@@ -234,18 +234,18 @@ ToolBox RID_TOOLBOX
             Text [ french ] = "Zone de liste" ;
             Text [ dutch ] = "Keuzelijst" ;
             Text [ swedish ] = "Listruta" ;
-            Text [ danish ] = "Liste" ;
+            Text [ danish ] = "Rulleliste" ;
             Text [ portuguese ] = "Caixa de listagem" ;
             Text [ portuguese_brazilian ] = "ListBox" ;
             /* ### ACHTUNG: Neuer Text in Resource? ListBox einf�gen : ListBox einf�gen */
             Text[ chinese_simplified ] = "列表框";
-            Text[ russian ] = "���� ������";
+            Text[ russian ] = "������";
             Text[ polish ] = "Pole listy";
             Text[ japanese ] = "リストボックス";
             Text[ chinese_traditional ] = "清單方塊";
             Text[ arabic ] = "���� �����";
             Text[ greek ] = "����� ������";
-            Text[ korean ] = "목록 필드";
+            Text[ korean ] = "목록 상자";
             Text[ turkish ] = "Liste kutusu";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Quadre de llista";
@@ -270,13 +270,13 @@ ToolBox RID_TOOLBOX
             Text [ portuguese_brazilian ] = "HScrollBar" ;
             /* ### ACHTUNG: Neuer Text in Resource? Horizontale ScrollBar einf�gen : Horizontale ScrollBar einf�gen */
             Text[ chinese_simplified ] = "水平向滚动栏";
-            Text[ russian ] = "�����. ������ ���������";
+            Text[ russian ] = "�������������� ������ ���������";
             Text[ polish ] = "Poziomy pasek przewijania";
             Text[ japanese ] = "水平スクロールバー";
             Text[ chinese_traditional ] = "水平向捲軸";
             Text[ arabic ] = "���� ����� ������ ������";
             Text[ greek ] = "��������� ������ �������";
-            Text[ korean ] = "수평 스크롤";
+            Text[ korean ] = "수평 스크롤 막대";
             Text[ turkish ] = "Yatay kayd�rma �ubu�u";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Barra de despla�ament horitzontal";
@@ -296,20 +296,20 @@ ToolBox RID_TOOLBOX
             Text [ spanish ] = "Marco de grupo" ;
             Text [ french ] = "Zone de groupe" ;
             Text [ swedish ] = "Grupperingsram" ;
-            Text [ danish ] = "FrameControl" ;
+            Text [ danish ] = "Gruppeboks" ;
             Text [ portuguese ] = "Caixa de grupo" ;
             Text [ portuguese_brazilian ] = "FrameControl" ;
             /* ### ACHTUNG: Neuer Text in Resource? GroupBox einf�gen : GroupBox einf�gen */
             Text[ chinese_simplified ] = "小组框";
-            Text[ russian ] = "��������� �����";
+            Text[ russian ] = "��������� ����";
             Text[ polish ] = "Ramka grupy";
             Text[ japanese ] = "グループ枠";
             Text[ chinese_traditional ] = "群組方塊";
             Text[ arabic ] = "FrameControl";
             Text[ greek ] = "������� ������������";
-            Text[ korean ] = "그룹박스";
+            Text[ korean ] = "그룹 상자";
             Text[ turkish ] = "FrameControl";
-            Text[ language_user1 ] = " ";
+            Text[ language_user1 ] = "; German should be \"Rahmen\"";
             Text[ catalan ] = "Control del marc";
             Text[ finnish ] = "Ryhm�ruutu";
             Text[ thai ] = "กล่องที่จัดเป็นกลุ่ม";
@@ -330,12 +330,12 @@ ToolBox RID_TOOLBOX
             Text[ spanish ] = "L�nea horizontal";
             Text[ finnish ] = "Vaakaviiva";
             Text[ italian ] = "Linea orizzontale";
-            Text[ danish ] = "HFixedLine";
+            Text[ danish ] = "Vandret linje";
             Text[ swedish ] = "Horisontell linje";
             Text[ polish ] = "Linia pozioma";
             Text[ portuguese_brazilian ] = "HFixedLine";
             Text[ japanese ] = "横線";
-            Text[ korean ] = "수평선";
+            Text[ korean ] = "가로선";
             Text[ chinese_simplified ] = "水平线条";
             Text[ chinese_traditional ] = "水平線";
             Text[ turkish ] = "HFixedLine";
@@ -357,20 +357,20 @@ ToolBox RID_TOOLBOX
             Text[ dutch ] = "Datumveld";
             Text[ french ] = "Champ de date";
             Text[ spanish ] = "Campo de fecha";
-            Text[ finnish ] = "DateField";
+            Text[ finnish ] = "P�iv�m��r�kentt�";
             Text[ italian ] = "Campo data";
-            Text[ danish ] = "DateField";
+            Text[ danish ] = "Datofelt";
             Text[ swedish ] = "Datumf�lt";
             Text[ polish ] = "Pole daty";
             Text[ portuguese_brazilian ] = "DateField";
             Text[ japanese ] = "日付フィールド";
-            Text[ korean ] = "데이터 필드";
+            Text[ korean ] = "날짜 필드";
             Text[ chinese_simplified ] = "日期字段";
             Text[ chinese_traditional ] = "日期欄位";
             Text[ turkish ] = "DateField";
             Text[ arabic ] = "DateField";
-            Text[ catalan ] = "DateField";
-            Text[ thai ] = "Date Field";
+            Text[ catalan ] = "Camp de dades";
+            Text[ thai ] = "เขตข้อมูลวันที่";
         };
         ToolBoxItem
         {
@@ -386,20 +386,20 @@ ToolBox RID_TOOLBOX
             Text[ dutch ] = "Numeriek veld";
             Text[ french ] = "Champ num�rique";
             Text[ spanish ] = "Campo num�rico";
-            Text[ finnish ] = "NumericField";
+            Text[ finnish ] = "Numeerinen kentt�";
             Text[ italian ] = "Campo  numerico";
-            Text[ danish ] = "NumericField";
+            Text[ danish ] = "Numerisk felt";
             Text[ swedish ] = "Numeriskt f�lt";
             Text[ polish ] = "Pole numeryczne";
             Text[ portuguese_brazilian ] = "NumericField";
             Text[ japanese ] = "番号フィールド";
-            Text[ korean ] = "수치 필드";
+            Text[ korean ] = "숫자 필드";
             Text[ chinese_simplified ] = "数字字段";
             Text[ chinese_traditional ] = "數字欄位";
             Text[ turkish ] = "NumericField";
             Text[ arabic ] = "NumericField";
-            Text[ catalan ] = "NumericField";
-            Text[ thai ] = "Numeric Field";
+            Text[ catalan ] = "Camp num�ric";
+            Text[ thai ] = "เขตข้อมูลตัวเลข";
         };
         ToolBoxItem
         {
@@ -410,25 +410,25 @@ ToolBox RID_TOOLBOX
             Text [ english ] = "FormattedField" ;
             Text[ english_us ] = "Formatted Field";
             Text[ portuguese ] = "Campo formatado";
-            Text[ russian ] = "����������������� ����";
+            Text[ russian ] = "���� ��������������";
             Text[ greek ] = "FormattedField";
             Text[ dutch ] = "Opgemaakt veld";
             Text[ french ] = "Champ format�";
             Text[ spanish ] = "Campo formateado";
-            Text[ finnish ] = "FormattedField";
+            Text[ finnish ] = "Muotoiltu kentt�";
             Text[ italian ] = "Campo formattato";
-            Text[ danish ] = "FormattedField";
+            Text[ danish ] = "Formateret felt";
             Text[ swedish ] = "Formaterat f�lt";
             Text[ polish ] = "Pole sformatowane";
             Text[ portuguese_brazilian ] = "FormattedField";
             Text[ japanese ] = "書式設定されたフィールド";
-            Text[ korean ] = "서식 지정된 필드";
+            Text[ korean ] = "서식 있는 필드";
             Text[ chinese_simplified ] = "格式化的字段";
             Text[ chinese_traditional ] = "格式化的字段";
             Text[ turkish ] = "FormattedField";
             Text[ arabic ] = "FormattedField";
-            Text[ catalan ] = "FormattedField";
-            Text[ thai ] = "Formatted Field";
+            Text[ catalan ] = "Camp formatat";
+            Text[ thai ] = "เขตข้อมูลการจัดรูปแบบ";
         };
         ToolBoxItem
         {
@@ -444,20 +444,20 @@ ToolBox RID_TOOLBOX
             Text[ dutch ] = "Bestandselectie";
             Text[ french ] = "S�lection de fichier";
             Text[ spanish ] = "Selecci�n de archivo";
-            Text[ finnish ] = "FileControl";
+            Text[ finnish ] = "Tiedoston valinta";
             Text[ italian ] = "Selezione file";
-            Text[ danish ] = "FileControl";
+            Text[ danish ] = "Filudvalg";
             Text[ swedish ] = "Filurval";
             Text[ polish ] = "Wyb�r plik�w";
             Text[ portuguese_brazilian ] = "FileControl";
             Text[ japanese ] = "ファイルの選択";
-            Text[ korean ] = "파일 컨트롤";
+            Text[ korean ] = "파일 선택";
             Text[ chinese_simplified ] = "选择文件";
             Text[ chinese_traditional ] = "選取檔案";
             Text[ turkish ] = "FileControl";
             Text[ arabic ] = "FileControl";
-            Text[ catalan ] = "FileControl";
-            Text[ thai ] = "File Selection";
+            Text[ catalan ] = "Fitxer de control";
+            Text[ thai ] = "การเลือกแฟ้ม";
         };
         ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
         ToolBoxItem
@@ -484,7 +484,7 @@ ToolBox RID_TOOLBOX
             Text[ chinese_traditional ] = "屬性";
             Text[ arabic ] = "�����";
             Text[ greek ] = "���������";
-            Text[ korean ] = "등록정보";
+            Text[ korean ] = "등록 정보";
             Text[ turkish ] = "�zellikler";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Propietats";
@@ -502,17 +502,17 @@ ToolBox RID_TOOLBOX
             Text[ portuguese ] = "Controlo gr�fico";
             Text[ russian ] = "����������� ������� ����������";
             Text[ greek ] = "������� ����� �������";
-            Text[ dutch ] = "Grafisch controleveld";
+            Text[ dutch ] = "Afbeeldingscontrole";
             Text[ french ] = "Contr�le picto";
             Text[ spanish ] = "Campo gr�fico de control";
             Text[ finnish ] = "Kuvan ohjaus";
             Text[ italian ] = "Campo di controllo immagine";
-            Text[ danish ] = "ImageControl";
+            Text[ danish ] = "Grafisk kontrolelement";
             Text[ swedish ] = "Grafiskt kontrollf�lt";
             Text[ polish ] = "Graficzne pole kontrolne";
             Text[ portuguese_brazilian ] = "ImageControl";
             Text[ japanese ] = "イメージコントロール";
-            Text[ korean ] = "그래픽 컨트롤 필드";
+            Text[ korean ] = "이미지 컨트롤";
             Text[ chinese_simplified ] = "图形控制";
             Text[ chinese_traditional ] = "圖式控制項";
             Text[ turkish ] = "ImageControl";
@@ -533,18 +533,18 @@ ToolBox RID_TOOLBOX
             Text [ spanish ] = "Campo de opci�n" ;
             Text [ french ] = "Bouton radio" ;
             Text [ swedish ] = "Alternativf�lt" ;
-            Text [ danish ] = "Alternativknap" ;
+            Text [ danish ] = "Alternativfelt" ;
             Text [ portuguese ] = "Bot�o de op��o" ;
             Text [ portuguese_brazilian ] = "OptionButton" ;
             /* ### ACHTUNG: Neuer Text in Resource? RadioButton einf�gen : RadioButton einf�gen */
             Text[ chinese_simplified ] = "选项字段";
-            Text[ russian ] = "�������������";
+            Text[ russian ] = "������ ������ ���������";
             Text[ polish ] = "Pole opcji";
             Text[ japanese ] = "オプションボックス";
             Text[ chinese_traditional ] = "選項欄位";
             Text[ arabic ] = "�� ����";
             Text[ greek ] = "����� ��������";
-            Text[ korean ] = "옵션 필드";
+            Text[ korean ] = "옵션 버튼";
             Text[ turkish ] = "Se�enek d��mesi";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Bot� d'opci�";
@@ -564,7 +564,7 @@ ToolBox RID_TOOLBOX
             Text [ spanish ] = "Campo de texto" ;
             Text [ french ] = "Zone de texte" ;
             Text [ swedish ] = "Textf�lt" ;
-            Text [ danish ] = "Tekstboks" ;
+            Text [ danish ] = "Tekstfelt" ;
             Text [ portuguese ] = "Caixa de texto" ;
             Text [ portuguese_brazilian ] = "TextBox" ;
             /* ### ACHTUNG: Neuer Text in Resource? Edit einf�gen : Edit einf�gen */
@@ -606,7 +606,7 @@ ToolBox RID_TOOLBOX
             Text[ chinese_traditional ] = "組合方塊";
             Text[ arabic ] = "���� ����� ����";
             Text[ greek ] = "����� ����������";
-            Text[ korean ] = "콤보 필드";
+            Text[ korean ] = "콤보 상자";
             Text[ turkish ] = "Kombinasyon alan�";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Quadre combinat";
@@ -631,13 +631,13 @@ ToolBox RID_TOOLBOX
             Text [ portuguese_brazilian ] = "VScrollBar" ;
             /* ### ACHTUNG: Neuer Text in Resource? Vertikale ScrollBar einf�gen : Vertikale ScrollBar einf�gen */
             Text[ chinese_simplified ] = "垂直滚动栏";
-            Text[ russian ] = "����. ������ ���������";
+            Text[ russian ] = "������������ ������ ���������";
             Text[ polish ] = "Pionowy pasek przewijania";
             Text[ japanese ] = "垂直スクロールバー";
             Text[ chinese_traditional ] = "垂直向捲軸";
             Text[ arabic ] = "���� ����� ������ ������";
             Text[ greek ] = "���������� ������ �������";
-            Text[ korean ] = "수직 스크롤";
+            Text[ korean ] = "수직 스크롤 막대";
             Text[ turkish ] = "Dikey kayd�rma �ubu�u";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Barra de despla�ament vertical";
@@ -653,19 +653,19 @@ ToolBox RID_TOOLBOX
             Text [ english ] = "ProgressBar" ;
             Text [ english_us ] = "Progress Bar" ;
             Text[ portuguese ] = "Barra de progress�o";
-            Text[ russian ] = "��������� ���������";
+            Text[ russian ] = "��������� ����������";
             Text[ greek ] = "������ �������";
             Text[ dutch ] = "Voortgangsindicator";
             Text[ french ] = "Barre de progression";
-            Text[ spanish ] = "Barra de progreso";
-            Text[ finnish ] = "Tilannepalkki";
+            Text[ spanish ] = "Barra de progresi�n";
+            Text[ finnish ] = "Tilannerivi";
             Text[ italian ] = "Barra di completamento";
-            Text[ danish ] = "ProgressBar";
+            Text[ danish ] = "Statuslinje";
             Text[ swedish ] = "F�rloppsindikator";
             Text[ polish ] = "Pasek post�pu";
             Text[ portuguese_brazilian ] = "ProgressBar";
             Text[ japanese ] = "進行グラフ";
-            Text[ korean ] = "진행표시줄";
+            Text[ korean ] = "진행 표시줄";
             Text[ chinese_simplified ] = "进展方框";
             Text[ chinese_traditional ] = "進展方塊";
             Text[ turkish ] = "ProgressBar";
@@ -689,12 +689,12 @@ ToolBox RID_TOOLBOX
             Text[ spanish ] = "L�nea vertical";
             Text[ finnish ] = "Pystyviiva";
             Text[ italian ] = "Linea verticale";
-            Text[ danish ] = "VFixedLine";
+            Text[ danish ] = "Lodret linje";
             Text[ swedish ] = "Vertikal linje";
             Text[ polish ] = "Linia pionowa";
             Text[ portuguese_brazilian ] = "VFixedLine";
             Text[ japanese ] = "縦線";
-            Text[ korean ] = "수직선";
+            Text[ korean ] = "세로선";
             Text[ chinese_simplified ] = "垂直线条";
             Text[ chinese_traditional ] = "垂直線";
             Text[ turkish ] = "VFixedLine";
@@ -716,9 +716,9 @@ ToolBox RID_TOOLBOX
             Text[ dutch ] = "Tijdveld";
             Text[ french ] = "Champ horaire";
             Text[ spanish ] = "Campo horario";
-            Text[ finnish ] = "TimeField";
+            Text[ finnish ] = "Aikakentt�";
             Text[ italian ] = "Campo ora";
-            Text[ danish ] = "TimeField";
+            Text[ danish ] = "Klokkesl�tsfelt";
             Text[ swedish ] = "Tidsf�lt";
             Text[ polish ] = "Pole godziny";
             Text[ portuguese_brazilian ] = "TimeField";
@@ -728,8 +728,8 @@ ToolBox RID_TOOLBOX
             Text[ chinese_traditional ] = "時間欄位";
             Text[ turkish ] = "TimeField";
             Text[ arabic ] = "TimeField";
-            Text[ catalan ] = "TimeField";
-            Text[ thai ] = "Time Field";
+            Text[ catalan ] = "Camp de temps";
+            Text[ thai ] = "เขตข้อมูลเวลา";
         };
         ToolBoxItem
         {
@@ -740,14 +740,14 @@ ToolBox RID_TOOLBOX
             Text [ english ] = "CurrencyField" ;
             Text[ english_us ] = "Currency Field";
             Text[ portuguese ] = "Campo para moeda";
-            Text[ russian ] = "���� ������";
+            Text[ russian ] = "�������� ����";
             Text[ greek ] = "CurrencyField";
             Text[ dutch ] = "Valutaveld";
             Text[ french ] = "Champ mon�taire";
             Text[ spanish ] = "Campo de moneda";
-            Text[ finnish ] = "CurrencyField";
+            Text[ finnish ] = "Valuuttakentt�";
             Text[ italian ] = "Campo valuta";
-            Text[ danish ] = "CurrencyField";
+            Text[ danish ] = "Valutafelt";
             Text[ swedish ] = "Valutaf�lt";
             Text[ polish ] = "Pole waluty";
             Text[ portuguese_brazilian ] = "CurrencyField";
@@ -757,8 +757,8 @@ ToolBox RID_TOOLBOX
             Text[ chinese_traditional ] = "貨幣欄位";
             Text[ turkish ] = "CurrencyField";
             Text[ arabic ] = "CurrencyField";
-            Text[ catalan ] = "CurrencyField";
-            Text[ thai ] = "Currency Field";
+            Text[ catalan ] = "Camp de moneda";
+            Text[ thai ] = "เขตข้อมูลสกุลเงิน";
         };
         ToolBoxItem
         {
@@ -769,14 +769,14 @@ ToolBox RID_TOOLBOX
             Text [ english ] = "PatternField" ;
             Text[ english_us ] = "Pattern Field";
             Text[ portuguese ] = "Campo mascarado";
-            Text[ russian ] = "���� �����";
+            Text[ russian ] = "���� � ������ �����";
             Text[ greek ] = "PatternField";
             Text[ dutch ] = "Patroonveld";
             Text[ french ] = "Champ masqu�";
             Text[ spanish ] = "Campo enmascarado";
-            Text[ finnish ] = "PatternField";
+            Text[ finnish ] = "Kuviokentt�";
             Text[ italian ] = "Campo modello";
-            Text[ danish ] = "PatternField";
+            Text[ danish ] = "Maskeret felt";
             Text[ swedish ] = "Maskerat f�lt";
             Text[ polish ] = "Pole maski";
             Text[ portuguese_brazilian ] = "PatternField";
@@ -786,8 +786,8 @@ ToolBox RID_TOOLBOX
             Text[ chinese_traditional ] = "遮罩欄位";
             Text[ turkish ] = "PatternField";
             Text[ arabic ] = "PatternField";
-            Text[ catalan ] = "PatternField";
-            Text[ thai ] = "Pattern Field";
+            Text[ catalan ] = "Camp de patr�";
+            Text[ thai ] = "เขตข้อมูลลวดลาย";
         };
         ToolBoxItem
         {
@@ -798,7 +798,7 @@ ToolBox RID_TOOLBOX
             Text [ english ] = "Select" ;
             Text [ english_us ] = "Select" ;
             Text [ norwegian ] = "Select" ;
-            Text [ italian ] = "Seleziona" ;
+            Text [ italian ] = "Scelta" ;
             Text [ portuguese_brazilian ] = "Selecionar" ;
             Text [ portuguese ] = "Seleccionar" ;
             Text [ finnish ] = "Valitse" ;
@@ -817,8 +817,8 @@ ToolBox RID_TOOLBOX
             Text[ korean ] = "선택";
             Text[ turkish ] = "Se�im";
             Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Seleccioneu";
-            Text[ thai ] = "เลือก";
+            Text[ catalan ] = "Opcions";
+            Text[ thai ] = "การเลือก";
         };
         ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
         ToolBoxItem
@@ -833,19 +833,19 @@ ToolBox RID_TOOLBOX
             Text [ portuguese_brazilian ] = "Ativar modoteste" ;
             Text [ portuguese ] = "Activar modo Teste" ;
             Text [ finnish ] = "Aktivoi testitila" ;
-            Text [ danish ] = "Aktiver testtilstand" ;
+            Text [ danish ] = "Aktiver testmodus" ;
             Text [ french ] = "Activer le mode Test" ;
             Text [ swedish ] = "Aktivera testl�ge" ;
-            Text [ dutch ] = "Testmodus inschakelen" ;
-            Text [ spanish ] = "Activar modo prueba" ;
+            Text [ dutch ] = "Testmodus activeren" ;
+            Text [ spanish ] = "Activar el modo de prueba" ;
             Text[ chinese_simplified ] = "启动试验模式";
-            Text[ russian ] = "������������ ����� �����";
+            Text[ russian ] = "������������ �������� �����";
             Text[ polish ] = "Uaktywnij tryb sprawdzania";
             Text[ japanese ] = "テストモードをアクティブにする";
             Text[ chinese_traditional ] = "啟動試驗模式";
             Text[ arabic ] = "����� ��� ��������";
             Text[ greek ] = "������������ ���������� �������";
-            Text[ korean ] = "테스트모드 활성화";
+            Text[ korean ] = "테스트 모드 활성화";
             Text[ turkish ] = "Deneme kipini etkinle�tir";
             Text[ language_user1 ] = " ";
             Text[ catalan ] = "Activar el mode de prova";
@@ -869,3 +869,6 @@ ToolBox RID_TOOLBOX
 
 
 
+
+
+
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index 0f58f670ef04..e3fb4cdbbdf2 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: tbe $ $Date: 2002-08-01 15:06:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -506,19 +506,16 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 
 //----------------------------------------------------------------------------
 
-::rtl::OUString DlgEdObj::GetServiceName() const
+sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const
 {
-    ::rtl::OUString aServiceName;
+    sal_Bool bSupports = sal_False;
+
     Reference< lang::XServiceInfo > xServiceInfo( GetUnoControlModel() , UNO_QUERY );
+        // TODO: cache xServiceInfo as member?
+    if ( xServiceInfo.is() )
+        bSupports = xServiceInfo->supportsService( ::rtl::OUString::createFromAscii( _pServiceName ) );
 
-    if (xServiceInfo.is())
-    {
-        Sequence< ::rtl::OUString > aServiceNames( xServiceInfo->getSupportedServiceNames() );
-        DBG_ASSERT( aServiceNames.getLength() == 1 , "DlgEdObj: aServiceNames.getLength() != 1" );
-        aServiceName = aServiceNames.getArray()[ 0 ];
-    }
-
-    return aServiceName;
+    return bSupports;
 }
 
 //----------------------------------------------------------------------------
@@ -527,85 +524,83 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
 {
     sal_uInt16 nResId = 0;
     ::rtl::OUString aDefaultName;
-    ::rtl::OUString aServiceName = GetServiceName();
-
-    if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDialogModel") ))
+    if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ) )
     {
         nResId = RID_STR_CLASS_DIALOG;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) )
     {
         nResId = RID_STR_CLASS_BUTTON;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) )
     {
         nResId = RID_STR_CLASS_RADIOBUTTON;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) )
     {
         nResId = RID_STR_CLASS_CHECKBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ) )
     {
         nResId = RID_STR_CLASS_LISTBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ) )
     {
         nResId = RID_STR_CLASS_COMBOBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) )
     {
         nResId = RID_STR_CLASS_GROUPBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlEditModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ) )
     {
         nResId = RID_STR_CLASS_EDIT;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
     {
         nResId = RID_STR_CLASS_FIXEDTEXT;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ) )
     {
         nResId = RID_STR_CLASS_IMAGECONTROL;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ) )
     {
         nResId = RID_STR_CLASS_PROGRESSBAR;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ) )
     {
         nResId = RID_STR_CLASS_SCROLLBAR;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ) )
     {
         nResId = RID_STR_CLASS_FIXEDLINE;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ) )
     {
         nResId = RID_STR_CLASS_DATEFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ) )
     {
         nResId = RID_STR_CLASS_TIMEFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ) )
     {
         nResId = RID_STR_CLASS_NUMERICFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) )
     {
         nResId = RID_STR_CLASS_CURRENCYFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
     {
         nResId = RID_STR_CLASS_FORMATTEDFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ) )
     {
         nResId = RID_STR_CLASS_PATTERNFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ) )
     {
         nResId = RID_STR_CLASS_FILECONTROL;
     }
@@ -654,85 +649,83 @@ sal_uInt32 DlgEdObj::GetObjInventor()   const
 
 sal_uInt16 DlgEdObj::GetObjIdentifier() const
 {
-    ::rtl::OUString aServiceName = GetServiceName();
-
-    if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDialogModel") ))
+    if ( supportsService( "com.sun.star.awt.UnoControlDialogModel" ))
     {
         return OBJ_DLG_DIALOG;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ))
     {
         return OBJ_DLG_PUSHBUTTON;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ))
     {
         return OBJ_DLG_RADIOBUTTON;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ))
     {
         return OBJ_DLG_CHECKBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlListBoxModel" ))
     {
         return OBJ_DLG_LISTBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlComboBoxModel" ))
     {
         return OBJ_DLG_COMBOBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
     {
         return OBJ_DLG_GROUPBOX;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlEditModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlEditModel" ))
     {
         return OBJ_DLG_EDIT;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ))
     {
         return OBJ_DLG_FIXEDTEXT;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlImageControlModel" ))
     {
         return OBJ_DLG_IMAGECONTROL;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlProgressBarModel" ))
     {
         return OBJ_DLG_PROGRESSBAR;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlScrollBarModel" ))
     {
         return OBJ_DLG_HSCROLLBAR;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFixedLineModel" ))
     {
         return OBJ_DLG_HFIXEDLINE;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlDateFieldModel" ))
     {
         return OBJ_DLG_DATEFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlTimeFieldModel" ))
     {
         return OBJ_DLG_TIMEFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlNumericFieldModel" ))
     {
         return OBJ_DLG_NUMERICFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlCurrencyFieldModel" ))
     {
         return OBJ_DLG_CURRENCYFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ))
     {
         return OBJ_DLG_FORMATTEDFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlPatternFieldModel" ))
     {
         return OBJ_DLG_PATTERNFIELD;
     }
-    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+    else if ( supportsService( "com.sun.star.awt.UnoControlFileControlModel" ))
     {
         return OBJ_DLG_FILECONTROL;
     }
@@ -900,18 +893,17 @@ void DlgEdObj::SetDefaults()
         xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Name" ) ), aUniqueName );
 
         // set labels
-        ::rtl::OUString aServiceName = GetServiceName();
-        if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ) ||
-            aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ) ||
-            aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ) ||
-            aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ) ||
-            aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ) )
+        if ( supportsService( "com.sun.star.awt.UnoControlButtonModel" ) ||
+            supportsService( "com.sun.star.awt.UnoControlRadioButtonModel" ) ||
+            supportsService( "com.sun.star.awt.UnoControlCheckBoxModel" ) ||
+            supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ) ||
+            supportsService( "com.sun.star.awt.UnoControlFixedTextModel" ) )
         {
             xPSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Label" ) ), aUniqueName );
         }
 
         // set number formats supplier for formatted field
-        if ( aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ) )
+        if ( supportsService( "com.sun.star.awt.UnoControlFormattedFieldModel" ) )
         {
             Reference< util::XNumberFormatsSupplier > xSupplier = GetDlgEdForm()->GetDlgEditor()->GetNumberFormatsSupplier();
             if ( xSupplier.is() )
@@ -1162,9 +1154,7 @@ void SAL_CALL DlgEdObj::_elementRemoved(const ::com::sun::star::container::Conta
 
 SdrObject* DlgEdObj::CheckHit( const Point& rPnt, USHORT nTol,const SetOfByte* pSet ) const
 {
-    ::rtl::OUString aServiceName = GetServiceName();
-
-    if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ))
+    if ( supportsService( "com.sun.star.awt.UnoControlGroupBoxModel" ))
     {
         Rectangle aROuter = aOutRect;
         aROuter.Left()   -= nTol;
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index a28cebcaf255..4268a2cb19dc 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgresid.src,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2001-10-18 07:28:07 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -163,18 +163,19 @@ String RID_STR_BRWTITLE_PROPERTIES
     Text[ french ] = "Propri�t�s : ";
     Text[ spanish ] = "Propiedades: ";
     Text[ italian ] = "Propriet�: ";
-    Text[ danish ] = "Properties: ";
+    Text[ danish ] = "Egenskaber: ";
     Text[ swedish ] = "Egenskaper: ";
     Text[ polish ] = "W�a�ciwo�ci: ";
     Text[ portuguese_brazilian ] = "Properties: ";
-    Text[ japanese ] = "ﾌﾟﾛﾊﾟﾃｨ: ";
-    Text[ korean ] = "속성: ";
+    Text[ japanese ] = "プロパティ: ";
+    Text[ korean ] = "등록 정보: ";
     Text[ chinese_simplified ] = "属性：";
     Text[ chinese_traditional ] = "屬性：";
     Text[ turkish ] = "Properties: ";
     Text[ arabic ] = "�������: ";
-    Text[ finnish ] = "Ominaisuudet:";
+    Text[ finnish ] = "Ominaisuudet: ";
     Text[ catalan ] = "Propietats: ";
+    Text[ thai ] = "คุณสมบัติ: ";
 };
 String RID_STR_BRWTITLE_NO_PROPERTIES
 {
@@ -188,18 +189,19 @@ String RID_STR_BRWTITLE_NO_PROPERTIES
     Text[ french ] = "Aucun �l�ment de contr�le marqu�";
     Text[ spanish ] = "Ning�n elemento de control seleccionado";
     Text[ italian ] = "Nessun elemento di controllo selezionato";
-    Text[ danish ] = "No Control marked";
+    Text[ danish ] = "Der er ikke markeret noget kontrolelement";
     Text[ swedish ] = "Inget kontrollelement markerat";
     Text[ polish ] = "Nie zaznaczono formantu";
     Text[ portuguese_brazilian ] = "No Control marked";
-    Text[ japanese ] = "ｺﾝﾄﾛｰﾙ要素の選択なし";
-    Text[ korean ] = "컨트롤 요소가 마크표시되지 않았음";
+    Text[ japanese ] = "コントロール要素の選択なし";
+    Text[ korean ] = "컨트롤이 선택되지 않음";
     Text[ chinese_simplified ] = "没有选择控制单元";
-    Text[ chinese_traditional ] = "沒有選取控製單元";
+    Text[ chinese_traditional ] = "沒有選取控制單元";
     Text[ turkish ] = "No Control marked";
     Text[ arabic ] = "�� ��� ����� ���� ����";
-    Text[ finnish ] = "Kein Kontrollelement markiert";
+    Text[ finnish ] = "Ei merkitty� ohjausobjektia";
     Text[ catalan ] = "Sense marques de control";
+    Text[ thai ] = "ไม่ได้ทำเครื่องหมายตัวควบคุมไว้";
 };
 String RID_STR_BRWTITLE_MULTISELECT
 {
@@ -213,7 +215,7 @@ String RID_STR_BRWTITLE_MULTISELECT
     Text[ french ] = "S�lection multiple";
     Text[ spanish ] = "Selecci�n m�ltiple";
     Text[ italian ] = "Selezione multipla";
-    Text[ danish ] = "Multiselection";
+    Text[ danish ] = "Multimarkering";
     Text[ swedish ] = "Multimarkering";
     Text[ polish ] = "Wyb�r wielokrotny";
     Text[ portuguese_brazilian ] = "Multiselection";
@@ -225,6 +227,7 @@ String RID_STR_BRWTITLE_MULTISELECT
     Text[ arabic ] = "����� �����";
     Text[ finnish ] = "Monivalinta";
     Text[ catalan ] = "Selecci� m�ltiple";
+    Text[ thai ] = "เลือกหลายส่วน";
 };
 
 // -----------------------------------------------------------------------
@@ -237,3 +240,12 @@ String RID_STR_BRWTITLE_MULTISELECT
 
 
 
+
+
+
+
+
+
+
+
+
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 5f029882af2b..824f91b42cbf 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propbrw.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: mba $ $Date: 2002-07-15 13:50:42 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -433,87 +433,83 @@ void PropBrw::implSetNewObject(const Reference< XPropertySet >& _rxObject)
         sal_uInt16 nResId = 0;
         aName = ::rtl::OUString(IDEResId(RID_STR_BRWTITLE_PROPERTIES));
 
-        Sequence< ::rtl::OUString > aServiceNames( xServiceInfo->getSupportedServiceNames() );
-        DBG_ASSERT( aServiceNames.getLength() == 1 , "PropBrw: aServiceNames.getLength() != 1" );
-        ::rtl::OUString const & aServiceName = aServiceNames.getConstArray()[ 0 ];
-
-        if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDialogModel") ))
+        if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDialogModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_DIALOG;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlButtonModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_BUTTON;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlRadioButtonModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_RADIOBUTTON;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCheckBoxModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_CHECKBOX;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlListBoxModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlListBoxModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_LISTBOX;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlComboBoxModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlComboBoxModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_COMBOBOX;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlGroupBoxModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlGroupBoxModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_GROUPBOX;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlEditModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_EDIT;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedTextModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_FIXEDTEXT;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlImageControlModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_IMAGECONTROL;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlProgressBarModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlProgressBarModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_PROGRESSBAR;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlScrollBarModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlScrollBarModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_SCROLLBAR;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedLineModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_FIXEDLINE;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlDateFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_DATEFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlTimeFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_TIMEFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlNumericFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_NUMERICFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCurrencyFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_CURRENCYFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFormattedFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_FORMATTEDFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlPatternFieldModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_PATTERNFIELD;
         }
-        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+        else if ( xServiceInfo->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFileControlModel" ) ) ) )
         {
             nResId = RID_STR_CLASS_FILECONTROL;
         }
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index 7c0aeea94d41..e5387b27143c 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.hxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: tbe $ $Date: 2002-04-24 14:48:23 $
+ *  last change: $Author: hr $ $Date: 2003-03-18 16:17:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,7 +135,7 @@ public:
     virtual void        operator= (const SdrObject& rObj);                      // not working yet
     virtual void clonedFrom(const DlgEdObj* _pSource);                          // not working yet
 
-    virtual ::rtl::OUString GetServiceName() const;
+    virtual sal_Bool        supportsService( const sal_Char* _pServiceName ) const;
     virtual ::rtl::OUString GetDefaultName() const;
     virtual ::rtl::OUString GetUniqueName() const;
 
diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk
index d5730a81cdc9..68a894077b13 100644
--- a/basctl/util/makefile.mk
+++ b/basctl/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.14 $
+#   $Revision: 1.15 $
 #
-#   last change: $Author: hjs $ $Date: 2002-04-18 11:35:10 $
+#   last change: $Author: hr $ $Date: 2003-03-18 16:17:10 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -66,6 +66,7 @@ PRJNAME=basctl
 TARGET=basctl
 #svx.hid generieren
 GEN_HID=TRUE
+GEN_HID_OTHER=TRUE
 USE_LDUMP2=TRUE
 
 # --- Settings -----------------------------------------------------
@@ -139,20 +140,6 @@ RESLIB1SRSFILES= $(SRSFILELIST)
 .INCLUDE :  target.mk
 
 
-ALLTAR: $(SRS)$/hidother.hid
-
-$(MISC)$/$(PRJNAME).hid : $(SRS)$/hidother.hid
-
-$(SRS)$/hidother.hid: hidother.src
-.IF "$(GUI)$(CPU)"!="WNTI" || "$(product)"!="full"
-    @echo nix
-.ELSE
-.IF "$(BUILD_SOSL)" == ""
-    @+echo NO HIDS!!!
-    @+-mhids hidother.src $(SRS) $(PRJNAME) dummy $(INCLUDE)    
-.ENDIF
-.ENDIF
-
 
 .ENDIF                  # "$(header)" == ""