1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-22 11:46:34 +01:00
Commit Graph

226 Commits

Author SHA1 Message Date
l10n daemon script
3b7402b0c1 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"
2022-05-03 02:52:56 +00:00
l10n daemon script
e9c0a423b6 GIT_SILENT made messages (after extraction) 2022-05-03 02:14:22 +00:00
Heiko Becker
7220a0a544 GIT_SILENT Update Appstream for new release 2022-04-13 00:09:03 +02:00
l10n daemon script
c32c20bea3 GIT_SILENT made messages (after extraction) 2022-03-29 02:53:51 +00:00
l10n daemon script
bd5a42fba2 GIT_SILENT made messages (after extraction) 2022-03-20 02:44:55 +00:00
l10n daemon script
17f27d6186 GIT_SILENT made messages (after extraction) 2022-03-11 00:45:07 +00:00
l10n daemon script
3ef3fd6ad0 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"
2022-03-05 01:43:20 +00:00
l10n daemon script
703c30c7fd GIT_SILENT made messages (after extraction) 2022-03-05 00:43:38 +00:00
l10n daemon script
da11721956 GIT_SILENT made messages (after extraction) 2022-02-27 00:46:22 +00:00
Jonathan Esk-Riddell
832b40027c new release 3.2.0 2022-01-31 13:55:47 +00:00
Snehit Sah
00d1c25ea8
Add release and content rating appdata tags
Signed-off-by: Snehit Sah <snehitsah@protonmail.com>
2022-01-19 16:29:23 +05:30
l10n daemon script
e9b597ea1a GIT_SILENT made messages (after extraction) 2022-01-12 00:44:30 +00:00
l10n daemon script
0568905c67 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-08-23 01:25:48 +00:00
l10n daemon script
217270bcdf 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-08-14 01:17:03 +00:00
l10n daemon script
4c0147106c 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-08-12 01:13:11 +00:00
l10n daemon script
1c2c8ab982 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-15 01:14:50 +00:00
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