tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2020-07-01 06:01:31 +02:00
parent 2b8e95caac
commit d0443e2e6b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
urlhandler/org.kde.kdeconnect.handler.desktop
View file

@ -9,6 +9,7 @@ Name[eu]=KDE Connect-en URL maneiatzailea
Name[fi]=KDE Connectin verkko-osoitekäsittelijä Name[fi]=KDE Connectin verkko-osoitekäsittelijä
Name[fr]=Gestionnaire d'URL de KDE Connect Name[fr]=Gestionnaire d'URL de KDE Connect
Name[it]=Gestore URL di KDE Connect Name[it]=Gestore URL di KDE Connect
Name[ko]=KDE Connect URL 처리기
Name[lt]=KDE Connect URL doroklė Name[lt]=KDE Connect URL doroklė
Name[nl]=URL behandelaar van KDE-Connect Name[nl]=URL behandelaar van KDE-Connect
Name[nn]=KDE Connect adressehandsamar Name[nn]=KDE Connect adressehandsamar