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
06736423ed
commit
720476bfd7
1 changed files with 4 additions and 0 deletions
|
@ -5,6 +5,10 @@ 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
|
||||
Name[sr]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
|
||||
Name[sr@ijekavian]=КДЕ‑конекцијин руковалац телефонским УРЛ‑овима
|
||||
Name[sr@ijekavianlatin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima
|
||||
Name[sr@latin]=KDE‑konekcijin rukovalac telefonskim URL‑ovima
|
||||
Name[sv]=KDE-anslut hanterare av telefonwebbadress
|
||||
Name[uk]=Обробник телефонних адрес KDE Connect
|
||||
Name[x-test]=xxKDE Connect Phone URL Handlerxx
|
||||
|
|
Loading…
Reference in a new issue