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

Authored by l10n daemon script <scripty@kde.org> on Aug 12 2019, 6:33 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>

Aug 12 2019, 6:33 AM

Parents

R223:fe5e467d71ed: GIT_SILENT Increase version number

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R223:b16dcf41aad4: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Aug 12 2019, 6:33 AM

Changes (38)

				Path	Packages
	M			core/okularGenerator.desktop
	M			generators/chm/kio-msits/ms-its.protocol
	M			generators/chm/okularApplication_chm.desktop
	M			generators/chm/org.kde.mobile.okular_chm.desktop
	M			generators/comicbook/okularApplication_comicbook.desktop
	M			generators/comicbook/org.kde.mobile.okular_comicbook.desktop
	M			generators/djvu/okularApplication_djvu.desktop
	M			generators/djvu/org.kde.mobile.okular_djvu.desktop
	M			generators/dvi/okularApplication_dvi.desktop
	M			generators/dvi/org.kde.mobile.okular_dvi.desktop
	M			generators/epub/okularApplication_epub.desktop
	M			generators/epub/org.kde.mobile.okular_epub.desktop
	M			generators/fax/okularApplication_fax.desktop
	M			generators/fax/org.kde.mobile.okular_fax.desktop
	M			generators/fictionbook/okularApplication_fb.desktop
	M			generators/fictionbook/org.kde.mobile.okular_fb.desktop
	M			generators/kimgio/okularApplication_kimgio.desktop
	M			generators/kimgio/org.kde.mobile.okular_kimgio.desktop
	M			generators/markdown/okularApplication_md.desktop
	M			generators/markdown/org.kde.mobile.okular_md.desktop
	M			generators/mobipocket/okularApplication_mobi.desktop
	M			generators/mobipocket/org.kde.mobile.okular_mobi.desktop
	M			generators/ooo/okularApplication_ooo.desktop
	M			generators/ooo/org.kde.mobile.okular_ooo.desktop
	M			generators/plucker/okularApplication_plucker.desktop
	M			generators/plucker/org.kde.mobile.okular_plucker.desktop
	M			generators/poppler/okularApplication_pdf.desktop
	M			generators/poppler/org.kde.mobile.okular_pdf.desktop
	M			generators/spectre/okularApplication_ghostview.desktop
	M			generators/spectre/org.kde.mobile.okular_ghostview.desktop
	M			generators/tiff/okularApplication_tiff.desktop
	M			generators/tiff/org.kde.mobile.okular_tiff.desktop
	M			generators/txt/okularApplication_txt.desktop
	M			generators/txt/org.kde.mobile.okular_txt.desktop
	M			generators/xps/okularApplication_xps.desktop
	M			generators/xps/org.kde.mobile.okular_xps.desktop
	M			mobile/app/package/metadata.desktop
	M			shell/org.kde.okular.desktop