mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01: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
102bd219b7
commit
2860504d6b
|
@ -18,6 +18,7 @@ Name[nn]=Falkon
|
|||
Name[pl]=Falkon
|
||||
Name[pt]=Falkon
|
||||
Name[pt_BR]=Falkon
|
||||
Name[ru]=Falkon
|
||||
Name[sk]=Falkon
|
||||
Name[sv]=Falkon
|
||||
Name[uk]=Falkon
|
||||
|
|
Loading…
Reference in New Issue
Block a user