Commit 9c84e0e8 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 ffee415c
Pipeline #140415 skipped
......@@ -3,6 +3,7 @@ Name=Honeywave
Name[ca]=Honeywave
Name[cs]=Vlna medu
Name[da]=Honeywave
Name[de]=Honeywave
Name[en_GB]=Honeywave
Name[es]=Onda de miel
Name[eu]=Honeywave
......@@ -12,6 +13,7 @@ Name[hi]=हनीवेव
Name[hu]=Honeywave
Name[ia]=Honeywave
Name[it]=Honeywave
Name[ko]=허니웨이브
Name[nl]=Honeywave
Name[pl]=Fala miodu
Name[pt_BR]=Onda de mel
......
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