Changeset 43863 in vbox for trunk/src

Timestamp:

Nov 13, 2012 2:01:19 PM (12 years ago)

Author:

vboxsync

Message:

Windows host installer: Renamed Languages directory to NLS, integrated German, French, Italian and Traditional Chinese (Taiwan); fixed corrupted + wrong codepage Traditional Chinese (Taiwan) file, fixed fr_FR typo.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (10 diffs)
• NLS (moved) (moved from trunk/src/VBox/Installer/win/Languages )
• NLS/fr_FR.wxl (modified) (1 diff)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -49 +49 @@
 # Globals and targets.
 #
-VBOX_INSTALLER_LANGUAGES  = en_US
+VBOX_INSTALLER_LANGUAGES  = de_DE en_US fr_FR it_IT zh_TW
 VBOX_INSTALLER_LANGUAGES += $(VBOX_INSTALLER_ADD_LANGUAGES)
+
+#
+# We don't have the license text in another language than English yet,
+# so just define the branding targets to use the English one for now.
+#
+$(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
+        $(eval VBOX_BRAND_$(lang)_LICENSE_RTF := $(VBOX_BRAND_LICENSE_RTF)) \
+        $(eval VBOX_BRAND_$(lang)_LANGUAGE_CODEPAGE := 1252))
+
+# Some languages need another codepage than 1252. Override them here.
+VBOX_BRAND_zh_TW_LANGUAGE_CODEPAGE := 950
 
 VBOX_PATH_WIN_INST_SRC := $(PATH_SUB_CURRENT)
@@ -92 +103 @@
 BLDDIRS += \
         $(VBOX_WIN_INST_OUT_DIR) \
-        $(VBOX_WIN_INST_OUT_DIR)/Languages/
+        $(VBOX_WIN_INST_OUT_DIR)/NLS/
 
 OTHER_CLEAN += \
@@ -101 +112 @@
         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
-                $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
-                $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
-                $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst \
                 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj \
                 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
@@ -164 +175 @@
 #
 define def_vbox_lang_xml
-$(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl: $(VBOX_PATH_WIN_INST_SRC)/Languages/$(lang).wxl | $$$$(dir $$$$@)
+$(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl: $(VBOX_PATH_WIN_INST_SRC)/NLS/$(lang).wxl | $$$$(dir $$$$@)
         $$(call MSG_GENERATE,,$$@,$$<)
         $(QUIET)$(INSTALL) -m 0644 $$< $$@
@@ -187 +198 @@
 #
 define def_vbox_license_xml
-$(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl: $(license_file) $(MAKEFILE_CURRENT) | $$$$(dir $$$$@)
+$(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl: $(license_file) $(MAKEFILE_CURRENT) | $$$$(dir $$$$@)
         $$(call MSG_GENERATE,,$$@,$$<)
         $(APPEND) -t $$@ '<?xml version="1.0" encoding="utf-8"?>'
-        $(APPEND) $$@ '<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252" Culture="$(lang)">'
+        $(APPEND) $$@ '<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="$(VBOX_BRAND_$(lang)_LANGUAGE_CODEPAGE)" Culture="$(lang)">'
 
         $(REDIRECT) -a+to $$@ -- $(ECHO_EXT) -n '<String Id=\"LicenseText\">'
@@ -286 +297 @@
 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi: \
                 $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_$(lang).wixobj \
-                $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
-                $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
                 $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \
                 $(VBOX_SVN_REV_KMK) \
@@ -295 +306 @@
         $(QUIET)$(RM) -f $$(wildcard $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_BASE)-r*_$(lang).msi)
         $(VBOX_PATH_WIX)/light.exe -nologo \
-                -loc $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
-                -loc $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
+                -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
+                -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/License_$(lang).wxl \
                 -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \
                 -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \
@@ -305 +316 @@
                         $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
                         $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
-        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst
+        $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
         $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)))
 endef
@@ -517 +528 @@
 #
 define def_vbox_create_mst
-.NOTPARALLEL: $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst
-$(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst: \
+.NOTPARALLEL: $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
+$(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst: \
                 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi \
                 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi \
@@ -551 +562 @@
                 $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
                 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
-                $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \
+                $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst) \
                 $(VBOX_SVN_REV_KMK) \
                 | $$(dir $$@)

trunk/src/VBox/Installer/win/NLS/fr_FR.wxl

@@ -59 +59 @@
     <String Id="Only32Bit">Cette application ne marche que sur des systèmes Windows 32-bit. Veuillez installer la version 64-bit de [ProductName]!</String>
     <String Id="Only64Bit">Cette application ne marche que sur des systèmes Windows 64-bit. Veuillez installer la version 32-bit de [ProductName]!</String>
-    <String Id="InnotekFound">Vous avez une ancienne installation de Sun VirtualBox sur cette machine. Il vous faudra la désinstaller avant de pouvoir installer [ProductName].</String>
     <String Id="InnotekFound">Vous avez une ancienne installation de innotek VirtualBox sur cette machine. Il vous faudra la désinstaller avant de pouvoir installer [ProductName].</String>