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 2019-10-02 05:26:15 +02:00
parent 118d91ae78
commit 58dca31212
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,7 @@ Name=KDE Connect Indicator
Name[ast]=Indicador de KDE Connnect
Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect
Name[cs]=Indikátor KDE Connect
Name[cs]=Ukazatel KDE Connect
Name[da]=KDE Connect-indikator
Name[de]=KDE-Connect-Anzeige
Name[el]=Εφαρμογή ένδειξης KDE Connect