Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

A reboot after "00 ZRCola" font substitute installation is explained now + Updater updated to version that should not reboot after an unattended update

Browse Source
This commit is contained in:
Simon Rozman 2016-07-22 01:20:24 +02:00
parent 333a415a66
commit 96bde4740f
8 changed files with 85 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
MSI/ZRCola/Main/Binary/fontsubst.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
MSI/ZRCola/Main/Binary/fontsubst.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 51 KiB

15
MSI/ZRCola/Main/Makefile
View File

@ -27,7 +27,8 @@ MSIBUILD_IS_LOCALIZEABLE=1
All :: \
"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
"$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp"
"$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp" \
"$(LANG).$(PLAT).$(CFG).Binary-1\fontsubst.bmp"
"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
-if exist $@ del /f /q $@
@ -36,11 +37,15 @@ Name Data
s$(MSIBUILD_LENGTH_ID) v0
Binary Name
binUIHeader.bmp UIHeader.bmp
binfontsubst.bmp fontsubst.bmp
<<NOKEEP
"$(LANG).$(PLAT).$(CFG).Binary-1\UIHeader.bmp" : "Binary\UIHeader.bmp"
copy /y $** $@ > NUL
"$(LANG).$(PLAT).$(CFG).Binary-1\fontsubst.bmp" : "Binary\fontsubst.bmp"
copy /y $** $@ > NUL
######################################################################
# Component
@ -93,6 +98,11 @@ dlgDeclaration ctlDeclarationText ScrollableText 15 89 370 149 7 {\rtf1\ansi\an
dlgDeclaration ctlNote Text 15 243 370 12 196611 Note: This declaration is also available in [SimpleProductName]'s about dialog or on its website. ctlIAgree
dlgDeclaration ctlIAgree CheckBox 15 265 300 15 19 IAgreeDecl I &agree. ctlContinue
dlgDeclaration ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap
dlgFontSubstitutes ctlBannerBitmap Bitmap 0 0 400 45 1 binUIHeader.bmp ctlTitle
dlgFontSubstitutes ctlTitle Text 15 15 320 15 196611 [DlgTitleFont]"00 ZRCola" to "ZRCola" Font ctlScreenshot
dlgFontSubstitutes ctlScreenshot Bitmap 79 60 242 156 5 binfontsubst.bmp ctlText1
dlgFontSubstitutes ctlText1 Text 15 221 370 36 196611 The "00 ZRCola" font was succeeded by "ZRCola" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after the next restart. ctlContinue
dlgFontSubstitutes ctlContinue PushButton 325 265 60 20 3 &Continue ctlBannerBitmap
<<NOKEEP
"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\de_DE.po"
@ -141,6 +151,7 @@ ControlEvent Dialog_ Control_ Event Argument Condition
dlgPrepare ctlBannerBitmap SpawnDialog dlgCancel 1 1000
dlgDeclaration ctlBannerBitmap SpawnDialog dlgCancel 1 1000
dlgDeclaration ctlContinue EndDialog Return IAgreeDecl 1000
dlgFontSubstitutes ctlContinue EndDialog Return 1 1000
<<NOKEEP
@ -172,6 +183,7 @@ Dialog HCentering VCentering Width Height Attributes Title Control_First Control
s$(MSIBUILD_LENGTH_ID) i2 i2 i2 i2 I4 L128 s50 S50 S50
Dialog Dialog
dlgDeclaration 50 50 400 300 3 [Setup] [SimpleProductName] [DisplayVersion] ctlTitle ctlContinue ctlBannerBitmap
dlgFontSubstitutes 50 50 400 300 3 [Setup] [SimpleProductName] [DisplayVersion] ctlTitle ctlContinue ctlContinue
<<NOKEEP
@ -394,6 +406,7 @@ InstallUISequence Action
caSetZRCOLADIR1 OLDZRCOLADIR 1001
caSetZRCOLADIR2 INSTALLDIR 1002
dlgDeclaration NOT Installed 1215
dlgFontSubstitutes ?comp00_ZRCola<>3 AND $$comp00_ZRCola=3 1580
<<NOKEEP

20
MSI/ZRCola/locale/ZRCola.pot
View File

@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-15 21:43+0200\n"
"POT-Creation-Date: 2016-07-22 01:01+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@ -22,11 +22,15 @@ msgstr ""
msgid "#60"
msgstr "#176"
#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
#, fuzzy
msgid "&Continue"
msgstr "&Nadaljuj"
#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
msgstr ""
#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
#, fuzzy
msgid "[DlgTitleFont][SimpleProductName] Declaration"
@ -799,7 +803,11 @@ msgstr "1250"
msgid "Amebis, Slovenia, E.U."
msgstr "Amebis, d. o. o., Kamnik"
#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
#: En.Win32.Release.Control-2.idtx:14 En.x64.Release.Control-2.idtx:14
msgid "binfontsubst.bmp"
msgstr ""
#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
#, fuzzy
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
@ -864,6 +872,12 @@ msgstr "Dokument PDF s seznamom ZRColinih bližnjic na tipkovnici"
msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"
msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
msgid ""
"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
"the next restart."
msgstr ""
#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
#, fuzzy
msgid "Times New Roman based font"

20
MSI/ZRCola/locale/de_DE.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-15 21:44+0200\n"
"POT-Creation-Date: 2016-07-22 01:04+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@ -21,10 +21,14 @@ msgstr ""
msgid "#60"
msgstr "#89"
#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
msgid "&Continue"
msgstr ""
#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
msgstr ""
#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
msgid "[DlgTitleFont][SimpleProductName] Declaration"
msgstr ""
@ -1531,7 +1535,11 @@ msgstr "1252"
msgid "Amebis, Slovenia, E.U."
msgstr ""
#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
#: En.Win32.Release.Control-2.idtx:14 En.x64.Release.Control-2.idtx:14
msgid "binfontsubst.bmp"
msgstr ""
#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
@ -1585,6 +1593,12 @@ msgstr ""
msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"
msgstr ""
#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
msgid ""
"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
"the next restart."
msgstr ""
#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
msgid "Times New Roman based font"
msgstr ""

20
MSI/ZRCola/locale/ru_RU.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-15 21:43+0200\n"
"POT-Creation-Date: 2016-07-22 01:03+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@ -21,10 +21,14 @@ msgstr ""
msgid "#60"
msgstr "#158"
#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
msgid "&Continue"
msgstr ""
#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
msgstr ""
#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
msgid "[DlgTitleFont][SimpleProductName] Declaration"
msgstr ""
@ -1531,7 +1535,11 @@ msgstr "1251"
msgid "Amebis, Slovenia, E.U."
msgstr "Amebis, Словения, ЕС"
#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
#: En.Win32.Release.Control-2.idtx:14 En.x64.Release.Control-2.idtx:14
msgid "binfontsubst.bmp"
msgstr ""
#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
@ -1583,6 +1591,12 @@ msgstr ""
msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"
msgstr ""
#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
msgid ""
"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
"the next restart."
msgstr ""
#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
msgid "Times New Roman based font"
msgstr ""

22
MSI/ZRCola/locale/sl_SI.po
View File

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ZRCola MSI\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-07-15 21:43+0200\n"
"POT-Creation-Date: 2016-07-22 01:01+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@ -21,10 +21,14 @@ msgstr ""
msgid "#60"
msgstr "#176"
#: En.Win32.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:11
#: En.Win32.Release.Control-2.idtx:11 En.Win32.Release.Control-2.idtx:16 En.x64.Release.Control-2.idtx:11 En.x64.Release.Control-2.idtx:16
msgid "&Continue"
msgstr "&Nadaljuj"
#: En.Win32.Release.Control-2.idtx:13 En.x64.Release.Control-2.idtx:13
msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
msgstr "[DlgTitleFont]\"00 ZRCola\" v pisavo \"ZRCola\""
#: En.Win32.Release.Control-2.idtx:6 En.x64.Release.Control-2.idtx:6
msgid "[DlgTitleFont][SimpleProductName] Declaration"
msgstr "[DlgTitleFont]Deklaracija [SimpleProductName]"
@ -1535,7 +1539,11 @@ msgstr "1250"
msgid "Amebis, Slovenia, E.U."
msgstr "Amebis, d. o. o., Kamnik"
#: En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:5
#: En.Win32.Release.Control-2.idtx:14 En.x64.Release.Control-2.idtx:14
msgid "binfontsubst.bmp"
msgstr "binfontsubst.bmp"
#: En.Win32.Release.Control-2.idtx:12 En.Win32.Release.Control-2.idtx:5 En.x64.Release.Control-2.idtx:12 En.x64.Release.Control-2.idtx:5
msgid "binUIHeader.bmp"
msgstr "binUIHeader.bmp"
@ -1587,6 +1595,14 @@ msgstr "Dokument PDF s seznamom ZRColinih bližnjic na tipkovnici"
msgid "Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"
msgstr "Besedilo, nastalo z uporabo ZRCole, mora biti v kolofonu, predgovoru, v opombi ali na drugem ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
#: En.Win32.Release.Control-2.idtx:15 En.x64.Release.Control-2.idtx:15
msgid ""
"The \"00 ZRCola\" font was succeeded by \"ZRCola\" font. To display your previous documents correctly, we have arranged a font substitution on your computer that will take effect after "
"the next restart."
msgstr ""
"Pisavo \"00 ZRCola\" je nadomestila pisava \"ZRCola\". Da bodo vaši prejšnji dokumenti prikazani pravilno, smo na vašem računalniku uredili nadomeščanje pisave, ki bo stopilo v veljavo "
"po naslednjem zagonu."
#: En.Win32.Release.Feature-2.idtx:5 En.x64.Release.Feature-2.idtx:5
msgid "Times New Roman based font"
msgstr "Pisava na osnovi Times New Roman"

2
Updater

@ -1 +1 @@
Subproject commit 429cab9e20521fe5724e406c0d4fc303d0f88ce5
Subproject commit 6434a51171e77d655ace8609c60acb0ad17e01b7