Commit graph

4548 commits

Author SHA1 Message Date
l10n daemon script
0ed48894b8 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"
2024-10-23 03:04:31 +00:00
l10n daemon script
e3febae013 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"
2024-10-22 03:02:42 +00:00
l10n daemon script
516fd42866 GIT_SILENT Sync po/docbooks with svn 2024-10-21 03:06:37 +00:00
l10n daemon script
51a49a6b1e 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"
2024-10-13 03:03:08 +00:00
l10n daemon script
dd530f9bd9 GIT_SILENT Sync po/docbooks with svn 2024-10-12 03:11:04 +00:00
l10n daemon script
6574a48948 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"
2024-10-12 03:05:13 +00:00
l10n daemon script
989793ee22 GIT_SILENT Sync po/docbooks with svn 2024-10-09 03:05:32 +00:00
Heiko Becker
8955c6cb65 GIT_SILENT Update Appstream for new release 2024-10-06 21:13:09 +02:00
Heiko Becker
14813e8426 GIT_SILENT Upgrade release service version to 24.08.2. 2024-10-06 19:58:52 +02:00
Volker Krause
a7045bfe0d
Don't set an absolute D-Bus service path on Windows and macOS
(cherry picked from commit f00e04c07d)
2024-10-05 09:56:09 +01:00
Albert Vaca Cintora
7274c62c7c
Revert "Revert "Use absolute path in D-Bus service file""
This reverts commit 01a2db20c4

(cherry picked from commit 0477bc93d0)
2024-10-05 09:55:39 +01:00
l10n daemon script
4015aafa83 GIT_SILENT made messages (after extraction) 2024-09-27 02:36:49 +00:00
l10n daemon script
7add2a0b3b GIT_SILENT Sync po/docbooks with svn 2024-09-24 03:31:11 +00:00
l10n daemon script
d9964d5219 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"
2024-09-24 03:21:06 +00:00
l10n daemon script
4d87bfa0ed GIT_SILENT Sync po/docbooks with svn 2024-09-23 03:05:46 +00:00
l10n daemon script
bd367cc9e9 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"
2024-09-23 03:00:41 +00:00
l10n daemon script
6152f37a2f 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"
2024-09-22 03:03:22 +00:00
l10n daemon script
41c937c2d6 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"
2024-09-21 03:06:12 +00:00
l10n daemon script
966deefd4b 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"
2024-09-20 03:11:45 +00:00
l10n daemon script
f81c6e030f GIT_SILENT Sync po/docbooks with svn 2024-09-19 03:08:10 +00:00
l10n daemon script
ddcbac152a 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"
2024-09-19 03:03:23 +00:00
l10n daemon script
533b0e48d9 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"
2024-09-18 03:09:21 +00:00
l10n daemon script
43f93641e1 GIT_SILENT made messages (after extraction) 2024-09-18 02:36:20 +00:00
l10n daemon script
c70779a391 GIT_SILENT Sync po/docbooks with svn 2024-09-17 03:15:52 +00:00
l10n daemon script
5387b044ba 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"
2024-09-17 03:09:29 +00:00
l10n daemon script
f9ce3d7d0d GIT_SILENT Sync po/docbooks with svn 2024-09-16 03:29:44 +00:00
l10n daemon script
96d43dc08f 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"
2024-09-16 03:24:34 +00:00
l10n daemon script
e9fccee309 GIT_SILENT Sync po/docbooks with svn 2024-09-15 03:11:39 +00:00
l10n daemon script
aca74a3455 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"
2024-09-15 03:06:48 +00:00
l10n daemon script
2bfe82fc52 GIT_SILENT Sync po/docbooks with svn 2024-09-14 03:16:20 +00:00
l10n daemon script
e816652622 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"
2024-09-13 03:06:06 +00:00
l10n daemon script
cc96336cdb GIT_SILENT made messages (after extraction) 2024-09-13 02:33:13 +00:00
Heiko Becker
73ae1aee5c GIT_SILENT Update Appstream for new release 2024-09-07 00:39:29 +02:00
Heiko Becker
f2ef52d309 GIT_SILENT Upgrade release service version to 24.08.1. 2024-09-06 23:51:27 +02:00
l10n daemon script
c9df8c728a GIT_SILENT Sync po/docbooks with svn 2024-09-06 03:32:48 +00:00
l10n daemon script
dca925d4ea GIT_SILENT Sync po/docbooks with svn 2024-09-04 03:01:05 +00:00
Albert Vaca Cintora
f3fa818cbf
Revert changes to QML incompatible with Qt 6.6 and older
- Revert "plasmoid: Port to pragma ComponentBehavior: Bound"
  This reverts commit 9ee0b23727.

- Revert "plasmoid: Flatten plugin controllers, menu and other non-graphical components"
  This reverts commit d2ee2bfdd8.

- Revert "plasmoid: Basic code cleanup"
  This reverts commit 90946829bf.
2024-09-04 00:37:36 +02:00
l10n daemon script
622708aa63 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"
2024-08-28 03:19:52 +00:00
l10n daemon script
97f65f5448 GIT_SILENT Sync po/docbooks with svn 2024-08-27 03:10:43 +00:00
l10n daemon script
30e485f1e2 GIT_SILENT Sync po/docbooks with svn 2024-08-26 03:27:43 +00:00
l10n daemon script
72f226e870 GIT_SILENT Sync po/docbooks with svn 2024-08-20 03:27:19 +00:00
l10n daemon script
6c863b5667 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"
2024-08-20 03:19:39 +00:00
l10n daemon script
5dedf244ef GIT_SILENT Sync po/docbooks with svn 2024-08-18 03:06:16 +00:00
Heiko Becker
a316901daf GIT_SILENT Update Appstream for new release 2024-08-16 00:25:13 +02:00
Heiko Becker
8da1232e06 GIT_SILENT Upgrade release service version to 24.08.0. 2024-08-15 23:34:02 +02:00
l10n daemon script
13963d92ef 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"
2024-08-11 03:08:47 +00:00
l10n daemon script
d31abf8d9c 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"
2024-08-10 03:12:33 +00:00
Albert Astals Cid
44d61922ac GIT_SILENT Upgrade release service version to 24.07.90. 2024-08-08 09:55:26 +02:00
l10n daemon script
40344d8db3 GIT_SILENT Sync po/docbooks with svn 2024-08-08 03:08:35 +00:00
l10n daemon script
1ec0490bfa GIT_SILENT Sync po/docbooks with svn 2024-08-05 03:03:27 +00:00