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:
parent
85247d37b5
commit
40c034537f
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user