Commit e17e4d0c 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 a47ead63
Pipeline #93689 skipped
......@@ -3,7 +3,7 @@ Comment=Desktop view furniture
Comment[ar]=إعداد عرض مساحة العمل
Comment[az]=Plasma istifadəçi interfeysi tərkibləri
Comment[bs]=Namjesti pogled radne površine
Comment[ca]=Accessori de vista d'escriptori
Comment[ca]=Accessori de vista de l'escriptori
Comment[ca@valencia]=Accessori de vista d'escriptori
Comment[cs]=Zobrazení plochy
Comment[da]=Møbler til skrivebordsvisning
......
Markdown is supported
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