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

2020-03-29 07:06:26 +02:00

..

bugreport

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

2020-03-27 06:24:35 +01:00

compactrepresentation

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

2019-12-09 05:18:11 +01:00

conditionalloader

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

2019-12-09 05:18:11 +01:00

config

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

2019-12-09 05:18:11 +01:00

dataenginemodel

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

2020-03-29 07:06:26 +02:00

helloworld

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

2019-12-09 05:18:11 +01:00

notes

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

2019-08-20 04:58:25 +02:00

nowplaying

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

2019-12-09 05:18:11 +01:00

pairsgame/contents/ui

add 3 example plasmoids to be ported

2013-09-04 11:57:46 +02:00

qmltasks

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

2019-08-20 04:58:25 +02:00

samegame

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

2019-12-09 05:18:11 +01:00

testcomponents

Port away from Title and towards level 1 Heading

2020-02-21 08:39:25 -07:00

testshaders

Fix minor issues found by EBN and typos

2019-11-10 12:06:10 +02:00

testtheme

Port away from Title and towards level 1 Heading

2020-02-21 08:39:25 -07:00

widgetgallery

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

2020-03-27 06:24:35 +01:00

windowthumbnails

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

2019-08-20 04:58:25 +02:00

CMakeLists.txt

New bugreport Plasmoid

2014-02-22 02:09:23 +01:00