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
9c91042441
commit
542e503bbc
1 changed files with 1 additions and 1 deletions
|
@ -18,7 +18,7 @@ Name[gl]=Enviar por KDE Connect
|
|||
Name[it]=Invia tramite KDE Connect
|
||||
Name[ko]=KDE Connect로 통해 보내기
|
||||
Name[lt]=Siųsti per KDE Connect
|
||||
Name[nl]=Via KDE Connect versturen
|
||||
Name[nl]=Via KDE Connect verzenden
|
||||
Name[nn]=Send via KDE Connect
|
||||
Name[pl]=Wyślij przez KDE Connect
|
||||
Name[pt]=Enviar pelo KDE Connect
|
||||
|
|
Loading…
Reference in a new issue