#i10000# adopt to ISO codes

2 files changed, 42 insertions, 247 deletions

diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src
index 2f1f069952ed..ae4295ccbe68 100644
--- a/framework/source/classes/resource.src
+++ b/framework/source/classes/resource.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: resource.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: hjs $ $Date: 2004-06-25 15:36:07 $
+ *  last change: $Author: hjs $ $Date: 2004-06-30 10:19:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -150,28 +150,8 @@ ModalDialog DLG_LICENSE
     SVLook = TRUE ;
     Hide = TRUE ;
     Size = MAP_APPFONT ( LICENSE_DIALOG_WIDTH , LICENSE_DIALOG_HEIGTH ) ;
-    Text = "Lizenzvertrag" ;
-    Text [ ENGLISH ] = "License Agreement" ;
-    Text[ english_us ] = "License Agreement";
-    Text[ portuguese ] = "License Agreement";
-    Text[ russian ] = "������������ ����������";
-    Text[ greek ] = "����� ������";
-    Text[ dutch ] = "Licentieovereenkomst";
-    Text[ french ] = "Contrat de licence";
-    Text[ spanish ] = "Contrato de licencia";
-    Text[ finnish ] = "Lisenssisopimus";
-    Text[ italian ] = "Contratto di licenza";
-    Text[ danish ] = "Licensaftale";
-    Text[ swedish ] = "Licensavtal";
-    Text[ polish ] = "Umowa licencyjna";
-    Text[ portuguese_brazilian ] = "Contrato da Licen�a";
-    Text[ japanese ] = "ライセンス許諾書";
-    Text[ korean ] = "사용권 계약";
-    Text[ chinese_simplified ] = "用户许可证协议";
-    Text[ chinese_traditional ] = "使用許可協定";
-    Text[ turkish ] = "Lisans Anla�mas�";
-    Text[ arabic ] = "License Agreement";
-    Text[ catalan ] = "Acord de llic�ncia";
+    Text [ de ] = "Lizenzvertrag" ;
+    Text [ en-US ] = "License Agreement";
 
     MultiLineEdit ML_LICENSE
     {
@@ -186,32 +166,8 @@ ModalDialog DLG_LICENSE
         WordBreak = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_2 ) ;
         Size = MAP_APPFONT ( LICENSE_WIDTH , FT_HEIGHT ) ;
