Commit c9e3969e 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 2f8cd478
Pipeline #59584 skipped
......@@ -38,6 +38,7 @@ Name[sl]=Odziv uporabnika
Name[sv]=Användaråterkoppling
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Name[zh_CN]=用户反馈
Name[zh_TW]=使用者回饋
X-KDE-Keywords=akregator, configure, settings, userfeedback
X-KDE-Keywords[az]=akregator, configure, settings, userfeedback,istifadəçi rəyi
......
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