Commit 08ff629c 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 082a5763
Pipeline #275412 skipped
......@@ -4,6 +4,7 @@ Name[ca]=Aterratge segur
Name[ca@valencia]=Aterratge segur
Name[cs]=Bezpečné přistání
Name[de]=Sichere Landung
Name[en_GB]=Safe Landing
Name[es]=Aterrizaje seguro
Name[eu]=Lurreratze segurua
Name[fi]=Turvallinen laskeutuminen
......
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