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

2015-08-25 12:56:42 +00:00

..

CMakeLists.txt

Add AppStream metadata

2014-11-06 23:28:44 +01:00

konsole.notifyrc

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

2015-07-30 10:27:00 +00:00

konsolehere.desktop

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

2015-06-27 10:49:43 +00:00

konsolepart.desktop

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

2015-06-27 10:49:43 +00:00

konsolerun.desktop

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

2015-08-25 12:56:42 +00:00

konsoleui.rc

Adjust the relative order between actions

2012-02-17 22:06:58 +08:00

org.kde.konsole.appdata.xml

SVN_SILENT made messages (after extraction)

2015-06-16 11:49:24 +00:00

org.kde.konsole.desktop

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

2015-08-25 12:56:42 +00: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

2015-06-27 10:49:43 +00:00