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
10de7b3763
commit
eefd721de6
1 changed files with 1 additions and 0 deletions
|
@ -5,6 +5,7 @@ Name[ca@valencia]=Gestor d'URL del KDE Connect
|
|||
Name[cs]=Nástroj pro práci s URL v KDE Connect
|
||||
Name[da]=URL-håndtering til KDE Connect
|
||||
Name[es]=Controlador de URL de KDE Connect
|
||||
Name[eu]=KDE Connect-eko URL maneiatzailea
|
||||
Name[fi]=KDE Connectin verkko-osoitekäsittelijä
|
||||
Name[fr]=Gestionnaire d'URL de KDE Connect
|
||||
Name[ia]=Gerente de URL de KDE Connect
|
||||
|
|
Loading…
Reference in a new issue