Commit 28e33957 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 5d7983f5
Pipeline #6141 passed with stage
in 8 minutes and 27 seconds
......@@ -46,6 +46,7 @@
"Description[cs]": "Použijte mobilní zařízení k ukázání na položky na obrazovce",
"Description[nl]": "Uw mobiele apparaat gebruiken om naar dingen op het scherm te wijzen",
"Description[nn]": "Bruk mobiltelefonen til å peika på ting på skjermen",
"Description[pt]": "Use o seu dispositivo móvel para apontar para coisas no ecrã",
"Description[sv]": "Använd mobilen för att peka på saker på skärmen",
"Description[uk]": "Використання мобільного пристрою для керування об'єктами на екрані",
"Description[x-test]": "xxUse your mobile device to point to things on the screenxx",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment