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-30 05:24:44 +02:00
parent 7bc2080697
commit f223399c2f
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

@ -7,6 +7,7 @@ Name=Plasma Mobile
Name[ast]=Plasma Mobile
Name[ca]=Plasma Mòbil
Name[ca@valencia]=Plasma Mòbil
Name[cs]=Plasma Mobile
Name[en_GB]=Plasma Mobile
Name[es]=Plasma Mobile
Name[gl]=Plasma Mobile
@ -22,6 +23,7 @@ Comment=Plasma Mobile by KDE
Comment[ast]=Plasma Mobile por KDE
Comment[ca]=Plasma Mòbil, creat per la comunitat KDE
Comment[ca@valencia]=Plasma Mòbil, creat per la comunitat KDE
Comment[cs]=Plasma Mobile od KDE
Comment[en_GB]=Plasma Mobile by KDE
Comment[es]=Plasma Mobile creado por KDE
Comment[gl]=Plasma Mobile de KDE