diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index dcea59a..3e7dc79 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -22,23 +22,6 @@ MSIBUILD_IS_LOCALIZEABLE=1 -###################################################################### -# AppSearch - -All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" - -"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ - move /y << $@ > NUL -Property Signature_ -s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) -AppSearch Property Signature_ -OLDZRCOLADIR cllibZRCola10u_vc100.dll.$(PLAT) -OLDZRCOLADIR cllibZRColaUI10u_vc100.dll.$(PLAT) -OLDZRCOLADIR clZRCola.exe.$(PLAT) -< NUL -###################################################################### -# CompLocator - -All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" - -"$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ - move /y << $@ > NUL -Signature_ ComponentId Type -s$(MSIBUILD_LENGTH_ID) s38 I2 -CompLocator Signature_ -!IF "$(PLAT)" == "Win32" -cllibZRCola10u_vc100.dll.Win32 {2251DF13-062A-4955-BEEE-CAB1A7041E93} 1 -cllibZRColaUI10u_vc100.dll.Win32 {D9A5BF44-DDFE-4A22-89F4-14D291581829} 1 -clZRCola.exe.Win32 {F30B6545-6203-4B7D-8575-85245A0F90E5} 1 -!ENDIF -!IF "$(PLAT)" == "x64" -cllibZRCola10u_vc100.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} 1 -cllibZRColaUI10u_vc100.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} 1 -clZRCola.exe.x64 {D45B105D-2303-459A-AF4B-52AC3AAD5510} 1 -!ENDIF -< NUL -Component ComponentId Directory_ Attributes Condition KeyPath -s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) -Component Component -!IF "$(PLAT)" == "Win32" -complibZRCola.dll.Win32 {2251DF13-062A-4955-BEEE-CAB1A7041E93} ZRCOLABINDIR 0 filelibZRCola.dll.Win32 -complibZRColaUI.dll.Win32 {D9A5BF44-DDFE-4A22-89F4-14D291581829} ZRCOLABINDIR 0 filelibZRColaUI.dll.Win32 -compZRCola.exe.Win32 {F30B6545-6203-4B7D-8575-85245A0F90E5} ZRCOLABINDIR 0 fileZRCola.exe.Win32 -!ENDIF -!IF "$(PLAT)" == "x64" -complibZRCola.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} ZRCOLABINDIR 256 filelibZRCola.dll.x64 -complibZRColaUI.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} ZRCOLABINDIR 256 filelibZRColaUI.dll.x64 -compZRCola.exe.x64 {D45B105D-2303-459A-AF4B-52AC3AAD5510} ZRCOLABINDIR 256 fileZRCola.exe.x64 -!ENDIF -< NUL -Feature Feature_Parent Title Description Display Level Directory_ Attributes -s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_ID) i2 -1252 Feature Feature -featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 -< NUL - -"It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po" - rcxgettext.exe idtp $@ $** - -"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl_SI.po" - rcxgettext.exe idtp $@ $** - - -###################################################################### -# FeatureComponents - -All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" - -"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" - -if exist $@ del /f /q $@ - move /y << $@ > NUL -Feature_ Component_ -s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) -FeatureComponents Feature_ Component_ -featZRCola complibZRCola.dll.$(PLAT) -featZRCola complibZRColaUI.dll.$(PLAT) -featZRCola compZRCola.exe.$(PLAT) -< NUL -File Component_ FileName FileSize Version Language Attributes Sequence -s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 -File File -!IF "$(PLAT)" == "Win32" -!IF "$(CFG)" == "Release" -filelibZRCola.dll.Win32 complibZRCola.dll.Win32 LIBZRC~1.DLL|libZRCola10u_vc100.dll 0 0 1536 1 -filelibZRColaUI.dll.Win32 complibZRColaUI.dll.Win32 LIBZRC~2.DLL|libZRColaUI10u_vc100.dll 0 0 1536 1 -!ENDIF -!IF "$(CFG)" == "Debug" -filelibZRCola.dll.Win32 complibZRCola.dll.Win32 LIBZRC~3.DLL|libZRCola10ud_vc100.dll 0 0 1536 1 -filelibZRColaUI.dll.Win32 complibZRColaUI.dll.Win32 LIBZRC~4.DLL|libZRColaUI10ud_vc100.dll 0 0 1536 1 -!ENDIF -!ENDIF -!IF "$(PLAT)" == "x64" -!IF "$(CFG)" == "Release" -filelibZRCola.dll.x64 complibZRCola.dll.x64 LIBZRC~5.DLL|libZRCola10u_vc100_x64.dll 0 0 1536 1 -filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~6.DLL|libZRColaUI10u_vc100_x64.dll 0 0 1536 1 -!ENDIF -!IF "$(CFG)" == "Debug" -filelibZRCola.dll.x64 complibZRCola.dll.x64 LIBZRC~7.DLL|libZRCola10ud_vc100_x64.dll 0 0 1536 1 -filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll 0 0 1536 1 -!ENDIF -!ENDIF -fileZRCola.exe.$(PLAT) compZRCola.exe.$(PLAT) AL_MON~1.EXE|ZRCola.exe 0 0 1536 1 -< NUL -Name Data -s$(MSIBUILD_LENGTH_ID) v0 -Icon Name -iconZRCola.ico ZRCola.ico -< NUL - - ###################################################################### # InstallExecuteSequence @@ -371,48 +207,6 @@ SecureCustomProperties OLDPRODUCTFOUND;NEWPRODUCTFOUND < NUL -FileKey Component_ FileName DirProperty InstallMode -s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) L255 s$(MSIBUILD_LENGTH_ID) i2 -RemoveFile FileKey -rmfiZRCola compZRCola.exe.$(PLAT) ZRColaShortcutDir 2 -< NUL -Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir -s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S255 L255 I2 S$(MSIBUILD_LENGTH_ID) I2 I2 S$(MSIBUILD_LENGTH_ID) -1252 Shortcut Shortcut -shctZRCola ZRColaShortcutDir ZRCola compZRCola.exe.$(PLAT) featZRCola Authentication progress real time monitor iconZRCola.ico ZRCOLABINDIR -< NUL - -"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po" - rcxgettext.exe idtp $@ $** - -"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl_SI.po" - rcxgettext.exe idtp $@ $** - - ###################################################################### # Build MSM module! ###################################################################### diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index 7bbccc5..8699123 100644 --- a/MSI/ZRCola/locale/sl_SI.po +++ b/MSI/ZRCola/locale/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-12 13:18+0100\n" +"POT-Creation-Date: 2016-03-12 14:44+0100\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -20,7 +20,7 @@ msgstr "" # 1. Translate as a separate RTF document. # 2. Remove ALL line breaks from RTF file. # 3. Paste translation. -#: En.Win32.Debug.Control-2.idtx:4 En.Win32.Release.Control-2.idtx:4 En.x64.Debug.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 +#: En.Win32.Release.Control-2.idtx:4 En.x64.Release.Control-2.idtx:4 msgid "" "{\\rtf1\\adeflang1025\\ansi" "\\ansicpg1250\\uc1\\adeff0\\deff0\\stshfdbch31505\\stshfloch31506\\stshfhich31506\\stshfbi31507\\deflang1060\\deflangfe1060\themelang1060\themelangfe0\themelangcs0{\\fonttbl{\\f0\\fbidi " @@ -1493,30 +1493,23 @@ msgstr "" "0105000002000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000c0ef044c8850cf01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}" # Windows charset for this language (decimal) -#: En.Win32.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Shortcut-2.idtx:3 En.Win32.Release.Control-2.idtx:3 -#: En.Win32.Release.Directory-2.idtx:3 En.Win32.Release.Feature-2.idtx:3 En.Win32.Release.Shortcut-2.idtx:3 En.x64.Debug.Control-2.idtx:3 En.x64.Debug.Directory-2.idtx:3 -#: En.x64.Debug.Feature-2.idtx:3 En.x64.Debug.Shortcut-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 En.x64.Release.Feature-2.idtx:3 -#: En.x64.Release.Shortcut-2.idtx:3 +#: En.Win32.Release.Control-2.idtx:3 En.Win32.Release.Directory-2.idtx:3 En.x64.Release.Control-2.idtx:3 En.x64.Release.Directory-2.idtx:3 msgid "1252" msgstr "1250" -#: En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 -msgid "Authentication progress real time monitor" -msgstr "Nadzira postopek overovljanja v realnem času" - -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 En.x64.Release.Feature-2.idtx:4 -msgid "Input system for linguistic use" -msgstr "Vnašalni sistem za jezikoslovno rabo" - -#: En.Win32.Debug.Feature-2.idtx:4 En.Win32.Debug.Shortcut-2.idtx:4 En.Win32.Release.Feature-2.idtx:4 En.Win32.Release.Shortcut-2.idtx:4 En.x64.Debug.Feature-2.idtx:4 -#: En.x64.Debug.Shortcut-2.idtx:4 En.x64.Release.Feature-2.idtx:4 En.x64.Release.Shortcut-2.idtx:4 -msgid "ZRCola" -msgstr "ZRCola" - -#: En.Win32.Debug.Directory-2.idtx:4 En.Win32.Release.Directory-2.idtx:4 En.x64.Debug.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 +#: En.Win32.Release.Directory-2.idtx:4 En.x64.Release.Directory-2.idtx:4 msgid "ZRCola:." msgstr "ZRCola:." +#~ msgid "Authentication progress real time monitor" +#~ msgstr "Nadzira postopek overovljanja v realnem času" + +#~ msgid "Input system for linguistic use" +#~ msgstr "Vnašalni sistem za jezikoslovno rabo" + +#~ msgid "ZRCola" +#~ msgstr "ZRCola" + #~ msgid "EAP-PEAP" #~ msgstr "EAP-PEAP" diff --git a/MSI/include/MSIBuildCfg.mak b/MSI/include/MSIBuildCfg.mak index fa44c0b..5a469ef 100644 Binary files a/MSI/include/MSIBuildCfg.mak and b/MSI/include/MSIBuildCfg.mak differ diff --git a/ZRCola/MSIBuild/.gitignore b/ZRCola/MSIBuild/.gitignore new file mode 100644 index 0000000..80ea676 --- /dev/null +++ b/ZRCola/MSIBuild/.gitignore @@ -0,0 +1,9 @@ +/*-1.idt +/*-2.idt +/*-2.idtx +/*.Binary-1 +/*.Binary-2 +/*.Icon-1 +/*.Icon-2 +/*.lst +/*.msm diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile new file mode 100644 index 0000000..6bea13a --- /dev/null +++ b/ZRCola/MSIBuild/Makefile @@ -0,0 +1,205 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +!INCLUDE "..\..\MSI\include\MSIBuildCfg.mak" + +MSIBUILD_IS_LOCALIZEABLE=1 + + +###################################################################### +# AppSearch + +All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" + +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +Property Signature_ +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) +AppSearch Property Signature_ +OLDZRCOLADIR clZRCola.exe.$(PLAT) +< NUL +Signature_ ComponentId Type +s$(MSIBUILD_LENGTH_ID) s38 I2 +CompLocator Signature_ +!IF "$(PLAT)" == "Win32" +clZRCola.exe.Win32 {F30B6545-6203-4B7D-8575-85245A0F90E5} 1 +!ENDIF +!IF "$(PLAT)" == "x64" +clZRCola.exe.x64 {D45B105D-2303-459A-AF4B-52AC3AAD5510} 1 +!ENDIF +< NUL +Component ComponentId Directory_ Attributes Condition KeyPath +s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) +Component Component +!IF "$(PLAT)" == "Win32" +compZRCola.exe.Win32 {F30B6545-6203-4B7D-8575-85245A0F90E5} ZRCOLABINDIR 0 fileZRCola.exe.Win32 +!ENDIF +!IF "$(PLAT)" == "x64" +compZRCola.exe.x64 {D45B105D-2303-459A-AF4B-52AC3AAD5510} ZRCOLABINDIR 256 fileZRCola.exe.x64 +!ENDIF +< NUL +Feature Feature_Parent Title Description Display Level Directory_ Attributes +s$(MSIBUILD_LENGTH_ID) S$(MSIBUILD_LENGTH_ID) L64 L255 I2 i2 S$(MSIBUILD_LENGTH_ID) i2 +1252 Feature Feature +featZRCola ZRCola Input system for linguistic use 1 1 ZRCOLADIR 8 +< NUL + +"It.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\it_IT.po" + rcxgettext.exe idtp $@ $** + +"Sl.$(PLAT).$(CFG).Feature-2.idt" : "En.$(PLAT).$(CFG).Feature-2.idtx" "..\locale\sl.po" + rcxgettext.exe idtp $@ $** + + +###################################################################### +# FeatureComponents + +All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" + +"$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +Feature_ Component_ +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) +FeatureComponents Feature_ Component_ +featZRCola complibZRCola.dll.$(PLAT) +featZRCola complibZRColaUI.dll.$(PLAT) +featZRCola compZRCola.exe.$(PLAT) +< NUL +File Component_ FileName FileSize Version Language Attributes Sequence +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 +File File +fileZRCola.exe.$(PLAT) compZRCola.exe.$(PLAT) ZRCola.exe 0 0 1536 1 +< NUL +Name Data +s$(MSIBUILD_LENGTH_ID) v0 +Icon Name +iconZRCola.ico ZRCola.ico +< NUL + + +###################################################################### +# RemoveFile + +All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" + +"$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\MSI\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +FileKey Component_ FileName DirProperty InstallMode +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) L255 s$(MSIBUILD_LENGTH_ID) i2 +RemoveFile FileKey +rmfiZRCola compZRCola.exe.$(PLAT) ZRColaShortcutDir 2 +< NUL +Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l128 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S255 L255 I2 S$(MSIBUILD_LENGTH_ID) I2 I2 S$(MSIBUILD_LENGTH_ID) +1252 Shortcut Shortcut +shctZRCola ZRColaShortcutDir ZRCola compZRCola.exe.$(PLAT) featZRCola Input system for linguistic use iconZRCola.ico ZRCOLABINDIR +< NUL + +"It.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\it_IT.po" + rcxgettext.exe idtp $@ $** + +"Sl.$(PLAT).$(CFG).Shortcut-2.idt" : "En.$(PLAT).$(CFG).Shortcut-2.idtx" "..\locale\sl.po" + rcxgettext.exe idtp $@ $** + + +###################################################################### +# Build MSM module! +###################################################################### + +!INCLUDE "..\..\MSI\MSIBuild\MSM.mak" diff --git a/ZRCola/locale/sl.po b/ZRCola/locale/sl.po index a1e5bf9..b8ff9b1 100644 --- a/ZRCola/locale/sl.po +++ b/ZRCola/locale/sl.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola\n" -"POT-Creation-Date: 2016-03-12 09:46+0100\n" -"PO-Revision-Date: 2016-03-12 09:47+0100\n" +"POT-Creation-Date: 2016-03-12 14:46+0100\n" +"PO-Revision-Date: 2016-03-12 14:46+0100\n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" "Language: sl_SI\n" @@ -66,10 +66,32 @@ msgstr "O progr&amu" msgid "&Help" msgstr "&Pomoč" -#: zrcolagui.h:47 +#: zrcolagui.h:47 MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 msgid "ZRCola" msgstr "ZRCola" +# Windows charset for this language (decimal) +#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 +#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3 +#: MSIBuild/En.x64.Release.Feature-2.idtx:3 +#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3 +msgid "1252" +msgstr "1250" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4 +#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4 +msgid "Input system for linguistic use" +msgstr "Vnašalni sistem za jezikoslovno rabo" + +#, fuzzy +#~ msgid "Authentication progress real time monitor" +#~ msgstr "Nadzira postopek overovljanja v realnem času" + #~ msgid "Grave\t&7" #~ msgstr "Krativec\t&7" diff --git a/lib/libZRCola/MSIBuild/.gitignore b/lib/libZRCola/MSIBuild/.gitignore new file mode 100644 index 0000000..80ea676 --- /dev/null +++ b/lib/libZRCola/MSIBuild/.gitignore @@ -0,0 +1,9 @@ +/*-1.idt +/*-2.idt +/*-2.idtx +/*.Binary-1 +/*.Binary-2 +/*.Icon-1 +/*.Icon-2 +/*.lst +/*.msm diff --git a/lib/libZRCola/MSIBuild/Makefile b/lib/libZRCola/MSIBuild/Makefile new file mode 100644 index 0000000..e03efe5 --- /dev/null +++ b/lib/libZRCola/MSIBuild/Makefile @@ -0,0 +1,112 @@ +# +# Copyright 1991-2016 Amebis +# +# This file is part of ZRCola. +# +# ZRCola is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ZRCola is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ZRCola. If not, see . +# + +!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak" + + +###################################################################### +# AppSearch + +All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" + +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +Property Signature_ +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) +AppSearch Property Signature_ +OLDZRCOLADIR cllibZRCola10u_vc100.dll.$(PLAT) +< NUL +Signature_ ComponentId Type +s$(MSIBUILD_LENGTH_ID) s38 I2 +CompLocator Signature_ +!IF "$(PLAT)" == "Win32" +cllibZRCola10u_vc100.dll.Win32 {2251DF13-062A-4955-BEEE-CAB1A7041E93} 1 +!ENDIF +!IF "$(PLAT)" == "x64" +cllibZRCola10u_vc100.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} 1 +!ENDIF +< NUL +Component ComponentId Directory_ Attributes Condition KeyPath +s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) +Component Component +!IF "$(PLAT)" == "Win32" +complibZRCola.dll.Win32 {2251DF13-062A-4955-BEEE-CAB1A7041E93} ZRCOLABINDIR 0 filelibZRCola.dll.Win32 +!ENDIF +!IF "$(PLAT)" == "x64" +complibZRCola.dll.x64 {23078D23-1397-4FD7-BB32-E012FEF8645A} ZRCOLABINDIR 256 filelibZRCola.dll.x64 +!ENDIF +< NUL +File Component_ FileName FileSize Version Language Attributes Sequence +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 +File File +!IF "$(PLAT)" == "Win32" +!IF "$(CFG)" == "Release" +filelibZRCola.dll.Win32 complibZRCola.dll.Win32 LIBZRC~1.DLL|libZRCola10u_vc100.dll 0 0 1536 1 +!ENDIF +!IF "$(CFG)" == "Debug" +filelibZRCola.dll.Win32 complibZRCola.dll.Win32 LIBZRC~3.DLL|libZRCola10ud_vc100.dll 0 0 1536 1 +!ENDIF +!ENDIF +!IF "$(PLAT)" == "x64" +!IF "$(CFG)" == "Release" +filelibZRCola.dll.x64 complibZRCola.dll.x64 LIBZRC~5.DLL|libZRCola10u_vc100_x64.dll 0 0 1536 1 +!ENDIF +!IF "$(CFG)" == "Debug" +filelibZRCola.dll.x64 complibZRCola.dll.x64 LIBZRC~7.DLL|libZRCola10ud_vc100_x64.dll 0 0 1536 1 +!ENDIF +!ENDIF +<. +# + +!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak" + + +###################################################################### +# AppSearch + +All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" + +"$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak" + -if exist $@ del /f /q $@ + move /y << $@ > NUL +Property Signature_ +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) +AppSearch Property Signature_ +OLDZRCOLADIR cllibZRColaUI10u_vc100.dll.$(PLAT) +< NUL +Signature_ ComponentId Type +s$(MSIBUILD_LENGTH_ID) s38 I2 +CompLocator Signature_ +!IF "$(PLAT)" == "Win32" +cllibZRColaUI10u_vc100.dll.Win32 {D9A5BF44-DDFE-4A22-89F4-14D291581829} 1 +!ENDIF +!IF "$(PLAT)" == "x64" +cllibZRColaUI10u_vc100.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} 1 +!ENDIF +< NUL +Component ComponentId Directory_ Attributes Condition KeyPath +s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) +Component Component +!IF "$(PLAT)" == "Win32" +complibZRColaUI.dll.Win32 {D9A5BF44-DDFE-4A22-89F4-14D291581829} ZRCOLABINDIR 0 filelibZRColaUI.dll.Win32 +!ENDIF +!IF "$(PLAT)" == "x64" +complibZRColaUI.dll.x64 {360E78E5-9560-4C52-B806-45EDC682BB17} ZRCOLABINDIR 256 filelibZRColaUI.dll.x64 +!ENDIF +< NUL +File Component_ FileName FileSize Version Language Attributes Sequence +s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 +File File +!IF "$(PLAT)" == "Win32" +!IF "$(CFG)" == "Release" +filelibZRColaUI.dll.Win32 complibZRColaUI.dll.Win32 LIBZRC~2.DLL|libZRColaUI10u_vc100.dll 0 0 1536 1 +!ENDIF +!IF "$(CFG)" == "Debug" +filelibZRColaUI.dll.Win32 complibZRColaUI.dll.Win32 LIBZRC~4.DLL|libZRColaUI10ud_vc100.dll 0 0 1536 1 +!ENDIF +!ENDIF +!IF "$(PLAT)" == "x64" +!IF "$(CFG)" == "Release" +filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~6.DLL|libZRColaUI10u_vc100_x64.dll 0 0 1536 1 +!ENDIF +!IF "$(CFG)" == "Debug" +filelibZRColaUI.dll.x64 complibZRColaUI.dll.x64 LIBZRC~8.DLL|libZRColaUI10ud_vc100_x64.dll 0 0 1536 1 +!ENDIF +!ENDIF +<