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
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
Jeremy Whiting
d491dacf37
Move xps generator away from deprecated QtXml classes.
...
Move XpsHandler bits into XpsPage to parse xml using new classes.
Use QXmlStreamReader instead of QXmlInputSource.
Use QXmlStreamAttributes instead of deprecated QXmlAttributes.
Convert QStringRef return values to string as needed.
2023-07-21 19:20:41 +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
Sune Vuorela
0f18f49397
Simple deprecation. SkipEmptyParts
2023-05-03 09:26:17 +00: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
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
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
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
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
4ad5753c3c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit a0c6cb572a
)
2022-08-10 23:45:16 +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
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
c53a64c8da
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-09 02:50:27 +00:00
l10n daemon script
8805d1bde9
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-09 01:41:46 +00:00