marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-28 22:53: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-05 06:05:26 +02:00
parent 65cf6a89da
commit cec97e231b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
shell/metadata.desktop
View file

@ -23,6 +23,7 @@ Name[zh_CN]=手机
Name[zh_TW]=電話
Comment=Plasma shell for phones
Comment[ca]=Espai de treball Plasma per a telèfons
Comment[ca@valencia]=Espai de treball Plasma per a telèfons
Comment[es]=Interfaz de Plasma para teléfonos
Comment[nl]=Plasma-shell voor telefoons
Comment[pt]=Área de trabalho Plasma para telemóveis