Commit 56c956a8 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 5d20c490
Pipeline #200943 skipped
......@@ -59,7 +59,7 @@ Description=Resembles the surface of a wood table
Description[ar]=يشبه سطح طاولة خشبية
Description[bs]=Nalikuje površini drvenog stola
Description[ca]=Sembla la superfície de fusta d'una taula
Description[ca@valencia]=Sembla la superfície de fusta d'una taula
Description[ca@valencia]=Pareix la superfície de fusta d'una taula
Description[da]=Minder om et træbords overflade
Description[de]=Gleicht der Oberfläche eines Holztisches.
Description[el]=Παρομοιάζει την επιφάνεια ενός ξύλινου τραπεζιού
......
Supports Markdown
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