Commit c0f4317a 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 f80d624a
......@@ -8,7 +8,7 @@ Name=UPower PowerDevil Backend
Name[ar]=خلفية UPower بوردفل
Name[az]=PowerDevil üçün UPower dəstək Modulu
Name[bs]=UPower PowerDevil pozadina
Name[ca]=Dorsal d'UPower per al PowerDevil
Name[ca]=Dorsal UPower del PowerDevil
Name[ca@valencia]=Dorsal d'UPower per a PowerDevil
Name[cs]=Podpůrná vrstva UPower PowerDevil
Name[da]=UPower-motor til PowerDevil
......
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