Commit c64e3731 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 af7e5d03
......@@ -12,7 +12,7 @@ X-KDE-System-Settings-Parent-Category=personalization
Name=Online Accounts
Name[ar]=حسابات الإنترنت
Name[az]=Onlayn İstifaadəçi Hesabları
Name[az]=Onlayn Hesablar
Name[ca]=Comptes en línia
Name[ca@valencia]=Comptes en línia
Name[cs]=Účty online
......
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