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
2981840026
commit
015672d98f
1 changed files with 1 additions and 1 deletions
|
@ -13,7 +13,7 @@ Name[et]=KDE Connecti rakendus
|
|||
Name[eu]=KDE Connect aplikazioa
|
||||
Name[fi]=KDE Connect -sovellus
|
||||
Name[fr]=Application KDE Connect
|
||||
Name[gl]=Aplicativo de KDE Connect
|
||||
Name[gl]=Aplicación de KDE Connect
|
||||
Name[he]=היישום KDE Connect
|
||||
Name[hu]=KDE Connect alkalmazás
|
||||
Name[id]=Aplikasi KDE Connect
|
||||
|
|
Loading…
Reference in a new issue