diff --git a/.gitattributes b/.gitattributes index d8c0ed7..ee0e487 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,11 +3,13 @@ MSICACert/L10N/sl_SI.po -text MSICACert/MSICACert.cpp -text MSICACert/MSICACert.h -text -MSICACert/MSICACert.rc -text svneol=unset#unset -MSICACert/MSICACert.rcx -text svneol=unset#unset MSICACert/MSICACert.vcxproj -text svneol=unset#text/xml MSICACert/MSICACert.vcxproj.filters -text svneol=unset#text/xml MSICACert/msm/Makefile -text +MSICACert/msm/build_all.bat -text +MSICACert/msm/clean_all.bat -text +MSICACert/res/MSICACert.rc -text svneol=unset#unset +MSICACert/res/MSICACert.rcx -text svneol=unset#unset MSICACert/stdafx.cpp -text MSICACert/stdafx.h -text MSICALib/L10N/sl_SI.po -text @@ -20,16 +22,20 @@ MSICALib/OpFile.cpp -text MSICALib/OpReg.cpp -text MSICALib/OpTS.cpp -text MSICALib/msm/Makefile -text +MSICALib/msm/build_all.bat -text +MSICALib/msm/clean_all.bat -text MSICALib/stdafx.cpp -text MSICALib/stdafx.h -text MSICATS/L10N/sl_SI.po -text MSICATS/MSICATS.cpp -text MSICATS/MSICATS.h -text -MSICATS/MSICATS.rc -text svneol=unset#unset -MSICATS/MSICATS.rcx -text svneol=unset#unset MSICATS/MSICATS.vcxproj -text svneol=unset#text/xml MSICATS/MSICATS.vcxproj.filters -text svneol=unset#text/xml MSICATS/msm/Makefile -text +MSICATS/msm/build_all.bat -text +MSICATS/msm/clean_all.bat -text +MSICATS/res/MSICATS.rc -text svneol=unset#unset +MSICATS/res/MSICATS.rcx -text svneol=unset#unset MSICATS/stdafx.cpp -text MSICATS/stdafx.h -text include/Debug.props -text svneol=unset#text/xml diff --git a/MSICACert/L10N/sl_SI.po b/MSICACert/L10N/sl_SI.po index 657eb2f..610f05e 100644 --- a/MSICACert/L10N/sl_SI.po +++ b/MSICACert/L10N/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: MSICACert\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-13 11:34+0100\n" +"POT-Creation-Date: 2014-03-13 12:19+0100\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -14,58 +14,77 @@ msgstr "" "X-Poedit-KeywordsList: __\n" "X-Poedit-Basepath: ..\n" "X-Generator: Poedit 1.5.7\n" -"X-Poedit-SearchPath-0: .\n" +"X-Poedit-SearchPath-0: msm\n" +"X-Poedit-SearchPath-1: res\n" # Language Code and Windows Charset (hexadecimal) # If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. # For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: MSICACert.rcx:42 +#: res/MSICACert.rcx:42 msgid "040904e4" msgstr "042404e2" # Language Code (hexadecimal) # If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. # For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: MSICACert.rcx:60 +#: res/MSICACert.rcx:60 msgid "0x409" msgstr "0x424" # Windows charset for this language (decimal) -#: MSICACert.rcx:60 +#: res/MSICACert.rcx:60 msm/En.Win32.Debug.ActionText-2.idtx:3 +#: msm/En.Win32.Release.ActionText-2.idtx:3 +#: msm/En.x64.Debug.ActionText-2.idtx:3 msm/En.x64.Release.ActionText-2.idtx:3 msgid "1252" msgstr "1250" # The name of the constant in RC to include the resources in this language. -#: MSICACert.rcx:41 MSICACert.rcx:59 MSICACert.rcx:75 +#: res/MSICACert.rcx:41 res/MSICACert.rcx:59 res/MSICACert.rcx:75 msgid "AFX_TARG_ENU" msgstr "AFX_TARG_SLV" -#: MSICACert.rcx:44 +#: res/MSICACert.rcx:44 msgid "Amebis, d. o. o., Kamnik" msgstr "Amebis, d. o. o., Kamnik" -#: MSICACert.rcx:45 +#: res/MSICACert.rcx:45 msgid "Certificate Installation Support Library" msgstr "Podporna knjižnica za nameščanje certifikatov" -#: MSICACert.rcx:48 +#: res/MSICACert.rcx:48 msgid "Copyright © Amebis, d. o. o., Kamnik, 2012" msgstr "Vse pravice pridržane © Amebis, d. o. o., Kamnik, 2012" # Language Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: MSICACert.rcx:77 +#: res/MSICACert.rcx:77 msgid "LANG_ENGLISH" msgstr "LANG_SLOVENIAN" -#: MSICACert.rcx:47 MSICACert.rcx:49 +#: res/MSICACert.rcx:49 +msgid "MSICA" +msgstr "MSICA" + +#: res/MSICACert.rcx:47 msgid "MSICACert" msgstr "MSICACert" # Sublanguage Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: MSICACert.rcx:77 +#: res/MSICACert.rcx:77 msgid "SUBLANG_DEFAULT" msgstr "SUBLANG_DEFAULT" +#: msm/En.Win32.Debug.ActionText-2.idtx:4 +#: msm/En.Win32.Release.ActionText-2.idtx:4 +#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4 +msgid "Certificate: [1]" +msgstr "Digitalno potrdilo: [1]" + +#: msm/En.Win32.Debug.ActionText-2.idtx:4 +#: msm/En.Win32.Release.ActionText-2.idtx:4 +#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4 +msgid "Installing certificates" +msgstr "Nameščanje digitalnih potrdil" + #~ msgid "Scheduled task: [1]" #~ msgstr "Razporejeno opravilo: [1]" diff --git a/MSICACert/MSICACert.vcxproj b/MSICACert/MSICACert.vcxproj index 1a815e9..e9fa613 100644 --- a/MSICACert/MSICACert.vcxproj +++ b/MSICACert/MSICACert.vcxproj @@ -76,13 +76,13 @@ <_ProjectFileVersion>10.0.30319.1 - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true @@ -151,10 +151,10 @@ - + - + diff --git a/MSICACert/MSICACert.vcxproj.filters b/MSICACert/MSICACert.vcxproj.filters index 1145ec2..89a6b03 100644 --- a/MSICACert/MSICACert.vcxproj.filters +++ b/MSICACert/MSICACert.vcxproj.filters @@ -31,12 +31,12 @@ - + Resource Files - + Resource Files diff --git a/MSICACert/msm/Makefile b/MSICACert/msm/Makefile index c2d5639..cb07ea2 100644 --- a/MSICACert/msm/Makefile +++ b/MSICACert/msm/Makefile @@ -1,4 +1,4 @@ -!INCLUDE "..\..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -8,7 +8,7 @@ MSIBUILD_IS_LOCALIZEABLE=1 All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" -"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description @@ -54,25 +54,25 @@ TaskTrigger Task_ N ScheduledTask 1 Identifier Key of the Trigger's task. All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" -"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Description Template s$(MSIBUILD_LENGTH_ID) L0 L0 -1250 ActionText Action +1252 ActionText Action InstallCertificates Installing certificates Certificate: [1] < NUL -"It.$(CFG).$(PLAT).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po" +"It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po" rcxgettext.exe idtp $@ $** -"Sl.$(CFG).$(PLAT).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po" +"Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po" rcxgettext.exe idtp $@ $** @@ -83,7 +83,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Binary-1.idt" \ "$(LANG).$(PLAT).$(CFG).Binary-1\MSICACert.dll" -"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" "$(LANG).$(PLAT).$(CFG).Binary-1" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -92,7 +92,7 @@ Binary Name binMSICACert.dll MSICACert.dll < NUL @@ -101,7 +101,7 @@ binMSICACert.dll MSICACert.dll All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" -"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -119,7 +119,7 @@ CommitCertificates 3585 binMSICACert.dll ExecuteSequence All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" -"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -137,7 +137,7 @@ CommitCertificates 6579 All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" -"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_ @@ -151,7 +151,7 @@ ScheduledTask Task All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" -"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Trigger BeginDate EndDate StartTime StartTimeRand MinutesDuration MinutesInterval Flags Type DaysInterval WeeksInterval DaysOfTheWeek DaysOfMonth WeekOfMonth MonthsOfYear Task_ @@ -164,4 +164,4 @@ TaskTrigger Trigger # Build MSM module! ###################################################################### -!INCLUDE "..\..\MSIBuild\MSM.mak" +!INCLUDE "..\..\..\MSIBuild\MSM.mak" diff --git a/MSICACert/msm/build_all.bat b/MSICACert/msm/build_all.bat new file mode 100644 index 0000000..16b8bc7 --- /dev/null +++ b/MSICACert/msm/build_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls All LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Release PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICACert/msm/clean_all.bat b/MSICACert/msm/clean_all.bat new file mode 100644 index 0000000..b1ff08a --- /dev/null +++ b/MSICACert/msm/clean_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICACert/MSICACert.rc b/MSICACert/res/MSICACert.rc similarity index 100% rename from MSICACert/MSICACert.rc rename to MSICACert/res/MSICACert.rc diff --git a/MSICACert/MSICACert.rcx b/MSICACert/res/MSICACert.rcx similarity index 100% rename from MSICACert/MSICACert.rcx rename to MSICACert/res/MSICACert.rcx diff --git a/MSICALib/L10N/sl_SI.po b/MSICALib/L10N/sl_SI.po index 269dbcd..a63265b 100644 --- a/MSICALib/L10N/sl_SI.po +++ b/MSICALib/L10N/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: MSICALib\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 21:16+0100\n" +"POT-Creation-Date: 2014-03-13 12:16+0100\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -17,26 +17,39 @@ msgstr "" "X-Poedit-SearchPath-0: msm\n" # Windows charset for this language (decimal) -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:3 ..\msm/Sl.DebugU.x64.Error-2.idtx:3 +#: msm/En.Win32.Debug.Error-2.idtx:3 msm/En.Win32.Release.Error-2.idtx:3 +#: msm/En.x64.Debug.Error-2.idtx:3 msm/En.x64.Release.Error-2.idtx:3 msgid "1252" msgstr "1250" -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:6 ..\msm/Sl.DebugU.x64.Error-2.idtx:6 +#: msm/En.Win32.Debug.Error-2.idtx:5 msm/En.Win32.Release.Error-2.idtx:5 +#: msm/En.x64.Debug.Error-2.idtx:5 msm/En.x64.Release.Error-2.idtx:5 msgid "" -"Error [3] reading from \"[2]\" task list file. Please, contact your support " +"Error [2] creating scheduled task list. Please, contact your support " "personnel." msgstr "" -"Pri branju iz datoteke seznama opravil »[2]« je prišlo do napake [3]. " -"Obrnite se na svojo tehnično službo." +"Pri pripravi seznama razvrščenih opravil je prišlo do napake [2]. Obrnite se " +"na svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:8 ..\msm/Sl.DebugU.x64.Error-2.idtx:8 +#: msm/En.Win32.Debug.Error-2.idtx:11 msm/En.Win32.Release.Error-2.idtx:11 +#: msm/En.x64.Debug.Error-2.idtx:11 msm/En.x64.Release.Error-2.idtx:11 +msgid "" +"Error [3] creating \"[2]\" scheduled task. Please, contact your support " +"personnel." +msgstr "" +"Pri stvaritvi razporejenega opravila »[2]« je prišlo do napake [3]. Obrnite " +"se na svojo tehnično službo." + +#: msm/En.Win32.Debug.Error-2.idtx:9 msm/En.Win32.Release.Error-2.idtx:9 +#: msm/En.x64.Debug.Error-2.idtx:9 msm/En.x64.Release.Error-2.idtx:9 msgid "" "Error [3] deleting \"[2]\" file. Please, contact your support personnel." msgstr "" "Pri brisanju datoteke »[2]« je prišlo do napake [3]. Obrnite se na svojo " "tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:11 ..\msm/Sl.DebugU.x64.Error-2.idtx:11 +#: msm/En.Win32.Debug.Error-2.idtx:12 msm/En.Win32.Release.Error-2.idtx:12 +#: msm/En.x64.Debug.Error-2.idtx:12 msm/En.x64.Release.Error-2.idtx:12 msgid "" "Error [3] deleting \"[2]\" scheduled task. Please, contact your support " "personnel." @@ -44,22 +57,8 @@ msgstr "" "Pri brisanju razporejenega opravila »[2]« je prišlo do napake [3]. Obrnite " "se na svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:13 ..\msm/Sl.DebugU.x64.Error-2.idtx:13 -msgid "" -"Error [4] copying \"[2]\" scheduled task to \"[3]\". Please, contact your " -"support personnel." -msgstr "" -"Pri kopiranju razporejenega opravila »[2]« v »[3]« je prišlo do napake [4]. " -"Obrnite se na svojo tehnično službo." - -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:7 ..\msm/Sl.DebugU.x64.Error-2.idtx:7 -msgid "" -"Error [3] setting \"[2]\" parameter. Please, contact your support personnel." -msgstr "" -"Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na " -"svojo tehnično službo." - -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:12 ..\msm/Sl.DebugU.x64.Error-2.idtx:12 +#: msm/En.Win32.Debug.Error-2.idtx:13 msm/En.Win32.Release.Error-2.idtx:13 +#: msm/En.x64.Debug.Error-2.idtx:13 msm/En.x64.Release.Error-2.idtx:13 msgid "" "Error [3] enabling/disabling \"[2]\" scheduled task. Please, contact your " "support personnel." @@ -67,14 +66,43 @@ msgstr "" "Pri o(ne)mogočanju razporejenega opravila »[2]« je prišlo do napake [3]. " "Obrnite se na svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:4 ..\msm/Sl.DebugU.x64.Error-2.idtx:4 +#: msm/En.Win32.Debug.Error-2.idtx:15 msm/En.Win32.Release.Error-2.idtx:15 +#: msm/En.x64.Debug.Error-2.idtx:15 msm/En.x64.Release.Error-2.idtx:15 msgid "" -"Error opening installation package. Please, contact your support personnel." +"Error [3] installing certificate to certificate store \"[2]\". Please, " +"contact your support personnel." msgstr "" -"Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na svojo " -"tehnično službo." +"Pri nameščanju digitalnega potrdila v shrambo »[2]« je prišlo do napake [3]. " +"Obrnite se na svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:5 ..\msm/Sl.DebugU.x64.Error-2.idtx:5 +#: msm/En.Win32.Debug.Error-2.idtx:7 msm/En.Win32.Release.Error-2.idtx:7 +#: msm/En.x64.Debug.Error-2.idtx:7 msm/En.x64.Release.Error-2.idtx:7 +msgid "" +"Error [3] reading from \"[2]\" task list file. Please, contact your support " +"personnel." +msgstr "" +"Pri branju iz datoteke seznama opravil »[2]« je prišlo do napake [3]. " +"Obrnite se na svojo tehnično službo." + +#: msm/En.Win32.Debug.Error-2.idtx:16 msm/En.Win32.Release.Error-2.idtx:16 +#: msm/En.x64.Debug.Error-2.idtx:16 msm/En.x64.Release.Error-2.idtx:16 +msgid "" +"Error [3] removing certificate from certificate store \"[2]\". Please, " +"contact your support personnel." +msgstr "" +"Pri odstranjevanju digitalnega potrdila iz shrambe »[2]« je prišlo do napake " +"[3]. Obrnite se na svojo tehnično službo." + +#: msm/En.Win32.Debug.Error-2.idtx:8 msm/En.Win32.Release.Error-2.idtx:8 +#: msm/En.x64.Debug.Error-2.idtx:8 msm/En.x64.Release.Error-2.idtx:8 +msgid "" +"Error [3] setting \"[2]\" parameter. Please, contact your support personnel." +msgstr "" +"Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na " +"svojo tehnično službo." + +#: msm/En.Win32.Debug.Error-2.idtx:6 msm/En.Win32.Release.Error-2.idtx:6 +#: msm/En.x64.Debug.Error-2.idtx:6 msm/En.x64.Release.Error-2.idtx:6 msgid "" "Error [3] writing to \"[2]\" task list file. Please, contact your support " "personnel." @@ -82,7 +110,17 @@ msgstr "" "Pri pisanju v datoteko seznama opravil »[2]« je prišlo do napake [3]. " "Obrnite se na svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:9 ..\msm/Sl.DebugU.x64.Error-2.idtx:9 +#: msm/En.Win32.Debug.Error-2.idtx:14 msm/En.Win32.Release.Error-2.idtx:14 +#: msm/En.x64.Debug.Error-2.idtx:14 msm/En.x64.Release.Error-2.idtx:14 +msgid "" +"Error [4] copying \"[2]\" scheduled task to \"[3]\". Please, contact your " +"support personnel." +msgstr "" +"Pri kopiranju razporejenega opravila »[2]« v »[3]« je prišlo do napake [4]. " +"Obrnite se na svojo tehnično službo." + +#: msm/En.Win32.Debug.Error-2.idtx:10 msm/En.Win32.Release.Error-2.idtx:10 +#: msm/En.x64.Debug.Error-2.idtx:10 msm/En.x64.Release.Error-2.idtx:10 msgid "" "Error [4] moving \"[2]\" file to \"[3]\". Please, contact your support " "personnel." @@ -90,10 +128,10 @@ msgstr "" "Pri premikanju datoteke »[2]« v »[3]« je prišlo do napake [4]. Obrnite se na " "svojo tehnično službo." -#: ..\msm/Sl.DebugU.Win32.Error-2.idtx:4 +#: msm/En.Win32.Debug.Error-2.idtx:4 msm/En.Win32.Release.Error-2.idtx:4 +#: msm/En.x64.Debug.Error-2.idtx:4 msm/En.x64.Release.Error-2.idtx:4 msgid "" -"Error [2] creating scheduled task list. Please, contact your support " -"personnel." +"Error opening installation package. Please, contact your support personnel." msgstr "" -"Pri pripravi seznama razvrščenih opravil je prišlo do napake [2]. Obrnite se " -"na svojo tehnično službo." +"Pri odpiranju namestitvenega paketa je prišlo do napake. Obrnite se na svojo " +"tehnično službo." diff --git a/MSICALib/msm/Makefile b/MSICALib/msm/Makefile index 4027b1c..aeea88c 100644 --- a/MSICALib/msm/Makefile +++ b/MSICALib/msm/Makefile @@ -1,4 +1,4 @@ -!INCLUDE "..\..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -10,7 +10,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Error-1.idt" \ "$(LANG).$(PLAT).$(CFG).Error-2.idt" -"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\include\MSINast.mak" +"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Error Message @@ -18,7 +18,7 @@ i2 L0 Error Error < NUL Error Message @@ -39,16 +39,16 @@ i2 L0 2570 Error [3] removing certificate from certificate store "[2]". Please, contact your support personnel. < NUL -"It.$(CFG).$(PLAT).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\it_IT.po" +"It.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\it_IT.po" rcxgettext.exe idtp $@ $** -"Sl.$(CFG).$(PLAT).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\sl_SI.po" +"Sl.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\sl_SI.po" rcxgettext.exe idtp $@ $** @@ -56,4 +56,4 @@ i2 L0 # Build MSM module! ###################################################################### -!INCLUDE "..\..\MSIBuild\MSM.mak" +!INCLUDE "..\..\..\MSIBuild\MSM.mak" diff --git a/MSICALib/msm/build_all.bat b/MSICALib/msm/build_all.bat new file mode 100644 index 0000000..16b8bc7 --- /dev/null +++ b/MSICALib/msm/build_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls All LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Release PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICALib/msm/clean_all.bat b/MSICALib/msm/clean_all.bat new file mode 100644 index 0000000..b1ff08a --- /dev/null +++ b/MSICALib/msm/clean_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICATS/L10N/sl_SI.po b/MSICATS/L10N/sl_SI.po index 07608e4..10599af 100644 --- a/MSICATS/L10N/sl_SI.po +++ b/MSICATS/L10N/sl_SI.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: MSICATS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-13 11:35+0100\n" +"POT-Creation-Date: 2014-03-13 12:21+0100\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -14,60 +14,73 @@ msgstr "" "X-Poedit-KeywordsList: __\n" "X-Poedit-Basepath: ..\n" "X-Generator: Poedit 1.5.7\n" -"X-Poedit-SearchPath-0: .\n" +"X-Poedit-SearchPath-0: msm\n" +"X-Poedit-SearchPath-1: res\n" # Language Code and Windows Charset (hexadecimal) # If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. # For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: MSICATS.rcx:42 +#: res/MSICATS.rcx:42 msgid "040904e4" msgstr "042404e2" # Language Code (hexadecimal) # If we do not intend to provide different localization of same base language (like merging Portugal Portugeese and Brasil Portugese into the same Portugeese), use the code of Microsoft defined default sublanguage. # For example: Use LANG_PORTUGUESE + SUBLANG_DEFAULT = 0x416, although 0x416 represents Brasil Portugese (too). -#: MSICATS.rcx:60 +#: res/MSICATS.rcx:60 msgid "0x409" msgstr "0x424" # Windows charset for this language (decimal) -#: MSICATS.rcx:60 +#: res/MSICATS.rcx:60 msm/En.Win32.Debug.ActionText-2.idtx:3 +#: msm/En.Win32.Release.ActionText-2.idtx:3 +#: msm/En.x64.Debug.ActionText-2.idtx:3 msm/En.x64.Release.ActionText-2.idtx:3 msgid "1252" msgstr "1250" # The name of the constant in RC to include the resources in this language. -#: MSICATS.rcx:41 MSICATS.rcx:59 MSICATS.rcx:75 +#: res/MSICATS.rcx:41 res/MSICATS.rcx:59 res/MSICATS.rcx:75 msgid "AFX_TARG_ENU" msgstr "AFX_TARG_SLV" -#: MSICATS.rcx:44 +#: res/MSICATS.rcx:44 msgid "Amebis, d. o. o., Kamnik" msgstr "Amebis, d. o. o., Kamnik" -#: MSICATS.rcx:48 +#: res/MSICATS.rcx:48 msgid "Copyright © Amebis, d. o. o., Kamnik, 2012" msgstr "Vse pravice pridržane © Amebis, d. o. o., Kamnik, 2012" # Language Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: MSICATS.rcx:77 +#: res/MSICATS.rcx:77 msgid "LANG_ENGLISH" msgstr "LANG_SLOVENIAN" -#: MSICATS.rcx:47 MSICATS.rcx:49 +#: res/MSICATS.rcx:49 +msgid "MSICA" +msgstr "MSICA" + +#: res/MSICATS.rcx:47 msgid "MSICATS" msgstr "MSICATS" -#: MSICATS.rcx:45 +#: res/MSICATS.rcx:45 msgid "Scheduled Task Installation Support Library" msgstr "Podporna knjižnica za nameščanje načrtovanih opravil" # Sublanguage Identifier (see http://msdn.microsoft.com/en-us/library/windows/desktop/dd318693(v=vs.85).aspx) -#: MSICATS.rcx:77 +#: res/MSICATS.rcx:77 msgid "SUBLANG_DEFAULT" msgstr "SUBLANG_DEFAULT" -#~ msgid "Scheduled task: [1]" -#~ msgstr "Razporejeno opravilo: [1]" +#: msm/En.Win32.Debug.ActionText-2.idtx:4 +#: msm/En.Win32.Release.ActionText-2.idtx:4 +#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4 +msgid "Registering scheduled tasks" +msgstr "Registracija razporejenih opravil" -#~ msgid "Registering scheduled tasks" -#~ msgstr "Registracija razporejenih opravil" +#: msm/En.Win32.Debug.ActionText-2.idtx:4 +#: msm/En.Win32.Release.ActionText-2.idtx:4 +#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4 +msgid "Scheduled task: [1]" +msgstr "Razporejeno opravilo: [1]" diff --git a/MSICATS/MSICATS.vcxproj b/MSICATS/MSICATS.vcxproj index be36eaa..c323c1d 100644 --- a/MSICATS/MSICATS.vcxproj +++ b/MSICATS/MSICATS.vcxproj @@ -76,13 +76,13 @@ <_ProjectFileVersion>10.0.30319.1 - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true - ..\output\$(Configuration).$(Platform)\ + ..\output\$(Platform).$(Configuration)\ true @@ -151,10 +151,10 @@ - + - + diff --git a/MSICATS/MSICATS.vcxproj.filters b/MSICATS/MSICATS.vcxproj.filters index c2a4cdc..318df94 100644 --- a/MSICATS/MSICATS.vcxproj.filters +++ b/MSICATS/MSICATS.vcxproj.filters @@ -31,12 +31,12 @@ - + Resource Files - + Resource Files diff --git a/MSICATS/msm/Makefile b/MSICATS/msm/Makefile index d1f538c..a6225ae 100644 --- a/MSICATS/msm/Makefile +++ b/MSICATS/msm/Makefile @@ -1,4 +1,4 @@ -!INCLUDE "..\..\include\MSIBuildCfg.mak" +!INCLUDE "..\..\..\include\MSIBuildCfg.mak" MSIBUILD_IS_LOCALIZEABLE=1 @@ -8,7 +8,7 @@ MSIBUILD_IS_LOCALIZEABLE=1 All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" -"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description @@ -54,25 +54,25 @@ TaskTrigger Task_ N ScheduledTask 1 Identifier Key of the Trigger's task. All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" -"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Description Template s$(MSIBUILD_LENGTH_ID) L0 L0 -1250 ActionText Action +1252 ActionText Action InstallScheduledTasks Registering scheduled tasks Scheduled task: [1] < NUL -"It.$(CFG).$(PLAT).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po" +"It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po" rcxgettext.exe idtp $@ $** -"Sl.$(CFG).$(PLAT).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po" +"Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po" rcxgettext.exe idtp $@ $** @@ -83,7 +83,7 @@ All :: \ "$(LANG).$(PLAT).$(CFG).Binary-1.idt" \ "$(LANG).$(PLAT).$(CFG).Binary-1\MSICATS.dll" -"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" "$(LANG).$(PLAT).$(CFG).Binary-1" +"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" -if exist $@ del /f /q $@ move /y << $@ > NUL Name Data @@ -92,7 +92,7 @@ Binary Name binMSICATS.dll MSICATS.dll < NUL @@ -101,7 +101,7 @@ binMSICATS.dll MSICATS.dll All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" -"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Type Source Target @@ -119,7 +119,7 @@ CommitScheduledTasks 3585 binMSICATS.dll ExecuteSequence All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" -"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Action Condition Sequence @@ -137,7 +137,7 @@ CommitScheduledTasks 6583 All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" -"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_ @@ -151,7 +151,7 @@ ScheduledTask Task All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" -"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" ""..\..\include\MSIBuildCfg.mak"" +"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ move /y << $@ > NUL Trigger BeginDate EndDate StartTime StartTimeRand MinutesDuration MinutesInterval Flags Type DaysInterval WeeksInterval DaysOfTheWeek DaysOfMonth WeekOfMonth MonthsOfYear Task_ @@ -164,4 +164,4 @@ TaskTrigger Trigger # Build MSM module! ###################################################################### -!INCLUDE "..\..\MSIBuild\MSM.mak" +!INCLUDE "..\..\..\MSIBuild\MSM.mak" diff --git a/MSICATS/msm/build_all.bat b/MSICATS/msm/build_all.bat new file mode 100644 index 0000000..16b8bc7 --- /dev/null +++ b/MSICATS/msm/build_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls All LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls All LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls All LANG=En CFG=Release PLAT=x64 +nmake.exe /ls All LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICATS/msm/clean_all.bat b/MSICATS/msm/clean_all.bat new file mode 100644 index 0000000..b1ff08a --- /dev/null +++ b/MSICATS/msm/clean_all.bat @@ -0,0 +1,9 @@ +@echo off +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Debug PLAT=x64 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=Win32 +nmake.exe /ls Clean LANG=En CFG=Release PLAT=x64 +nmake.exe /ls Clean LANG=Sl CFG=Release PLAT=x64 diff --git a/MSICATS/MSICATS.rc b/MSICATS/res/MSICATS.rc similarity index 100% rename from MSICATS/MSICATS.rc rename to MSICATS/res/MSICATS.rc diff --git a/MSICATS/MSICATS.rcx b/MSICATS/res/MSICATS.rcx similarity index 100% rename from MSICATS/MSICATS.rcx rename to MSICATS/res/MSICATS.rcx