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"
4 years ago · dae0a5df5e
parent b24b049cdf
commit dae0a5df5e
2 changed files with 2 additions and 2 deletions
--- a/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json
+++ b/dataengines/systemmonitor/plasma-dataengine-systemmonitor.json
@ -123,7 +123,7 @@
        "Name[te]": "సిస్టమ్ మానిటర్",
        "Name[tg]": "Назорати низом",
        "Name[th]": "ติดตามการทำงานของระบบ",
-        "Name[tr]": "Sistem İzleyici",
+        "Name[tr]": "Sistem Monitörü",
        "Name[ug]": "سىستېما كۆزەتكۈچ",
        "Name[uk]": "Монітор системи",
        "Name[vi]": "Trình giám sát hệ thống",
--- a/systemmonitor/org.kde.systemmonitor.desktop
+++ b/systemmonitor/org.kde.systemmonitor.desktop
@ -80,7 +80,7 @@ Name[ta]=கணினி நோட்டம்
 Name[te]=సిస్టమ్ మానిటర్
 Name[tg]=Назорати низом
 Name[th]=ติดตามการทำงานของระบบ
-Name[tr]=Sistem İzleyici
+Name[tr]=Sistem Monitörü
 Name[ug]=سىستېما كۆزەتكۈچ
 Name[uk]=Монітор системи
 Name[vi]=Trình giám sát hệ thống