#105924# use Button::GetStandardText for java error messages

2 files changed, 82 insertions, 70 deletions

diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index d822ad000ce2..2a19ede6c863 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: svdata.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: obr $ $Date: 2002-11-20 15:30:33 $
+ *  last change: $Author: pl $ $Date: 2002-12-06 10:26:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,6 +116,10 @@
 #include <unohelp.hxx>
 #endif
 
+#ifndef _SV_BUTTON_HXX
+#include <button.hxx> // for Button::GetStandardText
+#endif
+
 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #endif
@@ -158,6 +162,14 @@ ImplSVData* pImplSVData = &private_aImplSVData;
 // static SharedLib SV-Data
 ImplSVShlData aImplSVShlData;
 
+static String& ReplaceJavaErrorMessages( String& rString )
+{
+    rString.SearchAndReplaceAllAscii( "%IGNORE", Button::GetStandardText( BUTTON_IGNORE ) );
+    rString.SearchAndReplaceAllAscii( "%CANCEL", Button::GetStandardText( BUTTON_CANCEL ) );
+
+    return rString;
+}
+
 // =======================================================================
 
 void ImplInitSVData()
@@ -364,8 +376,8 @@ bool ImplInitAccessBridge()
                 ResMgr *pResMgr = ImplGetResMgr();
 
                 ImplShowNativeMessageBox(
-                    String(ResId(SV_ACCESSERROR_MISSING_JAVA, pResMgr)),
-                    String(ResId(SV_ACCESSERROR_MISSING_JAVA_MSG, pResMgr)),
+                    ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_MISSING_JAVA, pResMgr))),
+                    ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_MISSING_JAVA_MSG, pResMgr))),
                     SALSYSTEM_SHOWNATIVEMSGBOX_BTNCOMBI_ABORT_RETRY_IGNORE,
                     SALSYSTEM_SHOWNATIVEMSGBOX_BTN_IGNORE);
             }
@@ -383,13 +395,13 @@ bool ImplInitAccessBridge()
 
                 if( exception.Message.compareTo(::rtl::OUString::createFromAscii("ClassNotFound"), 13) )
                 {
-                    aTitle = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, pResMgr));
-                    aMessage = String(ResId(SV_ACCESSERROR_MISSING_BRIDGE_MSG, pResMgr));
+                    aTitle = ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_MISSING_BRIDGE, pResMgr)));
+                    aMessage = ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_MISSING_BRIDGE_MSG, pResMgr)));
                 }
                 else if( exception.Message.compareTo(::rtl::OUString::createFromAscii("NoSuchMethod"), 12) )
                 {
-                    aTitle = String(ResId(SV_ACCESSERROR_WRONG_VERSION, pResMgr));
-                    aMessage = String(ResId(SV_ACCESSERROR_WRONG_VERSION_MSG, pResMgr));
+                    aTitle = ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_WRONG_VERSION, pResMgr)));
+                    aMessage = ReplaceJavaErrorMessages(String(ResId(SV_ACCESSERROR_WRONG_VERSION_MSG, pResMgr)));
                 }
 
                 if( aTitle.Len() != 0 )
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index b8d7711019b8..abb86ed482fc 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: stdtext.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2002-12-05 10:17:54 $
+ *  last change: $Author: pl $ $Date: 2002-12-06 10:22:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,29 +203,29 @@ String SV_ACCESSERROR_WRONG_VERSION
 
 String SV_ACCESSERROR_WRONG_VERSION_MSG
 {
-    Text = "%PRODUCTNAME %PRODUCTVERSION ben�tigt eine Java Access Bridge 1.03 oder h�her. Bitte installieren Sie die aktuellste Java Access Bridge. Klicken Sie \"Ignorieren\" um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie \"Abbrechen\".";
-    Text [English] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text = "%PRODUCTNAME %PRODUCTVERSION ben�tigt eine Java Access Bridge 1.03 oder h�her. Bitte installieren Sie die aktuellste Java Access Bridge. Klicken Sie '%IGNORE' um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie '%CANCEL'.";
+    Text [English] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ greek ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION requiert Java Access Bridge 1.03 ou plus. Veuillez installer la version la plus r�cente de Java Access Bridge. Cliquez sur \"Ignorer\" pour d�marrer %PRODUCTNAME %PRODUCTVERSION sans support d'accessibilit�, ou sur \"Annuler\".";
     Text[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION requiere la versi�n de Java Access Bridge 1.03 o posterior. Instale la �ltima versi�n de Java Access Bridge. Pulse \"Ignorar\" para iniciar %PRODUCTNAME %PRODUCTVERSION sin el soporte de accesibilidad o pulse \"Cancelar\".";
-    Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTVERSION richiede una versione di Java Access Bridge 1.03 o pi� recente. Installate l'ultima versione di Java Access Bridge. Cliccate su \"Ignora\" per avviare %PRODUCTNAME %PRODUCTVERSION senza il supporto di accessibilit�, altrimenti cliccate su \"Annulla\".";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION kr�ver en Java Access Bridge 1.03 eller senare. Installera den senaste Java Access Bridge. Klicka p� \"Ignorera\" f�r att starta %PRODUCTNAME %PRODUCTVERSION utan tillg�nglighetsst�d eller klicka p� \"Avbryt\".";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ japanese ] = "%PRODUCTNAME %PRODUCTVERSION には、Java Access Bridge 1.03 以降のバージョンが必要です。最新版の Java Access Bridge をインストールしてください。アクセシビリティの支援なしで %PRODUCTNAME %PRODUCTVERSION を起動させるには、［無視する］ボタンをクリックします。または［キャンセル］ボタンをクリックします。";
     Text[ korean ] = "%PRODUCTNAME %PRODUCTVERSION 은(는) Java Access Bridge 1.03 이상의 버전을 필요로 합니다. 최신 버전의 Java Access Bridge를 설치해주십시오. 액세스빌리티 기능 지원이 없이 %PRODUCTNAME %PRODUCTVERSION을 시작하시려면 무시 버튼 또는 취소 버튼을 클릭해주십시오.";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTVERSION 需要一个“Java Access Bridge 1.03”或之上的版本。点击“忽略”，省去辅助功能支持。而直接开始安装 %PRODUCTNAME %PRODUCTVERSION 。或者点击“取消”，中断安装过程。";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTVERSION 需要一個[Java Access Bridge 1.03]或之上的版本。請安裝一個最新的[Java Access Bridge]版本。按一下「忽略」，省去協助工具支援，而直接啓動安裝 %PRODUCTNAME %PRODUCTVERSION 。或者按下「取消」，中斷安裝過程。";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ thai ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ turkish ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ arabic ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ catalan ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ thai ] = "%PRODUCTNAME %PRODUCTVERSION requires a Java Access Bridge 1.03 or later version. Please install the latest Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
 };
 
 String SV_ACCESSERROR_MISSING_BRIDGE