-        Text = "Bitte f�hren Sie die folgenden Schritte aus, um mit der Installation fortzufahren:" ;
-        Text [ english_us ] = "Please follow these steps to proceed with the installation:" ;
-        Text[ spanish ] = "Siga los siguientes pasos para proceder con la instalaci�n:";
-        Text[ italian ] = "Eseguite i seguenti passi per procedere con l'installazione:";
-        Text[ swedish ] = "Utf�r f�ljande steg f�r att forts�tta med installationen:";
-        Text[ japanese ] = "以下の手順に従ってインストールを続行してください。";
-        Text[ korean ] = "설치를 계속 진행하기 위해 다음 단계를 실행해주십시오:";
-        Text[ chinese_traditional ] = "請執行下列動作，以繼續安裝：";
-        Text[ french ] = "Suivez les �tapes suivantes pour proc�der � l'installation :";
-        Text[ chinese_simplified ] = "请执行以下的操作，继续安装：";
-        Text[ portuguese ] = "Leia o seguinte contrato de licen�a com aten��o. Se usar a barra de deslocamento poder� visualizar o texto completo.";
-        Text[ russian ] = "����������, ����������, ��������� ������������ ����������. ����������� ������ ���������, ����� ������� ��������� ����� ������.";
-        Text[ greek ] = "�������� ���������� ��� �������� ����� ������. �������������� �� ������ ������� ��� ����� �������� �� �������.";
-        Text[ dutch ] = "Lees de volgende licentieovereenkomst door. Met de beeldschuifbalk kunt u de resterende tekst van de overeenkomst zichtbaar maken.";
-        Text[ finnish ] = "Lue seuraava lisenssisopimus huolellisesti. Voit vieritt�� teksti� vierityspalkin avulla.";
-        Text[ danish ] = "L�s den f�lgende licensaftale. Du kan se resten af licensaftalen ved hj�lp af rullepanelet.";
-        Text[ polish ] = "Nale�y uwa�nie przeczyta� umow� licencyjn�. Aby zobaczy� ca�y tekst, mo�na pos�u�y� si� paskiem przewijania.";
-        Text[ portuguese_brazilian ] = "Leia o seguinte contrato de licen�a com aten��o. Use a barra de rolagem para visualizar o texto completo.";
-        Text[ turkish ] = "Kuruluma devam etmek i�in a�a��daki ad�mlar� izleyin:";
-        Text[ arabic ] = "������ ����� ������� ������� �������. ������ ���� ����� ������ ��� ����� �� ���� ����� ������� �� �� ���������.";
-        Text[ catalan ] = "Llegeix el seg�ent acord de llic�ncia. Amb la barra de despla�ament podreu veure la resta de l'acord.";
-        Text[ thai ] = "อ่านข้อตกลงการอนุญาตต่อไปนี้อย่างระมัดระวัง ใช้แถบเลื่อนเพื่อดูทั้งข้อความ";
-        Text[ czech ] = "Pro pokračování instalace proveďte následující kroky:";
-        Text[ hebrew ] = "Bitte führen Sie die folgenden Schritte aus, um mit der Installation fortzufahren:";
-        Text[ hindi ] = "निम्नलिखित अनुज्ञप्ति प्रमाणपत्र को ध्यान से पढ़िए । संपूर्ण टेक्स्ट् को देखने केलिए स्क्रॉल् पट्टी का उपयोग कीजिए ।";
-        Text[ slovak ] = "Prečítajte si pozorne licenčné podmienky. Použite posuvník na zobrazenie celého textu.";
+        Text [ de ] = "Bitte f�hren Sie die folgenden Schritte aus, um mit der Installation fortzufahren:" ;
+        Text [ en-US ] = "Please follow these steps to proceed with the installation:" ;
     };
 
     FixedImage IMG_ARROW
@@ -223,7 +179,7 @@ ModalDialog DLG_LICENSE
             ImageBitmap = Bitmap
             {
                 File = "arrow.bmp" ;
-                File[ arabic ] = "m_arrow.bmp" ;
+                File[ ar ] = "m_arrow.bmp" ;
             };
             MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
         };
@@ -234,32 +190,8 @@ ModalDialog DLG_LICENSE
         WordBreak = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_2 , LICENSE_ROW_3 ) ;
         Size = MAP_APPFONT ( COL2_WIDTH , FT_HEIGHT ) ;
-        Text = "1." ;
-        Text [ english_us ] = "1." ;
-        Text[ portuguese ] = "1.";
-        Text[ russian ] = "1.";
-        Text[ greek ] = "1.";
-        Text[ dutch ] = "1.";
-        Text[ french ] = "1.";
-        Text[ spanish ] = "1.";
-        Text[ finnish ] = "1.";
-        Text[ italian ] = "1.";
-        Text[ danish ] = "1.";
-        Text[ swedish ] = "1.";
-        Text[ polish ] = "1.";
-        Text[ portuguese_brazilian ] = "1.";
-        Text[ japanese ] = "1.";
-        Text[ korean ] = "1.";
-        Text[ chinese_simplified ] = "1.";
-        Text[ chinese_traditional ] = "1.";
-        Text[ turkish ] = "1.";
-        Text[ arabic ] = "1.";
-        Text[ catalan ] = "1.";
-        Text[ thai ] = "1.";
-        Text[ czech ] = "1.";
-        Text[ hebrew ] = "‮1.‬";
-        Text[ hindi ] = "1.";
-        Text[ slovak ] = "1.";
+        Text [ de ] = "1." ;
+        Text [ en-US ] = "1." ;
     };
 
     FixedText FT_INFO2
@@ -267,32 +199,8 @@ ModalDialog DLG_LICENSE
         WordBreak = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_3 , LICENSE_ROW_3 ) ;
         Size = MAP_APPFONT ( COL3_WIDTH, 3*FT_HEIGHT ) ;
