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

Authored by l10n daemon script <scripty@kde.org>.

Description

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"

Details

Committed

l10n daemon script <scripty@kde.org>

Dec 31 2015, 9:59 AM

Parents

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

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R114:777c3e56cea8: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 31 2015, 9:59 AM

Changes (57)

				Path	Packages
	M			applets/activitypager/package/metadata.desktop
	M			applets/blackboard/plasma-applet-blackboard.desktop
	M			applets/bookmarks/plasma-applet-bookmarks.desktop
	M			applets/bubblemon/plasma-applet-bubblemon.desktop
	M			applets/calculator/package/metadata.desktop
	M			applets/comic/package/metadata.desktop
	M			applets/dict/plasma-dict-default.desktop
	M			applets/diskquota/package/metadata.desktop
	M			applets/fifteenPuzzle/package/metadata.desktop
	M			applets/kickerdash/metadata.desktop
	M			applets/kimpanel/package/metadata.desktop
	M			applets/konsoleprofiles/package/metadata.desktop
	M			applets/lancelot/application/lancelot.notifyrc
	M			applets/luna/plasma-applet-luna.desktop
	M			applets/magnifique/plasma-applet-magnifique.desktop
	M			applets/mediaplayer/plasma-applet-mediaplayer.desktop
	M			applets/qalculate/plasma-applet-qalculate.desktop
	M			applets/quicklaunch/package/metadata.desktop
	M			applets/quickshare/plasmoid/metadata.desktop
	M			applets/rssnow/plasma-applet-rssnow.desktop
	M			applets/timer/package/metadata.desktop
	M			applets/userswitcher/package/metadata.desktop
	M			applets/webbrowser/metadata.desktop
	M			applets/webslice/plasma/plasma-applet-webslice.desktop
	M			dataengines/comic/plasma-dataengine-comic.desktop
	M			dataengines/comic/plasma-packagestructure-comic.desktop
	M			dataengines/comic/plasma_comicprovider.desktop
	M			dataengines/kimpanel/plasma-dataengine-kimpanel.desktop
	M			dataengines/konsoleprofiles/plasma-dataengine-konsoleprofiles.desktop
	M			dataengines/microblog/plasma-dataengine-microblog.desktop
	M			dataengines/potd/apodprovider.desktop
	M			dataengines/potd/epodprovider.desktop
	M			dataengines/potd/flickrprovider.desktop
	M			dataengines/potd/natgeoprovider.desktop
	M			dataengines/potd/oseiprovider.desktop
	M			dataengines/potd/plasma-dataengine-potd.desktop
	M			dataengines/potd/plasma_potdprovider.desktop
	M			dataengines/potd/wcpotdprovider.desktop
	M			runners/audioplayercontrol/plasma-runner-audioplayercontrol.desktop
	M			runners/audioplayercontrol/plasma-runner-audioplayercontrol_config.desktop
	M			runners/characters/CharacterRunner.desktop
	M			runners/datetime/plasma-runner-datetime.desktop
	M			runners/events/plasma-runner-events.desktop
	M			runners/events/plasma-runner-events_config.desktop
	M			runners/katesessions/katesessions.desktop
	M			runners/konquerorsessions/konquerorsessions.desktop
	M			runners/konsolesessions/konsolesessions.desktop
	M			runners/mediawiki/plasma-runner-techbase.desktop
	M			runners/mediawiki/plasma-runner-userbase.desktop
	M			runners/mediawiki/plasma-runner-wikipedia.desktop
	M			runners/mediawiki/plasma-runner-wikitravel.desktop
	M			runners/spellchecker/plasma-runner-spellchecker.desktop
	M			runners/spellchecker/plasma-runner-spellchecker_config.desktop
	M			runners/youtube/plasma-runner-youtube.desktop
	M			wallpapers/animals/metadata.desktop
	M			wallpapers/haenau/metadata.desktop
	M			wallpapers/hunyango/metadata.desktop