Skip to content
Snippets Groups Projects
Commit ff7a7b34 authored by Ewald's avatar Ewald
Browse files

Merge remote branch 'origin/uibk' into uibk

parents 4e008fe0 c6c8de1c
No related branches found
No related tags found
No related merge requests found
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment