marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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 2020-12-09 06:49:33 +01:00
parent 5809376938
commit 972046f062
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/plasma-mobile.desktop.cmake
View file

@ -4,7 +4,7 @@ TryExec=${CMAKE_INSTALL_FULL_BINDIR}/kwinwrapper
DesktopNames=KDE
Name=Plasma Mobile
Name[ast]=Plasma Mobile
Name[ca]=Plasma mòbil
Name[ca]=Plasma Mobile
Name[ca@valencia]=Plasma Mòbil
Name[cs]=Plasma Mobile
Name[da]=Plasma Mobile
@ -38,7 +38,7 @@ Name[zh_CN]=Plasma Mobile
Name[zh_TW]=Plasma 行動
Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile, por KDE
Comment[ca]=Plasma mòbil, creat per la comunitat KDE
Comment[ca]=Plasma Mobile, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[cs]=Plasma Mobile od KDE
Comment[da]=Plasma Mobile fra KDE