Sub-module update and version set to 2.0

MSI/ZRCola/Main/Makefile

@@ -431,7 +431,7 @@ Property	Value
 s$(MSIBUILD_LENGTH_ID)	l0
 1252	Property	Property
 Manufacturer	Amebis, Slovenia, E.U.
-ARPCONTACT	Fran Ramov<EFBFBD> Institute of Slovenian Language SRC SASA
+ARPCONTACT	Fran Ramov<EFBFBD> Institute of Slovenian Language ZRC SAZU
 ARPHELPTELEPHONE	+386 1 470 6170
 ARPURLINFOABOUT	http://zrcola.zrc-sazu.si/en/contact/
 ARPHELPLINK	http://zrcola.zrc-sazu.si/en/info/instructions/

MSI/ZRCola/locale/ZRCola.pot

@@ -814,7 +814,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr ""
 
 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr ""
 
 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6

MSI/ZRCola/locale/de_DE.po

@@ -1526,7 +1526,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr ""
 
 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr ""
 
 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6

MSI/ZRCola/locale/ru_RU.po

@@ -1479,7 +1479,7 @@ msgstr "Продолжить"
 
 #: en_US.Win32.Debug.Control-2.idtx:13 en_US.Win32.Release.Control-2.idtx:13 en_US.x64.Debug.Control-2.idtx:13 en_US.x64.Release.Control-2.idtx:13
 msgid "[DlgTitleFont]\"00 ZRCola\" to \"ZRCola\" Font"
-msgstr ""
+msgstr "[DlgTitleFont]Шрифт «00 ZRCola» в «ZRCola»"
 
 #: en_US.Win32.Debug.Control-2.idtx:14 en_US.Win32.Release.Control-2.idtx:14 en_US.x64.Debug.Control-2.idtx:14 en_US.x64.Release.Control-2.idtx:14
 msgid "binfontsubst.bmp"
@@ -1490,6 +1490,8 @@ 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 ""
+"Шрифт «00 ZRCola» заменился шрифтом «ZRCola». Для правильного показа предыдущих документов в вашем компьютере проведена субституция шрифтов, которая вступит в силу после следующего запуска "
+"компьютера."
 
 #: en_US.Win32.Debug.Directory-2.idtx:4 en_US.Win32.Release.Directory-2.idtx:4 en_US.x64.Debug.Directory-2.idtx:4 en_US.x64.Release.Directory-2.idtx:4
 msgid "ZRCola:."
@@ -1532,8 +1534,8 @@ msgid "Amebis, Slovenia, E.U."
 msgstr "Amebis, Словения, ЕС"
 
 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
-msgstr ""
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
+msgstr "Институт словенского языка им. Франа Рамовша ZRC SAZU"
 
 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "+386 1 470 6170"

MSI/ZRCola/locale/sl_SI.po

@@ -1531,7 +1531,7 @@ msgid "Amebis, Slovenia, E.U."
 msgstr "Amebis, d. o. o., Kamnik"
 
 #: en_US.Win32.Debug.Property-2.idtx:5 en_US.Win32.Release.Property-2.idtx:5 en_US.x64.Debug.Property-2.idtx:5 en_US.x64.Release.Property-2.idtx:5
-msgid "Fran Ramovš Institute of Slovenian Language SRC SASA"
+msgid "Fran Ramovš Institute of Slovenian Language ZRC SAZU"
 msgstr "Inštitut za slovenski jezik Frana Ramovša ZRC SAZU"
 
 #: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6

Makefile

@@ -450,9 +450,9 @@ Localization :: \
 !ENDIF
 
 
-LANG=de_DE
-LANG_OUT=De
-!INCLUDE "MSILocal.mak"
+#LANG=de_DE
+#LANG_OUT=De
+#!INCLUDE "MSILocal.mak"
 
 LANG=en_US
 LANG_OUT=En

ZRCola/ZRCola.fbp

@@ -5961,7 +5961,7 @@
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:</property>
+                                        <property name="label">Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:</property>
                                         <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
                                         <property name="maximum_size"></property>

ZRCola/locale/ZRCola.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:49+0200\n"
+"POT-Creation-Date: 2016-10-18 10:07+0200\n"
 "PO-Revision-Date: 2016-05-13 15:52+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
@@ -461,8 +461,8 @@ msgstr ""
 
 #: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"Texts made using ZRCola have to include in a footnote or some other "
+"appropriate part of the publication the note below:"
 msgstr ""
 
 #: zrcolagui.cpp:903

