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
2b8e95caac
commit
d0443e2e6b
1 changed files with 1 additions and 0 deletions
|
@ -9,6 +9,7 @@ Name[eu]=KDE Connect-en URL maneiatzailea
|
|||
Name[fi]=KDE Connectin verkko-osoitekäsittelijä
|
||||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||
Name[it]=Gestore URL di KDE Connect
|
||||
Name[ko]=KDE Connect URL 처리기
|
||||
Name[lt]=KDE Connect URL doroklė
|
||||
Name[nl]=URL behandelaar van KDE-Connect
|
||||
Name[nn]=KDE Connect adressehandsamar
|
||||
|
|
Loading…
Reference in a new issue