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 2017-11-28 05:04:29 +01:00
parent ba5e3ab2f8
commit afbaa911f9
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.telhandler.desktop
View file

@ -4,6 +4,7 @@ Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
Name[cs]=Nástroj pro práci s URL telefonu v KDE Connect
Name[da]=Telefon-URL-håndtering til KDE Connect
Name[de]=KDE-Connect-Telefon-Dienstprogramm für URLs (Adressen)
Name[el]=KDE Connect χειριστής URL για σύνδεση τηλεφώνου
Name[en_GB]=KDE Connect Phone URL Handler
Name[es]=Controlador de URL de teléfonos de KDE Connect