1
0
mirror of https://invent.kde.org/network/krfb synced 2024-07-08 20:15:53 +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:
l10n daemon script 2021-10-31 01:13:15 +00:00
parent f30d0b65e3
commit 5860226875

View File

@ -5,6 +5,18 @@ Exec=@CMAKE_INSTALL_PREFIX@/bin/krfb-virtualmonitor
Icon=krfb
Terminal=false
Name=KRFBs Virtual Monitor
Name[ca]=Monitor virtual del Krfb
Name[es]=Monitor virtual de KRFB
Name[nl]=Virtuele monitor van KRFB
Name[sv]=Krfb:s virtuella bildskärm
Name[uk]=Віртуальний монітор KRFB
Name[x-test]=xxKRFBs Virtual Monitorxx
Comment=Remote Virtual Monitor
Comment[ca]=Monitor virtual remot
Comment[es]=Monitor virtual remoto
Comment[nl]=Virtual Monitor op afstand
Comment[sv]=Virtuell fjärrbildskärm
Comment[uk]=Віддалений віртуальний монітор
Comment[x-test]=xxRemote Virtual Monitorxx
NoDisplay=true
X-KDE-Wayland-Interfaces=zkde_screencast_unstable_v1