Fix fdo#60754 - no translations for langs sorting after qtz

Adjust check to not rely on lexicographical order. This amends
8ae3ddca.

Change-Id: I5023b07af819eb09ea9dc569bdbac806f936485f

android/sdremote/Makefile

@@ -54,5 +54,7 @@ translations.done: $(foreach lang,$(call android_get_langlist),$(call android_ge
 
 translations.clean:
 	rm -rf $(foreach lang,$(call android_get_langlist),$(call android_get_podir,$(lang)))
+	rm -rf $(foreach lang,$(call android_get_langlist),translations-$(lang).db)
+	rm translations.done
 
 # vim: set noet sw=4 ts=4:

l10ntools/source/stringmerge.cxx

@@ -132,13 +132,14 @@ void StringParser::Merge(
     MergeDataFile aMergeDataFile(
         rMergeSrc, static_cast<OString>( m_pSource->name ), false );
     const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages();
-    if( vLanguages.size()>=2 && vLanguages[0] != m_sLang )
+    if( vLanguages.size()>=2 &&
+        vLanguages[vLanguages[0]=="qtz" ? 1 : 0] != m_sLang )
     {
         std::cerr
             << "stringex error: given language conflicts with "
             << "language of Mergedata file: "
             << m_sLang.getStr() << " - "
-            << vLanguages[vLanguages[0]=="qtz" ? 0 : 1].getStr() << std::endl;
+            << vLanguages[vLanguages[0]=="qtz" ? 1 : 0].getStr() << std::endl;
         return;
     }
 

l10ntools/source/treemerge.cxx

@@ -283,13 +283,13 @@ void TreeParser::Merge(
             rMergeSrc, static_cast<OString>( m_pSource->name ), false, false );
         const std::vector<OString> vLanguages = aMergeDataFile.GetLanguages();
         if( vLanguages.size()>=2 &&
-            vLanguages[vLanguages[0]=="qtz" ? 0 : 1] != m_sLang )
+            vLanguages[vLanguages[0]=="qtz" ? 1 : 0] != m_sLang )
         {
             std::cerr
                 << "Treex error: given language conflicts with "
                 << "language of Mergedata file: "
                 << m_sLang.getStr() << " - "
-                << vLanguages[vLanguages[0]=="qtz" ? 0 : 1].getStr() << std::endl;
+                << vLanguages[vLanguages[0]=="qtz" ? 1 : 0].getStr() << std::endl;
             return;
         }
         lcl_MergeLevel(