Merge SRC641: 25.10.01 - 22:36:40

1 files changed, 17 insertions, 16 deletions

diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index c0c7a447e1c6..d2fe98d15a5c 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: desktop.src,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: rt $ $Date: 2001-10-22 05:52:03 $
+ *  last change: $Author: obo $ $Date: 2001-10-25 20:36:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -165,7 +165,7 @@ String STR_BOOTSTRAP_ERR_CANNOT_START
     Text[ swedish ] = "Det g�r inte att starta programmet. ";
     Text[ polish ] = "Uruchomienie aplikacji nie jest mo�liwe.";
     Text[ portuguese_brazilian ] = "The program cannot be started. ";
-    Text[ japanese ] = "The program cannot be started. ";
+    Text[ japanese ] = "ﾌﾟﾛｸﾞﾗﾑは起動できません。";
     Text[ korean ] = "The program cannot be started. ";
     Text[ chinese_simplified ] = "无法启动该应用程序。";
     Text[ chinese_traditional ] = "無法啓動這個應用程式。";
@@ -191,7 +191,7 @@ String STR_BOOTSTRAP_ERR_DIR_MISSING
     Text[ swedish ] = "Konfigurationss�kv�gen \"$1\" hittades inte.";
     Text[ polish ] = "Nie znaleziono �cie�ki konfiguracyjnej \"$1\".";
     Text[ portuguese_brazilian ] = "The configuration directory \"$1\" is missing.";
-    Text[ japanese ] = "The configuration directory \"$1\" is missing.";
+    Text[ japanese ] = "設定ﾊﾟｽ \"$1\" はありません。";
     Text[ korean ] = "The configuration directory \"$1\" is missing.";
     Text[ chinese_simplified ] = "无法找到配置路径 \"$1\"。";
     Text[ chinese_traditional ] = "沒有找到配置路徑 \"$1\" 。";
@@ -217,7 +217,7 @@ String STR_BOOTSTRAP_ERR_PATH_INVALID
     Text[ swedish ] = "Installationss�kv�gen �r ogiltig.";
     Text[ polish ] = "�cie�ka instalacyjna jest nieprawid�owa.";
     Text[ portuguese_brazilian ] = "The installation path is invalid.";
-    Text[ japanese ] = "The installation path is invalid.";
+    Text[ japanese ] = "ｲﾝｽﾄｰﾙﾊﾟｽは無効です。";
     Text[ korean ] = "The installation path is invalid.";
     Text[ chinese_simplified ] = "安装路径无效。";
     Text[ chinese_traditional ] = "這個安裝路徑無效。";
@@ -243,7 +243,7 @@ String STR_BOOTSTRAP_ERR_NO_PATH
     Text[ swedish ] = "Det gick inte att best�mma installationss�kv�gen.";
     Text[ polish ] = "Ustalenie �cie�ki instalacyjnej nie powiod�o si�.";
     Text[ portuguese_brazilian ] = "The installation path is not available.";
-    Text[ japanese ] = "The installation path is not available.";
+    Text[ japanese ] = "ｲﾝｽﾄｰﾙﾊﾟｽは指定できませんでした。";
     Text[ korean ] = "The installation path is not available.";
     Text[ chinese_simplified ] = "无法确定安装路径。";
     Text[ chinese_traditional ] = "無法確定這個安裝路徑。";
@@ -269,10 +269,10 @@ String STR_BOOTSTRAP_ERR_INTERNAL
     Text[ swedish ] = "Det har uppst�tt ett internt fel.";
     Text[ polish ] = "Wyst�pi� wewn�trzny b��d.";
     Text[ portuguese_brazilian ] = "An internal failure occurred.";
-    Text[ japanese ] = "An internal failure occurred.";
+    Text[ japanese ] = "内部ｴﾗｰが発生しました。";
     Text[ korean ] = "An internal failure occurred.";
     Text[ chinese_simplified ] = "出现了一个内部的错误。";
-    Text[ chinese_traditional ] = "發生一個不明的内部錯誤。";
+    Text[ chinese_traditional ] = "發生一個不明的內部錯誤。";
     Text[ turkish ] = "An internal failure occurred.";
     Text[ arabic ] = "An internal failure occurred.";
     Text[ catalan ] = "An internal failure occurred.";
@@ -295,7 +295,7 @@ String STR_BOOTSTRAP_ERR_FILE_CORRUPT
     Text[ swedish ] = "Konfigurationsfilen \"$1\" �r skadad.";
     Text[ polish ] = "Plik konfiguracyjny \"$1\" jest uszkodzony.";
     Text[ portuguese_brazilian ] = "The configuration file \"$1\" is corrupt.";
-    Text[ japanese ] = "The configuration file \"$1\" is corrupt.";
+    Text[ japanese ] = "設定ﾌｧｲﾙ \"$1\" は破損しています。";
     Text[ korean ] = "The configuration file \"$1\" is corrupt.";
     Text[ chinese_simplified ] = "配置文件 \"$1\" 已经损坏。";
     Text[ chinese_traditional ] = "配置檔案 \"$1\" 已經損壞。";
@@ -321,7 +321,7 @@ String STR_BOOTSTRAP_ERR_FILE_MISSING
     Text[ swedish ] = "Konfigurationsfilen \"$1\" hittades inte.";
     Text[ polish ] = "Nie znaleziono pliku konfiguracyjnego \"$1\".";
     Text[ portuguese_brazilian ] = "The configuration file \"$1\" is missing.";
