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:
l10n daemon script 2019-05-11 05:53:53 +02:00
parent 23a1035f96
commit bba2d33579

View file

@ -9,40 +9,42 @@ NoDisplay=true
Icon=kdeconnect Icon=kdeconnect
Name=KDE Connect Name=KDE Connect
Name[ar]=عفريت KDEConnect Name[ar]=كدي المتّصل
Name[bg]=Услуга KDE Connect Name[bg]=KDE Connect
Name[ca]=Dimoni del KDEConnect Name[bs]=Konekcija KDE
Name[ca@valencia]=Dimoni del KDEConnect Name[ca]=KDE Connect
Name[cs]=Démon KDE Connect Name[ca@valencia]=KDE Connect
Name[da]=KDEConnect-dæmon Name[cs]=KDE Connect
Name[de]=KDE-Connect-Dienst Name[da]=KDE Connect
Name[el]=Δαίμονας του KDEConnect Name[de]=KDE-Connect
Name[en_GB]=KDEConnect daemon Name[el]=KDE Connect
Name[es]=Demonio de KDE Connect Name[en_GB]=KDE Connect
Name[et]=KDEConnecti deemon Name[es]=KDE Connect
Name[eu]=KDEConnect daimona Name[et]=KDE Connect
Name[fi]=KDEConnect-taustapalvelu Name[eu]=KDE Connect
Name[fr]=Démon KDE Connect Name[fi]=KDE Connect
Name[gl]=Servizo de KDE Connect Name[fr]=KDE Connect
Name[he]=דמון KDEConnect Name[gl]=KDE Connect
Name[hu]=KDEConnect szolgáltatás Name[he]=KDE Connect
Name[id]=Daemon KDEConnect Name[hu]=KDE csatlakozás
Name[it]=Demone KDE Connect Name[id]=KDE Connect
Name[ko]=KDE Name[it]=KDE Connect
Name[nl]=KDEConnect-daemon Name[ko]=KDE Connect
Name[nn]=KDEConnect-teneste Name[nl]=KDE Connect
Name[pl]=Usługa KDEConnect Name[nn]=KDE Connect
Name[pt]=Serviço do KDE Connect Name[pl]=KDE Connect
Name[pt_BR]=Serviço do KDE Connect Name[pt]=KDE Connect
Name[ru]=Служба KDE Connect Name[pt_BR]=KDE Connect
Name[sk]=KDEConnect démon Name[ro]=KDE Connect
Name[sr]=КДЕконекцијин демон Name[ru]=KDE Connect
Name[sr@ijekavian]=КДЕконекцијин демон Name[sk]=KDE Connect
Name[sr@ijekavianlatin]=KDEkonekcijin demon Name[sr]=КДЕконекција
Name[sr@latin]=KDEkonekcijin demon Name[sr@ijekavian]=КДЕконекција
Name[sv]=Demon för KDE-anslut Name[sr@ijekavianlatin]=KDEkonekcija
Name[tr]=KDEConnect süreci Name[sr@latin]=KDEkonekcija
Name[uk]=Фонова служба KDEConnect Name[sv]=KDE-anslut
Name[x-test]=xxKDEConnect daemonxx Name[tr]=KDE Connect
Name[zh_CN]=KDEConnect Name[uk]=Зєднання KDE
Name[zh_TW]=KDE Name[x-test]=xxKDE Connectxx
Name[zh_CN]=KDE Connect
Name[zh_TW]=KDE