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

l10n daemon script scripty at kde.org
Sun Sep 27 04:00:09 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 795dde0b6fd19529152460cddedbd358b55c2622
      https://github.com/Kst-plot/kst/commit/795dde0b6fd19529152460cddedbd358b55c2622
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-09-27 (Sun, 27 Sep 2015)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/ascii/kstdata_ascii.desktop
    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/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/chop/kstplugin_chop.desktop
    M src/plugins/dataobject/convolution/convolve/kstplugin_convolve.desktop
    M src/plugins/dataobject/convolution/deconvolve/kstplugin_deconvolve.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop
    M src/plugins/dataobject/correlation/crosscorrelation/kstplugin_crosscorrelation.desktop
    M src/plugins/dataobject/crossspectrum/kstplugin_crossspectrum.desktop
    M src/plugins/dataobject/effectivebandwidth/kstplugin_effectivebandwidth.desktop
    M src/plugins/dataobject/genericfilter/kstplugin_genericfilter.desktop
    M src/plugins/dataobject/interpolations/akima/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/akimaperiodic/kstplugin_akimaperiodic.desktop
    M src/plugins/dataobject/interpolations/cspline/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/csplineperiodic/kstplugin_csplineperiodic.desktop
    M src/plugins/dataobject/interpolations/linear/kstplugin_linear.desktop
    M src/plugins/dataobject/interpolations/polynomial/kstplugin_polynomial.desktop
    M src/plugins/dataobject/linefit/kstplugin_linefit.desktop
    M src/plugins/dataobject/lockin/kstplugin_lockin.desktop
    M src/plugins/dataobject/noiseaddition/kstplugin_noiseaddition.desktop
    M src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop
    M src/plugins/dataobject/phase/kstplugin_phase.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop
    M src/plugins/dataobject/statistics/kstplugin_statistics.desktop
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.desktop
    M src/plugins/filters/butterworth_bandpass/kstplugin_filter_butterworth_bandpass.desktop
    M src/plugins/filters/butterworth_bandstop/kstplugin_filter_butterworth_bandstop.desktop
    M src/plugins/filters/butterworth_highpass/kstplugin_filter_butterworth_highpass.desktop
    M src/plugins/filters/butterworth_lowpass/kstplugin_filter_butterworth_lowpass.desktop
    M src/plugins/filters/cumulativeaverage/kstplugin_cumulativeaverage.desktop
    M src/plugins/filters/cumulativesum/kstplugin_cumulativesum.desktop
    M src/plugins/filters/despike/kstplugin_filter_despike.desktop
    M src/plugins/filters/differentiation/kstplugin_differentiation.desktop
    M src/plugins/filters/unwind/kstplugin_filter_unwind.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.desktop
    M src/plugins/fits/exponential_weighted/kstplugin_fits_exponential_weighted.desktop
    M src/plugins/fits/gaussian_unweighted/kstplugin_fits_gaussian_unweighted.desktop
    M src/plugins/fits/gaussian_weighted/kstplugin_fits_gaussian_weighted.desktop
    M src/plugins/fits/gradient_unweighted/kstplugin_fits_gradient_unweighted.desktop
    M src/plugins/fits/gradient_weighted/kstplugin_fits_gradient_weighted.desktop
    M src/plugins/fits/kneefrequency/kstplugin_fits_kneefrequency.desktop
    M src/plugins/fits/linear_unweighted/kstplugin_fits_linear_unweighted.desktop
    M src/plugins/fits/linear_weighted/kstplugin_fits_linear_weighted.desktop
    M src/plugins/fits/lorentzian_unweighted/kstplugin_fits_lorentzian_unweighted.desktop
    M src/plugins/fits/lorentzian_weighted/kstplugin_fits_lorentzian_weighted.desktop
    M src/plugins/fits/polynomial_unweighted/kstplugin_fits_polynomial_unweighted.desktop
    M src/plugins/fits/polynomial_weighted/kstplugin_fits_polynomial_weighted.desktop
    M src/plugins/fits/sinusoid_unweighted/kstplugin_fits_sinusoid_unweighted.desktop
    M src/plugins/fits/sinusoid_weighted/kstplugin_fits_sinusoid_weighted.desktop
    M src/plugins/sampleplugin/kstplugin_sampleplugin.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"




More information about the Kst mailing list