Commit 81e8d3a7 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 db626fa4
Pipeline #8215 passed with stage
in 11 minutes and 13 seconds
......@@ -51,6 +51,7 @@
"Description[fr]": "Utilisez votre appareil mobile pour montrer des choses à l'écran",
"Description[gl]": "Use o seu dispositivo móbil para apuntar a cousas na pantalla",
"Description[it]": "Usa il tuo dispositivo mobile per indicare gli oggetti sullo schermo",
"Description[ko]": "모바일 장치로 화면의 항목 가리키기",
"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[pl]": "Użyj swojego urządzenia przenośnego do wskazywania rzeczy na ekranie",
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