SVN_SILENT made messages (.desktop file) - always resolve ours
968d000d8874
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>

Oct 16 2015, 10:27 AM

Parents

R37:4eb82a64ea6a: Rename KisBaseNode function setCompositeOpId()

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R37:968d000d8874: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 16 2015, 10:27 AM

Changes (179)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	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/film/.directory
	M			krita/data/templates/film/1K_super35_fullAp_1024x778.desktop
	M			krita/data/templates/film/2K_super35_fullAp_2048x1556.desktop
	M			krita/data/templates/film/4K_super35_fullAp_4096x3112.desktop
	M			krita/data/templates/film/HD_720p_1280x720.desktop
	M			krita/data/templates/film/HD_full_1920x1080.desktop
	M			krita/data/templates/film/HD_half_960x540.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/gemini/kritagemini.desktop
	M			krita/integration/thumbnail/krita_kra_thumbnail.desktop
	M			krita/krita.desktop
	M			krita/plugins/assistants/RulerAssistant/kritarulerassistanttool.desktop
	M			krita/plugins/colorspaces/extensions/krita_colorspaces_extensions_plugin.desktop
	M			krita/plugins/extensions/bigbrother/kritabigbrother.desktop
	M			krita/plugins/extensions/clonesarray/kritaclonesarray.desktop
	M			krita/plugins/extensions/colorrange/kritacolorrange.desktop
	M			krita/plugins/extensions/colorspaceconversion/kritacolorspaceconversion.desktop
	M			krita/plugins/extensions/dockers/advancedcolorselector/krita_colorselectorng.desktop
	M			krita/plugins/extensions/dockers/animation/krita_animationdocker.desktop
	M			krita/plugins/extensions/dockers/artisticcolorselector/krita_artisticcolorselector.desktop
	M			krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop
	M			krita/plugins/extensions/dockers/colorslider/krita_colorslider.desktop
	M			krita/plugins/extensions/dockers/compositiondocker/krita_compositiondocker.desktop
	M			krita/plugins/extensions/dockers/defaultdockers/kritadefaultdockers.desktop
	M			krita/plugins/extensions/dockers/digitalmixer/krita_digitalmixer.desktop
	M			krita/plugins/extensions/dockers/historydocker/kritahistorydocker.desktop
	M			krita/plugins/extensions/dockers/imagedocker/kritaimagedocker.desktop
	M			krita/plugins/extensions/dockers/lut/krita_lutdocker.desktop
	M			krita/plugins/extensions/dockers/overview/krita_overviewdocker.desktop
	M			krita/plugins/extensions/dockers/palettedocker/krita_palettedocker.desktop
	M			krita/plugins/extensions/dockers/patterndocker/krita_patterndocker.desktop
	M			krita/plugins/extensions/dockers/presetdocker/krita_presetdocker.desktop
	M			krita/plugins/extensions/dockers/presethistory/krita_presethistory.desktop
	M			krita/plugins/extensions/dockers/smallcolorselector/krita_smallcolorselector.desktop
	M			krita/plugins/extensions/dockers/specificcolorselector/krita_specificcolorselector.desktop
	M			krita/plugins/extensions/dockers/tasksetdocker/krita_tasksetdocker.desktop
	M			krita/plugins/extensions/gmic/kritagmic.desktop
	M			krita/plugins/extensions/histogram/kritahistogram.desktop
	M			krita/plugins/extensions/imagesize/kritaimagesize.desktop
	M			krita/plugins/extensions/imagesplit/kritaimagesplit.desktop
	M			krita/plugins/extensions/layergroupswitcher/kritalayergroupswitcher.desktop
	M			krita/plugins/extensions/layersplit/kritalayersplit.desktop
	M			krita/plugins/extensions/metadataeditor/kritametadataeditor.desktop
	M			krita/plugins/extensions/modify_selection/kritamodifyselection.desktop
	M			krita/plugins/extensions/offsetimage/kritaoffsetimage.desktop
	M			krita/plugins/extensions/resourcemanager/kritaresourcemanager.desktop
	M			krita/plugins/extensions/rotateimage/kritarotateimage.desktop
	M			krita/plugins/extensions/separate_channels/kritaseparatechannels.desktop
	M			krita/plugins/extensions/shearimage/kritashearimage.desktop
	M			krita/plugins/filters/blur/kritablurfilter.desktop
	M			krita/plugins/filters/colors/kritaextensioncolorsfilters.desktop
	M			krita/plugins/filters/colorsfilters/kritacolorsfilter.desktop
	M			krita/plugins/filters/convolutionfilters/kritaconvolutionfilters.desktop
	M			krita/plugins/filters/dodgeburn/kritadodgeburn.desktop
	M			krita/plugins/filters/embossfilter/kritaembossfilter.desktop
	M			krita/plugins/filters/example/kritaexample.desktop
	M			krita/plugins/filters/fastcolortransfer/kritafastcolortransfer.desktop
	M			krita/plugins/filters/imageenhancement/kritaimageenhancement.desktop
	M			krita/plugins/filters/indexcolors/kritaindexcolors.desktop
	M			krita/plugins/filters/levelfilter/kritalevelfilter.desktop
	M			krita/plugins/filters/noisefilter/kritanoisefilter.desktop
	M			krita/plugins/filters/normalize/kritanormalize.desktop
	M			krita/plugins/filters/oilpaintfilter/kritaoilpaintfilter.desktop
	M			krita/plugins/filters/phongbumpmap/kritaphongbumpmapfilter.desktop
	M			krita/plugins/filters/pixelizefilter/kritapixelizefilter.desktop
	M			krita/plugins/filters/posterize/kritaposterize.desktop
	M			krita/plugins/filters/raindropsfilter/kritaraindropsfilter.desktop
	M			krita/plugins/filters/randompickfilter/kritarandompickfilter.desktop
	M			krita/plugins/filters/roundcorners/kritaroundcornersfilter.desktop
	M			krita/plugins/filters/smalltilesfilter/kritasmalltilesfilter.desktop
	M			krita/plugins/filters/sobelfilter/kritasobelfilter.desktop
	M			krita/plugins/filters/unsharp/kritaunsharpfilter.desktop
	M			krita/plugins/filters/wavefilter/kritawavefilter.desktop
	M			krita/plugins/formats/bmp/krita_bmp.desktop
	M			krita/plugins/formats/bmp/krita_bmp_export.desktop
	M			krita/plugins/formats/bmp/krita_bmp_import.desktop
	M			krita/plugins/formats/exr/krita_exr.desktop
	M			krita/plugins/formats/exr/krita_exr_export.desktop
	M			krita/plugins/formats/exr/krita_exr_import.desktop
	M			krita/plugins/formats/heightmap/krita_heightmap.desktop
	M			krita/plugins/formats/heightmap/krita_heightmap_export.desktop
	M			krita/plugins/formats/heightmap/krita_heightmap_import.desktop
	M			krita/plugins/formats/jp2/krita_jp2.desktop
	M			krita/plugins/formats/jp2/krita_jp2_export.desktop
	M			krita/plugins/formats/jp2/krita_jp2_import.desktop
	M			krita/plugins/formats/jpeg/krita_jpeg.desktop
	M			krita/plugins/formats/jpeg/krita_jpeg_export.desktop
	M			krita/plugins/formats/jpeg/krita_jpeg_import.desktop
	M			krita/plugins/formats/odg/krita_odg.desktop
	M			krita/plugins/formats/odg/krita_odg_import.desktop
	M			krita/plugins/formats/oiio/krita_oiio.desktop
	M			krita/plugins/formats/oiio/krita_oiio_export.desktop
	M			krita/plugins/formats/oiio/krita_oiio_import.desktop
	M			krita/plugins/formats/ora/krita_ora.desktop
	M			krita/plugins/formats/ora/krita_ora_export.desktop
	M			krita/plugins/formats/ora/krita_ora_import.desktop
	M			krita/plugins/formats/ora/krita_ora_thumbnail.desktop
	M			krita/plugins/formats/pdf/krita_pdf.desktop
	M			krita/plugins/formats/pdf/krita_pdf_import.desktop
	M			krita/plugins/formats/png/krita_png.desktop
	M			krita/plugins/formats/png/krita_png_export.desktop
	M			krita/plugins/formats/png/krita_png_import.desktop
	M			krita/plugins/formats/ppm/krita_ppm.desktop
	M			krita/plugins/formats/ppm/krita_ppm_export.desktop
	M			krita/plugins/formats/ppm/krita_ppm_import.desktop
	M			krita/plugins/formats/psd/krita_psd.desktop
	M			krita/plugins/formats/psd/krita_psd_export.desktop
	M			krita/plugins/formats/psd/krita_psd_import.desktop
	M			krita/plugins/formats/qml/krita_qml_export.desktop
	M			krita/plugins/formats/raw/krita_raw.desktop
	M			krita/plugins/formats/raw/krita_raw_import.desktop
	M			krita/plugins/formats/tga/krita_tga.desktop
	M			krita/plugins/formats/tga/krita_tga_export.desktop
	M			krita/plugins/formats/tga/krita_tga_import.desktop
	M			krita/plugins/formats/tiff/krita_tiff.desktop
	M			krita/plugins/formats/tiff/krita_tiff_export.desktop
	M			krita/plugins/formats/tiff/krita_tiff_import.desktop
	M			krita/plugins/formats/xcf/krita_xcf.desktop
	M			krita/plugins/formats/xcf/krita_xcf_import.desktop
	M			krita/plugins/generators/pattern/kritapatterngenerator.desktop
	M			krita/plugins/generators/solid/kritacolorgenerator.desktop
	M			krita/plugins/paintops/chalk/kritachalkpaintop.desktop
	M			krita/plugins/paintops/colorsmudge/kritacolorsmudgepaintop.desktop
	M			krita/plugins/paintops/curvebrush/kritacurvepaintop.desktop
	M			krita/plugins/paintops/defaultpaintops/kritadefaultpaintops.desktop
	M			krita/plugins/paintops/deform/kritadeformpaintop.desktop
	M			krita/plugins/paintops/dynadraw/kritadynapaintop.desktop
	M			krita/plugins/paintops/experiment/kritaexperimentpaintop.desktop
	M			krita/plugins/paintops/filterop/kritafilterop.desktop
	M			krita/plugins/paintops/gridbrush/kritagridpaintop.desktop
	M			krita/plugins/paintops/hairy/kritahairypaintop.desktop
	M			krita/plugins/paintops/hatching/kritahatchingpaintop.desktop
	M			krita/plugins/paintops/particle/kritaparticlepaintop.desktop
	M			krita/plugins/paintops/sketch/kritasketchpaintop.desktop
	M			krita/plugins/paintops/spray/kritaspraypaintop.desktop
	M			krita/plugins/paintops/tangentnormal/kritatangentnormalpaintop.desktop
	M			krita/plugins/tools/defaulttools/kritadefaulttools.desktop
	M			krita/plugins/tools/selectiontools/kritaselectiontools.desktop
	M			krita/plugins/tools/tool_crop/kritatoolcrop.desktop
	M			krita/plugins/tools/tool_dyna/kritatooldyna.desktop
	M			krita/plugins/tools/tool_grid/kritatoolgrid.desktop
	M			krita/plugins/tools/tool_perspectivegrid/kritatoolperspectivegrid.desktop
	M			krita/plugins/tools/tool_polygon/kritatoolpolygon.desktop
	M			krita/plugins/tools/tool_polyline/kritatoolpolyline.desktop
	M			krita/plugins/tools/tool_text/kritatooltext.desktop
	M			krita/plugins/tools/tool_transform2/kritatooltransform.desktop
	M			krita/sketch/kritasketch.desktop