mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2026-06-09 14:35:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
9,392 Commits 141 Branches 418 Tags
de40407db991cd6af431dddedfe5f16c6f57b110
Commit Graph

910 Commits

Author SHA1 Message Date
l10n daemon script
1c5ad15fbe 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-02-17 01:16:20 +00:00
l10n daemon script
50723fcba3 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-02-16 01:16:19 +00:00
Heiko Becker
c30207c046 GIT_SILENT Update Appstream for new release 
(cherry picked from commit d45f003a96)
 2024-02-16 00:04:25 +01:00
Heiko Becker
b6fbdc95cb GIT_SILENT Update Appstream for new release 
(cherry picked from commit 0b4c8f75a0)
 2024-02-09 23:22:59 +01:00
l10n daemon script
c769f80d9d 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-01-20 01:13:36 +00:00
l10n daemon script
1c4b22ca72 GIT_SILENT made messages (after extraction) 2024-01-20 00:39:31 +00:00
l10n daemon script
b599a86c84 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-01-17 01:13:58 +00:00
l10n daemon script
f87dfe0873 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-01-06 02:07:25 +00:00
l10n daemon script
ad481ce2a7 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-12-24 02:33:13 +00:00
l10n daemon script
6f9aa644b3 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-12-10 02:31:46 +00:00
l10n daemon script
8a2d0d76fd GIT_SILENT made messages (after extraction) 2023-12-10 02:00:21 +00:00
l10n daemon script
6f766dd301 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-12-09 02:08:25 +00:00
l10n daemon script
5e2ad71501 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-12-03 02:08:05 +00:00
Heiko Becker
fdbb0c178e GIT_SILENT Update Appstream for new release 
(cherry picked from commit 16cee5905c)
 2023-11-30 17:54:13 +01:00
l10n daemon script
fc0961570f 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-26 02:34:09 +00:00
l10n daemon script
773905a414 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-15 02:10:11 +00:00
l10n daemon script
64538e6bbb 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-11 02:14:57 +00:00
l10n daemon script
d18f4a266a 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-05 01:38:18 +00:00
l10n daemon script
af4a4f4880 GIT_SILENT made messages (after extraction) 2023-11-05 01:10:22 +00:00
Heiko Becker
8d24fe265a GIT_SILENT Update Appstream for new release 
(cherry picked from commit 6c3d83d15c)
 2023-11-04 11:53:01 +01:00
l10n daemon script
a2966e58b0 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-10-29 02:19:50 +00:00
l10n daemon script
6ca0c88e79 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-10-27 02:10:07 +00:00
l10n daemon script
715acd6d79 GIT_SILENT made messages (after extraction) 2023-10-26 01:47:45 +00:00
Guilherme Marçal Silva
5cbf176e24 Update file konsole.notifyrc 2023-10-25 19:13:49 +00:00
Waqar Ahmed
1e136d63f2 move konsole to kf6 2023-10-25 22:13:53 +05:00
Heiko Becker
33df88667e GIT_SILENT Update Appstream for new release 
(cherry picked from commit a112562906)
 2023-10-07 17:15:22 +02:00
Heiko Becker
0d8e6b320c GIT_SILENT Update Appstream for new release 
(cherry picked from commit ea7c72202b)
 2023-09-09 10:26:09 +02:00
l10n daemon script
edfe26ab82 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-09-03 01:38:55 +00:00
l10n daemon script
8523a95de3 GIT_SILENT made messages (after extraction) 2023-09-03 00:48:46 +00:00
l10n daemon script
5c7224272e GIT_SILENT made messages (after extraction) 2023-09-01 00:49:00 +00:00
l10n daemon script
1c70edcd15 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-08-21 01:38:28 +00:00
Heiko Becker
18f62daf0d GIT_SILENT Update Appstream for new release 
(cherry picked from commit bbc38592e1)
 2023-08-16 22:47:53 +02:00
l10n daemon script
25193b3387 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-08-01 01:44:09 +00:00
l10n daemon script
527707a448 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:44:56 +00:00
l10n daemon script
8e8b9ffb8c 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-24 08:34:39 +00:00
l10n daemon script
d75a7532d8 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-21 01:49:32 +00:00
Heiko Becker
77c906bca2 GIT_SILENT Update Appstream for new release 
(cherry picked from commit d57f0ad981)
 2023-06-30 00:09:44 +02:00
l10n daemon script
cb08768746 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-25 01:56:17 +00:00
l10n daemon script
0cc9d51967 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-18 01:55:34 +00:00
Nicolas Fella
68c6acc43d Don't install terminalemulator service type for KF6 
Service types don't exist in KF6
 2023-06-06 22:24:27 +00:00
Heiko Becker
a9eb66b7fb GIT_SILENT Update Appstream for new release 
(cherry picked from commit 84e6860849)
 2023-06-02 20:43:30 +02:00
l10n daemon script
03608f3aa0 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-30 01:44:09 +00:00
Tobias Fella
53d473cff3 Port to KF6 2023-05-29 16:17:23 +00:00
l10n daemon script
d925f8a357 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-27 01:40:23 +00:00
l10n daemon script
000980b658 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-22 01:41:50 +00:00
l10n daemon script
9d0215aa2b 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-20 01:42:52 +00:00
l10n daemon script
3ff98555bf 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-19 01:41:07 +00:00
l10n daemon script
b315c9cebf 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-18 01:42:26 +00:00
l10n daemon script
a0471c9367 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-17 01:42:51 +00:00
l10n daemon script
07eb4bad04 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-16 01:43:40 +00:00