Make ZRCola window always-on-top while composing

Microsoft Remote Desktop introduced a bug in Windows 10 Falls Update
(1709 release) keeping Remote Desktop window always-on-top. This
prevents ZRCola window to pop-up on Win+F5.

This patch addresses this issue by temporarily making ZRCola window
always-on-top when called by Win+F5/F6, and restoring it back to normal
when finished by F5/F6 or dismissed by Esc.

ZRCola/locale/ru_RU.po

@@ -1,11 +1,12 @@
 # Translators:
 # Simon Rozman <simon@rozman.si>, 2018
+# Janoš Ježovnik, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: ZRCola\n"
 "POT-Creation-Date: 2018-09-19 09:00+0200\n"
 "PO-Revision-Date: 2018-09-19 09:09+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2018\n"
+"Last-Translator: Janoš Ježovnik, 2018\n"
 "Language-Team: Russian (Russia) (https://www.transifex.com/amebis/teams/91592/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,16 +96,16 @@ msgstr "Прервать составление и возвратить фоку
 
 #: res/zrcolagui.cpp:141 zrcolagui.cpp:141
 msgid "&ZRCola (De)composition"
-msgstr "&ZRCola составление/разборка"
+msgstr "Составление/разборка &ZRCola "
 
 #: res/zrcolagui.cpp:141 res/zrcolagui.cpp:219 zrcolagui.cpp:141
 #: zrcolagui.cpp:221
 msgid "Toggle ZRCola character (De)composition"
-msgstr ""
+msgstr "Переключить составление/разборку ZRCola"
 
 #: res/zrcolagui.cpp:145 zrcolagui.cpp:145
 msgid "Tra&nslation"
-msgstr ""
+msgstr "Тра&нслитерация"
 
 #: res/zrcolagui.cpp:151 zrcolagui.cpp:151
 msgid "&Settings..."
@@ -626,7 +627,7 @@ msgstr "▾ Опции поиска"
 
 #: zrcolafrm.cpp:89
 msgid "No Translation"
-msgstr ""
+msgstr "Без транслитерации"
 
 #: zrcolafrm.cpp:102
 msgid "Custom Translation..."

ZRCola/zrcolaapp.h

@@ -90,7 +90,7 @@ public:
 
 protected:
 #ifdef __WXMSW__
-    winstd::win_handle m_running;   ///< Global Win32 event to determine if another instance of ZRCola is already running
+    winstd::win_handle<NULL> m_running; ///< Global Win32 event to determine if another instance of ZRCola is already running
 #endif
 };
 

ZRCola/zrcolachrreq.cpp

@@ -71,6 +71,9 @@ void wxZRColaCharRequest::OnOKButtonClick(wxCommandEvent& event)
 // wxPersistentZRColaCharRequest
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaCharRequest::s_guiLevel = 1;
+
+
 wxPersistentZRColaCharRequest::wxPersistentZRColaCharRequest(wxZRColaCharRequest *wnd) : wxPersistentTLWEx(wnd)
 {
 }
