l10n daemon script
01a9a6fe46
GIT_SILENT made messages (after extraction)
2020-04-06 02:46:59 +02:00
l10n daemon script
e0ea9fd04c
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-12 06:06:11 +01:00
l10n daemon script
91612fcb55
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-13 05:40:25 +01:00
l10n daemon script
a75e26c5af
GIT_SILENT made messages (after extraction)
2020-01-13 02:46:22 +01:00
l10n daemon script
c2b4350521
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-12-03 05:37:17 +01:00
l10n daemon script
0fd9c4d9af
GIT_SILENT made messages (after extraction)
2019-11-30 02:50:25 +01:00
Nicolas Fella
f9471ba01a
Add icons to desktop file actions
...
Summary: This allows Plasma to show icons in the taskmanager/startmenu actions
Test Plan: {F7304489}
Reviewers: #falkon, cullmann
Reviewed By: #falkon, cullmann
Subscribers: cullmann, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D23631
2019-09-02 23:17:43 +02:00
l10n daemon script
6f1c729906
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-08-13 05:19:36 +02:00
l10n daemon script
0c10c30986
GIT_SILENT made messages (after extraction)
2019-08-09 02:46:27 +02:00
l10n daemon script
44730ae16d
GIT_SILENT made messages (after extraction)
2019-06-06 02:46:22 +02:00
l10n daemon script
a8ac59dc55
GIT_SILENT made messages (after extraction)
2019-06-03 02:50:32 +02:00
l10n daemon script
2887d87ed5
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-05-30 05:09:20 +02:00
l10n daemon script
fbf7f956ff
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-05-12 05:52:11 +02:00
l10n daemon script
fb19df1aa2
GIT_SILENT made messages (after extraction)
2019-05-12 03:12:18 +02:00
l10n daemon script
bde26dc861
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-04-06 05:57:30 +02:00
l10n daemon script
bdbd2127d6
GIT_SILENT made messages (after extraction)
2019-04-06 03:15:13 +02:00
l10n daemon script
c3dce2aa80
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-03-21 08:45:27 +01:00
l10n daemon script
9f393fe1ae
GIT_SILENT made messages (after extraction)
2019-03-21 07:43:00 +01:00
l10n daemon script
c32b899ae3
GIT_SILENT made messages (after extraction)
2019-02-25 03:15:21 +01:00
l10n daemon script
2860504d6b
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-02-24 05:28:07 +01:00
l10n daemon script
9eb11111aa
GIT_SILENT made messages (after extraction)
2019-02-09 03:07:15 +01:00
Christoph Cullmann
5bb7e9cfcf
Add --wmclass argument to linux completion files
...
Reviewers: #falkon, drosca
Reviewed By: #falkon, drosca
Subscribers: cullmann, falkon
Tags: #falkon
Differential Revision: https://phabricator.kde.org/D18667
2019-02-02 16:24:27 +01:00
l10n daemon script
524697d139
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-01-27 05:34:59 +01:00
l10n daemon script
caf1380774
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-01-21 05:18:24 +01:00
l10n daemon script
8d321a72bf
GIT_SILENT made messages (after extraction)
2019-01-21 03:00:18 +01:00
l10n daemon script
0684603930
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"
2018-12-24 05:18:23 +01:00
l10n daemon script
8f6054f788
GIT_SILENT made messages (after extraction)
2018-12-12 03:01:20 +01:00
l10n daemon script
5b831a3c8c
GIT_SILENT made messages (after extraction)
2018-11-01 03:43:13 +01:00
l10n daemon script
116ba93b79
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"
2018-10-22 05:54:15 +02:00
l10n daemon script
5fb500465f
GIT_SILENT made messages (after extraction)
2018-10-22 03:41:47 +02:00
l10n daemon script
b44134fd07
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"
2018-10-10 06:19:06 +02:00
l10n daemon script
82417ff4a5
GIT_SILENT made messages (after extraction)
2018-10-10 03:54:18 +02:00
l10n daemon script
e0d1175dd1
GIT_SILENT made messages (after extraction)
2018-08-26 03:34:44 +02:00
l10n daemon script
1500f2202a
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"
2018-08-03 05:36:42 +02:00
l10n daemon script
06020d9615
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"
2018-07-03 05:28:07 +02:00
l10n daemon script
1c6f5bd8e2
GIT_SILENT made messages (after extraction)
2018-07-03 03:23:47 +02:00
l10n daemon script
086d572e25
GIT_SILENT made messages (after extraction)
2018-06-26 03:24:35 +02:00
l10n daemon script
0e96dd33c2
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"
2018-06-17 05:29:07 +02:00
l10n daemon script
73123c72c2
GIT_SILENT made messages (after extraction)
2018-06-17 03:29:09 +02:00
l10n daemon script
c252de4bdd
GIT_SILENT made messages (after extraction)
2018-06-13 03:38:24 +02:00
l10n daemon script
aca4f6c0a9
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"
2018-05-16 05:26:16 +02:00
David Rosca
3760a9ffd1
AppImage: Bundle KWindowSystem plugins
2018-05-09 18:11:57 +02:00
David Rosca
68ff092b4c
Update AppImage build Dockerfile
2018-05-07 13:33:52 +02:00
David Rosca
dd8d8b9007
Add Dockerfile for building AppImage
2018-05-01 22:59:49 +02:00
l10n daemon script
e36d092c08
GIT_SILENT made messages (after extraction)
2018-04-27 03:32:10 +02:00
l10n daemon script
dd60458d6a
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"
2018-04-24 05:25:10 +02:00
l10n daemon script
75d5f5d552
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"
2018-04-21 07:16:56 +02:00
l10n daemon script
08a3fe5476
GIT_SILENT made messages (after extraction)
2018-04-21 06:15:24 +02:00
l10n daemon script
a62fb97ed8
GIT_SILENT made messages (after extraction)
2018-04-17 06:17:22 +02:00
l10n daemon script
e0f390e986
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"
2018-04-07 07:11:21 +02:00