Commit cf1c33a9 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 77fac5c0
......@@ -2,6 +2,7 @@
IconName=start-here-kde-plasma
Comment=Integrating applications into the KDE Plasma desktop
Comment[ca]=Integració d'aplicacions a l'escriptori Plasma del KDE
Comment[cs]=Integrace aplikací do pracovního prostředí KDE Plasma
Comment[en_GB]=Integrating applications into the KDE Plasma desktop
Comment[es]=Integración de aplicaciones en el escritorio KDE Plasma
Comment[et]=Rakenduste lõimimine KDE Plasma töölauda
......@@ -23,6 +24,7 @@ Comment[x-test]=xxIntegrating applications into the KDE Plasma desktopxx
Comment[zh_CN]=将应用程序整合到 KDE Plasma 桌面
Name=KDE Portal Integration
Name[ca]=Integració del Portal del KDE
Name[cs]=Integrace Portálu KDE
Name[en_GB]=KDE Portal Integration
Name[es]=Integración del portal de KDE
Name[et]=KDE portaali lõimimine
......
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