@@ -257,29 +257,29 @@ String SV_ACCESSERROR_MISSING_BRIDGE
 
 String SV_ACCESSERROR_MISSING_BRIDGE_MSG
 {
-    Text = "Es wurde keine Java Access Bridge gefunden. Bitte installieren Sie eine Java Access Bridge. Klicken Sie \"Ignorieren\" um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie \"Abbrechen\".";
-    Text [English] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ english_us ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ russian ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ greek ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ dutch ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text = "Es wurde keine Java Access Bridge gefunden. Bitte installieren Sie eine Java Access Bridge. Klicken Sie '%IGNORE' um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie '%CANCEL'.";
+    Text [English] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ english_us ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ russian ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ greek ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ dutch ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ french ] = "Java Access Bridge n'a pas pu �tre d�tect� sur le syst�me. Veuillez installer une version Java Access Bridge. Cliquez sur \"Ignorer\" pour d�marrer %PRODUCTNAME %PRODUCTVERSION sans support d'accessibilit�, ou sur \"Annuler\".";
     Text[ spanish ] = "Java Access Bridge no se encuentra en el sistema. Instale una versi�n de Java Access Bridge. Pulse \"Ignorar\" para iniciar %PRODUCTNAME %PRODUCTVERSION sin el soporte de accesibilidad o pulse \"Cancelar\".";
-    Text[ finnish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ finnish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ italian ] = "Non avete installato Java Access Bridge sul vostro sistema. L'installazione � necessaria. Cliccate su \"Ignora\" per avviare %PRODUCTNAME %PRODUCTVERSION senza il supporto di accessibilit�, altrimenti cliccate su \"Annulla\".";
-    Text[ danish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ danish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ swedish ] = "Ingen Java Access Bridge hittades i ditt system. Installera en Java Access Bridge. Klicka p� \"Ignorera\" f�r att starta %PRODUCTNAME %PRODUCTVERSION utan tillg�nglighetsst�d eller klicka p� \"Avbryt\".";
-    Text[ polish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese_brazilian ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ polish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese_brazilian ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ japanese ] = "お使いのシステムに Java Access Bridge は見つかりませんでした。Java Access Bridge をインストールしてください。アクセシビリティの支援なしで %PRODUCTNAME %PRODUCTVERSION を起動させるには、［無視する］ボタンをクリックします。または［キャンセル］ボタンをクリックします。";
     Text[ korean ] = "시스템에서 Java Access Bridge를 찾을 수 없었습니다. Java Access Bridge를 설치해주십시오. 액세스빌리티 기능 지원이 없는 %PRODUCTNAME %PRODUCTVERSION을 시작하시려면 무시 버튼 또는 취소 버튼을 클릭해주십시오.";
     Text[ chinese_simplified ] = "在系统内没有找到“Java Access Bridge”。请安装一个“Java Access Bridge”。点击“忽略”，省去辅助功能支持，而直接开始安装 %PRODUCTNAME %PRODUCTVERSION 。或者点击“取消”，中断安装过程。";
     Text[ chinese_traditional ] = "在系統内沒有找到[Java Access Bridge]。請安裝一個[Java Access Bridge]。按一下「忽略」，省去協助工具支援，而直接啓動安裝 %PRODUCTNAME %PRODUCTVERSION 。或者按下「取消」，中斷安裝過程。";
