1
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Commit Graph

210 Commits

Author SHA1 Message Date
l10n daemon script
b5edc951d4 GIT_SILENT made messages (after extraction) 2021-07-15 00:16:54 +00:00
l10n daemon script
8abf9d5cf0 GIT_SILENT made messages (after extraction) 2021-06-05 00:16:35 +00:00
Pino Toscano
9bebc144ac Stop installing app icon in pixmaps location
The /usr/share/pixmaps location is considered a legacy location for
application icons; since the application icons are already installed in
the global XDG hicolor theme, then simply stop installing the 128px one
in the legacy pixmaps location.

Copy the 128px icon from the hicolor directory instead, as it is the
same.
2021-05-16 21:14:08 +02:00
l10n daemon script
f7cb769371 GIT_SILENT made messages (after extraction) 2021-02-23 02:48:22 +01:00
l10n daemon script
b0acd55546 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-22 06:51:54 +01:00
l10n daemon script
fce7bddcac GIT_SILENT made messages (after extraction) 2021-01-16 02:39:17 +01:00
l10n daemon script
e88a636890 GIT_SILENT made messages (after extraction) 2021-01-05 02:27:31 +01:00
l10n daemon script
a661ac27d4 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-11-01 06:34:37 +01:00
l10n daemon script
e6e259fa53 GIT_SILENT made messages (after extraction) 2020-11-01 02:24:55 +01:00
l10n daemon script
02bf543919 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-29 06:36:15 +01:00
l10n daemon script
d3ddaba87d GIT_SILENT made messages (after extraction) 2020-10-29 02:29:29 +01:00
l10n daemon script
94a635c348 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-15 06:12:19 +02:00
l10n daemon script
0bf8132573 GIT_SILENT made messages (after extraction) 2020-09-18 02:21:41 +02:00
l10n daemon script
9d8a727f9f 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-05 06:13:09 +02:00
l10n daemon script
6fe0f76294 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-04 06:00:13 +02:00
l10n daemon script
004975b974 GIT_SILENT made messages (after extraction) 2020-09-04 02:19:43 +02:00
l10n daemon script
cc6fc7a4fa 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-29 06:01:26 +02:00
l10n daemon script
1f3a6e9ac3 GIT_SILENT made messages (after extraction) 2020-07-29 02:17:59 +02:00
l10n daemon script
30ca8c3aeb 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-25 05:46:03 +02:00
l10n daemon script
3bb9314603 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-24 05:54:22 +02:00
l10n daemon script
279fcd9d78 GIT_SILENT made messages (after extraction) 2020-06-24 02:09:44 +02:00
l10n daemon script
6765b10f8d 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:07 +02:00
l10n daemon script
9d75bbd1d4 GIT_SILENT made messages (after extraction) 2020-06-18 02:18:17 +02:00
l10n daemon script
6e4afc466c 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:46 +02:00
l10n daemon script
6c0cc6835a GIT_SILENT made messages (after extraction) 2020-06-17 11:31:50 +02:00
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