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 2018-03-26 05:10:31 +02:00
parent 9222d501fa
commit 7bc2080697
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plasma-mobile.desktop.cmake
View file

@ -17,6 +17,7 @@ Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
Name[x-test]=xxPlasma Mobilexx
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
@ -31,3 +32,4 @@ Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE
Comment[x-test]=xxPlasma Mobile by KDExx
Comment[zh_TW]=來自 KDE 的 Plasma 行動作業系統