@@ -78,6 +81,7 @@ wxPersistentZRColaCharRequest::wxPersistentZRColaCharRequest(wxZRColaCharRequest
 
 void wxPersistentZRColaCharRequest::Save() const
 {
+    SaveValue(wxT("guiLevel"), s_guiLevel);
     wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaCharRequest*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
@@ -97,5 +101,6 @@ bool wxPersistentZRColaCharRequest::Restore()
     if (RestoreValue(wxT("context"), &str))
         wnd->m_context->SetValue(str);
 
-    return wxPersistentTLWEx::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolachrreq.h

@@ -58,6 +58,9 @@ public:
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolachrslct.cpp

@@ -786,6 +786,9 @@ bool __cdecl wxZRColaCharSelect::SearchThread::TestDestroyS(void *cookie)
 // wxPersistentZRColaCharSelect
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaCharSelect::s_guiLevel = 1;
+
+
 wxPersistentZRColaCharSelect::wxPersistentZRColaCharSelect(wxZRColaCharSelect *wnd) : wxPersistentTLWEx(wnd)
 {
 }
@@ -793,6 +796,7 @@ wxPersistentZRColaCharSelect::wxPersistentZRColaCharSelect(wxZRColaCharSelect *w
 
 void wxPersistentZRColaCharSelect::Save() const
 {
+    SaveValue(wxT("guiLevel"), s_guiLevel);
     wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaCharSelect*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
@@ -870,5 +874,6 @@ bool wxPersistentZRColaCharSelect::Restore()
 
     wnd->ResetResults();
 
-    return wxPersistentTLWEx::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolachrslct.h

@@ -228,6 +228,9 @@ public:
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolacomppnl.cpp

@@ -398,6 +398,9 @@ void wxZRColaComposerPanel::SetHexValue(wxTextCtrl *wnd, std::pair<long, long> &
 // wxPersistentZRColaComposerPanel
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaComposerPanel::s_guiLevel = 1;
+
+
 wxPersistentZRColaComposerPanel::wxPersistentZRColaComposerPanel(wxZRColaComposerPanel *wnd) : wxPersistentWindow<wxZRColaComposerPanel>(wnd)
 {
 }
@@ -413,6 +416,7 @@ void wxPersistentZRColaComposerPanel::Save() const
 {
     auto wnd = static_cast<wxZRColaComposerPanel*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
 
+    SaveValue(wxT("guiLevel"       ), s_guiLevel);
     SaveValue(wxT("dpiX"           ), wxClientDC(wnd).GetPPI().x);
     SaveValue(wxT("splitDecomposed"), wnd->m_splitterSource     ->GetSashPosition());
     SaveValue(wxT("splitComposed"  ), wnd->m_splitterDestination->GetSashPosition());
@@ -423,6 +427,10 @@ bool wxPersistentZRColaComposerPanel::Restore()
 {
     auto wnd = dynamic_cast<wxZRColaComposerPanel*>(GetWindow());
 
+    int guiLevel;
+    if (!RestoreValue(wxT("guiLevel"), &guiLevel) || guiLevel != s_guiLevel)
+        return true;
+
     int dpiHorz = wxClientDC(wnd).GetPPI().x;
     int dpiHorzVal;
     int sashVal;

ZRCola/zrcolacomppnl.h

@@ -88,6 +88,9 @@ public:
     virtual wxString GetKind() const;
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolafrm.cpp

@@ -64,8 +64,12 @@ wxBEGIN_EVENT_TABLE(wxZRColaFrame, wxZRColaFrameBase)
 wxEND_EVENT_TABLE()
 
 
+const int wxZRColaFrame::s_guiLevel = 1;
+
+
 wxZRColaFrame::wxZRColaFrame() :
     m_hWndSource(NULL),
+    m_wasIconised(false),
     m_chrSelect(NULL),
     m_settings(NULL),
     m_chrReq(NULL),
@@ -125,6 +129,7 @@ wxZRColaFrame::wxZRColaFrame() :
     } else {
         // Taskbar icon creation failed. Not the end of the world. No taskbar icon then.
         delete m_taskBarIcon;
+        m_taskBarIcon = NULL;
     }
 
     wxPersistenceManager &persist_mgr = wxPersistenceManager::Get();
@@ -171,9 +176,12 @@ wxZRColaFrame::wxZRColaFrame() :
         SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
     }
 
-    // Restore persistent state of wxAuiManager manually, since m_mgr is not a standalone heap object
-    // and cannot be registered for persistence.
-    wxPersistentAuiManager(&m_mgr).Restore();
+    int guiLevel;
+    if (wxConfigBase::Get()->Read(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel) {
+        // Restore persistent state of wxAuiManager manually, since m_mgr is not a standalone heap object
+        // and cannot be registered for persistence.
+        wxPersistentAuiManager(&m_mgr).Restore();
+    }
     persist_mgr.RegisterAndRestore(this, new wxPersistentZRColaFrame(this));
 
     // Update (de)composition selection.
@@ -217,6 +225,7 @@ wxZRColaFrame::~wxZRColaFrame()
 
     // Save wxAuiManager's state before destructor is finished.
     // m_mgr is not a standalone heap object and is bound to wxZRColaFrame, which is being destroyed.
+    wxConfigBase::Get()->Write(wxT("guiLevel"), s_guiLevel);
     wxPersistentAuiManager(&m_mgr).Save();
     wxPersistenceManager::Get().SaveAndUnregister(this);
 
@@ -315,6 +324,8 @@ void wxZRColaFrame::OnSendAbort(wxCommandEvent& event)
 {
     if (m_hWndSource) {
         // Return focus to the source window.
+        ::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        if (m_wasIconised) Iconize();
         ::SetActiveWindow(m_hWndSource);
         ::SetForegroundWindow(m_hWndSource);
         m_hWndSource = NULL;
@@ -371,8 +382,8 @@ void wxZRColaFrame::OnIdle(wxIdleEvent& event)
 
 void wxZRColaFrame::OnTaskbarIconClick(wxTaskBarIconEvent& event)
 {
-    Iconize(false);
     Show(true);
+    Iconize(false);
     Raise();
 
     event.Skip();
@@ -598,6 +609,8 @@ void wxZRColaFrame::DoSend(const wxString& str)
     }
 
     // Return focus to the source window and send the input.
+    ::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    if (m_wasIconised) Iconize();
     ::SetActiveWindow(m_hWndSource);
     ::SetForegroundWindow(m_hWndSource);
     ::Sleep(200);
@@ -618,6 +631,8 @@ void wxZRColaFrame::DoCopyAndReturn(const wxString& str)
     }
 
     // Return focus to the source window.
+    ::SetWindowPos(m_hWnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    if (m_wasIconised) Iconize();
     ::SetActiveWindow(m_hWndSource);
     ::SetForegroundWindow(m_hWndSource);
     m_hWndSource = NULL;
@@ -679,12 +694,14 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
         }
 
         m_hWndSource = hWndSource;
+        m_wasIconised = IsIconized();
 
         //if (m_state == wxABS_FLOAT) {
-        if (IsIconized())
-            ::SendMessage(m_hWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
+        Show(true);
+        Iconize(false);
+        Raise();
+        ::SetWindowPos(m_hWnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
         ::SetActiveWindow(m_hWnd);
-        ::SetForegroundWindow(m_hWnd);
         //} else if (wxAppBarIsDocked(m_state)) {
         //    // ZRCola window is currently docked.
 
@@ -711,6 +728,9 @@ WXLRESULT wxZRColaFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM
 // wxPersistentZRColaFrame
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaFrame::s_guiLevel = 1;
+
+
 wxPersistentZRColaFrame::wxPersistentZRColaFrame(wxZRColaFrame *wnd) : wxPersistentTLWEx(wnd)
 {
 }
@@ -718,6 +738,7 @@ wxPersistentZRColaFrame::wxPersistentZRColaFrame(wxZRColaFrame *wnd) : wxPersist
 
 void wxPersistentZRColaFrame::Save() const
 {
+    SaveValue(wxT("guiLevel"), s_guiLevel);
     wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaFrame*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
@@ -747,5 +768,6 @@ bool wxPersistentZRColaFrame::Restore()
     else
         wnd->m_composition = wnd->m_transeq_id == ZRCOLA_TRANSEQID_DEFAULT;
 
-    return wxPersistentTLWEx::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolafrm.h

@@ -130,8 +130,12 @@ protected:
     virtual WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 #endif
 
+protected:
+    static const int s_guiLevel;        ///< Persisted placements/sizing are considered incompatible between different GUI levels
+
 protected:
     WXHWND m_hWndSource;                ///< Handle of the active window, when the ZRCola hotkey was pressed
+    bool m_wasIconised;                 ///< Was the ZRCola window iconized, when the ZRCola hotkey was pressed
     wxTaskBarIcon *m_taskBarIcon;       ///< Taskbar icon
     wxZRColaCharSelect *m_chrSelect;    ///< Character selection dialog
     wxZRColaCharRequest *m_chrReq;      ///< Request a New Character dialog
@@ -152,6 +156,9 @@ public:
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolasettings.cpp

@@ -139,6 +139,9 @@ void wxZRColaSettings::OnOKButtonClick(wxCommandEvent& event)
 // wxPersistentZRColaSettings
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaSettings::s_guiLevel = 1;
+
+
 wxPersistentZRColaSettings::wxPersistentZRColaSettings(wxZRColaSettings *wnd) : wxPersistentTLWEx(wnd)
 {
 }
@@ -146,6 +149,7 @@ wxPersistentZRColaSettings::wxPersistentZRColaSettings(wxZRColaSettings *wnd) :
 
 void wxPersistentZRColaSettings::Save() const
 {
+    SaveValue(wxT("guiLevel"), s_guiLevel);
     wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaSettings*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
@@ -177,5 +181,6 @@ bool wxPersistentZRColaSettings::Restore()
     } else
         wnd->m_lang = ZRCola::langid_t::blank;
 
-    return wxPersistentTLWEx::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolasettings.h

@@ -63,6 +63,9 @@ public:
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRCola/zrcolatranseq.cpp

@@ -208,6 +208,9 @@ void wxZRColaTranslationSeq::OnOKButtonClick(wxCommandEvent& event)
 // wxPersistentZRColaTranslationSeq
 //////////////////////////////////////////////////////////////////////////
 
+const int wxPersistentZRColaTranslationSeq::s_guiLevel = 1;
+
+
 wxPersistentZRColaTranslationSeq::wxPersistentZRColaTranslationSeq(wxZRColaTranslationSeq *wnd) : wxPersistentTLWEx(wnd)
 {
 }
@@ -215,6 +218,7 @@ wxPersistentZRColaTranslationSeq::wxPersistentZRColaTranslationSeq(wxZRColaTrans
 
 void wxPersistentZRColaTranslationSeq::Save() const
 {
+    SaveValue(wxT("guiLevel"), s_guiLevel);
     wxPersistentTLWEx::Save();
 
     auto wnd = static_cast<const wxZRColaTranslationSeq*>(GetWindow()); // dynamic_cast is not reliable as we are typically called late in the wxTopLevelWindowMSW destructor.
@@ -249,5 +253,6 @@ bool wxPersistentZRColaTranslationSeq::Restore()
             wnd->m_transeq = std::move(transet);
     }
 
-    return wxPersistentTLWEx::Restore();
+    int guiLevel;
+    return RestoreValue(wxT("guiLevel"), &guiLevel) && guiLevel == s_guiLevel ? wxPersistentTLWEx::Restore() : true;
 }

ZRCola/zrcolatranseq.h

@@ -71,6 +71,9 @@ public:
 
     virtual void Save() const;
     virtual bool Restore();
+
+protected:
+    static const int s_guiLevel;    ///< Persisted placements/sizing are considered incompatible between different GUI levels
 };
 
 

ZRColaCompile/dbsource.cpp

@@ -56,7 +56,7 @@ void ZRCola::DBSource::character_bank::build_related()
 
 
 ZRCola::DBSource::character_bank::build_related_worker::build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to) :
-    win_handle((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
+    win_handle<INVALID_HANDLE_VALUE>((HANDLE)_beginthreadex(NULL, 0, process, this, CREATE_SUSPENDED, NULL)),
     m_heap(HeapCreate(0, 0, 0)),
     m_cb(cb),
     m_from(from),

ZRColaCompile/dbsource.h

@@ -269,14 +269,14 @@ namespace ZRCola {
             void build_related();
 
         protected:
-            class build_related_worker : public winstd::win_handle
+            class build_related_worker : public winstd::win_handle<INVALID_HANDLE_VALUE>
             {
             public:
                 build_related_worker(_In_ const character_bank *cb, _In_ iterator from, _In_ iterator to);
 
                 inline void join()
                 {
-                    if (m_h)
+                    if (m_h != invalid)
                         WaitForSingleObject(m_h, INFINITE);
                 }
 

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          0x02000600
+#define PRODUCT_VERSION          0x02010200
 
 //
 // Product version by components
@@ -32,27 +32,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      2
-#define PRODUCT_VERSION_MIN      0
-#define PRODUCT_VERSION_REV      6
+#define PRODUCT_VERSION_MIN      1
+#define PRODUCT_VERSION_REV      2
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.1-beta6"
+#define PRODUCT_VERSION_STR      "2.1.2"
 #define PRODUCT_BUILD_YEAR_STR   "2018"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.0.6"
+#define PRODUCT_VERSION_INST     "2.1.2"
 
 //
 // 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     "{2881867D-6D2E-41BA-AD35-0B7275B7DEF1}"
+#define PRODUCT_VERSION_GUID     "{C51F698B-96A2-48D7-9CBB-F0E2134FD4DE}"
 
 //
 // The product vendor and application name for configuration keeping.

output/locale/ZRCola-zrcdb.pot

@@ -64,24 +64,63 @@ msgstr ""
 msgid "Cyrillic (Belarusian)"
 msgstr ""
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr ""
+
+msgid "Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Cyrillic (Macedonian)"
 msgstr ""
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Russian)"
 msgstr ""
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Serbian)"
 msgstr ""
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr ""
+
 msgid "Cyrillic (Ukrainian)"
 msgstr ""
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic BdC"
 msgstr ""
 
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr ""
+
 msgid "Czech"
 msgstr ""
 
@@ -241,6 +280,15 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
+msgid "Latin (English)"
+msgstr ""
+
+msgid "Latin (GOST2000)"
+msgstr ""
+
+msgid "Latin (Slovenian)"
+msgstr ""
+
 msgid "Latin ALE"
 msgstr ""
 
@@ -253,6 +301,9 @@ msgstr ""
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr ""
 

output/locale/de_DE/ZRCola-zrcdb.po

@@ -67,24 +67,63 @@ msgstr ""
 msgid "Cyrillic (Belarusian)"
 msgstr ""
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr ""
+
+msgid "Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Cyrillic (Macedonian)"
 msgstr ""
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Russian)"
 msgstr ""
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic (Serbian)"
 msgstr ""
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr ""
+
 msgid "Cyrillic (Ukrainian)"
 msgstr ""
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr ""
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr ""
+
 msgid "Cyrillic BdC"
 msgstr ""
 
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr ""
+
 msgid "Czech"
 msgstr ""
 
@@ -244,6 +283,15 @@ msgstr ""
 msgid "Latin"
 msgstr ""
 
+msgid "Latin (English)"
+msgstr ""
+
+msgid "Latin (GOST2000)"
+msgstr ""
+
+msgid "Latin (Slovenian)"
+msgstr ""
+
 msgid "Latin ALE"
 msgstr ""
 
@@ -256,6 +304,9 @@ msgstr ""
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr ""
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr ""
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr ""
 

output/locale/ru_RU/ZRCola-zrcdb.po

@@ -69,24 +69,63 @@ msgstr "Кириллические знаки"
 msgid "Cyrillic (Belarusian)"
 msgstr "кириллица (белорусский)"
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr "кириллица (белорусский) » латиница (английский)"
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr "кириллица (белорусский) » латиница (словенский)"
+
 msgid "Cyrillic (Bulgarian)"
 msgstr "кириллица (болгарский)"
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr "кириллица (болгарский) » латиница (английский)"
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr "кириллица (болгарский) » латиница (словенский)"
+
+msgid "Cyrillic (GOST2000)"
+msgstr "кириллица (ГОСТ2000)"
+
 msgid "Cyrillic (Macedonian)"
 msgstr "кириллица (македонский)"
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr "кириллица (македонский) » латиница (английский)"
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr "кириллица (македонский) » латиница (словенский)"
+
 msgid "Cyrillic (Russian)"
 msgstr "кириллица (русский)"
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr "кириллица (русский) » латиница (английский)"
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr "кириллица (русский) » латиница (словенский)"
+
 msgid "Cyrillic (Serbian)"
 msgstr "кириллица (сербский)"
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr "кириллица (сербский) » латиница"
+
 msgid "Cyrillic (Ukrainian)"
 msgstr "кириллица (украинский)"
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr "кириллица (украинский) » латиница (английский)"
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr "кириллица (украинский) » латиница (словенский)"
+
 msgid "Cyrillic BdC"
 msgstr "кириллица (BdC)"
 
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr "кириллица » латиница (ГОСТ2000)"
+
 msgid "Czech"
 msgstr "чешский"
 
@@ -247,6 +286,15 @@ msgstr "кашубский"
 msgid "Latin"
 msgstr "латинский"
 
+msgid "Latin (English)"
+msgstr "латиница (английский)"
+
+msgid "Latin (GOST2000)"
+msgstr "латиница (ГОСТ2000)"
+
+msgid "Latin (Slovenian)"
+msgstr "латиница (словенский)"
+
 msgid "Latin ALE"
 msgstr "латиница (ALE)"
 
@@ -259,6 +307,9 @@ msgstr "латиница » кириллица (белорусский)"
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr "латиница » кириллица (болгарский)"
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr "латиница » кириллица (ГОСТ2000)"
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr "латиница » кириллица (македонский)"
 

output/locale/sl_SI/ZRCola-zrcdb.po

@@ -69,24 +69,63 @@ msgstr "Cirilski znaki"
 msgid "Cyrillic (Belarusian)"
 msgstr "cirilica (beloruščina)"
 
+msgid "Cyrillic (Belarusian) » Latin (English)"
+msgstr "cirilica (beloruščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Belarusian) » Latin (Slovenian)"
+msgstr "cirilica (beloruščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Bulgarian)"
 msgstr "cirilica (bolgarščina)"
 
+msgid "Cyrillic (Bulgarian) » Latin (English)"
+msgstr "cirilica (bolgarščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Bulgarian) » Latin (Slovenian)"
+msgstr "cirilica (bolgarščina) » latinica (slovenščina)"
+
+msgid "Cyrillic (GOST2000)"
+msgstr "cirilica (GOST2000)"
+
 msgid "Cyrillic (Macedonian)"
 msgstr "cirilica (makedonščina)"
 
+msgid "Cyrillic (Macedonian) » Latin (English)"
+msgstr "cirilica (makedonščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Macedonian) » Latin (Slovenian)"
+msgstr "cirilica (makedonščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Russian)"
 msgstr "cirilica (ruščina)"
 
+msgid "Cyrillic (Russian) » Latin (English)"
+msgstr "cirilica (ruščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Russian) » Latin (Slovenian)"
+msgstr "cirilica (ruščina) » latinica (slovenščina)"
+
 msgid "Cyrillic (Serbian)"
 msgstr "cirilica (srbščina)"
 
+msgid "Cyrillic (Serbian) » Latin"
+msgstr "cirilica (srbščina) » latinica"
+
 msgid "Cyrillic (Ukrainian)"
 msgstr "cirilica (ukrajinščina)"
 
+msgid "Cyrillic (Ukrainian) » Latin (English)"
+msgstr "cirilica (ukrajinščina) » latinica (angleščina)"
+
+msgid "Cyrillic (Ukrainian) » Latin (Slovenian)"
+msgstr "cirilica (ukrajinščina) » latinica (slovenščina)"
+
 msgid "Cyrillic BdC"
 msgstr "cirilica (BdC)"
 
+msgid "Cyrillic » Latin (GOST2000)"
+msgstr "cirilica » latinica (GOST2000)"
+
 msgid "Czech"
 msgstr "češčina"
 
@@ -246,6 +285,15 @@ msgstr "kašubščina"
 msgid "Latin"
 msgstr "latinščina"
 
+msgid "Latin (English)"
+msgstr "latinica (angleščina)"
+
+msgid "Latin (GOST2000)"
+msgstr "latinica (GOST2000)"
+
+msgid "Latin (Slovenian)"
+msgstr "latinica (slovenščina)"
+
 msgid "Latin ALE"
 msgstr "latinščina (ALE)"
 
@@ -258,6 +306,9 @@ msgstr "latinica » cirilica (beloruščina)"
 msgid "Latin » Cyrillic (Bulgarian)"
 msgstr "latinica » cirilica (bolgarščina)"
 
+msgid "Latin » Cyrillic (GOST2000)"
+msgstr "latinica » cirilica (GOST2000)"
+
 msgid "Latin » Cyrillic (Macedonian)"
 msgstr "latinica » cirilica (makedonščina)"