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

Antonio Larrosa noreply at github.com
Thu May 1 23:58:19 BST 2025 

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: b1aa3181bc2a8e5aea9a63e3b1c5996c7ef1c1dd
      https://github.com/Kst-plot/kst/commit/b1aa3181bc2a8e5aea9a63e3b1c5996c7ef1c1dd
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-11-26 (Tue, 26 Nov 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: 22830b91eef8717c89617d2f3f6e542502fedbf2
      https://github.com/Kst-plot/kst/commit/22830b91eef8717c89617d2f3f6e542502fedbf2
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-11-27 (Wed, 27 Nov 2024)

  Changed paths:
    M src/plugins/filters/butterworth_bandpass/kstplugin_filter_butterworth_bandpass.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/hpboxcar/kstplugin_hpboxcar.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: 0e1dfa4537f90edae32a4f136d89ca860d692089
      https://github.com/Kst-plot/kst/commit/0e1dfa4537f90edae32a4f136d89ca860d692089
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-11-28 (Thu, 28 Nov 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: 83ab79f7e81080b78faa555770f8473fc8165228
      https://github.com/Kst-plot/kst/commit/83ab79f7e81080b78faa555770f8473fc8165228
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-11-29 (Fri, 29 Nov 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: 7cb3541c56161217f90bee52214163a62f548d92
      https://github.com/Kst-plot/kst/commit/7cb3541c56161217f90bee52214163a62f548d92
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-12-03 (Tue, 03 Dec 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: 5793c8473140b6f8114673a2e04efecc7419df52
      https://github.com/Kst-plot/kst/commit/5793c8473140b6f8114673a2e04efecc7419df52
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-12-05 (Thu, 05 Dec 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: cae47f24de806e217cd8a887a435949d59a42583
      https://github.com/Kst-plot/kst/commit/cae47f24de806e217cd8a887a435949d59a42583
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-12-08 (Sun, 08 Dec 2024)

  Changed paths:
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.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: d301860257eb10a7d5a0f8fc9830a10832b44b99
      https://github.com/Kst-plot/kst/commit/d301860257eb10a7d5a0f8fc9830a10832b44b99
  Author: l10n daemon script <scripty at kde.org>
  Date:   2025-01-04 (Sat, 04 Jan 2025)

  Changed paths:
    M src/plugins/filters/boxcar/kstplugin_boxcar.desktop
    M src/plugins/filters/exponential/kstplugin_exponential.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.desktop
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.desktop
    M src/plugins/filters/movingaverage/kstplugin_movingaverage.desktop
    M src/plugins/filters/movingmedian/kstplugin_movingmedian.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: 16334f6f99613a1b60873d93835f9083dca258b2
      https://github.com/Kst-plot/kst/commit/16334f6f99613a1b60873d93835f9083dca258b2
  Author: l10n daemon script <scripty at kde.org>
  Date:   2025-04-15 (Tue, 15 Apr 2025)

  Changed paths:
    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"


  Commit: 925d6fd0639306e3b300d52cb5b2788b07224010
      https://github.com/Kst-plot/kst/commit/925d6fd0639306e3b300d52cb5b2788b07224010
  Author: l10n daemon script <scripty at kde.org>
  Date:   2025-04-27 (Sun, 27 Apr 2025)

  Changed paths:
    M src/datasources/ascii/kstdata_ascii.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/hdf5/kstdata_hdf5.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: 2a7f4871a6813abafddd5d72638614689edf5769
      https://github.com/Kst-plot/kst/commit/2a7f4871a6813abafddd5d72638614689edf5769
  Author: Christophe Marin <christophe at krop.fr>
  Date:   2025-04-27 (Sun, 27 Apr 2025)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Fix build with CMake 4

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


  Commit: 55b2447df2bc0db0912d0930ec23203d6218cb09
      https://github.com/Kst-plot/kst/commit/55b2447df2bc0db0912d0930ec23203d6218cb09
  Author: Antonio Larrosa <alarrosa at suse.com>
  Date:   2025-04-27 (Sun, 27 Apr 2025)

  Changed paths:
    M src/datasources/hdf5/hdf5.h

  Log Message:
  -----------
  Fix a header path

Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>


Compare: https://github.com/Kst-plot/kst/compare/b20945f01b8b...55b2447df2bc

To unsubscribe from these emails, change your notification settings at https://github.com/Kst-plot/kst/settings/notifications

More information about the Kst mailing list