-    Text[ turkish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ arabic ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ catalan ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ thai ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ turkish ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ arabic ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ catalan ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ thai ] = "No Java Access Bridge was found on your system. Please install a Java Access Bridge. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
 };
 
 String SV_ACCESSERROR_FAULTY_JAVA
@@ -311,29 +311,29 @@ String SV_ACCESSERROR_FAULTY_JAVA
 
 String SV_ACCESSERROR_FAULTY_JAVA_MSG
 {
-    Text = "%PRODUCTNAME %PRODUCTVERSION hat auf Ihrem System eine fehlerhafte Java Installation gefunden Bitte installieren Sie Java neu, oder f�hren Sie eine Reparatur durch. Klicken Sie \"Ignorieren\" um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie \"Abbrechen\".";
-    Text [English] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ greek ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text = "%PRODUCTNAME %PRODUCTVERSION hat auf Ihrem System eine fehlerhafte Java Installation gefunden Bitte installieren Sie Java neu, oder f�hren Sie eine Reparatur durch. Klicken Sie '%IGNORE' um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie '%CANCEL'.";
+    Text [English] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ english_us ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ russian ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ greek ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ dutch ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ french ] = "%PRODUCTNAME %PRODUCTVERSION a d�tect� une installation Java d�fectueuse sur le syst�me. Veuillez r�installer Java ou ex�cuter une r�paration. Cliquez sur \"Ignorer\" pour d�marrer %PRODUCTNAME %PRODUCTVERSION sans support d'accessibilit�, ou sur \"Annuler\".";
     Text[ spanish ] = "%PRODUCTNAME %PRODUCTVERSION ha detectado una versi�n defectuosa de Java en el sistema. Vuelva a instalar Java o efect�e una reparaci�n. Pulse \"Ignorar\" para iniciar %PRODUCTNAME %PRODUCTVERSION sin el soporte de accesibilidad o pulse \"Cancelar\". ";
-    Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ finnish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ italian ] = "%PRODUCTNAME %PRODUCTVERSION ha rilevato un'installazione corrotta di Java sul vostro sistema. Installate nuovamente Java oppure avviate il programma di riparazione. Cliccate su \"Ignora\" per avviare %PRODUCTNAME %PRODUCTVERSION senza il supporto di accessibilit�, altrimenti cliccate su \"Annulla\".";
-    Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ danish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ swedish ] = "%PRODUCTNAME %PRODUCTVERSION har hittat en felaktig Java-installation i ditt system. Installera om Java eller reparera din nuvarande Java-installation. Klicka p� \"Ignorera\" f�r att starta %PRODUCTNAME %PRODUCTVERSION utan tillg�nglighetsst�d eller klicka p� \"Avbryt\".";
-    Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ polish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese_brazilian ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ japanese ] = "%PRODUCTNAME %PRODUCTVERSION がシステムに正常にインストールされなかった Java を検出しました。Java をインストールしなおすか、セットアッププログラムで修復を行うかしてください。アクセシビリティの支援なしで %PRODUCTNAME %PRODUCTVERSION を起動させるには、［無視する］ボタンをクリックします。または［キャンセル］ボタンをクリックします。";
     Text[ korean ] = "%PRODUCTNAME %PRODUCTVERSION 은(는) 오류가 있는 Java 설치를 발견했습니다. Java를 새로 설치하거나 복구를 실행해주십시오. 액세스빌리티 기능 지원이 없이 %PRODUCTNAME %PRODUCTVERSION을 시작하시려면 무시 버튼 또는 취소 버튼을 클릭해주십시오.";
     Text[ chinese_simplified ] = "%PRODUCTNAME %PRODUCTVERSION 发现在系统内有一个错误的 Java 版本。请重新安装 Java 或启动修复安装程序。点击“忽略”，省去辅助功能支持，而直接开始安装 %PRODUCTNAME %PRODUCTVERSION 。或者点击“取消”，中断安装过程。";
     Text[ chinese_traditional ] = "%PRODUCTNAME %PRODUCTVERSION 發現在系統内有一個錯誤的 Java 版本。請重新安裝 Java 或啓動修復安裝程式。按一下「忽略」，省去協助工具支援，而直接啓動安裝 %PRODUCTNAME %PRODUCTVERSION 。或者按下「取消」，中斷安裝過程。";
