Commit 872c4238 authored by Script Kiddy's avatar Script Kiddy

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 2044df69
......@@ -63,7 +63,6 @@ Name[tr]=KDebugAyarları
Name[uk]=KDebugSettings
Name[x-test]=xxKDebugSettingsxx
Name[zh_CN]=KDebugSettings
Name[zh_TW]=KDebug 設定
X-DBUS-StartupType=Unique
Categories=Qt;KDE;Utility;
X-DBUS-ServiceName=org.kde.kdebugsettings
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