-        Text = "Lesen Sie den gesamten Lizenzvertrag. Verwenden Sie die Bildlaufleiste oder die %PAGEDOWN Schaltfl�che in diesem Dialog um den gesamten Text sichtbar zu machen." ;
-        Text [ english_us ] = "View the complete License Agreement. Please use the scroll bar or the '%PAGEDOWN' button in this dialog to view the entire license text." ;
-        Text[ italian ] = "Leggete il seguente contratto di licenza. Con la barra o il tasto di scorrimento � possibile visualizzare il resto del contratto.";
-        Text[ swedish ] = "L�s igenom hela licensavtalet. Anv�nd rullningslisten eller %PAGEDOWN-knappen i den h�r dialogrutan f�r att visa hela texten.";
-        Text[ korean ] = "사용자 사용권 계약서의 내용을 상세히 읽으십시오. 스크롤바 사용하거나 대화 상자 내의 [%PAGEDOWN] 버튼을 누르십시오. 전체 텍스트가 표시됩니다.";
-        Text[ chinese_traditional ] = "檢視完整的許可證協議。請使用這個對話方塊中的捲軸或 '%PAGEDOWN' 按鈕閱讀許可證協議的完整內容。";
-        Text[ french ] = "Prenez connaissance du contrat de licence. Servez-vous de la barre de d�filement ou du bouton %PAGEDOWN afin d'afficher le texte en entier.";
-        Text[ spanish ] = "Lea el siguiente contrato de licencia. Utilice la barra de desplazamiento o el bot�n 'AvPag' para visualizar el texto entero.";
-        Text[ japanese ] = "次のライセンス条項を必ずお読みください。スクロールバーを動かすか、[%PAGEDOWN] ボタンを押すと残りの文章が表示されます。";
-        Text[ chinese_simplified ] = "请阅读许可证协议中的全部条款。通过滚动条或单击 %PAGEDOWN 按钮，阅读许可证协议的全部内容。";
-        Text[ portuguese ] = "Clique no bot�o '%1' se concordar com os termos do contrato de licen�a. Se n�o os aceitar clique no bot�o '%2' e a instala��o ser� cancelada.";
-        Text[ russian ] = "���� �� ���������� ��� ������� ������������� ����������, ������� ������ '%1'. ���� �� �� �������� � ����� ���������, ������� '%2', � ��������� ����� ����������.";
-        Text[ greek ] = "�� ���������� ����� ���� ����� ��� ������ ������, ������� '%1'. �����������, ������� '%2' ��� �� ��������� ��� �����������.";
-        Text[ dutch ] = "Als u met alle voorwaarden in deze licentieovereenkomst akkoord gaat, klikt u op de knop '%1'. Als u de voorwaarden niet accepteert, klikt u op '%2'. De installatie wordt dan geannuleerd.";
-        Text[ finnish ] = "Jos hyv�ksyt kaikki lisenssisopimuksen ehdot, valitse '%1'. Muussa tapauksessa peruuta asennus valitsemalla '%2'.";
-        Text[ danish ] = "Hvis du accepterer alle betingelser i denne licensaftale, skal du klikke p� knappen '%1'. Hvis du ikke accepterer betingelserne, skal du klikke p� '%2'. Herefter afbrydes installationen.";
-        Text[ polish ] = "Je�eli akceptujesz wszystkie warunki umowy licencyjnej, kliknij przycisk %1. W przeciwnym przypadku kliknij przycisk %2, aby anulowa� instalacj�.";
-        Text[ portuguese_brazilian ] = "Se voc� concorda com os termos do contrato de licen�a, clique no bot�o '%1'. Caso contr�rio, clique no bot�o '%2' para cancelar a instala��o.";
-        Text[ turkish ] = "T�m lisans anla�mas�n� okuyun. Bu metni okumak i�in kayd�rma �ubu�unu ya da %PAGEDOWN d��mesini kullanabilirsiniz.";
-        Text[ arabic ] = "��� ��� ������� ��� ���� ���� ������� ������� ��� ���� ��� '%1'. ��� �� ���� ���� ��ǡ ����� ��� '%2'. �� ��� ������ ��� ��� ��� ����� �������.";
-        Text[ catalan ] = "Si accepteu les condicions d'aquest acord, feu clic a '%1'. En el cas que no sigui aix�, feu clic a '%2' per cancel�lar la instal�laci�.";
-        Text[ thai ] = "View the complete License Agreement. Please use the scroll bar or the '%PAGEDOWN' button in this dialog to view the entire license text.";
-        Text[ czech ] = "Přečtěte si celé licenční ujednání. Použijte, prosím, posuvnou lištu nebo tlačítko '%PAGEDOWN' v tomto dialogu pro přečtení celého textu licenčního ujednání.";
-        Text[ hebrew ] = "Lesen Sie den gesamten Lizenzvertrag. Verwenden Sie die Bildlaufleiste oder die %PAGEDOWN Schaltfläche in diesem Dialog um den gesamten Text sichtbar zu machen.";
-        Text[ hindi ] = "अगर आप अनुज्ञप्ति प्रमाणपत्र का पूरा नियमों को स्वीकार करते है तो, '%1' को क्लिक् कीजिए । नहीं तो, प्रतिष्ठापन को रद्द करने केलिए '%2' को क्लिक् कीजिए ।";
-        Text[ slovak ] = "Ak súhlasíte so všetkými licenčnými podmienkami, kliknite '%1'. Inak, kliknite '%2' a prerušte inštaláciu.";
+        Text [ de ] = "Lesen Sie den gesamten Lizenzvertrag. Verwenden Sie die Bildlaufleiste oder die %PAGEDOWN Schaltfl�che in diesem Dialog um den gesamten Text sichtbar zu machen." ;
+        Text [ en-US ] = "View the complete License Agreement. Please use the scroll bar or the '%PAGEDOWN' button in this dialog to view the entire license text." ;
     };
 
     PushButton PB_PAGEDOWN
