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

244 Commits

Author SHA1 Message Date
Heiko Becker
b22e0a0ec5 GIT_SILENT Update Appstream for new release
(cherry picked from commit f8fefc7c89)
2022-09-03 00:48:49 +02:00
l10n daemon script
40ef95958d GIT_SILENT made messages (after extraction) 2022-08-25 00:45:48 +00:00
l10n daemon script
35e160afe2 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-08-23 01:47:02 +00:00
l10n daemon script
2e0f73fc5a GIT_SILENT made messages (after extraction) 2022-08-23 00:45:41 +00:00
l10n daemon script
d7f8b9a3d3 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-08-14 01:43:43 +00:00
l10n daemon script
427aba4a38 GIT_SILENT made messages (after extraction) 2022-08-14 00:45:13 +00:00
l10n daemon script
57d4769dc4 GIT_SILENT made messages (after extraction) 2022-08-12 00:44:40 +00:00
Albert Astals Cid
9be7fa190a GIT_SILENT Update Appstream for new release
(cherry picked from commit bbfbeb5997)
2022-08-11 00:28:41 +02:00
Albert Astals Cid
65e51dc54d Remove duplicate releases tag 2022-07-31 23:24:59 +02:00
l10n daemon script
2e5340ff14 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-07-03 01:55:22 +00:00
l10n daemon script
f472bd71d3 GIT_SILENT made messages (after extraction) 2022-07-03 00:46:06 +00:00
l10n daemon script
43114cafd8 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-07-02 02:00:11 +00:00
Heiko Becker
2ef46be24f GIT_SILENT Update Appstream for new release
(cherry picked from commit 57d6bd4f2f)
2022-07-01 21:28:09 +02:00
l10n daemon script
a976f194e3 GIT_SILENT made messages (after extraction) 2022-06-13 01:00:20 +00:00
Heiko Becker
39ed7cc61f GIT_SILENT Update Appstream for new release
(cherry picked from commit 90e579d882)
2022-06-04 11:05:39 +02:00
l10n daemon script
ae8955b12d GIT_SILENT made messages (after extraction) 2022-05-28 00:54:23 +00:00
Heiko Becker
e8369584bb GIT_SILENT Update Appstream for new release
(cherry picked from commit f2147a2bb3)
2022-05-07 12:15:41 +02:00
l10n daemon script
f40b707e58 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 01:48:40 +00:00
l10n daemon script
437ba0be77 GIT_SILENT made messages (after extraction) 2022-05-03 00:43:34 +00:00
Heiko Becker
b460ab0ae7 GIT_SILENT Update Appstream for new release
(cherry picked from commit 7220a0a544)
2022-04-13 00:09:12 +02:00
l10n daemon script
478861094a GIT_SILENT made messages (after extraction) 2022-03-29 00:49:03 +00:00
l10n daemon script
e9e1d32339 GIT_SILENT made messages (after extraction) 2022-03-20 00:48:28 +00:00
Snehit Sah
4c8f6e0570
Remove screenshot dimensions from appdata
Refer https://github.com/flathub/org.kde.falkon/pull/3#issuecomment-1064018275

Signed-off-by: Snehit Sah <snehitsah@protonmail.com>
2022-03-12 20:36:40 +05:30
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