Close #311: 2nd Fixup for a548227: install QT translation files again

The QT provided QM files in QM_FILES got overwritten by the
invokation of the translation function.
Put them into a different variable.

And their name is qtbase_XX.qm, not qt_XX.qm

This fix also translates the "Finder Menu"

lang/CMakeLists.txt

@@ -12,9 +12,9 @@ foreach(lang ${XCA_LANGUAGES})
   list(APPEND LANG_COMPREFS "  <ComponentRef Id=\"Ci18n.${lang}\"/>\n")
   set(LANG_COMPS "  <Component Id=\"Ci18n.${lang}\" Guid=\"${GUID}\">
     <File Id=\"xca_${lang}.qm\" Source=\"${D}/xca_${lang}.qm\" KeyPath=\"yes\"/>\n")
-  if(EXISTS ${_qt_bin_dir}/../translations/qt_${lang}.qm)
-    list(APPEND QM_FILES ${_qt_bin_dir}/../translations/qt_${lang}.qm)
-    string(APPEND LANG_COMPS "    <File Id=\"qt_${lang}.qm\" Source=\"${_qt_bin_dir}/../translations/qt_${lang}.qm\"/>\n")
+  if(EXISTS ${_qt_bin_dir}/../translations/qtbase_${lang}.qm)
+    list(APPEND QT_QM_FILES ${_qt_bin_dir}/../translations/qtbase_${lang}.qm)
+    string(APPEND LANG_COMPS "    <File Id=\"qtbase_${lang}.qm\" Source=\"${_qt_bin_dir}/../translations/qtbase_${lang}.qm\"/>\n")
   endif()
   string(APPEND LANG_COMPS "  </Component>\n")
   list(APPEND LANG_ALLCOMPS ${LANG_COMPS})
@@ -40,15 +40,15 @@ else()
   )
   add_custom_target(trans DEPENDS xca_lupdate "${D}/xca.pot")
 endif()
-list(APPEND APP_RESOURCES ${QM_FILES})
-target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${QM_FILES})
+list(APPEND APP_RESOURCES ${QM_FILES} ${QT_QM_FILES})
+target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${QM_FILES} ${QT_QM_FILES})
 
 if (UNIX AND NOT APPLE)
   install(FILES ${QM_FILES}
 	DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/i18n
   )
 elseif(WIN32)
-  install(FILES ${QM_FILES}
+  install(FILES ${QM_FILES} ${QT_QM_FILES}
 	  DESTINATION ${RUNTIME_DEST}/i18n
   )
 endif()

widgets/XcaApplication.cpp

@@ -102,9 +102,10 @@ void XcaApplication::setupLanguage(const QLocale &lang)
 #endif
 	};
 
-	qDebug() << "Setup language: " << lang;
 	for (const QString &dir : dirs) {
-		if (qtTr->load(lang, "qt", dir)) {
+		qDebug() << "Search QT translations for:" << lang << "in" << lang;
+		if (qtTr->load(lang, "qtbase", dir)) {
+			qDebug() << "Fount QT translations for:" << lang << "in" << lang;
 			break;
 		}
 	}

widgets/XcaApplication.h

@@ -23,8 +23,7 @@ class XcaTranslator : public QTranslator
 	bool load(const QLocale &locale, const QString &filename,
 		const QString &dir)
 	{
-		return QTranslator::load(QString("%1_%2").arg(filename)
-						.arg(locale.name()), dir);
+		return QTranslator::load(locale, filename, "_", dir, ".qm");
 	}
 };