mirror of
https://github.com/KDE/latte-dock.git
synced 2025-01-06 21:18:11 +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
5e5c352421
commit
1193856d40
@ -15,7 +15,7 @@ Comment[et]=Latte indikaator
|
||||
Comment[eu]=Latte adierazlea
|
||||
Comment[fi]=Latte-ilmaisin
|
||||
Comment[fr]=Indicateur de Latte
|
||||
Comment[gl]=Indicador de Latte
|
||||
Comment[gl]=Indicador de Latte.
|
||||
Comment[hsb]=Latte pokazowak
|
||||
Comment[id]=Indikator latte
|
||||
Comment[it]=Indicatore Latte
|
||||
|
Loading…
Reference in New Issue
Block a user