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
4f3b9a1fae
commit
6a0fcc83fd
1 changed files with 7 additions and 0 deletions
|
|
@ -5,6 +5,13 @@
|
|||
Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/plasma-dbus-run-session-if-needed @CMAKE_INSTALL_FULL_LIBEXECDIR@/startplasmamobile-dev.sh
|
||||
DesktopNames=KDE
|
||||
Name=Plasma Mobile (Development)
|
||||
Name[az]=Plasma Mobil (Tərtibat)
|
||||
Name[ca]=Plasma Mobile (Desenvolupament)
|
||||
Name[es]=Plasma Mobile (desarrollo)
|
||||
Name[nl]=Plasma-mobiel (ontwikkeling)
|
||||
Name[tr]=Plasma Mobile (Geliştirme)
|
||||
Name[uk]=Мобільна Плазма (версія у розробці)
|
||||
Name[x-test]=xxPlasma Mobile (Development)xx
|
||||
Comment=Plasma Mobile by KDE
|
||||
Comment[ast]=Plasma Mobile, por KDE
|
||||
Comment[az]=KDE Plasma Mobil
|
||||
|
|
|
|||
Loading…
Reference in a new issue