Commit f1aa3723 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 a3f5d3d6
Pipeline #43211 skipped
......@@ -118,7 +118,7 @@ GenericName[uk]=Фонова служба клієнта нагадування
GenericName[wa]=Cliyint do démon do rimimbreu d' KOrganizer
GenericName[x-test]=xxKOrganizer Reminder Daemon Clientxx
GenericName[zh_CN]=KOrganizer 提醒守护进程的客户端
GenericName[zh_TW]=KOrganizer 提醒守護程式用戶端
GenericName[zh_TW]=KOrganizr 提醒守護程式用戶端
Terminal=false
X-KDE-autostart-phase=2
......
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