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

Authored by l10n daemon script <scripty@kde.org> on Sep 7 2019, 3:12 AM.

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>

Sep 7 2019, 3:12 AM

Parents

R241:d79a991bd196: FileUndoManager: improve debugging facilities

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R241:b7ecc2623bde: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 7 2019, 3:12 AM

Changes (85)

				Path	Packages
	M			src/urifilters/ikws/searchprovider.desktop
	M			src/urifilters/ikws/searchproviders/baidu.desktop
	M			src/urifilters/ikws/searchproviders/cpan.desktop
	M			src/urifilters/ikws/searchproviders/ctan.desktop
	M			src/urifilters/ikws/searchproviders/ctan_cat.desktop
	M			src/urifilters/ikws/searchproviders/dbug.desktop
	M			src/urifilters/ikws/searchproviders/de2en.desktop
	M			src/urifilters/ikws/searchproviders/de2fr.desktop
	M			src/urifilters/ikws/searchproviders/deb.desktop
	M			src/urifilters/ikws/searchproviders/dictfr.desktop
	M			src/urifilters/ikws/searchproviders/doi.desktop
	M			src/urifilters/ikws/searchproviders/duckduckgo.desktop
	M			src/urifilters/ikws/searchproviders/duckduckgo_info.desktop
	M			src/urifilters/ikws/searchproviders/duckduckgo_shopping.desktop
	M			src/urifilters/ikws/searchproviders/ecosia.desktop
	M			src/urifilters/ikws/searchproviders/en2de.desktop
	M			src/urifilters/ikws/searchproviders/facebook.desktop
	M			src/urifilters/ikws/searchproviders/feedster.desktop
	M			src/urifilters/ikws/searchproviders/flickr.desktop
	M			src/urifilters/ikws/searchproviders/flickrcc.desktop
	M			src/urifilters/ikws/searchproviders/foldoc.desktop
	M			src/urifilters/ikws/searchproviders/fr2de.desktop
	M			src/urifilters/ikws/searchproviders/freecode.desktop
	M			src/urifilters/ikws/searchproviders/freedb.desktop
	M			src/urifilters/ikws/searchproviders/fsd.desktop
	M			src/urifilters/ikws/searchproviders/github.desktop
	M			src/urifilters/ikws/searchproviders/gitlab.desktop
	M			src/urifilters/ikws/searchproviders/google.desktop
	M			src/urifilters/ikws/searchproviders/google_code.desktop
	M			src/urifilters/ikws/searchproviders/google_maps.desktop
	M			src/urifilters/ikws/searchproviders/grec.desktop
	M			src/urifilters/ikws/searchproviders/hyperdictionary.desktop
	M			src/urifilters/ikws/searchproviders/hyperdictionary_thesaurus.desktop
	M			src/urifilters/ikws/searchproviders/identica_groups.desktop
	M			src/urifilters/ikws/searchproviders/identica_notices.desktop
	M			src/urifilters/ikws/searchproviders/identica_people.desktop
	M			src/urifilters/ikws/searchproviders/imdb.desktop
	M			src/urifilters/ikws/searchproviders/jamendo.desktop
	M			src/urifilters/ikws/searchproviders/kde.desktop
	M			src/urifilters/ikws/searchproviders/kde_apps.desktop
	M			src/urifilters/ikws/searchproviders/kde_forums.desktop
	M			src/urifilters/ikws/searchproviders/kde_look.desktop
	M			src/urifilters/ikws/searchproviders/leo.desktop
	M			src/urifilters/ikws/searchproviders/magnatune.desktop
	M			src/urifilters/ikws/searchproviders/metacrawler.desktop
	M			src/urifilters/ikws/searchproviders/multitran-deru.desktop
	M			src/urifilters/ikws/searchproviders/multitran-enru.desktop
	M			src/urifilters/ikws/searchproviders/multitran-esru.desktop
	M			src/urifilters/ikws/searchproviders/multitran-frru.desktop
	M			src/urifilters/ikws/searchproviders/multitran-itru.desktop
	M			src/urifilters/ikws/searchproviders/multitran-nlru.desktop
	M			src/urifilters/ikws/searchproviders/netcraft.desktop
	M			src/urifilters/ikws/searchproviders/nl-telephone.desktop
	M			src/urifilters/ikws/searchproviders/nl-teletekst.desktop
	M			src/urifilters/ikws/searchproviders/opendesktop.desktop
	M			src/urifilters/ikws/searchproviders/pgpkeys.desktop
	M			src/urifilters/ikws/searchproviders/php.desktop
	M			src/urifilters/ikws/searchproviders/qt.desktop
	M			src/urifilters/ikws/searchproviders/qt4.desktop
	M			src/urifilters/ikws/searchproviders/qwant.desktop
	M			src/urifilters/ikws/searchproviders/qwant_images.desktop
	M			src/urifilters/ikws/searchproviders/qwant_news.desktop
	M			src/urifilters/ikws/searchproviders/qwant_shopping.desktop
	M			src/urifilters/ikws/searchproviders/qwant_social.desktop
	M			src/urifilters/ikws/searchproviders/qwant_videos.desktop
	M			src/urifilters/ikws/searchproviders/rae.desktop
	M			src/urifilters/ikws/searchproviders/rag.desktop
	M			src/urifilters/ikws/searchproviders/rfc.desktop
	M			src/urifilters/ikws/searchproviders/rpmfind.desktop
	M			src/urifilters/ikws/searchproviders/ruby_application_archive.desktop
	M			src/urifilters/ikws/searchproviders/soundcloud.desktop
	M			src/urifilters/ikws/searchproviders/sourceforge.desktop
	M			src/urifilters/ikws/searchproviders/technorati.desktop
	M			src/urifilters/ikws/searchproviders/technoratitags.desktop
	M			src/urifilters/ikws/searchproviders/thesaurus.desktop
	M			src/urifilters/ikws/searchproviders/tvtome.desktop
	M			src/urifilters/ikws/searchproviders/urbandictionary.desktop
	M			src/urifilters/ikws/searchproviders/uspto.desktop
	M			src/urifilters/ikws/searchproviders/vimeo.desktop
	M			src/urifilters/ikws/searchproviders/voila.desktop
	M			src/urifilters/ikws/searchproviders/webster.desktop
	M			src/urifilters/ikws/searchproviders/wikia.desktop
	M			src/urifilters/ikws/searchproviders/wolfram_alpha.desktop
	M			src/urifilters/ikws/searchproviders/yahoo.desktop
	M			src/urifilters/ikws/searchproviders/youtube.desktop