Commit 92449d6b 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 b11fa738
......@@ -97,7 +97,7 @@
"Description[sr]": "Омогућава К‑девелопу да управља плазма пројектима",
"Description[sv]": "Tillåt att KDevPlatform hanterar Plasma-projekt",
"Description[tr]": "KDevPlatform'un Plasma projelerini yönetmesine izin ver",
"Description[uk]": "Надає змогу KDevPlatform керувати проектами Плазми",
"Description[uk]": "Надає змогу KDevPlatform керувати проєктами Плазми",
"Description[x-test]": "xxAllow KDevPlatform to manage Plasma projectsxx",
"Description[zh_CN]": "允许 KDevPlatform 来管理 Plasma 工程",
"Description[zh_TW]": "允許 KDevPlatform 管理 Plasma 專案",
......@@ -134,7 +134,7 @@
"Name[sr]": "Менаџер плазма пројеката",
"Name[sv]": "Plasma projektledare",
"Name[tr]": "PlaSma Proje Müdürü",
"Name[uk]": "Менеджер проекту Плазми",
"Name[uk]": "Менеджер проєкту Плазми",
"Name[x-test]": "xxPlasma Project Managerxx",
"Name[zh_CN]": "Plasma 工程管理器",
"Name[zh_TW]": "Plasma 專案管理員",
......
Supports Markdown
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