-    Text[ turkish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ arabic ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ catalan ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ thai ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ turkish ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ arabic ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ catalan ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ thai ] = "%PRODUCTNAME %PRODUCTVERSION detected a faulty Java installation on your system. Please repair or renew your Java installation. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
 };
 
 String SV_ACCESSERROR_MISSING_JAVA
@@ -365,27 +365,27 @@ String SV_ACCESSERROR_MISSING_JAVA
 
 String SV_ACCESSERROR_MISSING_JAVA_MSG
 {
-    Text = "Es wurde keine Java Installation gefunden. Bitte installieren Sie eine Java Version. Klicken Sie \"Ignorieren\" um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie \"Abbrechen\" um den Start zu beenden.";
-    Text [English] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ english_us ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ russian ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ greek ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ dutch ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text = "Es wurde keine Java Installation gefunden. Bitte installieren Sie eine Java Version. Klicken Sie '%IGNORE' um %PRODUCTNAME %PRODUCTVERSION ohne Unterst�tzung der Zug�nglichkeit zu starten, oder klicken Sie '%CANCEL' um den Start zu beenden.";
+    Text [English] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ english_us ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ russian ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ greek ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ dutch ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ french ] = "Aucune installation Java n'a pu �tre d�tect�e sur le syst�me. Veuillez installer une version de Java. Cliquez sur \"Ignorer\" pour d�marrer %PRODUCTNAME %PRODUCTVERSION sans support d'accessibilit�, ou sur \"Annuler\".";
     Text[ spanish ] = "No se encontr� ninguna instalaci�n de Java en el sistema. Instale una versi�n de Java. Pulse en \"Ignorar\" para iniciar %PRODUCTNAME %PRODUCTVERSION sin el soporte de accesibilidad o pulse en \"Cancelar\". ";
-    Text[ finnish ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ finnish ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ italian ] = "Non avete installato Java sul vostro sistema. Installate una versione di Java. Cliccate su \"Ignora\" per avviare %PRODUCTNAME %PRODUCTVERSION senza il supporto di accessibilit�, altrimenti cliccate su \"Annulla\".";
-    Text[ danish ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ danish ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ swedish ] = "Ingen Java-installation hittades i ditt system. Installera en version av Java. Klicka p� \"Ignorera\" f�r att starta %PRODUCTNAME %PRODUCTVERSION utan tillg�nglighetsst�d eller klicka p� \"Avbryt\".";
-    Text[ polish ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ portuguese_brazilian ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ polish ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ portuguese_brazilian ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
     Text[ japanese ] = "お使いのシステムに Java はインストールされていません。Java のバージョンをインストールしてください。アクセシビリティの支援なしで %PRODUCTNAME %PRODUCTVERSION を起動させるには、［無視する］ボタンをクリックしてください。または［キャンセル］ボタンをクリックしてください。";
     Text[ korean ] = "사용자 시스템에 Java가 설치되지 않았습니다. Java를 설치해주십시오. 액세스빌리티 기능 지원이 없이 %PRODUCTNAME %PRODUCTVERSION을 시작하시려면 무시 버튼 또는 취소 버튼을 클릭해주십시오.";
     Text[ chinese_simplified ] = "在系统内没有找到一个 Java 版本。请安装一个 Java 版本。点击“忽略”，省去辅助功能支持，而直接开始安装 %PRODUCTNAME %PRODUCTVERSION 。或者点击“取消”，中断安装过程。";
     Text[ chinese_traditional ] = "在系統内沒有找到一個 Java 版本。 請安裝一個 Java 版本。按一下「忽略」，省去協助工具支援，而直接啓動安裝 %PRODUCTNAME %PRODUCTVERSION 。或者按下「取消」，中斷安裝過程。";
-    Text[ turkish ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ arabic ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ catalan ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
-    Text[ thai ] = "No Java installation was found on your system. Please install a version of Java. Click \"Ignore\" to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click \"Cancel\".";
+    Text[ turkish ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ arabic ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ catalan ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
+    Text[ thai ] = "No Java installation was found on your system. Please install a version of Java. Click '%IGNORE' to start %PRODUCTNAME %PRODUCTVERSION without accessibility support, or click '%CANCEL'.";
 };