l10n daemon script
6faaf727f6
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
54687d764d
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
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"
5 years ago
Heiko Becker
5c16b25a11
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
9672d09900
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5c16b25a11 )
5 years ago
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"
5 years ago
l10n daemon script
361d084c44
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
7c2bac7d27
GIT_SILENT made messages (after extraction)
5 years ago
Heiko Becker
139b822b0f
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit bf0642bfcb )
5 years ago
Heiko Becker
bf0642bfcb
GIT_SILENT Update Appstream for new release
5 years ago
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"
5 years ago
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"
5 years ago
l10n daemon script
561336f2f0
GIT_SILENT made messages (after extraction)
5 years ago
Heiko Becker
ab812e6a52
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit a0cc1cd31e )
5 years ago
Alexander Lohnau
2f193a63de
Convert license headers to SPDX
5 years ago
Heiko Becker
0692e8b037
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
c785887516
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0692e8b037 )
5 years ago
l10n daemon script
6ad2ebdbbb
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
724b9413e3
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
3fb0390f2f
GIT_SILENT made messages (after extraction)
5 years ago
Alexander Lohnau
8b13d989c6
Clean up ServiceType property usage for JSON based plugins
...
This is no needed anymore, because the plugins are installed into a
specific dir. It is a leftover from the time where the ServiceTypes were
used to find the correct plugins.
Task: https://phabricator.kde.org/T14483
5 years ago
Heiko Becker
5941247354
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 1898bd2bec )
5 years ago
Heiko Becker
1898bd2bec
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
74c92306b8
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
218c5ab64e
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
41d3bedc41
GIT_SILENT made messages (after extraction)
5 years ago
Heiko Becker
e6dae5d4f9
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 8bdc851688 )
5 years ago
Heiko Becker
8bdc851688
GIT_SILENT Update Appstream for new release
5 years ago
Albert Astals Cid
3f923aa7b5
Move to new appstream format for mimetypes
...
It seems using mimetypes+mimetype is bad and now you have to use
provides+mediatype
5 years ago
Heiko Becker
5044a63cd4
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 5951fc2731 )
5 years ago
Heiko Becker
5951fc2731
GIT_SILENT Update Appstream for new release
5 years ago
Heiko Becker
1c97e60dbd
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 2aff8958b1 )
5 years ago
Heiko Becker
2aff8958b1
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
ee40297976
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
4161fec216
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
f16b767057
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
a61977aa8a
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
33483a10fa
GIT_SILENT made messages (after extraction)
5 years ago
l10n daemon script
c9440a9160
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
a752711872
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
02c3bd691a
GIT_SILENT Update Appstream for new release
5 years ago
l10n daemon script
dc74ffa68c
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
6abe9fcdfd
GIT_SILENT made messages (after extraction)
5 years ago
Christoph Feck
6a31bfc7e3
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 0abdab924d )
6 years ago
Christoph Feck
0abdab924d
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
b3101774cf
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit 4b9e50a1ed )
6 years ago
Christoph Feck
4b9e50a1ed
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
f6ce4a57d8
GIT_SILENT Update Appstream for new release
6 years ago
Christoph Feck
d0b9d83946
GIT_SILENT Update Appstream for new release
...
(cherry picked from commit f6ce4a57d8 )
6 years ago
l10n daemon script
36a6010c4f
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"
6 years ago