@@ -300,32 +208,8 @@ ModalDialog DLG_LICENSE
         TabStop = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ;
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
-        Text = "Bl�ttern" ;
-        Text [ english_us ] = "Scroll Down" ;
-        Text[ portuguese ] = "P�gina para baixo";
-        Text[ russian ] = "�������� ����";
-        Text[ greek ] = "������ ���� �� ����";
-        Text[ dutch ] = "Pagina naar beneden";
-        Text[ french ] = "Suivant";
-        Text[ spanish ] = "AvP�g";
-        Text[ finnish ] = "Sivu alas";
-        Text[ italian ] = "PagGi�";
-        Text[ danish ] = "Side nedad";
-        Text[ swedish ] = "Rulla ned";
-        Text[ polish ] = "Strona w d�";
-        Text[ portuguese_brazilian ] = "Pr�x. P�g.";
-        Text[ japanese ] = "下へ";
-        Text[ korean ] = "아래로";
-        Text[ chinese_simplified ] = "页面向下";
-        Text[ chinese_traditional ] = "向下一頁";
-        Text[ turkish ] = "Sayfa a�a��";
-        Text[ arabic ] = "������ ��� ����";
-        Text[ catalan ] = "Una p�gina cap avall";
-        Text[ thai ] = "หน้าถัดไป";
-        Text[ czech ] = "Další stránka";
-        Text[ hebrew ] = "Bild ab";
-        Text[ hindi ] = "पृष्ठ नीचे की ओर";
-        Text[ slovak ] = "Stránka dole";
+        Text [ de ] = "Bl�ttern" ;
+        Text [ en-US ] = "Scroll Down" ;
     };
 
     FixedText FT_INFO3_1
@@ -333,32 +217,8 @@ ModalDialog DLG_LICENSE
         WordBreak = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_2 , LICENSE_ROW_4 ) ;
         Size = MAP_APPFONT ( COL2_WIDTH, FT_HEIGHT ) ;
-        Text = "2." ;
-        Text [ english_us ] = "2." ;
-        Text[ portuguese ] = "2.";
-        Text[ russian ] = "2.";
-        Text[ greek ] = "2.";
-        Text[ dutch ] = "2.";
-        Text[ french ] = "2.";
-        Text[ spanish ] = "2.";
-        Text[ finnish ] = "2.";
-        Text[ italian ] = "2.";
-        Text[ danish ] = "2.";
-        Text[ swedish ] = "2.";
-        Text[ polish ] = "2.";
-        Text[ portuguese_brazilian ] = "2.";
-        Text[ japanese ] = "2.";
-        Text[ korean ] = "2.";
-        Text[ chinese_simplified ] = "2.";
-        Text[ chinese_traditional ] = "2.";
-        Text[ turkish ] = "2.";
-        Text[ arabic ] = "2.";
-        Text[ catalan ] = "2.";
-        Text[ thai ] = "2.";
-        Text[ czech ] = "2.";
-        Text[ hebrew ] = "‮2.‬";
-        Text[ hindi ] = "2.";
-        Text[ slovak ] = "2.";
+        Text [ de ] = "2." ;
+        Text [ en-US ] = "2." ;
     };
 
     FixedText FT_INFO3
