tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3250 commits 81 branches 117 tags 12 MiB
Commit graph

139 commits

Author SHA1 Message Date
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