marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03: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 2017-11-27 05:09:08 +01:00
parent f24429a49a
commit 39d6c71315
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plasma-mobile.desktop.cmake
View file

@ -7,13 +7,17 @@ Name=Plasma Mobile
Name[ca]=Plasma Mòbil
Name[ca@valencia]=Plasma Mòbil
Name[es]=Plasma Mobile
Name[nl]=Plasma-mobiel
Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
Name[x-test]=xxPlasma Mobilexx
Comment=Plasma Mobile by KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[es]=Plasma Mobile creado por KDE
Comment[nl]=Plasma-mobiel door KDE
Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE
Comment[x-test]=xxPlasma Mobile by KDExx