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 2018-08-30 05:46:27 +02:00
parent d5573b51ac
commit fb39f01440
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

@ -49,7 +49,7 @@ Comment[fr]=Afficher les informations de vos périphériques
Comment[gl]=Mostrar información sobre os dispositivos
Comment[he]=הצג מידע עך ההתקנים שלך
Comment[hu]=Információk megjelenítése az eszközeiről
Comment[id]=Tayangan informasi tentang perngkatmu
Comment[id]=Displaikan informasi tentang perangkatmu
Comment[it]=Visualizza informazioni sui tuoi dispositivi
Comment[ko]=장치 정보 표시
Comment[nl]=Toon informatie over uw apparaten