diff --git a/MSI/MSIBuild b/MSI/MSIBuild index 69cee66..b0c4f3e 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit 69cee66ae70005f02e5e4c4c686ba4383d3a4bd1 +Subproject commit b0c4f3edf3b6da1bae21673758ae2a2679e6ea0c diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index d2d151c..05f428f 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -412,7 +412,9 @@ Media DiskId ###################################################################### # Property -All :: "$(LANG).$(PLAT).$(CFG).Property-1.idt" +All :: \ + "$(LANG).$(PLAT).$(CFG).Property-1.idt" \ + "$(LANG).$(PLAT).$(CFG).Property-2.idt" "$(LANG).$(PLAT).$(CFG).Property-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" -if exist $@ del /f /q $@ @@ -428,6 +430,35 @@ InstallMode Typical SecureCustomProperties OLDPRODUCTFOUND;NEWPRODUCTFOUND < NUL +Property Value +s$(MSIBUILD_LENGTH_ID) l0 +1252 Property Property +Manufacturer Amebis, Slovenia, E.U. +ARPCONTACT Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U. +ARPHELPTELEPHONE +386 1 8311 035 +ARPURLINFOABOUT http://www.amebis.si/ +ARPHELPLINK http://www.amebis.si/ +ARPURLUPDATEINFO http://www.amebis.si/ +< NUL + +"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\it_IT.po" + rcxgettext.exe idtp $@ $** + +"Ru.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\ru_RU.po" + rcxgettext.exe idtp $@ $** + +"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\sl_SI.po" + rcxgettext.exe idtp $@ $** + ###################################################################### # Registry diff --git a/MSI/ZRCola/locale/ZRCola.pot b/MSI/ZRCola/locale/ZRCola.pot index df95203..9de64f7 100644 --- a/MSI/ZRCola/locale/ZRCola.pot +++ b/MSI/ZRCola/locale/ZRCola.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-14 09:22+0200\n" +"POT-Creation-Date: 2016-07-15 09:29+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -782,19 +782,32 @@ msgstr "" "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss." "\\i0\\f1\\par}" +#: En.Win32.Debug.Property-2.idtx:6 En.Win32.Release.Property-2.idtx:6 En.x64.Debug.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +msgid "+386 1 8311 035" +msgstr "" + #: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 #, fuzzy msgid "00 ZRCola" msgstr "00 ZRCola" -#: En.Win32.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Registry-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.Registry-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.Registry-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.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 +#: En.Win32.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Property-2.idtx:3 En.Win32.Debug.Registry-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.Property-2.idtx:3 +#: En.Win32.Release.Registry-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.Property-2.idtx:3 En.x64.Debug.Registry-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.Property-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 #, fuzzy msgid "1252" msgstr "1250" +#: En.Win32.Debug.Property-2.idtx:5 En.Win32.Release.Property-2.idtx:5 En.x64.Debug.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5 +msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U." +msgstr "" + +#: En.Win32.Debug.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:4 En.x64.Debug.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4 +msgid "Amebis, Slovenia, E.U." +msgstr "" + #: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 #, fuzzy msgid "binUIHeader.bmp" @@ -815,6 +828,12 @@ msgstr "Pisave" msgid "Fonts used by ZRCola" msgstr "Pisave, ki jih uporablja ZRCola" +#: En.Win32.Debug.Property-2.idtx:7 En.Win32.Debug.Property-2.idtx:8 En.Win32.Debug.Property-2.idtx:9 En.Win32.Release.Property-2.idtx:7 En.Win32.Release.Property-2.idtx:8 +#: En.Win32.Release.Property-2.idtx:9 En.x64.Debug.Property-2.idtx:7 En.x64.Debug.Property-2.idtx:8 En.x64.Debug.Property-2.idtx:9 En.x64.Release.Property-2.idtx:7 +#: En.x64.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:9 +msgid "http://www.amebis.si/" +msgstr "" + #: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 #, fuzzy msgid "I &agree." diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index 6faa0ae..3d1a18a 100644 --- a/MSI/ZRCola/locale/ru_RU.po +++ b/MSI/ZRCola/locale/ru_RU.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: ZRCola MSI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-06-14 09:23+0200\n" +"POT-Creation-Date: 2016-07-15 09:29+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1516,18 +1516,31 @@ msgid "" "using the ZRCola input system (http://zrcola.zrc-sazu.si), developed at the Science and Research Centre of SAZU in Ljubljana (http://www.zrc-sazu.si) by Dr. Peter Weiss.\\f1\\par}" msgstr "" +#: En.Win32.Debug.Property-2.idtx:6 En.Win32.Release.Property-2.idtx:6 En.x64.Debug.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +msgid "+386 1 8311 035" +msgstr "+386 1 8311 035" + #: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 msgid "00 ZRCola" msgstr "00 ZRCola" # 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.Registry-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.Registry-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.Registry-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.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 +#: En.Win32.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Property-2.idtx:3 En.Win32.Debug.Registry-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.Property-2.idtx:3 +#: En.Win32.Release.Registry-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.Property-2.idtx:3 En.x64.Debug.Registry-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.Property-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1251" +#: En.Win32.Debug.Property-2.idtx:5 En.Win32.Release.Property-2.idtx:5 En.x64.Debug.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5 +msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U." +msgstr "Amebis, p. p. 69, SI-1241 Kamnik, Словения, ЕС" + +#: En.Win32.Debug.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:4 En.x64.Debug.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4 +msgid "Amebis, Slovenia, E.U." +msgstr "Amebis, Словения, ЕС" + #: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" @@ -1544,6 +1557,12 @@ msgstr "" msgid "Fonts used by ZRCola" msgstr "" +#: En.Win32.Debug.Property-2.idtx:7 En.Win32.Debug.Property-2.idtx:8 En.Win32.Debug.Property-2.idtx:9 En.Win32.Release.Property-2.idtx:7 En.Win32.Release.Property-2.idtx:8 +#: En.Win32.Release.Property-2.idtx:9 En.x64.Debug.Property-2.idtx:7 En.x64.Debug.Property-2.idtx:8 En.x64.Debug.Property-2.idtx:9 En.x64.Release.Property-2.idtx:7 +#: En.x64.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:9 +msgid "http://www.amebis.si/" +msgstr "http://www.amebis.si/" + #: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." msgstr "" diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index ae3ffa3..e6efe1f 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-06-14 09:23+0200\n" +"POT-Creation-Date: 2016-07-15 09:26+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \n" @@ -1520,18 +1520,31 @@ msgstr "" "pripravljeno z vna\\'9aalnim sistemom ZRCola (http://zrcola.zrc-sazu.si), ki ga je na Znanstvenoraziskovalnem centru SAZU v Ljubljani (http://www.zrc-sazu.si) razvil dr. Peter Weiss." "\\i0\\f1\\par}" +#: En.Win32.Debug.Property-2.idtx:6 En.Win32.Release.Property-2.idtx:6 En.x64.Debug.Property-2.idtx:6 En.x64.Release.Property-2.idtx:6 +msgid "+386 1 8311 035" +msgstr "(01) 8311 035" + #: En.Win32.Debug.Feature-2.idtx:5 En.Win32.Release.Feature-2.idtx:5 En.x64.Debug.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5 msgid "00 ZRCola" msgstr "00 ZRCola" # 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.Registry-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.Registry-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.Registry-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.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 +#: En.Win32.Debug.Control-2.idtx:3 En.Win32.Debug.Directory-2.idtx:3 En.Win32.Debug.Feature-2.idtx:3 En.Win32.Debug.Property-2.idtx:3 En.Win32.Debug.Registry-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.Property-2.idtx:3 +#: En.Win32.Release.Registry-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.Property-2.idtx:3 En.x64.Debug.Registry-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.Property-2.idtx:3 En.x64.Release.Registry-2.idtx:3 En.x64.Release.Shortcut-2.idtx:3 msgid "1252" msgstr "1250" +#: En.Win32.Debug.Property-2.idtx:5 En.Win32.Release.Property-2.idtx:5 En.x64.Debug.Property-2.idtx:5 En.x64.Release.Property-2.idtx:5 +msgid "Amebis, p. p. 69, SI-1241 Kamnik, Slovenia, E.U." +msgstr "Amebis, p. p. 69, 1241 Kamnik" + +#: En.Win32.Debug.Property-2.idtx:4 En.Win32.Release.Property-2.idtx:4 En.x64.Debug.Property-2.idtx:4 En.x64.Release.Property-2.idtx:4 +msgid "Amebis, Slovenia, E.U." +msgstr "Amebis, d. o. o., Kamnik" + #: En.Win32.Debug.Control-2.idtx:5 En.Win32.Release.Control-2.idtx:5 En.x64.Debug.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5 msgid "binUIHeader.bmp" msgstr "binUIHeader.bmp" @@ -1548,6 +1561,12 @@ msgstr "Pisave" msgid "Fonts used by ZRCola" msgstr "Pisave, ki jih uporablja ZRCola" +#: En.Win32.Debug.Property-2.idtx:7 En.Win32.Debug.Property-2.idtx:8 En.Win32.Debug.Property-2.idtx:9 En.Win32.Release.Property-2.idtx:7 En.Win32.Release.Property-2.idtx:8 +#: En.Win32.Release.Property-2.idtx:9 En.x64.Debug.Property-2.idtx:7 En.x64.Debug.Property-2.idtx:8 En.x64.Debug.Property-2.idtx:9 En.x64.Release.Property-2.idtx:7 +#: En.x64.Release.Property-2.idtx:8 En.x64.Release.Property-2.idtx:9 +msgid "http://www.amebis.si/" +msgstr "http://www.amebis.si/" + #: En.Win32.Debug.Control-2.idtx:10 En.Win32.Release.Control-2.idtx:10 En.x64.Debug.Control-2.idtx:10 En.x64.Release.Control-2.idtx:10 msgid "I &agree." msgstr "&Strinjam se." diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index d7ed8a6..03c452a 100644 Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