Commit fda49798 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 3daa7bd2
......@@ -2,6 +2,9 @@
Exec=dbus-run-session @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -wayland
DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe
......
......@@ -3,6 +3,9 @@ Type=XSession
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasma-dev.sh -x11
DesktopNames=KDE
Name=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR})
Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})
Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR})
Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx
Comment=Plasma by KDE
Comment[ar]=بلازما كدي
Comment[bs]=Plazma od strane KDe
......
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