Albert Astals Cid
54faf31823
GIT_SILENT Update Appstream for new release
3 years ago
l10n daemon script
f6d578c876
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"
3 years ago
Heiko Becker
6076431f4b
GIT_SILENT Update Appstream for new release
3 years ago
l10n daemon script
8b72dcb4b2
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"
3 years ago
l10n daemon script
adaef601ce
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"
3 years ago
Ilya Pominov
a51de260f5
Fix build warning in pdf generator
...
warning: ‘void Poppler::Document::getPdfVersion(int*, int*) const’ is
deprecated [-Wdeprecated-declarations]
3 years ago
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"
3 years ago
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"
3 years ago
Heiko Becker
8119d903a3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit b39a4d7fe2 )
3 years ago
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"
4 years ago
l10n daemon script
5fcb59011b
GIT_SILENT made messages (after extraction)
4 years ago
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"
4 years ago
Heiko Becker
db9f77543e
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8cb15507fd )
4 years ago
Heiko Becker
8cb15507fd
GIT_SILENT Update Appstream for new release
4 years ago
Albert Astals Cid
4ad5753c3c
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit a0c6cb572a )
4 years ago
Albert Astals Cid
a0c6cb572a
GIT_SILENT Update Appstream for new release
4 years ago
Nicolas Fella
899575ce83
Remove unused include
4 years ago
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"
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
3d085787ea
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
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"
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
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"
4 years ago
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"
4 years ago
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"
4 years ago
l10n daemon script
dfe316c6ec
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
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"
4 years ago
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"
4 years ago
l10n daemon script
ad813d6667
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
e8d5f24ad4
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
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
Albert Astals Cid
8e311cf26d
Fix logical mistake in 44304b32a5
...
ifndef feature means < when checking for feature not >=
4 years ago
Albert Astals Cid
44304b32a5
Use the poppler version includes instead of check_cxx_source_compiles
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
Albert Astals Cid
252236d413
Port a few more QLinkedList to QList
...
We don't need the special properties of QLinkedList in any of those and
QLinkedList is deprecated, so move away from it
4 years ago