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
56d4029247
commit
958a1368a8
1 changed files with 1 additions and 0 deletions
|
@ -10,6 +10,7 @@ Name[fi]=KDE Connectin verkko-osoitekäsittelijä
|
|||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||
Name[ia]=Gerente de URL de KDE Connect
|
||||
Name[it]=Gestore URL di KDE Connect
|
||||
Name[ko]=KDE Connect URL 처리기
|
||||
Name[nl]=URL behandelaar van KDE-Connect
|
||||
Name[nn]=KDE Connect adressehandsamar
|
||||
Name[pt]=Tratamento de URL's do KDE Connect
|
||||
|
|
Loading…
Reference in a new issue