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

276 Commits

Author SHA1 Message Date
Heiko Becker
3ebcdaf51f GIT_SILENT Update Appstream for new release
(cherry picked from commit 3bc7cf673c)
2023-11-30 18:30:45 +01:00
l10n daemon script
77db3f2fc7 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"
2023-11-07 02:11:52 +00:00
l10n daemon script
a847940462 GIT_SILENT made messages (after extraction) 2023-11-07 01:17:38 +00:00
l10n daemon script
6bbea15e2b GIT_SILENT made messages (after extraction) 2023-11-05 12:31:40 +00:00
l10n daemon script
fae380f409 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"
2023-11-04 11:52:13 +00:00
Heiko Becker
404e435173 GIT_SILENT Update Appstream for new release
(cherry picked from commit 941d8f83ea)
2023-11-04 12:29:12 +01:00
Heiko Becker
da7f5af725 GIT_SILENT Update Appstream for new release
(cherry picked from commit 4da9a8f0be)
2023-10-07 17:55:26 +02:00
Heiko Becker
29d71f8160 GIT_SILENT Update Appstream for new release
(cherry picked from commit fbc15171e6)
2023-09-09 11:02:15 +02:00
Heiko Becker
7f7b4e16c2 GIT_SILENT Update Appstream for new release
(cherry picked from commit caea56c36e)
2023-08-16 23:29:19 +02:00
l10n daemon script
f127711f36 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"
2023-07-28 01:41:35 +00:00
l10n daemon script
6c5db638ec GIT_SILENT made messages (after extraction) 2023-07-16 00:47:50 +00:00
l10n daemon script
0133786fc7 GIT_SILENT made messages (after extraction) 2023-07-03 00:53:55 +00:00
Heiko Becker
176a31da00 GIT_SILENT Update Appstream for new release
(cherry picked from commit 54b2318644)
2023-06-30 01:09:27 +02:00
l10n daemon script
87787b60a1 GIT_SILENT made messages (after extraction) 2023-06-25 00:51:34 +00:00
l10n daemon script
62d627d288 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"
2023-06-24 01:47:07 +00:00
l10n daemon script
a8d1348959 GIT_SILENT made messages (after extraction) 2023-06-24 00:49:36 +00:00
l10n daemon script
22f11a2e19 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"
2023-06-12 01:53:33 +00:00
l10n daemon script
d1afb50055 GIT_SILENT made messages (after extraction) 2023-06-12 00:52:32 +00:00
Heiko Becker
b221e55870 GIT_SILENT Update Appstream for new release
(cherry picked from commit a18f3253b5)
2023-06-02 21:42:49 +02:00
Heiko Becker
ed74d621b8 GIT_SILENT Update Appstream for new release
(cherry picked from commit 14540b1543)
2023-05-06 11:10:18 +02:00
l10n daemon script
1457234caf 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"
2023-05-06 01:42:55 +00:00
l10n daemon script
b89d453fc9 GIT_SILENT made messages (after extraction) 2023-05-06 00:46:41 +00:00
Heiko Becker
7ba8500d88 GIT_SILENT Update Appstream for new release
(cherry picked from commit b40cc93f34)
2023-04-12 19:02:47 +02:00
Heiko Becker
b26309340b GIT_SILENT Update Appstream for new release
(cherry picked from commit 1b541fac5a)
2023-02-24 21:58:57 +01:00
Heiko Becker
d57be8f87f GIT_SILENT Update Appstream for new release
(cherry picked from commit cd0fff8320)
2023-01-30 00:59:58 +01:00
l10n daemon script
f36ecee537 GIT_SILENT made messages (after extraction) 2023-01-14 00:56:05 +00:00
Albert Astals Cid
6884f65708 GIT_SILENT Update Appstream for new release
(cherry picked from commit d25c8d464c)
2023-01-03 01:09:54 +01:00
Heiko Becker
f27f5be174 GIT_SILENT Update Appstream for new release
(cherry picked from commit 462bebf258)
2022-11-30 01:52:44 +01:00
Heiko Becker
2156918321 GIT_SILENT Update Appstream for new release
(cherry picked from commit 0f9b1e96fd)
2022-10-30 22:36:49 +01:00
Heiko Becker
248c0642ef GIT_SILENT Update Appstream for new release
(cherry picked from commit 70358fb913)
2022-10-10 22:37:25 +02:00
l10n daemon script
8e9baf047f 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-09-28 01:54:36 +00:00
l10n daemon script
47f6404330 GIT_SILENT made messages (after extraction) 2022-09-05 00:43:38 +00:00
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