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

Authored by l10n daemon script <scripty@kde.org> on May 21 2017, 3:48 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"

Committed

l10n daemon script <scripty@kde.org>

May 21 2017, 3:48 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			generators/chm/libokularGenerator_chmlib.json
	M			generators/chm/okularApplication_chm.desktop
	M			generators/comicbook/libokularGenerator_comicbook.json
	M			generators/comicbook/okularApplication_comicbook.desktop
	M			generators/djvu/okularApplication_djvu.desktop
	M			generators/dvi/libokularGenerator_dvi.json
	M			generators/dvi/okularApplication_dvi.desktop
	M			generators/epub/okularApplication_epub.desktop
	M			generators/fax/okularApplication_fax.desktop
	M			generators/fictionbook/libokularGenerator_fb.json
	M			generators/fictionbook/okularApplication_fb.desktop
	M			generators/kimgio/okularApplication_kimgio.desktop
	M			generators/mobipocket/libokularGenerator_mobi.json
	M			generators/mobipocket/okularApplication_mobi.desktop
	M			generators/ooo/libokularGenerator_ooo.json
	M			generators/ooo/okularApplication_ooo.desktop
	M			generators/plucker/libokularGenerator_plucker.json
	M			generators/plucker/okularApplication_plucker.desktop
	M			generators/poppler/libokularGenerator_poppler.json
	M			generators/poppler/okularApplication_pdf.desktop
	M			generators/spectre/libokularGenerator_ghostview.json
	M			generators/spectre/okularApplication_ghostview.desktop
	M			generators/tiff/libokularGenerator_tiff.json
	M			generators/tiff/okularApplication_tiff.desktop
	M			generators/txt/libokularGenerator_txt.json
	M			generators/txt/okularApplication_txt.desktop
	M			generators/xps/okularApplication_xps.desktop
	M			shell/org.kde.okular.desktop