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
fce8bc1e53
commit
3c810530e7
1 changed files with 1 additions and 0 deletions
|
@ -24,6 +24,7 @@ Name[pl]=Obsługa adresów URL dla KDE Connect
|
||||||
Name[pt]=Tratamento de URL's do KDE Connect
|
Name[pt]=Tratamento de URL's do KDE Connect
|
||||||
Name[pt_BR]=Tratamento de URLs do KDE Connect
|
Name[pt_BR]=Tratamento de URLs do KDE Connect
|
||||||
Name[ro]=Manipulant de URL KDE Connect
|
Name[ro]=Manipulant de URL KDE Connect
|
||||||
|
Name[sk]=Obslužný program URL KDE Connect
|
||||||
Name[sl]=Upravitelj naslovov KDE Connect
|
Name[sl]=Upravitelj naslovov KDE Connect
|
||||||
Name[sv]=KDE-anslut webbadresshanterare
|
Name[sv]=KDE-anslut webbadresshanterare
|
||||||
Name[uk]=Обробник адрес KDE Connect
|
Name[uk]=Обробник адрес KDE Connect
|
||||||
|
|
Loading…
Reference in a new issue