1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-05 17:17:49 +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 2023-12-10 03:47:40 +00:00
parent a9f8f2ace3
commit e119477dd3

View File

@ -55,7 +55,7 @@ Comment[sl]=Kazalnik Latte sloga Plasma zavihkov
Comment[sv]=Plasma flikstilsindikator för Latte
Comment[uk]=Індикатор стилю вкладок Плазми для Латте
Comment[x-test]=xxPlasma Tab style indicator for Lattexx
Comment[zh_CN]=Latte Plasma
Comment[zh_CN]=Latte Plasma
Comment[zh_TW]= Latte Plasma
Encoding=UTF-8