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 2015-10-28 10:17:04 +00:00
parent 633952b638
commit 3fd1eb4d2f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
Name=KDE Connect Monitor
Name[ca]=Controlador del KDE Connect
Name[cs]=Monitor KDE Connect
Name[de]=KDE-Connect-Monitor
Name[en_GB]=KDE Connect Monitor
Name[es]=Monitor de KDE Connect
Name[fi]=KDE Connect -valvonta
@ -21,6 +22,7 @@ Name[zh_CN]=KDE Connect 监视器
Comment=Display information about your devices
Comment[ca]=Mostra la informació dels vostres dispositius
Comment[cs]=Zobrazit informace o vašich zařízeních
Comment[de]=Anzeige von Informationen über Ihre Geräte
Comment[en_GB]=Display information about your devices
Comment[es]=Mostrar información sobre sus dispositivos
Comment[fi]=Näyttää tietoa laitteistasi