mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03:09 +00:00
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"
This commit is contained in:
parent
3a73eae701
commit
f24429a49a
1 changed files with 12 additions and 0 deletions
|
|
@ -4,4 +4,16 @@ Exec=dbus-launch --exit-with-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasmacom
|
|||
TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasmacompositor
|
||||
DesktopNames=KDE
|
||||
Name=Plasma Mobile
|
||||
Name[ca]=Plasma Mòbil
|
||||
Name[ca@valencia]=Plasma Mòbil
|
||||
Name[es]=Plasma Mobile
|
||||
Name[pt]=Plasma Mobile
|
||||
Name[uk]=Мобільна Плазма
|
||||
Name[x-test]=xxPlasma Mobilexx
|
||||
Comment=Plasma Mobile by KDE
|
||||
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
|
||||
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
|
||||
Comment[es]=Plasma Mobile creado por KDE
|
||||
Comment[pt]=Plasma Mobile do KDE
|
||||
Comment[uk]=Мобільна Плазма від KDE
|
||||
Comment[x-test]=xxPlasma Mobile by KDExx
|
||||
|
|
|
|||
Loading…
Reference in a new issue