kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 02:50:22 +03:00
Code Issues Projects Releases Wiki Activity

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 2021-10-21 01:16:23 +00:00
parent c9515a0353
commit dacf4d71a8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indicators/org.kde.latte.plasma/metadata.desktop
View File

@ -61,7 +61,7 @@ Comment[sl]=Kazalnik sloga Latte Plasma
Comment[sv]=Latte Plasmastilindikator
Comment[uk]=Індикатор стилю Плазми Латте
Comment[x-test]=xxLatte Plasma style indicatorxx
Comment[zh_CN]=Latte Plasma 样式指示器
Comment[zh_CN]=Latte Plasma 风格指示器
Comment[zh_TW]=Latte Plasma 樣式指示器
Encoding=UTF-8

2
indicators/org.kde.latte.plasmatabstyle/metadata.desktop
View File

@ -24,7 +24,7 @@ Name[sl]=Slog Plasma zavihkov
Name[sv]=Plasma flikstil
Name[uk]=Стиль вкладок Плазми
Name[x-test]=xxPlasma Tab Stylexx
Name[zh_CN]=Plasma 标签样式
Name[zh_CN]=Plasma 标签页风格
Name[zh_TW]=Plasma 分頁樣式
Comment=Plasma Tab style indicator for Latte
Comment[az]=Latte üçün Plasma Vərəq Üslubu indikatoru