ZRCola/locale/de_DE.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:55+0200\n"
-"PO-Revision-Date: 2016-10-13 11:55+0200\n"
+"POT-Creation-Date: 2016-10-18 10:10+0200\n"
+"PO-Revision-Date: 2016-10-18 10:10+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -496,8 +496,8 @@ msgstr ""
 
 #: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"Texts made using ZRCola have to include in a footnote or some other "
+"appropriate part of the publication the note below:"
 msgstr ""
 
 #: zrcolagui.cpp:903

ZRCola/locale/ru_RU.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:53+0200\n"
-"PO-Revision-Date: 2016-10-13 11:54+0200\n"
+"POT-Creation-Date: 2016-10-18 10:09+0200\n"
+"PO-Revision-Date: 2016-10-18 10:10+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: ru_RU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -51,7 +51,6 @@ msgstr "▸ Опции поиска"
 
 # Recitation separator
 #: zrcolachrslct.cpp:164
-#, fuzzy
 msgid ", "
 msgstr ", "
 
@@ -386,9 +385,8 @@ msgid "Unicode character description"
 msgstr "Описание знака Юникод"
 
 #: zrcolagui.cpp:623
-#, fuzzy
 msgid "Character tags"
-msgstr "Список знаков"
+msgstr "Ключевые слова"
 
 #: zrcolagui.cpp:628
 msgid "Unicode character category"
@@ -480,8 +478,8 @@ msgstr "zrcola.zrc-sazu.si"
 
 #: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"Texts made using ZRCola have to include in a footnote or some other "
+"appropriate part of the publication the note below:"
 msgstr ""
 "Текст, созданный с помощью системы ZRCola, должен в примечании или другом "
 "соответствующем месте в публикации сопровождаться следующей записью:"
@@ -535,7 +533,6 @@ msgstr ""
 "ZRCola либо копировать и вставить знаки из окна для разборки."
 
 #: zrcolagui.cpp:1027
-#, fuzzy
 msgid ""
 "The &context, examples or description why and where the character is "
 "required:"
@@ -548,14 +545,13 @@ msgid "Additional notes for character request"
 msgstr "Дополнительные примечания"
 
 #: zrcolagui.cpp:1040
-#, fuzzy
 msgid ""
 "After clicking OK button, your e-mail application should open allowing you "
 "to submit the new character request to ZRCola Editor.\n"
 "Your e-mail application might not display all the characters correctly, but "
 "the Editor will be able to read them correctly anyway."
 msgstr ""
-"После нажатия на кнопку \"OK\" ваша почтовая программа должна открытся для "
+"После нажатия на кнопку «OK» ваша почтовая программа должна открытся для "
 "отправки запроса нового знака администратору системы ZRCola.\n"
 "Возможно, не все знаки будут отображены правильно, но все информации будут "
 "закодированны таким образом, что администратор сможет их правильно прочитать."

ZRCola/locale/sl_SI.po

@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
-"POT-Creation-Date: 2016-10-13 11:53+0200\n"
-"PO-Revision-Date: 2016-10-13 11:55+0200\n"
+"POT-Creation-Date: 2016-10-18 10:08+0200\n"
+"PO-Revision-Date: 2016-10-18 10:09+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
@@ -478,12 +478,11 @@ msgstr "zrcola.zrc-sazu.si"
 
 #: zrcolagui.cpp:899
 msgid ""
-"Texts made using ZRCola have to include in the colophon, foreword, footnote "
-"or some other appropriate part of the publication the note below:"
+"Texts made using ZRCola have to include in a 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:"
+"Besedilo, nastalo z uporabo ZRCole, mora biti v opombi ali na drugem "
+"ustreznem mestu v publikaciji opremljeno z naslednjim zapisom:"
 
 #: zrcolagui.cpp:903
 msgid ""

ZRCola/zrcolaapp.cpp

@@ -32,6 +32,7 @@ wxIMPLEMENT_APP(ZRColaApp);
 
 ZRColaApp::ZRColaApp() :
     m_mainWnd(NULL),
+    m_lang_ui(wxLANGUAGE_DEFAULT),
     wxApp()
 {
 }
@@ -55,7 +56,7 @@ bool ZRColaApp::OnInit()
         return false;
 
     // Initialize locale.
-    if (wxInitializeLocale(m_locale)) {
+    if (wxInitializeLocale(m_locale, &m_lang_ui)) {
         wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
         wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola")));
         wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));

ZRCola/zrcolaapp.h

@@ -84,6 +84,7 @@ public:
     wxZRColaFrame *m_mainWnd;       ///< Main window
 
     wxLocale m_locale;              ///< Current locale
