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
858d7b0057
commit
06736423ed
1 changed files with 1 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect Phone URL Handler
|
||||
Name[ca]=Gestor d'URL de telèfons del KDE Connect
|
||||
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
|
||||
Name[nl]=URL behandelaar van KDE-Connect-telefoon
|
||||
Name[pl]=KDE Connect - obsługa URL telefonu
|
||||
Name[pt]=Tratamento de URL's Telefónicos do KDE Connect
|
||||
|
|
Loading…
Reference in a new issue