Commit graph

482 commits

Author SHA1 Message Date
l10n daemon script
326d314677 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-07-03 01:54:16 +00:00
l10n daemon script
566687744e 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-07-02 01:59:30 +00:00
l10n daemon script
07b9872518 GIT_SILENT made messages (after extraction) 2022-07-02 00:44:24 +00:00
Heiko Becker
f9e78b9253 GIT_SILENT Update Appstream for new release
(cherry picked from commit 6bc195446d)
2022-07-01 21:37:09 +02:00
l10n daemon script
9df4986183 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-07-01 01:46:49 +00:00
Harald Sitter
8870f6074f alias generator desktop files
this allows UIs to know that this is really okular and may show okular
instead (considering the generators are nodisplay=true)

specifically this allows the xdg-desktop-portal-kde to show okular in
its appchooser dialog even though the actual mimetype match happend
against (e.g.) okularApplication_pdf.desktop and is NoDisplay

(mobile curious has inconsistent naming, the main desktop file is
definitely org.kde.okular.kirigami.desktop)
2022-06-17 17:37:10 +00:00
l10n daemon script
d17b4ab2e9 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-06-13 02:20:38 +00:00
Albert Astals Cid
12a222c950 Merge remote-tracking branch 'origin/release/22.04' 2022-06-09 11:21:35 +02:00
Heiko Becker
6ad408cd66 GIT_SILENT Update Appstream for new release 2022-06-04 10:27:58 +02:00
l10n daemon script
c823af787b 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-05-31 03:16:29 +00:00
l10n daemon script
a1d0b42a7f 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-05-31 01:55:33 +00:00
Heiko Becker
be0f1090ae GIT_SILENT Update Appstream for new release
(cherry picked from commit 3144226af6)
2022-05-07 11:34:49 +02:00
Heiko Becker
3144226af6 GIT_SILENT Update Appstream for new release 2022-05-07 11:34:30 +02:00
l10n daemon script
7cd0d78b5c 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-04-14 01:42:53 +00:00
Heiko Becker
715b8707b5 GIT_SILENT Update Appstream for new release
(cherry picked from commit 172f4edeae)
2022-04-12 23:28:06 +02:00
Heiko Becker
172f4edeae GIT_SILENT Update Appstream for new release 2022-04-12 23:27:55 +02:00
Albert Astals Cid
5ceeb68dfe Remove unused KIO::Core dependencies 2022-04-03 10:57:09 +00:00
Albert Astals Cid
ba35bbd9e6 emit -> Q_EMIT
A future ECM is going to force that on us, so do it early
2022-03-19 10:58:47 +00:00
Volker Krause
50d0703ae0 Enable readability-braces-around-statements 2022-03-09 23:29:56 +01:00
Heiko Becker
fe5847155c GIT_SILENT Update Appstream for new release
(cherry picked from commit b2d872c79f)
2022-02-27 19:11:13 +01:00
l10n daemon script
5115d6db24 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-02-05 01:43:36 +00:00
Heiko Becker
db9dd90925 GIT_SILENT Update Appstream for new release
(cherry picked from commit 715fd1ac36)
2022-01-28 23:45:01 +01:00
Leonid Soshinskiy
cc0e128561 fb2: fix duplicating book title, annotation, cover etc. 2022-01-06 09:57:43 +00:00
Lenny Soshinskiy
2b837e08a0 fb2: show keywords in DocumentInfo 2022-01-05 15:16:55 +00:00
Yuri Chornoivan
3400e8aee6 Remove extra spaces in FB2 paragraphs
BUG: 359059
2022-01-04 12:08:43 +00:00
Heiko Becker
11448b94b1 GIT_SILENT Update Appstream for new release
(cherry picked from commit 8a09492a9a)
2022-01-04 01:06:53 +01:00
Albert Astals Cid
09a2b506ed GIT_SILENT Update Appstream for new release
(cherry picked from commit 84d977dd2d)
2021-12-09 17:12:37 +01:00
Heiko Becker
b5eebfa12d GIT_SILENT Update Appstream for new release
(cherry picked from commit 2a00f650c5)
2021-10-31 11:18:54 +01:00
Heiko Becker
458c72a9c3 GIT_SILENT Update Appstream for new release
(cherry picked from commit 4304bcc397)
2021-10-05 00:16:35 +02:00
l10n daemon script
84c9f3ea2a 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"
2021-10-01 01:22:33 +00:00
l10n daemon script
e6c6e52253 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"
2021-09-15 01:20:14 +00:00
l10n daemon script
9a4f79ff83 GIT_SILENT made messages (after extraction) 2021-09-15 00:17:02 +00:00
l10n daemon script
7ae4288f35 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"
2021-09-10 01:16:35 +00:00
l10n daemon script
f023cdc5b7 GIT_SILENT made messages (after extraction) 2021-09-10 00:16:21 +00:00
l10n daemon script
21f96680a6 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"
2021-09-08 01:23:37 +00:00
l10n daemon script
a225fb6d9a 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"
2021-08-28 01:17:34 +00:00
Heiko Becker
9672d09900 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5c16b25a11)
2021-08-27 22:59:54 +02:00
Albert Astals Cid
c0de8366fc Merge remote-tracking branch 'origin/release/21.08' 2021-08-27 10:44:29 +02:00
l10n daemon script
3dbe3b18f5 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"
2021-08-23 02:27:41 +00:00
l10n daemon script
361d084c44 GIT_SILENT made messages (after extraction) 2021-08-23 01:51:24 +00:00
l10n daemon script
7c2bac7d27 GIT_SILENT made messages (after extraction) 2021-08-22 00:15:58 +00:00
Heiko Becker
139b822b0f GIT_SILENT Update Appstream for new release
(cherry picked from commit bf0642bfcb)
2021-08-04 23:53:58 +02:00
Heiko Becker
bf0642bfcb GIT_SILENT Update Appstream for new release 2021-08-04 23:53:58 +02:00
Yaroslav Sidlovsky
504eec7688 Fix non unique KPlugin Id for fictionbook generator
BUG: 439807
(cherry picked from commit 8dc58c7617)
2021-07-14 21:58:22 +02:00
Yaroslav Sidlovsky
8dc58c7617 Fix non unique KPlugin Id for fictionbook generator
BUG: 439807
2021-07-13 22:00:42 +00:00
l10n daemon script
5447aa1021 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"
2021-07-11 01:11:37 +00:00
l10n daemon script
16da5cb4b4 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"
2021-07-06 01:14:42 +00:00
l10n daemon script
561336f2f0 GIT_SILENT made messages (after extraction) 2021-07-06 00:15:45 +00:00
Heiko Becker
ab812e6a52 GIT_SILENT Update Appstream for new release
(cherry picked from commit a0cc1cd31e)
2021-07-05 21:05:39 +02:00
Nicolas Fella
7d15dc1ae6 Clean up include_directories calls
Remove unnecessary calls

Convert necessary calls to target_include_directories
2021-07-04 00:51:15 +02:00