Commit cec67839 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 cc403e60
Pipeline #199343 skipped
......@@ -47,7 +47,7 @@
"Description[ar]": "محرّك بيانات عُدّة الحزم",
"Description[az]": "PackageKit verilənlər mənbəyi",
"Description[bg]": "Енджин за данни на PackageKit",
"Description[ca@valencia]": "Motor de dades del PackageKit",
"Description[ca@valencia]": "Motor de dades de PackageKit",
"Description[ca]": "Motor de dades del PackageKit",
"Description[cs]": "Datový nástroj PackageKit",
"Description[da]": "PackageKit datamotor",
......
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