@@ -366,94 +226,20 @@ ModalDialog DLG_LICENSE
         WordBreak = TRUE ;
         Pos = MAP_APPFONT ( LICENSE_COL_3, LICENSE_ROW_4 ) ;
         Size = MAP_APPFONT ( COL3_WIDTH, FT_HEIGHT ) ;
-        Text = "Akzeptieren Sie den Lizenzvertrag." ;
-        Text [ english_us ] = "Accept the License Agreement." ;
-        Text[ portuguese ] = "Accept the License Agreement.";
-        Text[ russian ] = "Accept the License Agreement.";
-        Text[ greek ] = "Accept the License Agreement.";
-        Text[ dutch ] = "Accept the License Agreement.";
-        Text[ french ] = "Accepter le contrat de licence";
-        Text[ spanish ] = "Aceptar el contrato de licencia.";
-        Text[ finnish ] = "Accept the License Agreement.";
-        Text[ italian ] = "Accetto i termini del contratto.";
-        Text[ danish ] = "Accept the License Agreement.";
-        Text[ swedish ] = "Acceptera licensavtalet.";
-        Text[ polish ] = "Accept the License Agreement.";
-        Text[ portuguese_brazilian ] = "Aceitar o Contrato de Licen�a";
-        Text[ japanese ] = "ライセンス条項に同意する。";
-        Text[ korean ] = "사용자 사용권 계약에 동의하십시오.";
-        Text[ chinese_simplified ] = "接受许可证协议。";
-        Text[ chinese_traditional ] = "接受許可證協議。";
-        Text[ turkish ] = "Lisans Ko�ullar�n� Kabul Et";
-        Text[ arabic ] = "Accept the License Agreement.";
-        Text[ catalan ] = "Accept the License Agreement.";
-        Text[ thai ] = "Accept the License Agreement.";
-        Text[ czech ] = "Přijmout licenci.";
-        Text[ hebrew ] = "Akzeptieren Sie den Lizenzvertrag.";
-        Text[ hindi ] = "Accept the License Agreement.";
-        Text[ slovak ] = "Prijať licenčnú zmluvu.";
+        Text [de ] = "Akzeptieren Sie den Lizenzvertrag." ;
+        Text [ en-US ] = "Accept the License Agreement." ;
     };
 
     String LICENSE_ACCEPT
     {
-        Text = "~Akzeptieren" ;
-        Text [ English ] = "~Accept" ;
-        Text [ italian ] = "~Accetto" ;
-        Text [ french ] = "Accepter" ;
-        Text [ spanish ] = "~Aceptar" ;
-        Text [ english_us ] = "~Accept" ;
-        Text [ portuguese ] = "~Aceitar" ;
-        Text [ portuguese_brazilian ] = "Aceitar" ;
-        Text [ swedish ] = "A~cceptera" ;
-        Text [ danish ] = "Accepter" ;
-        Text [ dutch ] = "~Accepteren" ;
-        Text[ chinese_simplified ] = "接受";
-        Text[ russian ] = "��������";
-        Text[ polish ] = "Zaakceptuj";
-        Text[ japanese ] = "同意する(~A)";
-        Text[ chinese_traditional ] = "接受(~A)";
-        Text[ arabic ] = "����";
-        Text[ greek ] = "~�������";
-        Text[ korean ] = "동의(~A)";
-        Text[ turkish ] = "~Kabul";
-        Text[ language_user1 ] = " ";
-        Text[ catalan ] = "~Accepta";
-        Text[ finnish ] = "~Hyv�ksy";
-        Text[ thai ] = "~ยอมรับ";
-        Text[ czech ] = "Přijmout";
-        Text[ hebrew ] = "‮קבלת שינוי‬";
-        Text[ hindi ] = "~स्वीकार";
-        Text[ slovak ] = "~Prijať";
+        Text [ de ] = "~Akzeptieren" ;
+        Text [ en-US ] = "~Accept" ;
     };
 
     String LICENSE_NOTACCEPT
     {
-        Text = "Ablehnen" ;
-        Text [ english_us ] = "Decline" ;
-        Text[ spanish ] = "No aceptar";
-        Text[ swedish ] = "Acceptera inte";
-        Text[ chinese_traditional ] = "拒絕";
-        Text[ french ] = "Refuser";
-        Text[ japanese ] = "同意しない";
-        Text[ chinese_simplified ] = "不接受";
-        Text[ portuguese ] = "~Cancelar";
-        Text[ russian ] = "�� ��������";
-        Text[ greek ] = "�� �������";
-        Text[ dutch ] = "~Niet accepteren";
-        Text[ finnish ] = "~Peruuta";
-        Text[ italian ] = "~Non accetto";
-        Text[ danish ] = "Accepter ikke";
-        Text[ polish ] = "Odrzu�";
-        Text[ portuguese_brazilian ] = "Recusar";
-        Text[ korean ] = "거부";
-        Text[ turkish ] = "Reddet";
-        Text[ arabic ] = "���";
-        Text[ catalan ] = "~No acceptar";
-        Text[ thai ] = "~ยกเลิก";
-        Text[ czech ] = "Zrušit";
-        Text[ hebrew ] = "Ablehnen";
-        Text[ hindi ] = "~रद्द करो";
-        Text[ slovak ] = "Zrušiť";
+        Text [ de ] = "Ablehnen" ;
+        Text [ en-US ] = "Decline" ;
     };
 
     FixedLine FL_DIVIDE
