3 files changed, 27 insertions, 9 deletions
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 06d6e3e..6b58280 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -193,7 +193,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventListViewItem *it,TQString &buf
 			if(KviTQString::equalCI(newName,ch->m_szName))
 			{
 				bFound = true;
-				KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx);
+				KviTQString::sprintf(newName,"%Q_%d",&buffer,idx);
 				idx++;
 				break;
 			}
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index fc915ed..b44a498 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -30,6 +30,10 @@
 #include <tqdir.h>
 #include <tqmessagebox.h>
 
+#include <algorithm>
+#include <filesystem>
+#include <vector>
+
 TQString g_szPrevSettedLocale;
 
 KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
@@ -82,15 +86,29 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
 	TQString szLocaleDir;
 	g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale);
 
-	TQStringList list=TQDir(szLocaleDir).entryList("kvirc_*.mo",TQDir::Files);
-	
+	// Find available translations by checking for existance of kvirc.mo files
+	namespace fs = std::filesystem;
+	std::vector<fs::path> translationPaths;
+	const fs::path localeDir { szLocaleDir.local8Bit().data() };
+	for (const auto &dir : fs::directory_iterator(localeDir))
+	{
+		if (!dir.is_directory())
+		{
+			continue;
+		}
+
+		if (fs::exists(dir.path()/"LC_MESSAGES/kvirc.mo"))
+		{
+			translationPaths.push_back(dir.path().filename());
+		}
+	}
+	std::sort(translationPaths.begin(), translationPaths.end());
+
 	i = 0;
 	iMatch = 0;
-	
-	for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-		TQString szTmp=*it;
-		szTmp.replace("kvirc_","");
-		szTmp.replace(".mo","");
+	for (const auto &filename : translationPaths)
+	{
+		TQString szTmp { filename.c_str() };
 		m_pForcedLocaleCombo->insertItem(szTmp);
 		if(KviTQString::equalCI(szTmp,m_szLanguage))
 			iMatch = i + 2;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index a1221d7..9b3662c 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -196,7 +196,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawListViewItem *it,TQString &buffer)
 			if(KviTQString::equalCI(newName,ch->m_szName))
 			{
 				bFound = true;
-				KviTQString::sprintf(newName,"%TQ_%d",&buffer,idx);
+				KviTQString::sprintf(newName,"%Q_%d",&buffer,idx);
 				idx++;
 				break;
 			}