Commit graph

209 commits

Author SHA1 Message Date
l10n daemon script
ebfe0da73f GIT_SILENT made messages (after extraction) 2021-11-25 00:27:58 +00:00
l10n daemon script
c630a3de90 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"
2021-11-04 01:16:42 +00:00
l10n daemon script
210e8d6cdd GIT_SILENT made messages (after extraction) 2021-11-04 00:17:59 +00:00
l10n daemon script
057d3eeb7f GIT_SILENT made messages (after extraction) 2021-11-01 00:18:25 +00:00
Heiko Becker
94edd95f65 GIT_SILENT Update Appstream for new release
(cherry picked from commit 7885b78efe)
2021-10-31 11:36:50 +01:00
l10n daemon script
6c925803bb GIT_SILENT made messages (after extraction) 2021-10-31 00:16:32 +00:00
Tanguy Fardet
f3b9dcfd6f add mobile formfactor 2021-10-24 20:02:22 +02:00
l10n daemon script
89f3dccf32 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"
2021-10-16 01:16:19 +00:00
Heiko Becker
5dfbd6bb9a GIT_SILENT Update Appstream for new release
(cherry picked from commit cfdb39e9a4)
2021-10-05 00:34:00 +02:00
l10n daemon script
61b2e607b4 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"
2021-09-26 01:12:22 +00:00
l10n daemon script
d36ef58899 GIT_SILENT made messages (after extraction) 2021-09-16 00:17:28 +00:00
Nicolas Fella
1662179bd6 Remove icon from appstream metadata
It breaks the flatpak build and other projects don't have it either
2021-09-08 15:17:09 +02:00
l10n daemon script
5a3e5065f0 GIT_SILENT made messages (after extraction) 2021-09-02 00:17:39 +00:00
Heiko Becker
a5f7fe375c GIT_SILENT Update Appstream for new release
(cherry picked from commit 631f06645c)
2021-08-27 23:17:41 +02:00
Heiko Becker
d41558d541 GIT_SILENT Update Appstream for new release
(cherry picked from commit 076cd9930e)
2021-08-05 00:10:36 +02:00
l10n daemon script
8d10683a1a GIT_SILENT made messages (after extraction) 2021-07-28 00:17:45 +00:00
l10n daemon script
a6c8498e9b 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"
2021-07-23 01:13:23 +00:00
l10n daemon script
3cde8c73f7 GIT_SILENT made messages (after extraction) 2021-07-23 00:16:41 +00:00
Heiko Becker
be6479cfc8 GIT_SILENT Update Appstream for new release
(cherry picked from commit 5ddd5ee109)
2021-07-05 21:25:10 +02:00
l10n daemon script
73b9c03053 GIT_SILENT made messages (after extraction) 2021-06-30 00:17:53 +00:00
Heiko Becker
82129cd866 GIT_SILENT Update Appstream for new release
(cherry picked from commit e86ae09fbd)
2021-06-05 23:24:55 +02:00
Nicolas Fella
e8563388e4 Link to proper website in appstream
BUG: 437205
2021-05-25 12:35:49 +02:00
l10n daemon script
8a1e75695d GIT_SILENT made messages (after extraction) 2021-05-22 00:16:02 +00:00
Heiko Becker
153bc22788 GIT_SILENT Update Appstream for new release
(cherry picked from commit 104b80d128)
2021-05-07 20:40:16 +02:00
l10n daemon script
f4211e0431 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"
2021-04-22 01:12:28 +00:00
Heiko Becker
e7261a3e4f GIT_SILENT Update Appstream for new release
(cherry picked from commit 784a15a9f0)
2021-04-14 17:29:15 +02:00
l10n daemon script
c314093d7e 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"
2021-03-24 05:53:37 +01:00
l10n daemon script
7344a5fa59 GIT_SILENT made messages (after extraction) 2021-03-24 02:21:46 +01:00
l10n daemon script
dc25d8ef5e 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"
2021-03-05 06:23:20 +01:00
Heiko Becker
28e04a3569 GIT_SILENT Update Appstream for new release
(cherry picked from commit 004e7bc79a)
2021-02-25 00:45:29 +01:00
l10n daemon script
24dff35aa1 GIT_SILENT made messages (after extraction) 2021-02-18 02:34:42 +01:00
l10n daemon script
cd1d047a3c 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"
2021-02-15 07:07:57 +01:00
Heiko Becker
7d74e44672 GIT_SILENT Update Appstream for new release
(cherry picked from commit 7e51bfc170)
2021-01-29 21:29:15 +01:00
l10n daemon script
c7411ead21 GIT_SILENT made messages (after extraction) 2021-01-18 02:42:22 +01:00
l10n daemon script
a558af4dd3 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"
2021-01-16 06:40:31 +01:00
l10n daemon script
6aac7fa97d GIT_SILENT made messages (after extraction) 2021-01-16 02:40:01 +01:00
Christoph Feck
1711f8b3d8 GIT_SILENT Update Appstream for new release
(cherry picked from commit e8861f9fce)
2021-01-02 15:36:33 +01:00
l10n daemon script
38afb807bf 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"
2020-12-07 06:11:38 +01:00
l10n daemon script
1c337e15aa GIT_SILENT made messages (after extraction) 2020-12-07 02:27:13 +01:00
Christoph Feck
8bf54f6170 GIT_SILENT Update Appstream for new release
(cherry picked from commit 7c80b1fcfb)
2020-12-02 23:47:52 +01:00
l10n daemon script
cfec7d57df GIT_SILENT made messages (after extraction) 2020-10-18 02:23:34 +02:00
l10n daemon script
f814a2c8f6 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"
2020-10-17 06:06:46 +02:00
l10n daemon script
e155eefaec GIT_SILENT made messages (after extraction) 2020-10-17 02:21:15 +02:00
Thomas Staudinger
f1ce22124c Fix kdeconnect_open MimeType
This changes the MimeType handler of the kdeconnect_open desktop file from an invalid "*/*" to the (hopefully) appropriate "application/octet-stream;" as discussed [here](https://bugs.launchpad.net/ubuntu/+source/kdeconnect/+bug/1878400)(including this solution), [here](https://github.com/clearlinux/distribution/issues/1906) and [here](https://bugs.archlinux.org/task/65865).
2020-10-05 00:20:47 +02:00
l10n daemon script
e57fd79f26 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"
2020-09-19 06:10:24 +02:00
l10n daemon script
8a9fc9d7f8 GIT_SILENT made messages (after extraction) 2020-09-19 02:15:17 +02:00
l10n daemon script
b7bdc75ff9 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"
2020-09-17 06:15:05 +02:00
l10n daemon script
db5437ddbb GIT_SILENT made messages (after extraction) 2020-09-17 02:22:06 +02:00
l10n daemon script
90a3ded076 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"
2020-08-09 05:37:05 +02:00
Pino Toscano
76fefacc8d appdata: use canonical help URL 2020-08-08 11:16:57 +02:00
l10n daemon script
10de7b3763 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"
2020-07-23 09:50:37 +02:00
l10n daemon script
32311bab6b GIT_SILENT made messages (after extraction) 2020-07-15 07:51:17 +02:00
l10n daemon script
d2bf605a0c GIT_SILENT made messages (after extraction) 2020-07-07 02:12:38 +02:00
l10n daemon script
0c32010a28 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"
2020-07-06 05:30:08 +02:00
l10n daemon script
be3b89aa39 GIT_SILENT made messages (after extraction) 2020-07-06 02:07:08 +02:00
Nicolas Fella
c8a87db367 Merge branch 'release/20.04' 2020-07-05 15:49:58 +02:00
l10n daemon script
e44e4a4c19 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"
2020-06-20 05:10:40 +02:00
l10n daemon script
e046b8829b GIT_SILENT made messages (after extraction) 2020-06-20 02:08:16 +02:00
l10n daemon script
373557cd26 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"
2020-06-18 08:27:38 +02:00
l10n daemon script
dbc476e995 GIT_SILENT made messages (after extraction) 2020-06-18 07:13:50 +02:00
l10n daemon script
653a708727 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"
2020-06-18 05:39:20 +02:00
l10n daemon script
9fc921c557 GIT_SILENT made messages (after extraction) 2020-06-18 02:18:34 +02:00
l10n daemon script
5fe8d7ea90 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"
2020-06-17 16:50:11 +02:00
l10n daemon script
d48849d7cc GIT_SILENT made messages (after extraction) 2020-06-17 15:34:37 +02:00
l10n daemon script
e873eddcde 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"
2020-06-17 14:06:59 +02:00
l10n daemon script
c850f59910 GIT_SILENT made messages (after extraction) 2020-06-17 11:32:03 +02:00
l10n daemon script
ee34142f33 GIT_SILENT made messages (after extraction) 2020-06-11 08:14:46 +02:00
l10n daemon script
40ea1dd9ff GIT_SILENT made messages (after extraction) 2020-06-11 02:11:39 +02:00
l10n daemon script
046a572542 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"
2020-06-07 08:58:38 +02:00
l10n daemon script
b06162acfe GIT_SILENT made messages (after extraction) 2020-06-07 07:40:10 +02:00
l10n daemon script
c3375506db GIT_SILENT made messages (after extraction) 2020-05-10 09:13:23 +02:00
l10n daemon script
08ea3d783d GIT_SILENT made messages (after extraction) 2020-05-10 03:31:34 +02:00
Weixuan XIAO
02b38f56f6 Add entry into Deepin file manager context menu 2020-04-22 18:31:25 +02:00
Heiko Becker
03a1357a24 Merge remote-tracking branch 'origin/release/20.04' 2020-04-16 18:26:30 +02:00
Heiko Becker
fba0c2d55f Fix previous commit
KDE_INSTALL_DATADIR already points to PREFIX/share of course.
2020-04-16 18:26:00 +02:00
Nicolas Fella
cdcf3400dd Merge branch 'release/20.04' 2020-04-16 18:01:26 +02:00
Heiko Becker
f1da4b4850 Use KDE_INSTALL_DATADIR 2020-04-16 10:48:11 +02:00
l10n daemon script
da0089c741 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"
2020-04-09 11:01:28 +02:00
l10n daemon script
b6ee1f1228 GIT_SILENT made messages (after extraction) 2020-04-09 09:20:13 +02:00
l10n daemon script
5ef95c7c25 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"
2020-04-09 06:26:57 +02:00
l10n daemon script
ab511646c8 GIT_SILENT made messages (after extraction) 2020-04-09 03:20:44 +02:00
l10n daemon script
baf52b49ac 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"
2020-04-08 11:04:09 +02:00
l10n daemon script
d22522dce0 GIT_SILENT made messages (after extraction) 2020-04-08 09:30:30 +02:00
l10n daemon script
43ea8052fe 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"
2020-04-08 06:32:15 +02:00
l10n daemon script
6a67865618 GIT_SILENT made messages (after extraction) 2020-04-08 03:24:26 +02:00
l10n daemon script
1634126eb5 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"
2020-04-07 10:16:35 +02:00
l10n daemon script
2ade99b14f GIT_SILENT made messages (after extraction) 2020-04-07 08:58:33 +02:00
l10n daemon script
0e04769a43 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"
2020-04-07 06:11:40 +02:00
l10n daemon script
62a00df7ba GIT_SILENT made messages (after extraction) 2020-04-07 03:31:53 +02:00
l10n daemon script
a702c0bd4d GIT_SILENT made messages (after extraction) 2020-04-01 09:22:44 +02:00
l10n daemon script
e2d175f2a0 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"
2020-04-01 06:36:16 +02:00
l10n daemon script
d8029897d5 GIT_SILENT made messages (after extraction) 2020-03-31 03:24:43 +02:00
l10n daemon script
9673dbe6a5 GIT_SILENT made messages (after extraction) 2020-03-21 08:36:30 +01:00
l10n daemon script
b75a74abcc GIT_SILENT made messages (after extraction) 2020-03-20 03:15:49 +01:00
l10n daemon script
87d58643a2 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"
2020-03-17 10:05:04 +01:00
l10n daemon script
201be5d898 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"
2020-03-16 10:21:09 +01:00
l10n daemon script
c5caedee60 GIT_SILENT made messages (after extraction) 2020-03-16 09:04:41 +01:00
l10n daemon script
102779fe29 GIT_SILENT made messages (after extraction) 2020-03-16 03:22:20 +01:00
l10n daemon script
877d8950a2 GIT_SILENT made messages (after extraction) 2020-03-09 03:13:50 +01:00
l10n daemon script
1d74dba057 GIT_SILENT made messages (after extraction) 2020-02-17 03:17:24 +01:00