-    Text[ japanese ] = "The configuration file \"$1\" is missing.";
+    Text[ japanese ] = "設定ﾌｧｲﾙ \"$1\" はありません。";
     Text[ korean ] = "The configuration file \"$1\" is missing.";
     Text[ chinese_simplified ] = "无法找到配置文件 \"$1\" 。";
     Text[ chinese_traditional ] = "沒有找到配置檔案 \"$1\" 。";
@@ -347,7 +347,7 @@ String STR_BOOTSTRAP_ERR_NO_SUPPORT
     Text[ swedish ] = "Konfigurationsfilen \"$1\" underst�der inte den h�r versionen.";
     Text[ polish ] = "Plik konfiguracyjny \"$1\" nie obs�uguje danej wersji.";
     Text[ portuguese_brazilian ] = "The main configuration file \"$1\" does not support the current version.";
-    Text[ japanese ] = "The main configuration file \"$1\" does not support the current version.";
+    Text[ japanese ] = "設定ﾌｧｲﾙ \"$1\" はこのﾊﾞｰｼﾞｮﾝを支援しません。";
     Text[ korean ] = "The main configuration file \"$1\" does not support the current version.";
     Text[ chinese_simplified ] = "配置文件 \"$1\" 不支持这个版本。";
     Text[ chinese_traditional ] = "配置檔案 \"$1\" 不支援這個版本。";
@@ -373,7 +373,7 @@ String STR_BOOTSTRAP_ERR_NO_SERVICE
     Text[ swedish ] = "Komponenthanteraren �r inte tillg�nglig.";
     Text[ polish ] = "Brak dost�pu do mened�era komponent�w.";
     Text[ portuguese_brazilian ] = "The service manager is not available.";
-    Text[ japanese ] = "The service manager is not available.";
+    Text[ japanese ] = "ｺﾝﾎﾟｰﾈﾝﾄﾏﾈｰｼﾞｬｰは使用できません。";
     Text[ korean ] = "The service manager is not available.";
     Text[ chinese_simplified ] = "无法使用程序元件管理器。";
     Text[ chinese_traditional ] = "程式元件管理員不存在。";
@@ -399,7 +399,7 @@ String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE
     Text[ swedish ] = "Det g�r inte att skapa konfigurationshanteraren.";
     Text[ polish ] = "Utworzenie mened�era konfiguracyjnego nie jest mo�liwe.";
     Text[ portuguese_brazilian ] = "The configuration service is not available.";
-    Text[ japanese ] = "The configuration service is not available.";
+    Text[ japanese ] = "設定ﾏﾈｰｼﾞｬｰは作成できません。";
     Text[ korean ] = "The configuration service is not available.";
     Text[ chinese_simplified ] = "无法生成配置服务管理器。";
     Text[ chinese_traditional ] = "無法建立配置管理員。";
@@ -425,7 +425,7 @@ String STR_ASK_START_SETUP_REPAIR
     Text[ swedish ] = "Ska setupprogrammet startas s� att din installation kan repareras?";
     Text[ polish ] = "Uruchomi� aplikacj� instalacyjn� w celu naprawy zainstalowanego programu?";
     Text[ portuguese_brazilian ] = "Start setup application to repair installation?";
-    Text[ japanese ] = "Start setup application to repair installation?";
+    Text[ japanese ] = "ｲﾝｽﾄｰﾙの修復をするのにｾｯﾄｱｯﾌﾟｱﾌﾟﾘｹｰｼｮﾝを開始しますか。";
     Text[ korean ] = "Start setup application to repair installation?";
     Text[ chinese_simplified ] = "要启动安装程序来修补您原先的安装？";
     Text[ chinese_traditional ] = "要啓動安裝程式，修復已經安裝的應用程式？";
@@ -451,7 +451,7 @@ String STR_ASK_START_SETUP
     Text[ swedish ] = "Ska setupprogrammet startas s� att din installation kan kontrolleras?";
     Text[ polish ] = "Uruchomi� aplikacj� instalacyjn� w celu sprawdzenia zainstalowanego programu?";
     Text[ portuguese_brazilian ] = "Start setup application to check installation?";
-    Text[ japanese ] = "Start setup application to check installation?";
+    Text[ japanese ] = "ｲﾝｽﾄｰﾙを確認するのにｾｯﾄｱｯﾌﾟｱﾌﾟﾘｹｰｼｮﾝを開始しますか。";
     Text[ korean ] = "Start setup application to check installation?";
     Text[ chinese_simplified ] = "要启动安装程序来检查您原先的安装？";
     Text[ chinese_traditional ] = "要啓動安裝程式，檢查已安裝的應用程式？";
@@ -477,7 +477,7 @@ String STR_SETUP_ERR_CANNOT_START
     Text[ swedish ] = "Det gick inte att starta setupprogrammet automatiskt! Starta det manuellt.";
     Text[ polish ] = "Automatyczne uruchomienie aplikacji instalacyjnej nie powiod�o si�! Nale�y uruchomi� j� r�cznie.";
     Text[ portuguese_brazilian ] = "Couldn't start setup application! Please start it manually.";
-    Text[ japanese ] = "Couldn't start setup application! Please start it manually.";
+    Text[ japanese ] = "ｾｯﾄｱｯﾌﾟｱﾌﾟﾘｹｰｼｮﾝは自動開始できませんでした。手動で開始してください。";
     Text[ korean ] = "Couldn't start setup application! Please start it manually.";
     Text[ chinese_simplified ] = "无法自动启动安装程序！请手动启动。";
     Text[ chinese_traditional ] = "無法自動啓動安裝程式！請手動啓動安裝程式。";
@@ -488,3 +488,4 @@ String STR_SETUP_ERR_CANNOT_START
 
 
 
+