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

netterfield noreply at github.com
Thu Jul 1 00:59:14 BST 2021


  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 845b3a0aa18bab86c03c73f3f5110d9c00ec2500
      https://github.com/Kst-plot/kst/commit/845b3a0aa18bab86c03c73f3f5110d9c00ec2500
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-02 (Tue, 02 Jun 2020)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.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"


  Commit: f74321e68a3eaab5d68179d95027196c0113c1ed
      https://github.com/Kst-plot/kst/commit/f74321e68a3eaab5d68179d95027196c0113c1ed
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-17 (Wed, 17 Jun 2020)

  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/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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/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/flag/kstplugin_filter_flag.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"


  Commit: 6f8880fb296407b6f326aeffaf709fb7d2156f03
      https://github.com/Kst-plot/kst/commit/6f8880fb296407b6f326aeffaf709fb7d2156f03
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-18 (Thu, 18 Jun 2020)

  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/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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/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/flag/kstplugin_filter_flag.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"


  Commit: d8ff520c9328f12001f5706b708ee52e9e56f14a
      https://github.com/Kst-plot/kst/commit/d8ff520c9328f12001f5706b708ee52e9e56f14a
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-24 (Wed, 24 Jun 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 9f069603b1a3c1828d502fabf12962c1b4ba850e
      https://github.com/Kst-plot/kst/commit/9f069603b1a3c1828d502fabf12962c1b4ba850e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-24 (Wed, 24 Jun 2020)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.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"


  Commit: 1195e4dfb7230d2414e10c00a23722238133fabc
      https://github.com/Kst-plot/kst/commit/1195e4dfb7230d2414e10c00a23722238133fabc
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-06-25 (Thu, 25 Jun 2020)

  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/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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/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

  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"


  Commit: ace16ef9fbff95ba4d7d5bec228a54efb8af293b
      https://github.com/Kst-plot/kst/commit/ace16ef9fbff95ba4d7d5bec228a54efb8af293b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-07-26 (Sun, 26 Jul 2020)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.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/hdf5/kstdata_hdf5.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.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/flag/kstplugin_filter_flag.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"


  Commit: 2346aa1d368c290a51ba9b12300fa06455256419
      https://github.com/Kst-plot/kst/commit/2346aa1d368c290a51ba9b12300fa06455256419
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-09-04 (Fri, 04 Sep 2020)

  Changed paths:
    M src/plugins/filters/window/kstplugin_filter_window.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"


  Commit: 54739323e39eaca56d514e5bf6edfbc9ed187f5e
      https://github.com/Kst-plot/kst/commit/54739323e39eaca56d514e5bf6edfbc9ed187f5e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-10-27 (Tue, 27 Oct 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: ddaf2f92a7973961f3650857573368ddfccc16bd
      https://github.com/Kst-plot/kst/commit/ddaf2f92a7973961f3650857573368ddfccc16bd
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 87d88ae49f38c015207ac5c9c5ba69d9995b4e12
      https://github.com/Kst-plot/kst/commit/87d88ae49f38c015207ac5c9c5ba69d9995b4e12
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-10-29 (Thu, 29 Oct 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: dff1110682643e319e329c8fd6bd61d5f5e39dae
      https://github.com/Kst-plot/kst/commit/dff1110682643e319e329c8fd6bd61d5f5e39dae
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-10-30 (Fri, 30 Oct 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 22c5dd34519bf4159b9ed66bb2aa0ed15927c4f7
      https://github.com/Kst-plot/kst/commit/22c5dd34519bf4159b9ed66bb2aa0ed15927c4f7
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-11-01 (Sun, 01 Nov 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: e9098254c7fcc2f4e3f38696b71b1a03dc920597
      https://github.com/Kst-plot/kst/commit/e9098254c7fcc2f4e3f38696b71b1a03dc920597
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-11-03 (Tue, 03 Nov 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: b2e8bcf8a2e64679de9ce64e7b9cea2a04afda9e
      https://github.com/Kst-plot/kst/commit/b2e8bcf8a2e64679de9ce64e7b9cea2a04afda9e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-11-05 (Thu, 05 Nov 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 592bf0128353db228e1993bf7410a9f6100f9d57
      https://github.com/Kst-plot/kst/commit/592bf0128353db228e1993bf7410a9f6100f9d57
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-11-07 (Sat, 07 Nov 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 9cd43659a0822f15c39ff25f1c20fc5f0bacee85
      https://github.com/Kst-plot/kst/commit/9cd43659a0822f15c39ff25f1c20fc5f0bacee85
  Author: l10n daemon script <scripty at kde.org>
  Date:   2020-11-22 (Sun, 22 Nov 2020)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 38eddb5322a1d557f9d86ea95d456d76272941e3
      https://github.com/Kst-plot/kst/commit/38eddb5322a1d557f9d86ea95d456d76272941e3
  Author: l10n daemon script <scripty at kde.org>
  Date:   2021-01-24 (Sun, 24 Jan 2021)

  Changed paths:
    M src/plugins/dataobject/bin/kstplugin_bin.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.desktop
    M src/plugins/fits/kneefrequency/kstplugin_fits_kneefrequency.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"


  Commit: 2f101360712175b4876216860f38800677d54bc4
      https://github.com/Kst-plot/kst/commit/2f101360712175b4876216860f38800677d54bc4
  Author: l10n daemon script <scripty at kde.org>
  Date:   2021-02-15 (Mon, 15 Feb 2021)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 6e92ce010f791eb41146ce409d1ceeed4d3e1783
      https://github.com/Kst-plot/kst/commit/6e92ce010f791eb41146ce409d1ceeed4d3e1783
  Author: l10n daemon script <scripty at kde.org>
  Date:   2021-03-09 (Tue, 09 Mar 2021)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 44c7d320b5df0981ff4e0bd96e74730586cb33a9
      https://github.com/Kst-plot/kst/commit/44c7d320b5df0981ff4e0bd96e74730586cb33a9
  Author: l10n daemon script <scripty at kde.org>
  Date:   2021-03-27 (Sat, 27 Mar 2021)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


  Commit: 6a41644c39ffb394c350de3dacbacdffa54a0a2a
      https://github.com/Kst-plot/kst/commit/6a41644c39ffb394c350de3dacbacdffa54a0a2a
  Author: Adriaan de Groot <groot at kde.org>
  Date:   2021-04-03 (Sat, 03 Apr 2021)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Fix CMake-time with CMake 3.20

Having multiple else-blocks for a single if() is now a syntax
error; they need to be elseif() with only a single
optional else() at the end.


  Commit: 24d378c299265d4c2e4c9682f0f1e69c6a7cfac2
      https://github.com/Kst-plot/kst/commit/24d378c299265d4c2e4c9682f0f1e69c6a7cfac2
  Author: Pino Toscano <pino at kde.org>
  Date:   2021-05-22 (Sat, 22 May 2021)

  Changed paths:
    R kst.spec.in

  Log Message:
  -----------
  Drop woefully outdated RPM spec file

It refers to KDE 3 bits, so better remove it instead of confusing
users.


  Commit: 254ee25e7a57d2d2696dd24463141ae06c717930
      https://github.com/Kst-plot/kst/commit/254ee25e7a57d2d2696dd24463141ae06c717930
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2021-06-30 (Wed, 30 Jun 2021)

  Changed paths:
    M src/libkstapp/mainwindow.cpp
    M src/libkstapp/mainwindow.h

  Log Message:
  -----------
  Add option to hide status bar.

Inspired by patch submitted to the list by Nadav Aharoni.


Compare: https://github.com/Kst-plot/kst/compare/132c0a14e6d5...254ee25e7a57


More information about the Kst mailing list