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

2017-03-15 05:04:17 +01:00

..

CMakeLists.txt

Depend on ECM 1.6 and use new install variables

2016-06-19 20:19:45 -04:00

konsole.notifyrc

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

2017-03-15 05:04:17 +01:00

konsole.qrc

Don't require dbus + bundle ui files in resources

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

konsolehere.desktop

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

2017-03-15 05:04:17 +01:00

konsolepart.desktop

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

2017-03-15 05:04:17 +01:00

konsolerun.desktop

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

2017-03-15 05:04:17 +01:00

konsoleui.rc

…

org.kde.konsole.appdata.xml

GIT_SILENT made messages (after extraction)

2017-03-15 03:26:09 +01:00

org.kde.konsole.desktop

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

2017-03-15 05:04:17 +01:00

partui.rc

set the konsolepart's translation catalog

2014-11-18 21:10:09 +01:00

sessionui.rc

Avoid duplicate "Show Menubar" entries in shortcuts dialog

2012-10-20 18:56:41 +08:00

terminalemulator.desktop

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

2017-03-15 05:04:17 +01:00