kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-30 14:50:12 +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 2020-01-16 09:30:21 +01:00
parent 54e59e773b
commit b4dcd158a4
1 changed files with 1 additions and 1 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

@ -37,7 +37,7 @@ Comment[gl]=Indicador de estilo Plasma de Latte
Comment[id]=Indikator latte gaya Plasma
Comment[it]=Indicatore stile di Plasma di Latte
Comment[ko]=Latte 플라즈마 스타일 표시도구
Comment[nl]=Plasma stijlindicator van Latte
Comment[nl]=Plasma stijlindicator voor Latte
Comment[nn]=Latte-markør i Plasma-stil
Comment[pl]=Wskaźnik Latte dla Plazmy
Comment[pt]=Indicador de estilo do Plasma no Latte