1
0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +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 2020-03-27 10:59:22 +01:00
parent 85247d37b5
commit 40c034537f

View File

@ -10,7 +10,7 @@ Name[fi]=Latte-ilmaisimet
Name[gl]=Indicadores de Latte
Name[id]=Indikator Latte
Name[it]=Indicatori Latte
Name[ko]=Latte 표시도구
Name[ko]=Latte 표시
Name[nl]=Indicatoren van Latte
Name[nn]=Latte-markørar
Name[pl]=Wskaźniki Latte