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-06-28 08:22:58 +02:00
parent fbd7e6d383
commit bb3722b144
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
indicator/org.kde.kdeconnect.nonplasma.desktop
View file

@ -4,6 +4,7 @@ Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect
Name[de]=KDE-Connect-Anzeige
Name[es]=Indicador de KDE Connect
Name[fr]=Indicateur de KDE Connect
Name[it]=Indicatore di KDE Connect
Name[nl]=KDE-Connect indicator
Name[pl]=Wskaźnik KDE Connect

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

@ -3,6 +3,7 @@ Name=KDE Connect Phone URL Handler
Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
Name[es]=Controlador de URL de teléfonos de KDE Connect
Name[fr]=Gestionnaire d'URL téléphoniques de KDE Connect
Name[it]=Gestore URL del telefono di KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-telefoon
Name[pl]=KDE Connect - obsługa URL telefonu