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-05-31 08:06:19 +02:00
parent 60fa493171
commit ece098ac3b
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
Name=KDE Connect Indicator
Name[ca]=Indicador del KDE Connect
Name[ca@valencia]=Indicador del KDE Connect
Name[de]=KDE-Connect-Anzeige
Name[nl]=KDE-Connect indicator
Name[pt]=Indicador do KDE Connect
Name[sv]=KDE-anslut indikator