Commit 17afc0b2 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 91a7fdaf
......@@ -4,6 +4,7 @@ X-KDE-ServiceType=KIPI/Plugin
X-KDE-DerivedName=KIPI Plugin
Name=KIPIPlugin
Name[ar]=كايْبِيبْلوغِن
Name[az]=KIPIPlugin
Name[bg]=KIPIPlugin
Name[bs]=KIPI priključak
Name[ca]=Connector de KIPI
......@@ -63,6 +64,7 @@ Name[zh_CN]=KIPIPlugin
Name[zh_TW]=KIPI 外掛程式
Comment=A KIPI Plugin
Comment[ar]=ملحق كايْبي
Comment[az]=KIPI Qoşması
Comment[bg]=Приставка KIPI
Comment[bs]=KIPI priključak
Comment[ca]=Un connector de KIPI
......
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