diff --git a/MSI/ZRCola/Main/Binary/fontsubst.bmp b/MSI/ZRCola/Main/Binary/fontsubst.bmp new file mode 100644 index 0000000..f7fd50a Binary files /dev/null and b/MSI/ZRCola/Main/Binary/fontsubst.bmp differ diff --git a/MSI/ZRCola/Main/Binary/fontsubst.png b/MSI/ZRCola/Main/Binary/fontsubst.png new file mode 100644 index 0000000..b335503 Binary files /dev/null and b/MSI/ZRCola/Main/Binary/fontsubst.png differ diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index efc01f2..6973abf 100644 --- a/MSI/ZRCola/Main/Makefile +++ b/MSI/ZRCola/Main/Makefile @@ -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 < 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 <3 AND $$comp00_ZRCola=3 1580 <\n" "Language-Team: Amebis, d. o. o., Kamnik \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" diff --git a/MSI/ZRCola/locale/de_DE.po b/MSI/ZRCola/locale/de_DE.po index 9cf38be..0fa9467 100644 --- a/MSI/ZRCola/locale/de_DE.po +++ b/MSI/ZRCola/locale/de_DE.po @@ -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 \n" "Language-Team: Amebis, d. o. o., Kamnik \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 "" diff --git a/MSI/ZRCola/locale/ru_RU.po b/MSI/ZRCola/locale/ru_RU.po index b867656..fc084a7 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-07-15 21:43+0200\n" +"POT-Creation-Date: 2016-07-22 01:03+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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 "" diff --git a/MSI/ZRCola/locale/sl_SI.po b/MSI/ZRCola/locale/sl_SI.po index 55fd8fd..6c1740d 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-07-15 21:43+0200\n" +"POT-Creation-Date: 2016-07-22 01:01+0200\n" "PO-Revision-Date: \n" "Last-Translator: Simon Rozman \n" "Language-Team: Amebis, d. o. o., Kamnik \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" diff --git a/Updater b/Updater index 429cab9..6434a51 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 429cab9e20521fe5724e406c0d4fc303d0f88ce5 +Subproject commit 6434a51171e77d655ace8609c60acb0ad17e01b7