Commit 7e139685 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 2d2cf744
......@@ -48,6 +48,7 @@
"Description[de]": "Anzeige von Objekten auf dem Bildschirm mit Ihrem mobilen Gerät",
"Description[en_GB]": "Use your mobile device to point to things on the screen",
"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[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
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment