Merge remote branch 'origin/uibk' into uibk

shared/config.default/lang/language_tmx.xml

@@ -13745,7 +13745,11 @@ Statistiques des questions et des réponses peuvent non seulement être consult
   </tu>
   <tu tuid="m_not_enough_answers" datatype="plaintext">
    <tuv xml:lang="IT">
+<<<<<<< HEAD
     <seg>non abbastanza risposte, selezionato tutti disponibili</seg>
+=======
+    <seg>not enough answers, selezionato tutti disponibili</seg>
+>>>>>>> 54401e9... updated language file
    </tuv>
    <tuv xml:lang="EN">
     <seg>not enough answers, all available selected</seg>