1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-12 01:17:55 +03:00

SVN_SILENT made messages (.desktop file) - always resolve ours

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-19 05:33:09 +02:00
parent cfc9143632
commit fc78cae03f

View File

@ -27,7 +27,7 @@ Name[zh_CN]=Latte 停靠栏
Name[zh_TW]=Latte Dock
Comment=Latte Dock
Comment[ar]=رصيف لاتيه
Comment[ca]=Acoblable del Latte
Comment[ca]=Acoblador del Latte
Comment[ca@valencia]=Acoblable del Latte
Comment[cs]=Dok Latte
Comment[da]=Latte-dok