+    wxLanguage m_lang_ui;           ///< Translation language (language of User Interface, wxLANGUAGE_DEFAULT = English)
 
 protected:
 #ifdef __WXMSW__

ZRCola/zrcolachrslct.cpp

@@ -35,8 +35,9 @@ wxZRColaCharSelect::wxZRColaCharSelect(wxWindow* parent) :
     wxZRColaCharSelectBase(parent)
 {
     // Set tag lookup locale.
-    auto language = static_cast<wxLanguage>(dynamic_cast<ZRColaApp*>(wxTheApp)->m_locale.GetLanguage());
-         if (wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
+    wxLanguage language = dynamic_cast<ZRColaApp*>(wxTheApp)->m_lang_ui;
+         if (wxLANGUAGE_DEFAULT   == language ||
+             wxLANGUAGE_ENGLISH   <= language && language <= wxLANGUAGE_ENGLISH_ZIMBABWE) m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);
     else if (wxLANGUAGE_RUSSIAN   <= language && language <= wxLANGUAGE_RUSSIAN_UKRAINE ) m_locale = MAKELCID(MAKELANGID(LANG_RUSSIAN  , SUBLANG_DEFAULT), SORT_DEFAULT);
     else if (wxLANGUAGE_SLOVENIAN == language                                           ) m_locale = MAKELCID(MAKELANGID(LANG_SLOVENIAN, SUBLANG_DEFAULT), SORT_DEFAULT);
     else                                                                                  m_locale = MAKELCID(MAKELANGID(LANG_ENGLISH  , SUBLANG_DEFAULT), SORT_DEFAULT);

ZRCola/zrcolagui.cpp

@@ -896,7 +896,7 @@ wxZRColaAboutBase::wxZRColaAboutBase( wxWindow* parent, wxWindowID id, const wxS
 	
 	bSizerText->Add( 0, 0, 0, wxALL|wxEXPAND, 5 );
 	
-	m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in the colophon, foreword, footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDeclaration = new wxStaticText( this, wxID_ANY, _("Texts made using ZRCola have to include in a footnote or some other appropriate part of the publication the note below:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextDeclaration->Wrap( 400 );
 	bSizerText->Add( m_staticTextDeclaration, 0, wxALL|wxEXPAND, 5 );
 	

ZRCola/zrcolaupdater.cpp

@@ -41,7 +41,7 @@ wxZRColaUpdater::wxZRColaUpdater(wxWindow* parent) :
 
     // Prepare Updater.
     auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
-    m_updater = new wxUpdCheckThread(app->m_locale.GetCanonicalName(), this);
+    m_updater = new wxUpdCheckThread(app->m_lang_ui == wxLANGUAGE_DEFAULT ? wxT("en_US") : wxLocale::GetLanguageCanonicalName(app->m_lang_ui), this);
     //if (m_updater->Run() != wxTHREAD_NO_ERROR) {
     //    wxFAIL_MSG(wxT("Can't create the thread!"));
     //    delete m_updater;

ZRColaCompile/dbsource.cpp

@@ -878,6 +878,7 @@ bool ZRCola::DBSource::GetCharacterGroup(const com_obj<ADORecordset>& rs, chrgrp
 
     {
         cg.chars.clear();
+        cg.show.clear();
         com_obj<ADOFields> flds;
         wxVERIFY(SUCCEEDED(rs_chars->get_Fields(&flds)));
         com_obj<ADOField> f_char, f_show;

include/version.h

@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01ff1500
+#define PRODUCT_VERSION          0x02000000
 
 //
 // Product version by components
@@ -31,28 +31,28 @@
 // thus we need to specify major, minor and other version components
 // separately.
 //
-#define PRODUCT_VERSION_MAJ      1
-#define PRODUCT_VERSION_MIN      255
-#define PRODUCT_VERSION_REV      21
+#define PRODUCT_VERSION_MAJ      2
+#define PRODUCT_VERSION_MIN      0
+#define PRODUCT_VERSION_REV      0
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.0-beta12"
+#define PRODUCT_VERSION_STR      "2.0"
 #define PRODUCT_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.255.21"
+#define PRODUCT_VERSION_INST     "2.0"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{25210484-50C8-495E-9384-1A052CB69F44}"
+#define PRODUCT_VERSION_GUID     "{59833018-A0F9-4C90-B4F3-8B88908BB89A}"
 
 //
 // The product vendor and application name for configuration keeping.

output/locale/.gitignore

@@ -1,5 +1,5 @@
 */libZRColaUI.mo
-*/wxExtend14.mo
+*/wxExtend*.mo
 */wxstd.mo
 */UpdaterZRCola.mo
 */ZRCola.mo