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-12 05:09:43 +02:00
parent 858d7b0057
commit 06736423ed
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

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Phone URL Handler Name=KDE Connect Phone URL Handler
Name[ca]=Gestor d'URL de telèfons del KDE Connect Name[ca]=Gestor d'URL de telèfons del KDE Connect
Name[ca@valencia]=Gestor d'URL de telèfons del KDE Connect
Name[nl]=URL behandelaar van KDE-Connect-telefoon Name[nl]=URL behandelaar van KDE-Connect-telefoon
Name[pl]=KDE Connect - obsługa URL telefonu Name[pl]=KDE Connect - obsługa URL telefonu
Name[pt]=Tratamento de URL's Telefónicos do KDE Connect Name[pt]=Tratamento de URL's Telefónicos do KDE Connect