Commit graph

451 commits

Author SHA1 Message Date
Heiko Becker 9c2fb5af53 GIT_SILENT Update Appstream for new release
(cherry picked from commit 21c7411e1d)
2024-04-08 18:04:20 +02:00
l10n daemon script 081ec7d4ec GIT_SILENT made messages (after extraction) 2024-03-28 00:37:36 +00:00
Heiko Becker aa9ae5b82a GIT_SILENT Update Appstream for new release
(cherry picked from commit bb19076108)
2024-03-15 22:29:10 +01:00
l10n daemon script 6cc91439e1 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"
2024-03-09 01:13:56 +00:00
l10n daemon script 3324424891 GIT_SILENT made messages (after extraction) 2024-03-09 00:37:17 +00:00
Heiko Becker 3f042a7136 GIT_SILENT Update Appstream for new release
(cherry picked from commit 22481a6a89)
2024-02-16 00:56:02 +01:00
l10n daemon script 9d8e8c90ef 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"
2024-02-14 01:13:45 +00:00
Heiko Becker 4f215109fc GIT_SILENT Update Appstream for new release
(cherry picked from commit f98272f40f)
2024-02-10 00:41:17 +01:00
l10n daemon script 87c4cd8876 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"
2024-02-03 01:13:43 +00:00
l10n daemon script d614c09a25 GIT_SILENT made messages (after extraction) 2024-02-03 00:37:23 +00:00
l10n daemon script 882cebf811 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"
2024-02-02 01:12:49 +00:00
Sune Vuorela a0031b4a05 Remove leftover desktop files. The generators is now with json files 2024-01-09 21:57:05 +00:00
l10n daemon script 651098cf5a 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"
2024-01-08 02:08:32 +00:00
l10n daemon script ee54715d81 GIT_SILENT made messages (after extraction) 2024-01-08 01:35:10 +00:00
Sune Vuorela a0d40ab0bc Remove Id from json files. Everything complains and ignores 2023-12-18 22:56:22 +00:00
Nicolas Fella c29f0fec54 Switch to kf6 2023-12-18 22:56:22 +00:00
Nicolas Fella 30eca3dd96 Don't install kservice files for KF6
They are not relevant there
2023-12-18 22:56:22 +00:00
Sune Vuorela f3be4f1cd3 Hardcode Qt6 2023-12-18 22:56:22 +00:00
Nicolas Fella b1c904bda3 Don't hardcode Qt5
Prepares for using Qt6
2023-12-18 22:56:22 +00:00
l10n daemon script 20a5bb2b5c 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"
2023-12-14 01:15:39 +00:00
Heiko Becker 4696cb4a91 GIT_SILENT Update Appstream for new release
(cherry picked from commit 06578a35b7)
2023-11-30 18:02:31 +01:00
l10n daemon script 1641c47234 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"
2023-11-07 02:06:23 +00:00
l10n daemon script da7c7ee957 GIT_SILENT made messages (after extraction) 2023-11-07 01:13:10 +00:00
l10n daemon script 25e7d3fd6f GIT_SILENT made messages (after extraction) 2023-11-05 12:27:13 +00:00
l10n daemon script c16357bebf 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"
2023-11-04 11:46:37 +00:00
Heiko Becker b370320bbe GIT_SILENT Update Appstream for new release
(cherry picked from commit 22b81f84bd)
2023-11-04 12:00:51 +01:00
l10n daemon script e11183bfb9 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"
2023-10-20 01:19:41 +00:00
Heiko Becker f844409a14 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5c8e3c6b62)
2023-10-07 17:25:59 +02:00
Heiko Becker 02a23c5f52 GIT_SILENT Update Appstream for new release
(cherry picked from commit 0de81d092e)
2023-09-09 10:34:08 +02:00
Heiko Becker 044c2e3f08 GIT_SILENT Update Appstream for new release
(cherry picked from commit 0849af5fe8)
2023-08-16 22:56:30 +02:00
Sune Vuorela 88fc4032ac Random collection of cppcheck fixes
- missing consts
 - shadowing of variable names
 - superflous code
 - tighter scoping of some variables
 and other such bits
2023-08-10 22:47:57 +00:00
l10n daemon script 54a72d01ad 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"
2023-08-07 01:48:35 +00:00
l10n daemon script 22c6f90398 GIT_SILENT made messages (after extraction) 2023-08-07 00:45:24 +00:00
l10n daemon script eb676c23fb 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"
2023-07-31 01:38:24 +00:00
l10n daemon script a9f51e4490 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"
2023-07-30 01:37:06 +00:00
Heiko Becker c593aa5866 GIT_SILENT Update Appstream for new release
(cherry picked from commit 4b90f55cb6)
2023-06-30 00:22:01 +02:00
l10n daemon script 56c0407bcd 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"
2023-06-12 01:50:14 +00:00
Heiko Becker 34f99b2094 GIT_SILENT Update Appstream for new release
(cherry picked from commit 01906f8fd9)
2023-06-02 20:56:30 +02:00
Heiko Becker 1b5803a699 GIT_SILENT Update Appstream for new release
(cherry picked from commit 1e405ebc4c)
2023-05-06 10:22:13 +02:00
l10n daemon script 251ca60e90 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"
2023-04-24 01:43:52 +00:00
Heiko Becker 7c2c9a1231 GIT_SILENT Update Appstream for new release
(cherry picked from commit bcaeb7566a)
2023-04-12 18:13:21 +02:00
Heiko Becker c400b675b6 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5138c6ceae)
2023-02-24 22:39:10 +01:00
l10n daemon script 9ef28fffec 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"
2023-02-20 02:01:39 +00:00
l10n daemon script e91c6cf0cf GIT_SILENT made messages (after extraction) 2023-02-20 00:55:34 +00:00
l10n daemon script bf745445bf 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"
2023-02-16 02:03:52 +00:00
Heiko Becker c3c0d8d528 GIT_SILENT Update Appstream for new release
(cherry picked from commit cffa20eeae)
2023-01-30 01:08:40 +01:00
Albert Astals Cid 3165771409 GIT_SILENT Update Appstream for new release
(cherry picked from commit 54faf31823)
2023-01-03 01:18:33 +01:00
Heiko Becker 95846eaf4e GIT_SILENT Update Appstream for new release
(cherry picked from commit 6076431f4b)
2022-11-30 09:03:22 +01:00
Heiko Becker 7a27483063 GIT_SILENT Update Appstream for new release
(cherry picked from commit cf4777477c)
2022-11-30 09:03:22 +01:00
l10n daemon script b44ac3af51 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"
2022-11-11 01:50:49 +00:00