l10n daemon script 169ce33d4b 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"

2025-12-20 01:37:16 +00:00

..

CMakeLists.txt

Fix cmakelint issues

2024-07-01 23:29:08 +00:00

konsole.notifyrc

SVN_SILENT made messages (.desktop file) - always resolve ours

2025-12-20 01:37:16 +00:00

konsole.qrc

Don't require dbus + bundle ui files in resources

2016-06-18 22:35:40 +02:00

konsolepart.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2025-12-20 01:37:16 +00:00

konsolerun.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2025-12-20 01:37:16 +00:00

konsoleui.rc

Bump konsoleui.rc version number.

2023-01-27 18:07:35 +02:00

org.kde.konsole.appdata.xml

GIT_SILENT Update Appstream for new release

2025-12-03 23:23:56 +01:00

org.kde.konsole.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2025-12-20 01:37:16 +00:00

partui.rc

Add Split View context menu for partui.rc

2024-05-20 23:50:09 +00:00

sessionui.rc

Increase ui version

2024-07-28 13:09:29 -04:00

terminalemulator.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2025-12-20 01:37:16 +00:00