l10n daemon script
209e4aa034
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"
4 years ago
Heiko Becker
8cb15507fd
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
a0c6cb572a
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
7094ed0586
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"
4 years ago
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"
4 years ago
l10n daemon script
946406d114
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"
4 years ago
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"
4 years ago
l10n daemon script
07b9872518
GIT_SILENT made messages (after extraction)
4 years ago
Heiko Becker
f9e78b9253
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 6bc195446d )
4 years ago
Heiko Becker
6bc195446d
GIT_SILENT Update Appstream for new release
4 years ago
l10n daemon script
1852cc8513
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"
4 years ago
l10n daemon script
b438b6bb0f
GIT_SILENT made messages (after extraction)
4 years ago
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"
4 years ago
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)
4 years ago
l10n daemon script
559c274f3a
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"
4 years ago
Heiko Becker
6ad408cd66
GIT_SILENT Update Appstream for new release
4 years ago
Heiko Becker
be0f1090ae
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 3144226af6 )
4 years ago
Heiko Becker
3144226af6
GIT_SILENT Update Appstream for new release
4 years ago
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"
4 years ago
Heiko Becker
715b8707b5
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 172f4edeae )
4 years ago
Heiko Becker
172f4edeae
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
0d40301d50
Add a few definitions that will come with ECM 5.85
...
Better enforce them now, so that the work to port doesn't increase over
time
Not a super fan of this for regular applications, but oh well the ship
has sailed
4 years ago
M B
5339b7eef1
Markdown: Fix images with special chars in URLs not loaded
...
If an image URL contains a non-ASCII character (e.g. `kartöffelchen.jpg`), the html returned by the markdown parser contains the encoded path `kart%C3%B6ffelchen.jpg`. We must decode the path before checking if the image file exists.
(cherry picked from commit 8aa96484da )
4 years ago
M B
8aa96484da
Markdown: Fix images with special chars in URLs not loaded
...
If an image URL contains a non-ASCII character (e.g. `kartöffelchen.jpg`), the html returned by the markdown parser contains the encoded path `kart%C3%B6ffelchen.jpg`. We must decode the path before checking if the image file exists.
4 years ago
Albert Astals Cid
5ceeb68dfe
Remove unused KIO::Core dependencies
4 years ago
Albert Astals Cid
ba35bbd9e6
emit -> Q_EMIT
...
A future ECM is going to force that on us, so do it early
4 years ago
Volker Krause
50d0703ae0
Enable readability-braces-around-statements
4 years ago
Heiko Becker
fe5847155c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b2d872c79f )
4 years ago
l10n daemon script
18fab8e19b
GIT_SILENT made messages (after extraction)
4 years ago
l10n daemon script
9cdc390f53
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"
4 years ago
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"
4 years ago
Heiko Becker
db9dd90925
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 715fd1ac36 )
4 years ago
Heiko Becker
715fd1ac36
GIT_SILENT Update Appstream for new release
4 years ago
Heiko Becker
11448b94b1
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8a09492a9a )
4 years ago
Heiko Becker
8a09492a9a
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
84d977dd2d
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
09a2b506ed
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 84d977dd2d )
4 years ago
Albert Astals Cid
f686f4c6bf
Markdown: Don't crash on files with html images, alt text, inside links
...
If we have code like <a><img></a><a><img></a> and the img has alt text
The old code did
remove image
insert alt text
but when we remove the image, the qtextdocument says
"i don't need the <a> anymore since there's nothing inside"
and then everything breaks because the layout has changed and we're
iterating over "unexisting" text blocks
So instead we just insert the alt text and
since we have selected the image with the cursor it will
replace it correctly
BUGS: 444971
4 years ago
Heiko Becker
b5eebfa12d
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2a00f650c5 )
4 years ago
Heiko Becker
458c72a9c3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4304bcc397 )
5 years ago
Heiko Becker
4304bcc397
GIT_SILENT Update Appstream for new release
5 years ago
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"
5 years ago
Albert Astals Cid
bbc775909c
markdown: Only remove text if we're going to add something
...
Otherwise things get confused
BUGS: 443057
(cherry picked from commit 3b8cbc3320 )
5 years ago
Albert Astals Cid
3b8cbc3320
markdown: Only remove text if we're going to add something
...
Otherwise things get confused
BUGS: 443057
5 years ago
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"
5 years ago
l10n daemon script
9a4f79ff83
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
7c87c702df
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"
5 years ago
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"
5 years ago
l10n daemon script
f023cdc5b7
GIT_SILENT made messages (after extraction)
5 years ago
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"
5 years ago