[PATCH 2/2] Revert prev. Hack, as Bug 10000 is still present.

Detlef Riekenberg wine.dev at web.de
Thu Apr 1 11:16:42 CDT 2010


With greeting from the current day.

--
By by ... Detlef
---
 programs/wineboot/wineboot.c     |    2 --
 programs/wineboot/wineboot_De.rc |    2 +-
 programs/wineboot/wineboot_En.rc |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 2e318e1..32ac3ac 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1170,8 +1170,6 @@ int main( int argc, char *argv[] )
         ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE );
         start_services_process();
     }
-
-    update = 1; /* Fix Bug 10000 */
     if (init || update) update_wineprefix( update );
 
     create_volatile_environment_registry_key();
diff --git a/programs/wineboot/wineboot_De.rc b/programs/wineboot/wineboot_De.rc
index faf369f..2bfc03d 100644
--- a/programs/wineboot/wineboot_De.rc
+++ b/programs/wineboot/wineboot_De.rc
@@ -45,6 +45,6 @@ CAPTION "Wine"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_WAITICON, 3, 3, 10, 10
-    LTEXT "Die Weltherrschaft von Windows wird an Wine übergeben, bitte warten...",
+    LTEXT "Die Konfiguration von Wine in %s wird aktualisiert, bitte warten...",
           IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
 END
diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc
index 7c87a62..2b6720b 100644
--- a/programs/wineboot/wineboot_En.rc
+++ b/programs/wineboot/wineboot_En.rc
@@ -42,6 +42,6 @@ CAPTION "Wine"
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON "", IDC_WAITICON, 3, 3, 10, 10
-    LTEXT "World domination is moving from Windows to Wine, please wait...",
+    LTEXT "The Wine configuration in %s is being updated, please wait...",
           IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX
 END
-- 
1.7.0




More information about the wine-patches mailing list