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

Authored by l10n daemon script <scripty@kde.org> on Jun 17 2020, 2:48 PM.

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>

Jun 17 2020, 2:48 PM

Parents

R37:d98e6c86307a: GIT_SILENT made messages (after extraction)

Branches

Unknown

Tags

Unknown

References

refs/keep-around/70de789d6f296f2d94a1866073687393874414aa

l10n daemon script <scripty@kde.org> committed R37:70de789d6f29: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jun 17 2020, 2:48 PM

Changes (78)

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/data/templates/comics/.directory
	M			krita/data/templates/comics/BD-EuroTemplate.desktop
	M			krita/data/templates/comics/Comics-USTemplate.desktop
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/comics/a4_waffle_grid.desktop
	M			krita/data/templates/design/.directory
	M			krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/web_design.desktop
	M			krita/data/templates/dslr/.directory
	M			krita/data/templates/dslr/Canon_550D_5184x3456.desktop
	M			krita/data/templates/dslr/Canon_5Dmk3_5760x3840.desktop
	M			krita/data/templates/dslr/Nikon_D3000_3872x2592.desktop
	M			krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
	M			krita/data/templates/dslr/Nikon_D7000_4928x3264.desktop
	M			krita/data/templates/texture/.directory
	M			krita/data/templates/texture/Texture1024x10248bitsrgb.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture1k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture2048x20488bitsrgb.desktop
	M			krita/data/templates/texture/Texture256x2568bitsrgb.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture4096x40968bitsrgb.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture512x5128bitsrgb.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k8bitsrgb.desktop
	M			krita/org.kde.krita.desktop
	M			plugins/impex/brush/krita_brush.desktop
	M			plugins/impex/csv/krita_csv.desktop
	M			plugins/impex/exr/krita_exr.desktop
	M			plugins/impex/gif/krita_gif.desktop
	M			plugins/impex/heif/krita_heif.desktop
	M			plugins/impex/heightmap/krita_heightmap.desktop
	M			plugins/impex/jp2/krita_jp2.desktop
	M			plugins/impex/jpeg/krita_jpeg.desktop
	M			plugins/impex/kra/krita_kra.desktop
	M			plugins/impex/ora/krita_ora.desktop
	M			plugins/impex/pdf/krita_pdf.desktop
	M			plugins/impex/png/krita_png.desktop
	M			plugins/impex/psd/krita_psd.desktop
	M			plugins/impex/qimageio/krita_qimageio.desktop
	M			plugins/impex/raw/krita_raw.desktop
	M			plugins/impex/spriter/krita_spriter.desktop
	M			plugins/impex/svg/krita_svg.desktop
	M			plugins/impex/tga/krita_tga.desktop
	M			plugins/impex/tiff/krita_tiff.desktop
	M			plugins/impex/xcf/krita_xcf.desktop
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/exportlayers/kritapykrita_exportlayers.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/hello/kritapykrita_hello.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/scripter/kritapykrita_scripter.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop