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:
parent
a9f8f2ace3
commit
e119477dd3
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user