Commit graph

2633 commits

Author SHA1 Message Date
l10n daemon script
e7f7f7d7af GIT_SILENT made messages (after extraction) 2023-02-25 00:58:02 +00: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
Cimbali
a33e499b40 Fix wrong interpretation of autoplay flag
BUGS: 436709
2023-02-15 23:32:49 +00:00
Albert Astals Cid
f1f638c2c5 Compile with discount 3 2023-02-09 22:46:26 +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
Willyanto Willyanto
98876cf588 Replace qSwap with std::swap
Fixes obsolete function 'qSwap' called. It is recommended to use 'std::swap'
instead. (CWE-477)
2023-01-26 18:11:50 +00: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
l10n daemon script
a9c435bce6 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-12-11 01:52:30 +00: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
dcc6cd77f2 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-29 01:49:28 +00:00
Albert Astals Cid
fc8059575e Two more version checks that are not needed now 2022-11-19 11:10:16 +01:00
Albert Astals Cid
91afa74342 Set minimum requirement to Ubuntu 22.04 2022-11-19 09:48:15 +00: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
l10n daemon script
3c4d8cbfd3 GIT_SILENT made messages (after extraction) 2022-11-11 00:43:49 +00:00
l10n daemon script
9f1300c115 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-10 01:51:04 +00:00
Ilya Pominov
a51de260f5 Fix build warning in pdf generator
warning: ‘void Poppler::Document::getPdfVersion(int*, int*) const’ is
deprecated [-Wdeprecated-declarations]
2022-11-03 01:05:40 +03:00
l10n daemon script
a8a89b2d8c 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-01 01:52:20 +00:00
l10n daemon script
547a0e2f76 GIT_SILENT made messages (after extraction) 2022-11-01 00:45:28 +00:00
l10n daemon script
9579a4540f 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-10-28 01:51:08 +00:00
l10n daemon script
235c93c8ad GIT_SILENT made messages (after extraction) 2022-10-28 00:43:52 +00:00
Heiko Becker
8119d903a3 GIT_SILENT Update Appstream for new release
(cherry picked from commit b39a4d7fe2)
2022-10-10 21:58:46 +02:00
l10n daemon script
804cadfb53 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-09-18 01:41:53 +00:00
l10n daemon script
5fcb59011b GIT_SILENT made messages (after extraction) 2022-09-18 00:43:16 +00:00
l10n daemon script
04059bae4b 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-09-08 01:47:47 +00:00
Heiko Becker
db9f77543e GIT_SILENT Update Appstream for new release
(cherry picked from commit 8cb15507fd)
2022-09-03 01:08:35 +02:00
Albert Astals Cid
b2c56a0a71 Merge remote-tracking branch 'origin/release/22.08' 2022-08-31 22:09:06 +02:00
Albert Astals Cid
656587ca63 epub: Improve TableOfContents for some files
The link can be percent encoded so try it like that if not found in the
normal way, also if the text overflows the page, it's in the next page

BUGS: 458289
2022-08-25 23:38:42 +02:00
Albert Astals Cid
4ad5753c3c GIT_SILENT Update Appstream for new release
(cherry picked from commit a0c6cb572a)
2022-08-10 23:45:16 +02:00
Albert Astals Cid
a0c6cb572a GIT_SILENT Update Appstream for new release 2022-08-10 23:44:59 +02:00
l10n daemon script
0330558977 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-08-07 02:53:38 +00:00
l10n daemon script
f0d3e6f047 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-08-07 01:45:43 +00:00
Nicolas Fella
899575ce83 Remove unused include 2022-08-06 19:40:51 +02:00
l10n daemon script
7589278d35 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-08-05 01:42:21 +00:00
Albert Astals Cid
0a571b84df clang-tidy-14 2022-08-02 23:09:05 +02:00
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
l10n daemon script
a761a59630 GIT_SILENT made messages (after extraction) 2022-06-13 00:54:48 +00:00
Albert Astals Cid
12a222c950 Merge remote-tracking branch 'origin/release/22.04' 2022-06-09 11:21:35 +02:00
l10n daemon script
b910edafb6 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-09 03:27:27 +00:00
l10n daemon script
1626b59fef 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-09 02:00:18 +00:00
l10n daemon script
06612d93f0 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-07 03:45:56 +00:00