[Kst] [Kst-plot/kst] 4357c2: SVN_SILENT made messages (.desktop file) - always ...

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 4357c20bda861803b18b4f38676b361a6110caaf
      https://github.com/Kst-plot/kst/commit/4357c20bda861803b18b4f38676b361a6110caaf
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-12-09 (Wed, 09 Dec 2015)

  Changed paths:
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/fitsimage/kstdata_fitsimage.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/sourcelist/kstdata_sourcelist.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.desktop
    M src/kst/x-kst2.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/dataobject/bin/kstplugin_bin.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop

  Log Message:
  -----------
  SVN_SILENT made messages (.desktop file) - always resolve ours

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"