Commit b02d4f93 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 e75b7ba7
Pipeline #78301 skipped
......@@ -3,7 +3,7 @@ GenericName=Screenshot Capture Utility
GenericName[ar]=أداة لأخذ اللقطات
GenericName[az]=Ekran şəkli çəkmə aləti
GenericName[bg]=Инструмент за заснемане на екрана
GenericName[ca]=Utilitat per a prendre captures de pantalla
GenericName[ca]=Utilitat de captura de pantalla
GenericName[ca@valencia]=Utilitat per a prendre captures de pantalla
GenericName[cs]=Nástroj na snímání obrazovky
GenericName[da]=Værktøj til skærmbilleder
......
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