Commit 06b5d22c 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 f9163674
......@@ -160,6 +160,7 @@ Categories=Qt;KDE;Utility;Archiving;Compression;X-KDE-Utilities-File;
Comment=Work with file archives
Comment[ar]=العمل مع أرشيفات الملفات
Comment[ast]=Trabaya con archivos
Comment[az]=Fayl arxivləri ilə işləmək
Comment[ca]=Treball amb arxius de fitxer
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