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 2022-07-03 01:57:41 +00:00
parent 9a913e1783
commit c632dab1c1
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/plasma-mobile-dev.desktop.cmake
View file

@ -17,6 +17,7 @@ Name[sl]=Plasma Mobile (Razvoj)
Name[tr]=Plasma Mobile (Geliştirme)
Name[uk]=Мобільна Плазма (версія у розробці)
Name[x-test]=xxPlasma Mobile (Development)xx
Name[zh_CN]=Plasma Mobile (开发)
Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile, por KDE
Comment[az]=KDE Plasma Mobil