@@ -476,10 +262,5 @@ ModalDialog DLG_LICENSE
         Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ;
     };
 
-    Text[ thai ] = "License Agreement";
-    Text[ czech ] = "Licenční ujednání";
-    Text[ hebrew ] = "Lizenzvertrag";
-    Text[ hindi ] = "License Agreement";
-    Text[ slovak ] = "Licenčný dohovor";
 };
 
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 67560515a638..447cdedffd02 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: license.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2004-06-10 13:22:39 $
+ *  last change: $Author: hjs $ $Date: 2004-06-30 10:19:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -321,23 +321,37 @@ css::uno::Any SAL_CALL License::execute(const css::uno::Sequence< css::beans::Na
             return aRet;
         }
         // determine the filename of the license to show
-        LanguageType aLanguage = LANGUAGE_DONTKNOW;
+        OUString  aLangString;
+        ::com::sun::star::lang::Locale aLocale;
         OString aMgrName = OString("fwe") + OString::valueOf((sal_Int32)SUPD, 10);
         AllSettings aSettings(Application::GetSettings());
-        aLanguage = aSettings.GetUILanguage();
-        ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLanguage);
+        aLocale = aSettings.GetUILocale();
+        ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
 
+        aLangString = aLocale.Language;
+        if ( aLocale.Country.getLength() != 0 )
+        {
+            aLangString += OUString::createFromAscii("-");
+            aLangString += aLocale.Country;
+            if ( aLocale.Variant.getLength() != 0 )
+            {
+                aLangString += OUString::createFromAscii("-");
+                aLangString += aLocale.Variant;
+            }
+        }
 #ifdef WNT
         OUString aLicensePath =
             aBaseInstallPath + OUString::createFromAscii(szLicensePath)
             + OUString::createFromAscii(szWNTLicenseName)
-            + OUString::createFromAscii(ResMgr::GetLang(aLanguage, 0))
+            + OUString::createFromAscii("_")
+            + aLangString
             + OUString::createFromAscii(szWNTLicenseExt);
 #else
         OUString aLicensePath =
             aBaseInstallPath + OUString::createFromAscii(szLicensePath)
             + OUString::createFromAscii(szUNXLicenseName)
-            + OUString::createFromAscii(ResMgr::GetLang(aLanguage, 0))
+            + OUString::createFromAscii("_")
+            + aLangString
             + OUString::createFromAscii(szUNXLicenseExt);
 #endif
         // check if we need to show the license at all