INTEGRATION: CWS mergebuild (1.27.34); FILE MERGED

2004/05/28 17:53:04 hjs 1.27.34.5: RESYNC: (1.29-1.30); FILE MERGED
2004/04/28 18:22:08 hjs 1.27.34.4: #i8252# fix unmerge probs
2004/04/20 18:39:25 hjs 1.27.34.3: RESYNC: (1.27-1.29); FILE MERGED
2003/11/11 19:16:57 ihi 1.27.34.2: en -> en-US
2003/11/10 16:44:40 ihi 1.27.34.1: #111234# Merge during build

1 files changed, 35 insertions, 326 deletions

diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src
index 1732a4a78bd0..a757ec91f43d 100644
--- a/extensions/source/bibliography/toolbar.src
+++ b/extensions/source/bibliography/toolbar.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: toolbar.src,v $
  *
- *  $Revision: 1.31 $
+ *  $Revision: 1.32 $
  *
- *  last change: $Author: rt $ $Date: 2004-06-17 16:16:25 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 11:29:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,36 +81,9 @@ ToolBox RID_BIB_TOOLBAR
         {
             Identifier = TBC_FT_SOURCE;
             //HelpID = SID_SBA_BRW_INSERT ;
-            Text = "Tabelle" ;
-            Text [ ENGLISH ] = "Table" ;
-            Text[ english_us ] = "Table";
-            Text[ portuguese ] = "Tabela";
-            Text[ russian ] = "�������";
-            Text[ greek ] = "�������";
-            Text[ dutch ] = "Tabel";
-            Text[ french ] = "Table";
-            Text[ spanish ] = "Tabla";
-            Text[ italian ] = "Tabella";
-            Text[ danish ] = "Tabel";
-            Text[ swedish ] = "Tabell";
-            Text[ polish ] = "Tabela";
-            Text[ portuguese_brazilian ] = "Tabela";
-            Text[ japanese ] = "テーブル";
-            Text[ korean ] = "테이블";
-            Text[ chinese_simplified ] = "表格";
-            Text[ chinese_traditional ] = "表格";
-            Text[ arabic ] = "����";
-            Text[ turkish ] = "Tablo";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Taula";
-            Text[ finnish ] = "Taulukko";
-            Text[ thai ] = "ตาราง";
-            Text[ czech ] = "Tabulka";
-            Text[ hebrew ] = "‮טבלה‬";
-            Text[ hindi ] = "सारणी";
-            Text[ slovak ] = "Tabuľka";
-            Text[ hungarian ] = "Tábla";
-            Text[ slovenian ] = "Tabela";
+            Text [ de ] = "Tabelle" ;
+            Text [ en-US ] = "Table";
+            Text [ x-comment ] = " ";
         };
         ToolBoxItem
         {
@@ -127,35 +100,8 @@ ToolBox RID_BIB_TOOLBAR
         {
             Identifier = TBC_FT_QUERY;
             //HelpID = SID_SBA_BRW_INSERT ;
-            Text = "Suchbegriff" ;
-            Text [ ENGLISH ] = "Search key" ;
-            Text[ english_us ] = "Search Key";
-            Text[ portuguese ] = "Express�o procurada";
-            Text[ russian ] = "������� �������";
-            Text[ greek ] = "���� ����������";
-            Text[ dutch ] = "Zoekbegrip";
-            Text[ french ] = "Terme recherch�";
-            Text[ spanish ] = "Expresi�n de b�squeda";
-            Text[ italian ] = "Termine ricercato";
-            Text[ danish ] = "S�geord";
-            Text[ swedish ] = "S�kord";
-            Text[ polish ] = "Szukane has�o";
-            Text[ portuguese_brazilian ] = "Chave de pesquisa";
-            Text[ japanese ] = "検索キー";
-            Text[ korean ] = "검색 키";
-            Text[ chinese_simplified ] = "搜寻条目";
-            Text[ chinese_traditional ] = "搜尋項目";
-            Text[ arabic ] = "����� �����";
-            Text[ turkish ] = "Arama �l��t�";
-            Text[ catalan ] = "Clau de cerca";
-            Text[ finnish ] = "Etsitt�v�";
-            Text[ thai ] = "ปุ่มค้นหา";
-            Text[ czech ] = "Hledat klíčové slovo";
-            Text[ hebrew ] = "Suchbegriff";
-            Text[ hindi ] = "खोज करने की चाभी";
-            Text[ slovak ] = "Hľadať kľúčové slovo";
-            Text[ hungarian ] = "Keresési kulcs";
-            Text[ slovenian ] = "Ključ za iskanje";
+            Text [ de ] = "Suchbegriff" ;
+            Text [ en-US ] = "Search Key";
         };
         ToolBoxItem
         {
@@ -174,37 +120,10 @@ ToolBox RID_BIB_TOOLBAR
             HelpID = HID_BIB_TBX_AUTOFILTER;
 //            ItemBitmap = Bitmap { File = "sc10716.bmp" ; };
             DropDown = TRUE ;
-            Text = "AutoFilter" ;
-            Text [ ENGLISH ] = "AutoFilter" ;
+            Text [ de ] = "AutoFilter" ;
             Command = ".uno:Bib/autoFilter" ;
-            Text[ english_us ] = "AutoFilter";
-            Text[ portuguese ] = "AutoFiltro";
-            Text[ russian ] = "������� ������";
-            Text[ greek ] = "�������� ������";
-            Text[ dutch ] = "AutoFilter";
-            Text[ french ] = "AutoFiltre";
-            Text[ spanish ] = "Filtro autom�tico";
-            Text[ italian ] = "Filtro automatico";
-            Text[ danish ] = "AutoFilter";
-            Text[ swedish ] = "AutoFilter";
-            Text[ polish ] = "Autofiltr";
-            Text[ portuguese_brazilian ] = "AutoFiltro";
-            Text[ japanese ] = "オートフィルタ";
-            Text[ korean ] = "자동 필터";
-            Text[ chinese_simplified ] = "自动筛选";
-            Text[ chinese_traditional ] = "自訂篩選";
-            Text[ arabic ] = "���� ���";
-            Text[ turkish ] = "Otomatik filtre";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Filtre autom�tic";
-            Text[ finnish ] = "Automaattinen suodatus";
-            Text[ thai ] = "ตัวกรองอัตโนมัติ";
-            Text[ czech ] = "Automatický filtr";
-            Text[ hebrew ] = "‮סינון אוטומטי‬";
-            Text[ hindi ] = "स्वचालित ढंग से छानना";
-            Text[ slovak ] = "Automatický filter";
-            Text[ hungarian ] = "Automatikus szűrő";
-            Text[ slovenian ] = "Samodejni filter";
+            Text [ en-US ] = "AutoFilter";
+            Text [ x-comment ] = " ";
         };
 
         ToolBoxItem
@@ -212,37 +131,10 @@ ToolBox RID_BIB_TOOLBAR
             Identifier = TBC_BT_FILTERCRIT ;
             HelpID = SID_FM_FILTERCRIT ;
 //            ItemBitmap = Bitmap { File = "sc10715.bmp" ; };
-            Text = "Standard Filter" ;
-            Text [ ENGLISH ] = "Standard Filter" ;
+            Text [ de ] = "Standard Filter" ;
             Command = ".uno:Bib/standardFilter" ;
-            Text[ english_us ] = "Standard Filter";
-            Text[ portuguese ] = "Filtro padr�o";
-            Text[ russian ] = "������";
-            Text[ greek ] = "������ �����������";
-            Text[ dutch ] = "Standaardfilter";
-            Text[ french ] = "Filtre standard";
-            Text[ spanish ] = "Filtro predeterminado";
-            Text[ italian ] = "Filtro standard";
-            Text[ danish ] = "Standardfilter";
-            Text[ swedish ] = "Standardfilter";
-            Text[ polish ] = "Filtr standardowy";
-            Text[ portuguese_brazilian ] = "Filtro padr�o";
-            Text[ japanese ] = "標準フィルタ";
-            Text[ korean ] = "표준 필터";
-            Text[ chinese_simplified ] = "标准筛选";
-            Text[ chinese_traditional ] = "標準篩選";
-            Text[ arabic ] = "���� �����";
-            Text[ turkish ] = "Standart filtre";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Filtre est�ndard";
-            Text[ finnish ] = "Oletussuodatin";
-            Text[ thai ] = "ตัวกรองมาตรฐาน";
-            Text[ czech ] = "Standardní filtr";
-            Text[ hebrew ] = "Standard Filter";
-            Text[ hindi ] = "स्टान्डर्ड फिल्टर";
-            Text[ slovak ] = "Bežný filter";
-            Text[ hungarian ] = "Általános szűrő";
-            Text[ slovenian ] = "Standardni filter";
+            Text [ en-US ] = "Standard Filter";
+            Text [ x-comment ] = " ";
         };
 
         ToolBoxItem
