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-09-29 12:23:45 +00:00
parent 7d1ce74d94
commit ba818c743c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcm/org.kde.kdeconnect.kcm.desktop
View file

@ -6,6 +6,7 @@ Exec=kcmshell5 kcm_kdeconnect
Name=KDE Connect Settings
Name[ca]=Arranjament del KDE Connect
Name[cs]=Nastavení KDE Connect
Name[de]=KDE-Connect-Einstellungen
Name[en_GB]=KDE Connect Settings
Name[es]=Ajustes de KDE Connect
Name[fi]=KDE Connectin asetukset