marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 07:03:08 +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-12-03 04:49:42 +01:00
parent 39d6c71315
commit 276e5e1aaa
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

@ -8,6 +8,7 @@ Name[ca]=Plasma Mòbil
Name[ca@valencia]=Plasma Mòbil
Name[es]=Plasma Mobile
Name[nl]=Plasma-mobiel
Name[pl]=Plazma Mobile
Name[pt]=Plasma Mobile
Name[sv]=Plasma mobil
Name[uk]=Мобільна Плазма
@ -17,6 +18,7 @@ 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[pl]=Plazma Mobile stworzona przez KDE
Comment[pt]=Plasma Mobile do KDE
Comment[sv]=Plasma mobil av KDE
Comment[uk]=Мобільна Плазма від KDE