Commit graph

88 commits

Author SHA1 Message Date
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
l10n daemon script
cbb11a4325 GIT_SILENT made messages (after extraction) 2020-02-16 03:25:24 +01:00
l10n daemon script
d36f2f7c5e GIT_SILENT made messages (after extraction) 2020-02-06 03:14:39 +01:00
l10n daemon script
4f06eae48d GIT_SILENT made messages (after extraction) 2020-02-05 03:19:06 +01:00
l10n daemon script
c61a67f86a 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-02-04 06:10:13 +01:00
l10n daemon script
f0dba4e7b9 GIT_SILENT made messages (after extraction) 2020-02-04 03:16:17 +01:00
l10n daemon script
75f129a4b3 GIT_SILENT made messages (after extraction) 2020-02-03 02:59:15 +01:00
l10n daemon script
4b6246de89 GIT_SILENT made messages (after extraction) 2020-02-02 03:14:52 +01:00
l10n daemon script
10b58d88e2 GIT_SILENT made messages (after extraction) 2020-02-01 03:12:49 +01:00
l10n daemon script
6db1662454 GIT_SILENT made messages (after extraction) 2020-01-31 03:10:26 +01:00
l10n daemon script
84c5481aa8 GIT_SILENT made messages (after extraction) 2020-01-30 03:14:32 +01:00
l10n daemon script
178b36ebed GIT_SILENT made messages (after extraction) 2020-01-29 03:00:04 +01:00
Nicolas Fella
e9953f2f63 Amend appstream 2020-01-28 23:53:37 +01:00
Nicolas Fella
d48c42b8fc Add google play link too 2020-01-28 23:10:55 +01:00
Nicolas Fella
688884406d Add link to F-Droid to appstream data 2020-01-28 22:24:55 +01:00
l10n daemon script
c54104b24f 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-01-09 05:46:17 +01:00
l10n daemon script
56880448fd 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"
2019-11-30 05:34:44 +01:00
l10n daemon script
4a6a98d8a9 GIT_SILENT made messages (after extraction) 2019-11-20 02:39:59 +01:00
l10n daemon script
cb307e16b2 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"
2019-11-17 05:06:27 +01:00
Nicolas Fella
41ba3990cc Add missing provides description to appdata 2019-10-18 01:19:32 +02:00
l10n daemon script
7d27ef1417 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"
2019-09-30 05:04:12 +02:00
l10n daemon script
b5ebbfc0b4 GIT_SILENT made messages (after extraction) 2019-09-30 02:34:49 +02:00