Commit aab6ebf1 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 087255f1
Pipeline #88021 skipped
......@@ -56,7 +56,7 @@ Comment=Forward ports using UPnP
Comment[bg]=Пренасочване на портове с UPnP
Comment[bs]=Proslijedi priključke koristeći UPnP
Comment[ca]=Redirigeix els ports usant UPnP
Comment[ca@valencia]=Rediregeix els ports usant UPnP
Comment[ca@valencia]=Redirigeix els ports usant UPnP
Comment[cs]=Předávání portů pomocí UPnP
Comment[da]=Åbning af porte via UPnP
Comment[de]=Port-Weiterleitung unter Verwendung von UPnP
......
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