@@ -250,112 +142,31 @@ ToolBox RID_BIB_TOOLBAR
             Identifier = TBC_BT_REMOVEFILTER ;
             HelpID = SID_FM_REMOVE_FILTER_SORT ;
 //            ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
-            Text = "Filter entfernen" ;
-            Text [ ENGLISH ] = "Remove Filter" ;
+            Text [ de ] = "Filter entfernen" ;
             Command = ".uno:Bib/removeFilter" ;
-            Text[ english_us ] = "Remove Filter";
-            Text[ portuguese ] = "Eliminar filtro";
-            Text[ russian ] = "������� ������";
-            Text[ greek ] = "�������� �������";
-            Text[ dutch ] = "Filter verwijderen";
-            Text[ french ] = "Supprimer le filtre";
-            Text[ spanish ] = "Borrar filtro";
-            Text[ italian ] = "Rimuovi filtro";
-            Text[ danish ] = "Fjern filter";
-            Text[ swedish ] = "Ta bort filter";
-            Text[ polish ] = "Usu� filtr";
-            Text[ portuguese_brazilian ] = "Remover Filtro";
-            Text[ japanese ] = "フィルタの解除";
-            Text[ korean ] = "필터 제거";
-            Text[ chinese_simplified ] = "删除筛选";
-            Text[ chinese_traditional ] = "清除篩選";
-            Text[ arabic ] = "����� ����";
-            Text[ turkish ] = "Filtreyi kald�r";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Suprimeix el filtre";
-            Text[ finnish ] = "Poista suodatus";
-            Text[ thai ] = "เอาตัวกรองออก";
-            Text[ czech ] = "Odstranit filtr";
-            Text[ hebrew ] = "Filter entfernen";
-            Text[ hindi ] = "फिल्टर हटाओ";
-            Text[ slovak ] = "Odstrániť filter";
-            Text[ hungarian ] = "Szűrő törlése";
-            Text[ slovenian ] = "Odstrani filter";
+            Text [ en-US ] = "Remove Filter";
+            Text [ x-comment ] = " ";
         };
         ToolBoxItem
         {
             Identifier = TBC_BT_COL_ASSIGN ;
             HelpId = HID_BIB_MAPPINGDLG;
-            Text = "Spaltenzuordnung" ;
-            Text[ English ] = "Column assignment" ;
+            Text [ de ] = "Spaltenzuordnung" ;
 //          Command = ".uno:Bib/Mapping" ;
 //            ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
-            Text[ english_us ] = "Column Arrangement";
-            Text[ portuguese ] = "Dispor colunas";
-            Text[ russian ] = "������������ ��������";
-            Text[ greek ] = "������� ������";
-            Text[ dutch ] = "Kolomindeling";
-            Text[ french ] = "Assignation de colonnes";
-            Text[ spanish ] = "Disposici�n de columnas";
-            Text[ italian ] = "Assegnazione colonne";
-            Text[ danish ] = "Kolonnetildeling";
-            Text[ swedish ] = "Kolumntilldelning";
-            Text[ polish ] = "Rozmieszczenie kolumn";
-            Text[ portuguese_brazilian ] = "Disposi��o das Colunas";
-            Text[ japanese ] = "列の分類";
-            Text[ korean ] = "열 배치";
-            Text[ chinese_simplified ] = "编排列(C)";
-            Text[ chinese_traditional ] = "編排欄(C)";
-            Text[ arabic ] = "����� �������";
-            Text[ turkish ] = "S�tun d�zeni";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Disposici� de les columnes";
-            Text[ finnish ] = "Sarakej�rjestys";
-            Text[ thai ] = "จัดเรียงคอลัมน์";
-            Text[ czech ] = "Uspořádání sloupců";
-            Text[ hebrew ] = "Spaltenzuordnung";
-            Text[ hindi ] = "स्तंभ को क्रम में रखना";
-            Text[ slovak ] = "Usporiadanie stĺpcov";
-            Text[ hungarian ] = "Oszlop rendezése";
-            Text[ slovenian ] = "Razporeditev stolpcev";
+            Text [ en-US ] = "Column Arrangement";
+            Text [ x-comment ] = " ";
         };
         ToolBoxItem
         {
             Identifier = TBC_BT_CHANGESOURCE ;
             HelpId = HID_BIB_CHANGESOURCE;
-            Text = "Datenquelle" ;
-            Text[ English ] = "Data source" ;
             Command = ".uno:Bib/sdbsource" ;
+            Text [ de ] = "Datenquelle" ;
 //            ItemBitmap = Bitmap { File = "sc10711.bmp" ; };
             Checkable=TRUE;
-            Text[ english_us ] = "Data Source";
-            Text[ portuguese ] = "Fonte de dados";
-            Text[ russian ] = "�������� ������";
-            Text[ greek ] = "��������� ���������";
-            Text[ dutch ] = "Gegevensbron";
-            Text[ french ] = "Source de donn�es";
-            Text[ spanish ] = "Fuente de datos";
-            Text[ italian ] = "Sorgente dati";
-            Text[ danish ] = "Datakilde";
-            Text[ swedish ] = "Datak�lla";
-            Text[ polish ] = "�r�d�o danych";
-            Text[ portuguese_brazilian ] = "Fonte de dados";
-            Text[ japanese ] = "データソース";
-            Text[ korean ] = "데이터 원본";
-            Text[ chinese_simplified ] = "数据源(D)";
-            Text[ chinese_traditional ] = "資料源(D)";
-            Text[ arabic ] = "���� ��������";
-            Text[ turkish ] = "Veri Kaynak kodu";
-            Text[ language_user1 ] = " ";
-            Text[ catalan ] = "Font de les dades";
-            Text[ finnish ] = "Tietol�hde";
-            Text[ thai ] = "แหล่งข้อมูล";
-            Text[ czech ] = "Zdroj dat";
-            Text[ hebrew ] = "‮מקור הנתונים‬";
-            Text[ hindi ] = "ड़ॉटा मूल";
-            Text[ slovak ] = "Zdroj dát";
-            Text[ hungarian ] = "Adatforrás";
-            Text[ slovenian ] = "Vir podatkov";
+            Text [ en-US ] = "Data Source";
+            Text [ x-comment ] = " ";
         };
 /*
         ToolBoxItem
@@ -369,25 +180,8 @@ ToolBox RID_BIB_TOOLBAR
             //HelpID = SID_FM_REMOVE_FILTER_SORT ;
             Command = ".uno:Bib/newEntry" ;
             ItemBitmap = Bitmap { File = "newcard.bmp" ; };
-            Text = "Neue Adresse" ;
-            Text [ ENGLISH ] = "New Address" ;
-            Text[ english_us ] = "New Address";
-            Text[ portuguese ] = "Novo endere�o";
-            Text[ russian ] = "����� �����";
-            Text[ greek ] = "New Address";
-            Text[ dutch ] = "Nieuw adres";
-            Text[ french ] = "Nouvelle adresse";
-            Text[ spanish ] = "Nueva direcci�n";
-            Text[ italian ] = "Nuovo indirizzo";
-            Text[ danish ] = "Ny adresse";
-            Text[ swedish ] = "Ny adress";
-            Text[ polish ] = "Nowy adres";
-            Text[ portuguese_brazilian ] = "New Address";
-            Text[ japanese ] = "�V�����Z��";
-            Text[ korean ] = "New Address";
-            Text[ chinese_simplified ] = "�µ�ַ";
-            Text[ chinese_traditional ] = "�s�a�}";
-            Text[ arabic ] = "����� ����";
+            Text [ de ]= "Neue Adresse" ;
+            Text [ en-US ] = "New Address";
         };
 
         ToolBoxItem
@@ -396,25 +190,8 @@ ToolBox RID_BIB_TOOLBAR
             //HelpID = SID_FM_REMOVE_FILTER_SORT ;
             Command = ".uno:Bib/changeEntry" ;
             ItemBitmap = Bitmap { File = "modcard.bmp" ; };
-            Text = "Adresse bearbeiten" ;
-            Text [ ENGLISH ] = "Edit address" ;
-            Text[ english_us ] = "Edit Address";
-            Text[ portuguese ] = "Editar endere�o";
-            Text[ russian ] = "������ ������";
-            Text[ greek ] = "Edit address";
-            Text[ dutch ] = "Adres wijzigen";
-            Text[ french ] = "�diter une adresse";
-            Text[ spanish ] = "Editar direcci�n";
-            Text[ italian ] = "Modifica indirizzo";
-            Text[ danish ] = "Rediger adresse";
-            Text[ swedish ] = "Redigera adress";
-            Text[ polish ] = "Edytuj adres";
-            Text[ portuguese_brazilian ] = "Edit address";
-            Text[ japanese ] = "���ڽ�̕ҏW";
-            Text[ korean ] = "Edit address";
-            Text[ chinese_simplified ] = "�༭��ַ";
-            Text[ chinese_traditional ] = "�s��a�}";
-            Text[ arabic ] = "����� �����";
+            Text [ de ]= "Adresse bearbeiten" ;
+            Text [ en-US ] = "Edit Address";
         };
 
         ToolBoxItem
@@ -423,25 +200,8 @@ ToolBox RID_BIB_TOOLBAR
             //HelpID = SID_FM_REMOVE_FILTER_SORT ;
             Command = ".uno:Bib/removeEntry" ;
             ItemBitmap = Bitmap { File = "remcard.bmp" ; };
-            Text = "Adresse l�schen" ;
-            Text [ ENGLISH ] = "Remove address" ;
-            Text[ english_us ] = "Remove Address";
-            Text[ portuguese ] = "Eliminar endere�o";
-            Text[ russian ] = "������� �����";
-            Text[ greek ] = "�������� ����������";
-            Text[ dutch ] = "Adres wissen";
-            Text[ french ] = "Supprimer une adresse";
-            Text[ spanish ] = "Eliminar direcci�n";
-            Text[ italian ] = "Elimina indirizzo";
-            Text[ danish ] = "Slet adresse";
-            Text[ swedish ] = "Ta bort adress";
-            Text[ polish ] = "Usu� adres";
-            Text[ portuguese_brazilian ] = "Remove address";
-            Text[ japanese ] = "���ڽ�̍폜";
-            Text[ korean ] = "Remove address";
-            Text[ chinese_simplified ] = "ɾ����ַ";
-            Text[ chinese_traditional ] = "�R���a�}";
-            Text[ arabic ] = "��� �����";
+            Text [ de ] = "Adresse l�schen" ;
+            Text [ en-US ] = "Remove Address";
         };
 
         ToolBoxItem
@@ -454,25 +214,8 @@ ToolBox RID_BIB_TOOLBAR
             Identifier = TBC_BT_INSERT ;
             HelpID = SID_SBA_BRW_INSERT ;
             ItemBitmap = Bitmap { File = "sc12202.bmp" ; };
-            Text = "Daten in Text" ;
-            Text [ ENGLISH ] = "Insert" ;
-            Text[ english_us ] = "Data into Text";
-            Text[ portuguese ] = "Dados no texto";
-            Text[ russian ] = "������ � �����";
-            Text[ greek ] = "�������� ��� �������";
-            Text[ dutch ] = "Gegevens in tekst";
-            Text[ french ] = "Donn�es dans le texte";
-            Text[ spanish ] = "Datos en texto";
-            Text[ italian ] = "Dati nel testo";
-            Text[ danish ] = "Data i tekst";
-            Text[ swedish ] = "Data i text";
-            Text[ polish ] = "Dane w tek�cie";
-            Text[ portuguese_brazilian ] = "Insert";
-            Text[ japanese ] = "�������ް�";
-            Text[ korean ] = "Insert";
-            Text[ chinese_simplified ] = "�����������ı���";
-            Text[ chinese_traditional ] = "���u�ഫ����r";
-            Text[ arabic ] = "������ ��� ��";
+            Text [ de ] = "Daten in Text" ;
+            Text [ en-US ] = "Data into Text";
         };
         ToolBoxItem
         {
@@ -492,50 +235,16 @@ ToolBox RID_BIB_TOOLBAR
             Identifier = TBC_BT_MAIL ;
             //HelpID = HID_ADDRPI_AUTOMAIL ;
             ItemBitmap = Bitmap { File = "sc06305.bmp" ; };
-            Text = "AutoMail" ;
-            Text [ ENGLISH ] = "AutoMail" ;
-            Text[ english_us ] = "AutoMail";
-            Text[ portuguese ] = "AutoMail";
-            Text[ russian ] = "AutoMail";
-            Text[ greek ] = "AutoMail";
-            Text[ dutch ] = "AutoMail";
-            Text[ french ] = "AutoMail";
-            Text[ spanish ] = "AutoMail";
-            Text[ italian ] = "Mail automatica";
-            Text[ danish ] = "AutoPost";
-            Text[ swedish ] = "AutoMail";
-            Text[ polish ] = "AutoMail";
-            Text[ portuguese_brazilian ] = "AutoMail";
-            Text[ japanese ] = "���Ұ�";
-            Text[ korean ] = "AutoMail";
-            Text[ chinese_simplified ] = "�Զ������ʼ�";
-            Text[ chinese_traditional ] = "�۰ʹq�l�l��";
-            Text[ arabic ] = "���� ���";
+            Text [ de ] = "AutoMail" ;
+            Text [ en-US ] = "AutoMail";
         };
         ToolBoxItem
         {
             Identifier = TBC_BT_URL ;
             //HelpID = HID_ADDRPI_AUTOBROWSE ;
             ItemBitmap = Bitmap { File = "sc06304.bmp" ; };
-            Text = "AutoBrowse" ;
-            Text [ ENGLISH ] = "AutoBrowse" ;
-            Text[ english_us ] = "AutoBrowse";
-            Text[ portuguese ] = "AutoBrowse";
-            Text[ russian ] = "������������";
-            Text[ greek ] = "AutoBrowse";
-            Text[ dutch ] = "AutoBrowse";
-            Text[ french ] = "AutoBrowse";
-            Text[ spanish ] = "AutoBrowse";
-            Text[ italian ] = "Browse automatico";
-            Text[ danish ] = "AutoBrowse";
-            Text[ swedish ] = "AutoBrowse";
-            Text[ polish ] = "AutoBrowse";
-            Text[ portuguese_brazilian ] = "AutoBrowse";
-            Text[ japanese ] = "�����׳��";
-            Text[ korean ] = "AutoBrowse";
-            Text[ chinese_simplified ] = "�Զ����";
-            Text[ chinese_traditional ] = "�۰��s��";
-            Text[ arabic ] = "������� ���";
+            Text [ de ] = "AutoBrowse" ;
+            Text [ en-US ] = "AutoBrowse";
         };*/
     };
     Scroll = TRUE ;
@@ -546,7 +255,7 @@ ToolBox RID_BIB_TOOLBAR
         SID_FM_AUTOFILTER;      /*10716*/     \
         SID_FM_FILTERCRIT;      /*10715*/     \
         SID_FM_REMOVE_FILTER_SORT ; /*10711*/ \
-    };                                      \
+    };                                     \
     IdCount = { 3; };
 
 ImageList RID_TOOLBAR_IMGLIST