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 2019-05-03 05:58:45 +02:00
parent a1ed480913
commit fd6c1e6826
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
shell/metadata.desktop
View file

@ -22,6 +22,12 @@ Name[x-test]=xxPhonexx
Name[zh_CN]=手机
Name[zh_TW]=電話
Comment=Plasma shell for phones
Comment[ca]=Espai de treball Plasma per a telèfons
Comment[nl]=Plasma-shell voor telefoons
Comment[pt]=Área de trabalho Plasma para telemóveis
Comment[sv]=Plasma skal för telefoner
Comment[uk]=Оболонка Плазми для телефонів
Comment[x-test]=xxPlasma shell for phonesxx
Type=Service
X-KDE-ServiceTypes=Plasma/Shell