From b8aa0b67d1328f370c1cc63d2794026a0f7d383f Mon Sep 17 00:00:00 2001 From: Ari Pollak Date: Wed, 4 Dec 2013 20:45:50 -0500 Subject: [PATCH] Imported Upstream version 2.8.10 --- AUTHORS | 4 + ChangeLog | 2349 ++++++++++++- Makefile.in | 18 +- NEWS | 78 + aclocal.m4 | 142 +- app/Makefile.am | 27 +- app/Makefile.in | 41 +- app/actions/Makefile.in | 12 +- app/actions/colormap-actions.c | 2 +- app/actions/file-actions.c | 6 +- app/actions/file-commands.c | 146 +- app/actions/image-commands.c | 13 +- app/actions/view-commands.c | 10 +- app/app.c | 53 +- app/base/Makefile.in | 12 +- app/base/base-utils.c | 4 +- app/composite/Makefile.in | 12 +- app/config/Makefile.in | 12 +- app/core/Makefile.in | 12 +- app/core/gimpbrush-load.c | 17 + app/core/gimpbrushpipe-load.c | 10 +- app/core/gimpdata.c | 15 +- app/core/gimpdrawable.c | 32 +- app/core/gimpidtable.c | 12 + app/core/gimpimage-colormap.c | 36 +- app/core/gimpimage-colormap.h | 2 + app/core/gimpimage-convert.c | 2 +- app/core/gimpimage-merge.c | 54 +- app/core/gimpimage-merge.h | 3 +- app/core/gimpimage-scale.c | 11 +- app/core/gimpimageundo.c | 9 +- app/dialogs/Makefile.in | 12 +- app/dialogs/authors.h | 4 + app/dialogs/file-save-dialog.c | 205 +- app/dialogs/file-save-dialog.h | 3 + app/dialogs/quit-dialog.c | 349 +- app/display/Makefile.in | 12 +- app/display/gimpcanvaspassepartout.c | 2 +- app/display/gimpdisplayshell-close.c | 96 +- app/display/gimpdisplayshell-render.c | 2 +- app/display/gimpimagewindow.c | 43 +- app/display/gimpmotionbuffer.c | 4 +- app/file/Makefile.in | 12 +- app/file/file-open.c | 12 +- app/gegl/Makefile.in | 12 +- app/git-version.h | 2 +- app/gui/Makefile.am | 24 +- app/gui/Makefile.in | 36 +- app/gui/gimpuiconfigurer.c | 27 +- app/gui/gui-unique.c | 185 +- app/gui/gui.c | 86 +- app/gui/ige-mac-menu.c | 988 ------ app/gui/ige-mac-menu.h | 43 - app/gui/session.c | 9 + app/language.c | 6 +- app/menus/Makefile.in | 12 +- app/paint-funcs/Makefile.in | 12 +- app/paint/Makefile.in | 12 +- app/paint/gimppaintcore-stroke.c | 13 +- app/paint/gimppaintcore.c | 4 +- app/paint/gimppaintcore.h | 2 +- app/pdb/Makefile.in | 12 +- app/pdb/image-cmds.c | 2 +- app/pdb/layer-cmds.c | 5 +- app/plug-in/Makefile.in | 12 +- app/plug-in/gimpplugin-message.c | 2 +- app/plug-in/gimpplugin.c | 2 +- app/tests.h | 10 + app/tests/Makefile.in | 12 +- app/tests/files/Makefile.in | 8 +- app/tests/gimpdir-empty/Makefile.in | 8 +- app/tests/gimpdir-empty/brushes/Makefile.in | 8 +- app/tests/gimpdir-empty/gradients/Makefile.in | 8 +- app/tests/gimpdir-empty/patterns/Makefile.in | 8 +- app/tests/gimpdir/Makefile.in | 8 +- app/tests/gimpdir/brushes/Makefile.in | 8 +- app/tests/gimpdir/gradients/Makefile.in | 8 +- app/tests/gimpdir/patterns/Makefile.in | 8 +- app/tests/test-session-2-6-compatibility.c | 11 + ...t-session-2-8-compatibility-multi-window.c | 12 + ...-session-2-8-compatibility-single-window.c | 11 + app/text/Makefile.in | 12 +- app/text/gimptext-vectors.c | 9 +- app/text/gimptextlayer.c | 24 +- app/text/gimptextlayout.c | 41 +- app/text/gimptextlayout.h | 3 +- app/tools/Makefile.in | 12 +- app/tools/gimpcagetool.c | 159 +- app/tools/gimpcagetool.h | 1 - app/tools/gimpmovetool.c | 7 +- app/tools/gimppainttool.c | 15 +- app/tools/gimptexttool.c | 8 +- app/vectors/Makefile.in | 12 +- app/widgets/Makefile.in | 12 +- app/widgets/gimpcontainergridview.c | 10 +- app/widgets/gimpcontainertreeview-dnd.c | 15 + app/widgets/gimpcontainertreeview-dnd.h | 4 + app/widgets/gimpcontainertreeview.c | 11 + app/widgets/gimpcontainertreeview.h | 4 + app/widgets/gimpcontainerview.c | 22 +- app/widgets/gimpdeviceinfo-coords.c | 12 +- app/widgets/gimpimagepropview.c | 29 +- app/widgets/gimppaletteview.c | 2 +- app/widgets/gimppanedbox.c | 2 +- app/widgets/gimpprofilechooserdialog.c | 4 +- app/widgets/gimpprogressdialog.c | 2 + app/xcf/Makefile.in | 12 +- app/xcf/xcf-save.c | 9 +- authors.xml | 4 + build/Makefile.in | 8 +- build/windows/Makefile.in | 8 +- build/windows/gimp-plug-ins.rc | 8 +- build/windows/gimp.manifest | 1 + build/windows/gimp.rc | 8 +- config.guess | 8 +- config.h.in | 21 +- config.sub | 13 +- configure | 669 ++-- configure.ac | 75 +- cursors/Makefile.in | 8 +- data/Makefile.in | 8 +- data/brushes/Basic/Makefile.in | 8 +- data/brushes/Legacy/Makefile.in | 8 +- data/brushes/Makefile.in | 8 +- data/brushes/Media/Makefile.in | 8 +- data/brushes/Sketch/Makefile.in | 8 +- data/brushes/Splatters/Makefile.in | 8 +- data/brushes/Texture/Makefile.in | 8 +- data/brushes/gimp-obsolete-files/Makefile.in | 8 +- data/dynamics/Basic/Makefile.in | 8 +- data/dynamics/FX/Makefile.in | 8 +- data/dynamics/Makefile.in | 8 +- data/environ/Makefile.in | 8 +- data/gradients/Makefile.in | 8 +- data/images/Makefile.in | 8 +- data/interpreters/Makefile.in | 8 +- data/palettes/Makefile.in | 8 +- data/patterns/Makefile.in | 8 +- data/tags/Makefile.in | 8 +- data/tips/Makefile.in | 8 +- data/tips/gimp-tips.xml | 1 + data/tool-presets/FX/Makefile.in | 8 +- data/tool-presets/Makefile.in | 8 +- data/tool-presets/Paint/Makefile.in | 8 +- data/tool-presets/Selection/Makefile.in | 8 +- data/tool-presets/Sketch/Makefile.in | 8 +- desktop/Makefile.am | 9 +- desktop/Makefile.in | 84 +- desktop/gimp.appdata.xml.in | 38 + devel-docs/Makefile.in | 8 +- devel-docs/app/Makefile.in | 112 +- devel-docs/app/app-docs.sgml | 1 - devel-docs/libgimp/Makefile.in | 106 +- .../libgimp/html/GimpAspectPreview.html | 4 +- .../libgimp/html/GimpBrushSelectButton.html | 4 +- .../libgimp/html/GimpDrawablePreview.html | 4 +- .../libgimp/html/GimpFontSelectButton.html | 4 +- .../html/GimpGradientSelectButton.html | 4 +- .../libgimp/html/GimpImageComboBox.html | 4 +- .../libgimp/html/GimpPaletteSelectButton.html | 4 +- .../libgimp/html/GimpPatternSelectButton.html | 4 +- .../libgimp/html/GimpProcBrowserDialog.html | 4 +- devel-docs/libgimp/html/GimpProgressBar.html | 4 +- devel-docs/libgimp/html/GimpSelectButton.html | 4 +- devel-docs/libgimp/html/GimpZoomPreview.html | 4 +- devel-docs/libgimp/html/index.html | 6 +- devel-docs/libgimp/html/index.sgml | 100 + devel-docs/libgimp/html/libgimp-Gimp.html | 22 +- .../html/libgimp-GimpItemComboBox.html | 4 +- .../libgimp/html/libgimp-GimpProcView.html | 4 +- devel-docs/libgimp/html/libgimp-data.html | 4 +- devel-docs/libgimp/html/libgimp-general.html | 4 +- .../libgimp/html/libgimp-gimpbrush.html | 4 +- .../libgimp/html/libgimp-gimpbrushes.html | 4 +- .../libgimp/html/libgimp-gimpbrushmenu.html | 4 +- .../libgimp/html/libgimp-gimpbrushselect.html | 4 +- .../libgimp/html/libgimp-gimpbuffer.html | 4 +- .../libgimp/html/libgimp-gimpchannel.html | 4 +- .../libgimp/html/libgimp-gimpcolor.html | 4 +- .../libgimp/html/libgimp-gimpcontext.html | 4 +- .../libgimp/html/libgimp-gimpconvert.html | 4 +- .../libgimp/html/libgimp-gimpdisplay.html | 4 +- .../libgimp/html/libgimp-gimpdrawable.html | 4 +- .../html/libgimp-gimpdrawabletransform.html | 4 +- .../libgimp/html/libgimp-gimpdynamics.html | 4 +- devel-docs/libgimp/html/libgimp-gimpedit.html | 4 +- .../libgimp/html/libgimp-gimpenums.html | 524 ++- .../libgimp/html/libgimp-gimpexport.html | 82 +- .../libgimp/html/libgimp-gimpfileops.html | 4 +- .../libgimp/html/libgimp-gimpfloatingsel.html | 4 +- .../libgimp/html/libgimp-gimpfontmenu.html | 4 +- .../libgimp/html/libgimp-gimpfonts.html | 4 +- .../libgimp/html/libgimp-gimpfontselect.html | 4 +- .../libgimp/html/libgimp-gimpgimprc.html | 4 +- .../libgimp/html/libgimp-gimpgradient.html | 4 +- .../html/libgimp-gimpgradientmenu.html | 4 +- .../libgimp/html/libgimp-gimpgradients.html | 4 +- .../html/libgimp-gimpgradientselect.html | 4 +- devel-docs/libgimp/html/libgimp-gimpgrid.html | 4 +- .../libgimp/html/libgimp-gimpguides.html | 4 +- devel-docs/libgimp/html/libgimp-gimphelp.html | 4 +- .../libgimp/html/libgimp-gimpimage.html | 10 +- .../libgimp/html/libgimp-gimpimageselect.html | 4 +- devel-docs/libgimp/html/libgimp-gimpitem.html | 4 +- .../html/libgimp-gimpitemtransform.html | 4 +- .../libgimp/html/libgimp-gimplayer.html | 4 +- devel-docs/libgimp/html/libgimp-gimpmenu.html | 4 +- .../libgimp/html/libgimp-gimpmessage.html | 4 +- .../libgimp/html/libgimp-gimppainttools.html | 4 +- .../libgimp/html/libgimp-gimppalette.html | 4 +- .../libgimp/html/libgimp-gimppalettemenu.html | 4 +- .../libgimp/html/libgimp-gimppalettes.html | 4 +- .../html/libgimp-gimppaletteselect.html | 4 +- .../libgimp/html/libgimp-gimppaths.html | 4 +- .../libgimp/html/libgimp-gimppattern.html | 4 +- .../libgimp/html/libgimp-gimppatternmenu.html | 4 +- .../libgimp/html/libgimp-gimppatterns.html | 4 +- .../html/libgimp-gimppatternselect.html | 4 +- .../libgimp/html/libgimp-gimppixbuf.html | 27 +- .../html/libgimp-gimppixelfetcher.html | 37 +- .../libgimp/html/libgimp-gimppixelrgn.html | 4 +- .../libgimp/html/libgimp-gimpplugin.html | 6 +- .../html/libgimp-gimpproceduraldb.html | 4 +- .../libgimp/html/libgimp-gimpprogress.html | 4 +- .../html/libgimp-gimpregioniterator.html | 4 +- .../libgimp/html/libgimp-gimpselection.html | 4 +- .../html/libgimp-gimpselectiontools.html | 4 +- .../libgimp/html/libgimp-gimptextlayer.html | 4 +- .../libgimp/html/libgimp-gimptexttool.html | 4 +- devel-docs/libgimp/html/libgimp-gimptile.html | 4 +- .../html/libgimp-gimptransformtools.html | 4 +- devel-docs/libgimp/html/libgimp-gimpui.html | 4 +- devel-docs/libgimp/html/libgimp-gimpundo.html | 4 +- .../libgimp/html/libgimp-gimpvectors.html | 10 +- devel-docs/libgimp/html/libgimp-image.html | 4 +- .../html/libgimp-index-deprecated.html | 4 +- .../html/libgimp-index-new-in-2-2.html | 4 +- .../html/libgimp-index-new-in-2-4.html | 4 +- .../html/libgimp-index-new-in-2-6.html | 4 +- .../html/libgimp-index-new-in-2-8.html | 4 +- devel-docs/libgimp/html/libgimp-index.html | 4 +- .../libgimp/html/libgimp-selectors.html | 4 +- devel-docs/libgimp/html/libgimp.devhelp2 | 100 + devel-docs/libgimp/html/libgimp.html | 4 +- .../libgimp/html/libgimpui-hierarchy.html | 4 +- devel-docs/libgimp/html/libgimpui.html | 4 +- devel-docs/libgimpbase/Makefile.in | 106 +- devel-docs/libgimpbase/html/index.html | 6 +- devel-docs/libgimpbase/html/index.sgml | 175 + .../html/libgimpbase-gimpbaseenums.html | 1088 +++++- .../html/libgimpbase-gimpbasetypes.html | 4 +- .../html/libgimpbase-gimpchecks.html | 4 +- .../html/libgimpbase-gimpcpuaccel.html | 52 +- .../html/libgimpbase-gimpdatafiles.html | 4 +- .../libgimpbase/html/libgimpbase-gimpenv.html | 4 +- .../html/libgimpbase-gimplimits.html | 4 +- .../html/libgimpbase-gimpmemsize.html | 4 +- .../html/libgimpbase-gimpparam.html | 4 +- .../html/libgimpbase-gimpparasite.html | 4 +- .../html/libgimpbase-gimpparasiteio.html | 4 +- .../html/libgimpbase-gimprectangle.html | 4 +- .../html/libgimpbase-gimpsignal.html | 4 +- .../html/libgimpbase-gimpunit.html | 51 +- .../html/libgimpbase-gimputils.html | 4 +- .../html/libgimpbase-gimpversion.html | 8 +- .../html/libgimpbase-index-deprecated.html | 4 +- .../html/libgimpbase-index-new-in-2-2.html | 4 +- .../html/libgimpbase-index-new-in-2-4.html | 4 +- .../html/libgimpbase-index-new-in-2-6.html | 4 +- .../html/libgimpbase-index-new-in-2-8.html | 4 +- .../libgimpbase/html/libgimpbase-index.html | 4 +- .../libgimpbase/html/libgimpbase.devhelp2 | 175 + devel-docs/libgimpbase/html/libgimpbase.html | 4 +- devel-docs/libgimpcolor/Makefile.in | 106 +- devel-docs/libgimpcolor/html/index.html | 6 +- devel-docs/libgimpcolor/html/index.sgml | 3 + .../libgimpcolor-GimpAdaptiveSupersample.html | 4 +- .../html/libgimpcolor-GimpBilinear.html | 4 +- .../html/libgimpcolor-GimpCMYK.html | 4 +- .../html/libgimpcolor-GimpCairoColor.html | 4 +- .../html/libgimpcolor-GimpColorManaged.html | 4 +- .../html/libgimpcolor-GimpColorSpace.html | 4 +- .../html/libgimpcolor-GimpHSV.html | 4 +- .../html/libgimpcolor-GimpRGB.html | 27 +- .../html/libgimpcolor-index-deprecated.html | 4 +- .../html/libgimpcolor-index-new-in-2-2.html | 4 +- .../html/libgimpcolor-index-new-in-2-4.html | 4 +- .../html/libgimpcolor-index-new-in-2-6.html | 4 +- .../html/libgimpcolor-index-new-in-2-8.html | 4 +- .../libgimpcolor/html/libgimpcolor-index.html | 4 +- .../libgimpcolor/html/libgimpcolor.devhelp2 | 3 + .../libgimpcolor/html/libgimpcolor.html | 4 +- devel-docs/libgimpconfig/Makefile.in | 106 +- .../libgimpconfig/html/GimpColorConfig.html | 55 +- devel-docs/libgimpconfig/html/index.html | 6 +- devel-docs/libgimpconfig/html/index.sgml | 11 + .../libgimpconfig-GimpConfig-deserialize.html | 4 +- .../html/libgimpconfig-GimpConfig-params.html | 4 +- .../html/libgimpconfig-GimpConfig-path.html | 32 +- .../libgimpconfig-GimpConfig-serialize.html | 4 +- .../html/libgimpconfig-GimpConfig-utils.html | 4 +- .../html/libgimpconfig-GimpConfig.html | 4 +- .../html/libgimpconfig-GimpConfigError.html | 4 +- .../html/libgimpconfig-GimpConfigWriter.html | 4 +- .../html/libgimpconfig-GimpScanner.html | 4 +- .../html/libgimpconfig-hierarchy.html | 4 +- .../html/libgimpconfig-index-deprecated.html | 4 +- .../html/libgimpconfig-index-new-in-2-4.html | 4 +- .../html/libgimpconfig-index-new-in-2-6.html | 4 +- .../html/libgimpconfig-index-new-in-2-8.html | 4 +- .../html/libgimpconfig-index.html | 4 +- .../libgimpconfig/html/libgimpconfig.devhelp2 | 11 + .../libgimpconfig/html/libgimpconfig.html | 4 +- devel-docs/libgimpmath/Makefile.in | 106 +- devel-docs/libgimpmath/html/index.html | 6 +- .../libgimpmath/html/libgimpmath-GimpMD5.html | 4 +- .../html/libgimpmath-GimpMath.html | 4 +- .../html/libgimpmath-GimpMatrix.html | 4 +- .../html/libgimpmath-GimpVector.html | 4 +- .../html/libgimpmath-index-deprecated.html | 4 +- .../html/libgimpmath-index-new-in-2-2.html | 4 +- .../html/libgimpmath-index-new-in-2-4.html | 4 +- .../html/libgimpmath-index-new-in-2-6.html | 4 +- .../libgimpmath/html/libgimpmath-index.html | 4 +- devel-docs/libgimpmath/html/libgimpmath.html | 4 +- devel-docs/libgimpmodule/Makefile.in | 106 +- devel-docs/libgimpmodule/html/GimpModule.html | 15 +- .../libgimpmodule/html/GimpModuleDB.html | 4 +- devel-docs/libgimpmodule/html/index.html | 6 +- devel-docs/libgimpmodule/html/index.sgml | 1 + .../html/libgimpmodule-index-deprecated.html | 4 +- .../html/libgimpmodule-index-new-in-2-2.html | 4 +- .../html/libgimpmodule-index-new-in-2-4.html | 4 +- .../html/libgimpmodule-index-new-in-2-6.html | 4 +- .../html/libgimpmodule-index-new-in-2-8.html | 4 +- .../html/libgimpmodule-index.html | 4 +- .../libgimpmodule/html/libgimpmodule.devhelp2 | 1 + .../libgimpmodule/html/libgimpmodule.html | 4 +- devel-docs/libgimpthumb/Makefile.in | 106 +- .../libgimpthumb/html/GimpThumbnail.html | 4 +- devel-docs/libgimpthumb/html/index.html | 6 +- .../html/libgimpthumb-GimpThumb-enums.html | 4 +- .../html/libgimpthumb-GimpThumb-error.html | 4 +- .../html/libgimpthumb-GimpThumb-utils.html | 4 +- .../html/libgimpthumb-index-deprecated.html | 4 +- .../html/libgimpthumb-index-new-in-2-2.html | 4 +- .../html/libgimpthumb-index-new-in-2-4.html | 4 +- .../html/libgimpthumb-index-new-in-2-6.html | 4 +- .../libgimpthumb/html/libgimpthumb-index.html | 4 +- .../libgimpthumb/html/libgimpthumb.html | 4 +- devel-docs/libgimpwidgets/Makefile.in | 106 +- .../libgimpwidgets/html/GimpBrowser.html | 4 +- .../libgimpwidgets/html/GimpButton.html | 4 +- .../html/GimpCellRendererColor.html | 4 +- .../html/GimpCellRendererToggle.html | 4 +- .../libgimpwidgets/html/GimpChainButton.html | 4 +- .../libgimpwidgets/html/GimpColorArea.html | 4 +- .../libgimpwidgets/html/GimpColorButton.html | 4 +- .../libgimpwidgets/html/GimpColorDisplay.html | 4 +- .../html/GimpColorDisplayStack.html | 4 +- .../html/GimpColorHexEntry.html | 4 +- .../html/GimpColorNotebook.html | 4 +- .../html/GimpColorProfileComboBox.html | 4 +- .../html/GimpColorProfileStore.html | 4 +- .../libgimpwidgets/html/GimpColorScale.html | 4 +- .../libgimpwidgets/html/GimpColorScales.html | 4 +- .../libgimpwidgets/html/GimpColorSelect.html | 4 +- .../html/GimpColorSelection.html | 4 +- .../html/GimpColorSelector.html | 4 +- .../libgimpwidgets/html/GimpController.html | 4 +- .../libgimpwidgets/html/GimpDialog.html | 4 +- .../libgimpwidgets/html/GimpEnumComboBox.html | 4 +- .../libgimpwidgets/html/GimpEnumLabel.html | 4 +- .../libgimpwidgets/html/GimpEnumStore.html | 4 +- .../libgimpwidgets/html/GimpFileEntry.html | 4 +- devel-docs/libgimpwidgets/html/GimpFrame.html | 4 +- .../libgimpwidgets/html/GimpIntComboBox.html | 4 +- .../libgimpwidgets/html/GimpIntStore.html | 4 +- .../libgimpwidgets/html/GimpMemsizeEntry.html | 4 +- .../html/GimpNumberPairEntry.html | 4 +- .../libgimpwidgets/html/GimpOffsetArea.html | 4 +- .../libgimpwidgets/html/GimpPageSelector.html | 4 +- .../libgimpwidgets/html/GimpPathEditor.html | 4 +- .../libgimpwidgets/html/GimpPickButton.html | 4 +- .../libgimpwidgets/html/GimpPixmap.html | 4 +- .../libgimpwidgets/html/GimpPreview.html | 4 +- .../libgimpwidgets/html/GimpPreviewArea.html | 6 +- devel-docs/libgimpwidgets/html/GimpRuler.html | 4 +- .../html/GimpScrolledPreview.html | 4 +- .../libgimpwidgets/html/GimpSizeEntry.html | 4 +- .../html/GimpStringComboBox.html | 4 +- .../libgimpwidgets/html/GimpUnitComboBox.html | 4 +- .../libgimpwidgets/html/GimpUnitMenu.html | 4 +- .../libgimpwidgets/html/GimpUnitStore.html | 4 +- .../libgimpwidgets/html/GimpZoomModel.html | 4 +- devel-docs/libgimpwidgets/html/index.html | 6 +- devel-docs/libgimpwidgets/html/index.sgml | 1 + .../html/libgimpwidgets-GimpCairoUtils.html | 4 +- .../html/libgimpwidgets-GimpEnumWidgets.html | 4 +- .../html/libgimpwidgets-GimpHelpUI.html | 4 +- .../html/libgimpwidgets-GimpHintBox.html | 4 +- .../html/libgimpwidgets-GimpOldWidgets.html | 4 +- .../html/libgimpwidgets-GimpPropWidgets.html | 4 +- .../html/libgimpwidgets-GimpQueryBox.html | 4 +- .../html/libgimpwidgets-GimpStock.html | 4 +- .../html/libgimpwidgets-GimpWidgets.html | 15 +- .../html/libgimpwidgets-cell-renderers.html | 4 +- .../html/libgimpwidgets-colordisplay.html | 4 +- .../html/libgimpwidgets-colorselector.html | 4 +- .../html/libgimpwidgets-controller.html | 4 +- .../html/libgimpwidgets-deprecated.html | 4 +- .../html/libgimpwidgets-gallery.html | 4 +- .../html/libgimpwidgets-hierarchy.html | 4 +- .../html/libgimpwidgets-index-deprecated.html | 4 +- .../html/libgimpwidgets-index-new-in-2-2.html | 4 +- .../html/libgimpwidgets-index-new-in-2-4.html | 4 +- .../html/libgimpwidgets-index-new-in-2-6.html | 4 +- .../html/libgimpwidgets-index-new-in-2-8.html | 4 +- .../html/libgimpwidgets-index.html | 4 +- .../html/libgimpwidgets-utils.html | 4 +- .../html/libgimpwidgets-widgets.html | 4 +- .../html/libgimpwidgets.devhelp2 | 1 + .../html/stock-tool-align-16.png | Bin 387 -> 304 bytes .../html/stock-tool-align-22.png | Bin 435 -> 380 bytes devel-docs/tools/Makefile.in | 12 +- devel-docs/vbr.txt | 17 +- docs/Makefile.in | 8 +- docs/gimprc.5.in | 2 +- etc/Makefile.in | 8 +- etc/gimprc | 2 +- gtk-doc.make | 82 +- libgimp/Makefile.in | 12 +- libgimp/gimpexport.c | 33 +- libgimpbase/Makefile.am | 4 +- libgimpbase/Makefile.in | 16 +- libgimpbase/gimpdatafiles.c | 65 +- libgimpbase/gimpversion.h | 4 +- libgimpcolor/Makefile.in | 12 +- libgimpconfig/Makefile.in | 12 +- libgimpmath/Makefile.in | 12 +- libgimpmodule/Makefile.in | 12 +- libgimpthumb/Makefile.am | 8 +- libgimpthumb/Makefile.in | 21 +- libgimpthumb/gimpthumb-utils.c | 67 +- libgimpwidgets/Makefile.in | 12 +- libgimpwidgets/gimppickbutton.c | 29 +- ltmain.sh | 4 +- m4macros/Makefile.in | 8 +- m4macros/gtk-doc.m4 | 6 +- menus/Makefile.in | 8 +- modules/Makefile.am | 2 +- modules/Makefile.in | 18 +- modules/color-selector-cmyk-lcms.c | 64 +- modules/color-selector-wheel.c | 52 +- modules/display-filter-lcms.c | 109 +- modules/display-filter-proof.c | 45 +- modules/gimpcolorwheel.c | 1484 +++++++++ modules/gimpcolorwheel.h | 97 + plug-ins/Makefile.in | 8 +- plug-ins/color-rotate/Makefile.in | 12 +- plug-ins/color-rotate/images/Makefile.in | 8 +- plug-ins/common/Makefile.in | 12 +- plug-ins/common/bump-map.c | 8 +- plug-ins/common/crop-auto.c | 7 +- plug-ins/common/file-aa.c | 10 +- plug-ins/common/file-cel.c | 11 +- plug-ins/common/file-csource.c | 6 +- plug-ins/common/file-dicom.c | 4 +- plug-ins/common/file-gbr.c | 8 +- plug-ins/common/file-gif-save.c | 2 +- plug-ins/common/file-gih.c | 4 +- plug-ins/common/file-header.c | 8 +- plug-ins/common/file-jp2-load.c | 2 + plug-ins/common/file-mng.c | 17 +- plug-ins/common/file-pat.c | 6 +- plug-ins/common/file-pcx.c | 9 +- plug-ins/common/file-pix.c | 8 +- plug-ins/common/file-png.c | 11 +- plug-ins/common/file-pnm.c | 8 +- plug-ins/common/file-ps.c | 11 +- plug-ins/common/file-psp.c | 4 +- plug-ins/common/file-sunras.c | 10 +- plug-ins/common/file-tga.c | 11 +- plug-ins/common/file-tiff-save.c | 38 +- plug-ins/common/file-xbm.c | 3 +- plug-ins/common/file-xmc.c | 12 +- plug-ins/common/file-xpm.c | 11 +- plug-ins/common/file-xwd.c | 10 +- plug-ins/common/lcms.c | 155 +- plug-ins/common/mosaic.c | 50 +- plug-ins/file-bmp/Makefile.in | 12 +- plug-ins/file-bmp/bmp-read.c | 247 +- plug-ins/file-bmp/bmp.c | 16 +- plug-ins/file-compressor/Makefile.in | 12 +- plug-ins/file-faxg3/Makefile.in | 12 +- plug-ins/file-fits/Makefile.in | 12 +- plug-ins/file-fits/fits.c | 30 +- plug-ins/file-fli/Makefile.in | 12 +- plug-ins/file-fli/fli-gimp.c | 4 +- plug-ins/file-ico/Makefile.in | 12 +- plug-ins/file-jpeg/Makefile.in | 12 +- plug-ins/file-jpeg/jpeg-load.c | 25 +- plug-ins/file-jpeg/jpeg-save.c | 41 +- plug-ins/file-jpeg/jpeg.c | 8 +- plug-ins/file-psd/Makefile.in | 12 +- plug-ins/file-psd/psd-save.c | 3 +- plug-ins/file-psd/psd.c | 4 +- plug-ins/file-sgi/Makefile.in | 12 +- plug-ins/file-sgi/sgi.c | 10 +- plug-ins/file-uri/Makefile.in | 12 +- plug-ins/file-xjt/Makefile.in | 12 +- plug-ins/flame/Makefile.in | 12 +- plug-ins/fractal-explorer/Makefile.in | 12 +- .../fractal-explorer/examples/Makefile.in | 8 +- plug-ins/gfig/Makefile.in | 12 +- plug-ins/gfig/gfig-examples/Makefile.in | 8 +- plug-ins/gfig/images/Makefile.in | 8 +- plug-ins/gimpressionist/Brushes/Makefile.in | 8 +- plug-ins/gimpressionist/Makefile.in | 12 +- plug-ins/gimpressionist/Paper/Makefile.in | 8 +- plug-ins/gimpressionist/Presets/Makefile.in | 8 +- plug-ins/gradient-flare/Makefile.in | 12 +- plug-ins/gradient-flare/flares/Makefile.in | 8 +- plug-ins/help-browser/Makefile.in | 12 +- plug-ins/help/Makefile.in | 12 +- plug-ins/ifs-compose/Makefile.in | 12 +- plug-ins/imagemap/Makefile.in | 12 +- plug-ins/imagemap/images/Makefile.in | 8 +- plug-ins/lighting/Makefile.in | 12 +- plug-ins/lighting/images/Makefile.in | 8 +- plug-ins/map-object/Makefile.in | 12 +- plug-ins/maze/Makefile.in | 12 +- plug-ins/metadata/Makefile.in | 12 +- plug-ins/pagecurl/Makefile.in | 12 +- plug-ins/print/Makefile.in | 12 +- plug-ins/pygimp/Makefile.in | 12 +- plug-ins/pygimp/plug-ins/Makefile.in | 8 +- plug-ins/script-fu/Makefile.in | 12 +- plug-ins/script-fu/ftx/Makefile.in | 12 +- plug-ins/script-fu/scripts/Makefile.in | 8 +- plug-ins/script-fu/scripts/images/Makefile.in | 8 +- plug-ins/script-fu/tinyscheme/Makefile.in | 12 +- plug-ins/selection-to-path/Makefile.in | 12 +- plug-ins/twain/Makefile.in | 12 +- plug-ins/ui/Makefile.in | 8 +- plug-ins/win-snap/Makefile.in | 12 +- po-libgimp/eu.po | 101 +- po-libgimp/fi.po | 273 +- po-libgimp/ru.po | 18 +- po-plug-ins/es.po | 106 +- po-plug-ins/eu.po | 2944 ++++++++++------- po-plug-ins/hu.po | 1102 +++--- po-plug-ins/ja.po | 1558 +++++---- po-plug-ins/lt.po | 504 ++- po-plug-ins/ru.po | 2050 ++++++------ po-script-fu/ru.po | 232 +- po-tips/eu.po | 506 +-- po/POTFILES.in | 2 + po/de.po | 491 +-- po/el.po | 202 +- po/es.po | 391 ++- po/eu.po | 2477 +++++++------- po/hu.po | 281 +- po/it.po | 351 +- po/ja.po | 859 ++--- po/ko.po | 398 +-- po/lt.po | 287 +- po/pa.po | 883 +++-- po/pl.po | 371 ++- po/pt_BR.po | 256 +- po/ru.po | 2319 +++++++------ po/sl.po | 2240 +++++++------ themes/Default/Makefile.in | 8 +- themes/Default/images/Makefile.in | 8 +- themes/Default/images/preferences/Makefile.in | 8 +- .../images/tools/stock-tool-align-16.png | Bin 387 -> 304 bytes .../images/tools/stock-tool-align-22.png | Bin 435 -> 380 bytes themes/Makefile.in | 8 +- themes/Small/Makefile.in | 8 +- tools/Makefile.in | 12 +- tools/gimptool.c | 12 +- tools/pdbgen/Makefile.in | 8 +- tools/pdbgen/pdb/image.pdb | 2 +- tools/pdbgen/pdb/layer.pdb | 5 +- 584 files changed, 23342 insertions(+), 13384 deletions(-) delete mode 100644 app/gui/ige-mac-menu.c delete mode 100644 app/gui/ige-mac-menu.h create mode 100644 desktop/gimp.appdata.xml.in create mode 100644 modules/gimpcolorwheel.c create mode 100644 modules/gimpcolorwheel.h diff --git a/AUTHORS b/AUTHORS index e08ee42e72..08b6b6c32c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -101,6 +101,7 @@ The following people have contributed code to GIMP: Tim Harder Marcus Heese Robert Helgesson + Michael Henning James Henstridge Eric Hernes Lukasz Hladowski @@ -119,6 +120,7 @@ The following people have contributed code to GIMP: Kristian Jantz Javier Jardón Tim Jedlicka + Jehan Róman Joost Alexander Jones Geert Jordaens @@ -168,6 +170,7 @@ The following people have contributed code to GIMP: Torsten Martinsen Takeshi Matsuyama Gordon Matzigkeit + Téo Mazars Gregory McLean Mike Melancon Federico Mena Quintero @@ -227,6 +230,7 @@ The following people have contributed code to GIMP: Marco Rossini Tim Rowley Karthikeyan S + Daniel Sabo Mike Schaeffer John Schlag Norbert Schmitz diff --git a/ChangeLog b/ChangeLog index 8ddf8622cf..1a7070ad67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,2275 @@ +commit 9bb7eb05451b344160ea3062ce3f877ecbe9c1b7 +Author: Michael Natterer +Date: Thu Nov 28 19:33:16 2013 +0100 + + configure.ac: bump version to 2.8.10 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 19025ea50823028a3a6eaa91f702156e8d94af7e +Author: Michael Natterer +Date: Thu Nov 28 19:21:37 2013 +0100 + + Add test-driver to the toplevel .gitignore + + .gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit e8755c60a9b6d185212d053bc8d63f907d87f959 +Author: Michael Natterer +Date: Thu Nov 28 19:08:55 2013 +0100 + + NEWS: some updates + + NEWS | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +commit 50bfbd94a3c4aa4e55293c75a091afc88b2f9f20 +Author: Michael Natterer +Date: Thu Nov 28 19:08:26 2013 +0100 + + desktop: add gimp.appdata.xml to .gitignore + + desktop/.gitignore | 1 + + 1 file changed, 1 insertion(+) + +commit fc7fce4bc9ee80a822a607ad88baaa81053bcbe5 +Author: Nils Philippsen +Date: Thu Nov 28 17:43:14 2013 +0100 + + initialize length to appease cppcheck + + The code was technically correct previously: It wrote the + uninitialized + length only as a placeholder to overwrite it later on. Yet it's better + to not confuse tools (or people) analysing the code. Besides that + having + 0 for the length in the file while the payload is being written + may aid + debugging e.g. crashes in that code later on. + + (cherry picked from commit 2e6af22686cba732a10dce3a066349083a4f1498) + + app/xcf/xcf-save.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 779264f237be1464f80343d3121ccea32cc97051 +Author: Michael Natterer +Date: Sat Aug 4 03:20:36 2012 +0200 + + Bug 676270 - cppcheck report + + Fix a couple of harmless stuff pointed out in the report, and one + real bug: gimp_plug_in_close() was killing each process 10 times + on windows. + + (cherry picked from commit 47c987b09e21b460e3d7f5c9e706ffaef4f198a3) + + Conflicts: + app/actions/image-actions.c + + app/display/gimpmotionbuffer.c | 4 ++-- + app/plug-in/gimpplugin.c | 2 +- + app/tools/gimpmovetool.c | 7 +++---- + app/xcf/xcf-save.c | 5 +++-- + 4 files changed, 9 insertions(+), 9 deletions(-) + +commit a8bc5b3418407dbc4677b8a9f7855f6ef695101d +Author: SimaMoto,RyōTa +Date: Thu Nov 28 23:50:51 2013 +0900 + + l10n: Update Japanese translation + + po-plug-ins/ja.po | 1558 + ++++++++++++++++++++++++++++------------------------- + 1 file changed, 829 insertions(+), 729 deletions(-) + +commit 39b841ccb1c357bfc773a7e4280081eab14ee265 +Author: Daniel Sabo +Date: Thu Nov 28 04:37:15 2013 -0800 + + NEWS: update for 2.8.10 + + NEWS | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +commit dd68c83032a6ae5304322ed370794eb2b8749c25 +Author: Christian Kirbach +Date: Sat Nov 23 17:23:53 2013 +0100 + + Updated German translation + + po/de.po | 412 + ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 264 insertions(+), 148 deletions(-) + +commit b6f7826f30a7e4b69cf6b9c990056488b922978f +Author: Michael Natterer +Date: Fri Nov 22 20:47:16 2013 +0100 + + Bug 715018 - Developer documentation on VBRs incorrect + + Fix the order of fields, and improve some other parts. + + (cherry picked from commit a7e9016f11cc91eb1c71c68354f3747fc2e5a8b1) + + devel-docs/vbr.txt | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 34cef1f37255d1d23a72d8c63a1ba72b0a7d2721 +Author: Michael Natterer +Date: Thu Nov 21 23:00:44 2013 +0100 + + Bug 678043 - Single Window Mode does not remember hide docks option + + If docks are hidden and single-window-mode is active, emit + "notify::hide-docks" manually on gimp->config in session_restore() so + GimpImageWindow syncs its state at the right time. + + (cherry picked from commit 07e6dc12707a0b6aa46f776fb71491cc4c767962) + + app/gui/session.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit a1e2439a1e994e7c7f76c73d2636aab97fb6ae16 +Author: Piotr Drąg +Date: Thu Nov 21 01:09:35 2013 +0100 + + Updated Polish translation + + po/pl.po | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit 5121a5f6aa229ba3f3da778f34665690acaa4374 +Author: Michael Natterer +Date: Wed Nov 20 23:17:40 2013 +0100 + + Bug 704896 - pop ups are annoying when opening multiple files... + + ...from the command line on some platforms/window managers + + file_open_from_command_line(): display the progress in the active + display if there is no empty display. This way the progress appears in + the display that was opened from the previous command line argument. + + (cherry picked from commit 4fb7fc918ab6f42c31894ffca5f5f80b756d5609) + + app/file/file-open.c | 4 ++++ + 1 file changed, 4 insertions(+) + +commit 43238a343c2b48d4fe0670139b3ca78b2cf756eb +Author: Daniel Mustieles +Date: Wed Nov 20 18:15:35 2013 +0100 + + Updated Spanish translation + + po/es.po | 306 + +++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 202 insertions(+), 104 deletions(-) + +commit 97dcb9dc088883afaeaf3425ffd2ecfa3928850b +Author: Michael Natterer +Date: Tue Nov 19 21:39:13 2013 +0100 + + pdb: fix gimp_layer_new_from_drawable() PDB wrapper + + We must always call gimp_item_convert() even if the source drawable is + in the same image, or we might end up with a layer of wrong pixel + format. This was probably broken for years. + + (cherry picked from commit 29d95f4c39463ba644a7a4795c352b06fde529cb) + + app/pdb/layer-cmds.c | 5 +---- + tools/pdbgen/pdb/layer.pdb | 5 +---- + 2 files changed, 2 insertions(+), 8 deletions(-) + +commit b361d18d277e90287620e6ffbbedb1b8cc217d7a +Author: Marco Ciampa +Date: Mon Nov 18 18:35:05 2013 +0100 + + Updated italian translation. + + po/it.po | 148 + ++++++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 114 insertions(+), 34 deletions(-) + +commit 43f7961c1798efa067f9a33aacea94ba96bf4ad6 +Author: Clayton Walker +Date: Sun Nov 17 17:37:17 2013 -0700 + + osx: Update build files, prep for 2.8.8 dmg + + build/osx/gimp-2.8-python.bundle | 39 +++++++++----- + build/osx/gimp.modules | 110 + ++++++++++++++++++++++++++++++--------- + build/osx/launcher-2.8-python.sh | 45 +++++++++++----- + 3 files changed, 145 insertions(+), 49 deletions(-) + +commit 3097b94e614841150c6790c1932f85b51a261812 +Author: Jehan +Date: Mon Nov 18 09:44:10 2013 +1300 + + file-export* labels renamed. + + Follows updated save+export specification. + Partial implementation of commit 4b14ed2. The full commit also renames + the actions for consistency. + + app/actions/file-actions.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 95465563914b9827254dac4ae26f85b86c9c444a +Author: Piotr Drąg +Date: Sun Nov 17 19:14:39 2013 +0100 + + Updated Polish translation + + po/pl.po | 68 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 58 insertions(+), 10 deletions(-) + +commit 1fa53c46708c9ceab34c3b97361f99ca7a5cb531 +Author: Michael Natterer +Date: Sun Nov 17 01:22:52 2013 +0100 + + app: gimp_brush_load_brush(): add special error for possible old files + + The obsolete .gbp format had a 3-byte pattern following a 1-byte + brush, when embedded in a brush pipe, the current code tries to load + that pattern as a brush, and encounters the '3' in the header. Detect + that and suggest to re-save the file because the plug-in still loads + the legacy format. + + (cherry picked from commit 83bd1c86faa293b1c6456147395be18ade24f748) + + app/core/gimpbrush-load.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +commit ad29d7e7405c34e2c0e3ad66c323cef0ec215890 +Author: Jernej Simončič +Date: Sun Nov 17 00:18:12 2013 +0100 + + Windows manifest: mark as Windows 8-compatible (only affects theme + display in + high contrast) + + build/windows/gimp.manifest | 1 + + 1 file changed, 1 insertion(+) + +commit 86f31151492fbd256abc5b4cd5b028cd33385a33 +Author: Clayton Walker +Date: Sat Nov 16 15:33:56 2013 -0700 + + configure.ac: Remove -Wformat-non-litearl (removed in master) + + configure.ac | 3 --- + 1 file changed, 3 deletions(-) + +commit b191b2f83f0200c079b701fee8cc1cd888437d40 +Author: Michael Natterer +Date: Sat Nov 16 22:59:36 2013 +0100 + + app: add $(GTK_MAC_INTEGRATION_LIBS) to LDADD + + app/Makefile.am | 23 ++++++++++++----------- + 1 file changed, 12 insertions(+), 11 deletions(-) + +commit abd16f9b1e3e6bd9260f83241f5ff3035d64b090 +Author: Michael Natterer +Date: Sat Nov 16 22:53:16 2013 +0100 + + libgimpwidets: don't pick transparent colors in + gimp_pick_button_pick() + + Full opacity in gimp_rgba_set_uchar() is 255, not 1.0. + + (cherry picked from commit f489ef2c5a77edb49e3062381cc207aa1698dedd) + + libgimpwidgets/gimppickbutton.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b4fe880e58f3b371c47b900dc46af07618cac386 +Author: Michael Henning +Date: Sat Nov 16 10:23:34 2013 -0500 + + desktop: Install the appdata file and also make it translatable. + + (cherry picked from commit fe3b80d617646e4995626babe36fd3ced83d4671) + + desktop/Makefile.am | 12 +++++++----- + desktop/gimp.appdata.xml | 38 -------------------------------------- + desktop/gimp.appdata.xml.in | 38 ++++++++++++++++++++++++++++++++++++++ + po/POTFILES.in | 1 + + 4 files changed, 46 insertions(+), 43 deletions(-) + +commit 2958f48e6294b6f823a6879f63e0f9a9f825832b +Author: SimaMoto,RyōTa +Date: Sat Nov 16 18:09:31 2013 +0900 + + l10n: Update Japanese translation + + po/ja.po | 859 + +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 479 insertions(+), 380 deletions(-) + +commit 492f9be1457c81c03999beb03ec5e71d204ccf53 +Author: Michael Natterer +Date: Sat Nov 16 09:38:29 2013 +0100 + + app: don't ignore the return value of gimp_rectangle_intersect() + + In gimp_drawable_resize(), don't blindly copy the width and height + returned by gimp_rectangle_intersect(), we have to check if the + function actually returned TRUE. + + (cherry picked from commit 2b7f38f47362a5cb3d21b1bc26778f8abbd181fa) + + app/core/gimpdrawable.c | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +commit c7bb77c45d51964e1eec7420b4b2ca1e9667cfb9 +Author: Michael Natterer +Date: Sat Nov 16 08:51:25 2013 +0100 + + Bug 711476 - Problems using animated GIH brushes + + Show the error message from gimp_brush_load_brush() instead of + a generic "File is corrupt". Doesn't fix anything. + + (cherry picked from commit 3e711fec092d88a2cd69f335b461d1e3a3a5f368) + + app/core/gimpbrushpipe-load.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit fab68c6b9b488d9be47247586207584662143842 +Author: Clayton Walker +Date: Fri Nov 15 19:16:05 2013 -0700 + + build-osx: Update modules + + build/osx/gimp.modules | 286 + ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 202 insertions(+), 84 deletions(-) + +commit de4fceea6c4d06cf837479cdc02deb4a576e8dc0 +Author: Jernej Simončič +Date: Mon Nov 11 18:59:19 2013 +0100 + + Installer: set PYTHONPATH environment variable on 32-bit installs, too + + build/windows/installer/gimp3264.iss | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 03509683cbac28fbb4ac1de5034025482df0d577 +Author: Martin Husemann +Date: Sun Nov 10 22:17:38 2013 +0100 + + Bug 711795 - execinfo.h functions need -lexecinfo on NetBSD + + Allow building on NetBSD -current where execinfo.h is present but + backtrace() and backtrace_symbols() are in -lexecinfo. + + (cherry picked from commit 4ac3967a5dbb5eb70d9f6496c1c91b838fbed7ad) + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit fef663774e90bbf5edc47a1f85ad14fcc45f80f1 +Author: Michael Natterer +Date: Sun Nov 10 20:51:37 2013 +0100 + + configure: check for gtk-mac-intregration only if GTK+ is built + for quartz + + (cherry picked from commit cfa074628f24211d681b18d96be8eef7d217fcd9) + + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c21e7b581c898692b6721468b0568d705280ad1e +Author: Michael Natterer +Date: Sun Nov 10 18:58:23 2013 +0100 + + configure: run check for gtk-mac-integration only on OSX + + configure.ac | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit 2d548c71df2e62bd345e02f50e5a3c1b08a1cf1e +Author: Daniel Sabo +Date: Sat Nov 9 21:00:55 2013 +0100 + + app: Port to gtk-mac-integration + + Replace deprecated Carbon APIs with Cocoa. + + Includes code by: + Simone Karin Lehmann + Michael Natterer + Daniel Sabo + + (cherry picked from commit e56344294c90e1ba97de5c134b50c4c522f0808f) + + app/Makefile.am | 4 +- + app/gui/Makefile.am | 24 +- + app/gui/gui-unique.c | 175 +++++---- + app/gui/gui.c | 82 ++-- + app/gui/ige-mac-menu.c | 988 + ------------------------------------------------- + app/gui/ige-mac-menu.h | 43 --- + configure.ac | 9 + + 7 files changed, 176 insertions(+), 1149 deletions(-) + +commit cf988e7d76b4e59c6ebc808a389315cf102faaee +Author: Michael Natterer +Date: Sun Nov 10 00:18:48 2013 +0100 + + plug-ins: pass the format's name again in calls to gimp_export_image() + + and clean up the formatting of the call and the lines around it. Now + we can check the various (disabled) export options for regressions + again by changing a single line in gimp_export_image(). + + (cherry picked from commit 03df8c6af4ec4e5d547e9fff46d0710b3c262c58) + + plug-ins/common/file-aa.c | 10 ++++++---- + plug-ins/common/file-cel.c | 11 ++++++----- + plug-ins/common/file-csource.c | 6 +++--- + plug-ins/common/file-dicom.c | 4 ++-- + plug-ins/common/file-gbr.c | 8 +++++--- + plug-ins/common/file-gif-save.c | 2 +- + plug-ins/common/file-gih.c | 4 +++- + plug-ins/common/file-header.c | 8 +++++--- + plug-ins/common/file-mng.c | 17 +++++++++-------- + plug-ins/common/file-pat.c | 6 ++++-- + plug-ins/common/file-pcx.c | 9 +++++---- + plug-ins/common/file-pix.c | 8 +++++--- + plug-ins/common/file-png.c | 11 ++++++----- + plug-ins/common/file-pnm.c | 8 ++++---- + plug-ins/common/file-ps.c | 11 +++++++---- + plug-ins/common/file-psp.c | 4 +++- + plug-ins/common/file-sunras.c | 10 ++++++---- + plug-ins/common/file-tga.c | 11 ++++++----- + plug-ins/common/file-tiff-save.c | 12 +++++++----- + plug-ins/common/file-xbm.c | 3 ++- + plug-ins/common/file-xmc.c | 12 +++++++----- + plug-ins/common/file-xpm.c | 11 ++++++----- + plug-ins/common/file-xwd.c | 10 ++++++---- + plug-ins/file-bmp/bmp.c | 16 ++++++++++------ + plug-ins/file-fits/fits.c | 30 ++++++++++++++++-------------- + plug-ins/file-fli/fli-gimp.c | 4 +++- + plug-ins/file-jpeg/jpeg.c | 8 +++++--- + plug-ins/file-psd/psd-save.c | 3 ++- + plug-ins/file-psd/psd.c | 4 +++- + plug-ins/file-sgi/sgi.c | 10 ++++++---- + 30 files changed, 159 insertions(+), 112 deletions(-) + +commit cdb0b5816e13843c811abf35635ff4b334f78b14 +Author: Michael Natterer +Date: Sun Nov 10 01:54:45 2013 +0100 + + Bug 705457 - Export doesn't handle a single top-level layer group + + Add special export code for single top-level layers groups, other + cases should be mostly (not perfectly) handled by the export code + for layered images. Also, show the legacy export dialog when the + envorinment variable GIMP_INTERACTIVE_EXPORT is set, so export + changes can actually be tested and verified again. + + (cherry picked from commit 8c79a070bb28416752d76c4f8505119871819bfb) + + libgimp/gimpexport.c | 27 ++++++++++++++++++++++++--- + 1 file changed, 24 insertions(+), 3 deletions(-) + +commit adacb2a2a877de7bbbdb68edb6ca8727a7254f5d +Author: Michael Natterer +Date: Sun Nov 10 00:02:11 2013 +0100 + + app: add an "interactive" boolean inside gimp_export_image() + + instead of using "format_name", which is confusing, and file plug-ins + will soon pass their format name again. + + (cherry picked from commit 206df0026654c7d2a1eff317a02e86e317e6ae80) + + libgimp/gimpexport.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit 4563dbcde753705c81b5f6fe63e845e0491f4b39 +Author: Piotr Drąg +Date: Sat Nov 9 20:04:28 2013 +0100 + + Updated Polish translation + + po/pl.po | 60 + +++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 41 insertions(+), 19 deletions(-) + +commit e0fa66f6e7a606d0b67584c79f99f23e6fde4990 +Author: Michael Natterer +Date: Fri Nov 8 23:26:34 2013 +0100 + + app: add the same D shortcut in the image close dialog + + and change the button label to "_Discard Changes" so it's the same as + in quit. + + (cherry picked from commit 9057b63c1b5390289ef097166de28eaea26b9660) + + app/display/gimpdisplayshell-close.c | 79 + ++++++++++++++++++++++++++++++------ + 1 file changed, 67 insertions(+), 12 deletions(-) + +commit 627caeb620eee6801d33bdc84a7b79d8c10ba018 +Author: Michael Natterer +Date: Fri Nov 8 23:17:22 2013 +0100 + + app: always use D for the shortcut in the quit dialog + + (do not take it from the button's mnemonic) + + (cherry picked from commit 25c4acbd157e183dd8135b9d40fdd3140198cd95) + + app/dialogs/quit-dialog.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +commit d8fe4a16499e678171d837809908a33cf25df227 +Author: Michael Natterer +Date: Fri Nov 8 22:46:10 2013 +0100 + + app: make quitting by keyboard shortcuts easier + + This mitigates the pain of having to confirm quitting when images have + only be exported but not saved: Introduce a D shortcut in the + quit dialog and tell about it using a hint label at the bottom, so + quitting with dirty images is now a matter of pressing Q + D which is much easier to memorize than Q + D. + + (cherry picked from commit ca3440aa1e9e7748713552a2a0103ae7decdb1d1) + + app/dialogs/quit-dialog.c | 259 + ++++++++++++++++++++++++++++++++-------------- + 1 file changed, 180 insertions(+), 79 deletions(-) + +commit f937dbe63a713ab7161c5d95d5eeeee203eb442b +Author: Piotr Drąg +Date: Fri Nov 8 23:03:34 2013 +0100 + + Updated Polish translation + + po/pl.po | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) + +commit e803f1930ff26d5d2bb0716d8937b3ef53d6b235 +Author: Nils Philippsen +Date: Fri Nov 8 14:02:03 2013 +0100 + + file-bmp: don't close foreign FD in ReadImage() + + (cherry picked from commit 4664c1f479e7768d08ed5198bed2251e6aa0464c) + + plug-ins/file-bmp/bmp-read.c | 1 - + 1 file changed, 1 deletion(-) + +commit 49b05ce3e70726ab7464db863fb281480f072d90 +Author: Michael Natterer +Date: Thu Nov 7 19:12:07 2013 +0100 + + app: show file:// uris as filename in the close and quit dialogs + + and make the quit dialog's "Exported to foo" string easier to + translate by constructing the markup in a separate step. + + (cherry picked from commit beb184e3953bc77553c6fb0c723792ac919ba1a9) + + app/dialogs/quit-dialog.c | 21 +++++++++++++++------ + app/display/gimpdisplayshell-close.c | 17 +++++++++++------ + 2 files changed, 26 insertions(+), 12 deletions(-) + +commit 4a7bf96e5394c0599757db991a05ddf1fe7f00be +Author: Michael Natterer +Date: Thu Nov 7 12:49:03 2013 +0100 + + app: make the "exported to foo" string in the quit dialog nicer + + (cherry picked from commit 936780676bcf66c8fe89c511f36173bb43f270e4) + + app/dialogs/quit-dialog.c | 29 ++++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +commit a28fcb239255f83fffb1b4541db86e451f5ba74f +Author: Michael Natterer +Date: Thu Nov 7 11:35:48 2013 +0100 + + app: in the quit dialog, mention if the image has been exported + + Install a cell_data_func for the dirty image list's text renderer abd + construct the label manually, using the same string and logic as in + the close dialog. + + (cherry picked from commit 9fe3da2bf242be83f2799f71281e27a4dc146baf) + + app/dialogs/quit-dialog.c | 82 + +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 72 insertions(+), 10 deletions(-) + +commit 67eb73093679c49692e738620a70ddfc18f0f7bc +Author: Michael Natterer +Date: Thu Nov 7 11:32:23 2013 +0100 + + app: add new accessor gimp_container_tree_view_get_name_cell() + + (cherry picked from commit 78ad0327da4b85e5d6d2807b670f06abe47824fd) + + app/widgets/gimpcontainertreeview.c | 8 ++++++++ + app/widgets/gimpcontainertreeview.h | 4 ++++ + 2 files changed, 12 insertions(+) + +commit dc8bb4eecf43eadae1bc562def7569e59d6515b7 +Author: Nils Philippsen +Date: Thu Nov 7 12:28:28 2013 +0100 + + app: don't ignore return value + + ...of gtk_widget_translate_coordinates() + + (cherry picked from commit 391de600f1bd76aa21a3ec1ea4d349ef04cc160b) + + app/widgets/gimpdeviceinfo-coords.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit 6abd0f2438dd3b025b1224ab6a473615c17f3418 +Author: Nils Philippsen +Date: Thu Nov 7 12:18:25 2013 +0100 + + file-jpeg: fix operator precedence errors + + (cf. commit a9376443d7a2530f4481be18ee96a0322dc01ae5) + + plug-ins/file-jpeg/jpeg-load.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 8082363e9c887b9f31e43b7fc947e1867f9c087b +Author: Nils Philippsen +Date: Thu Nov 7 12:12:55 2013 +0100 + + gimpcolorwheel: comment out ineffectual code + + (cherry picked from commit 1bb379c3f5ffbaada8942e71d1c333b9fcf5580a) + + modules/gimpcolorwheel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5c2f97f9f274bc20eef4ffd55c28156c39254343 +Author: Nils Philippsen +Date: Thu Nov 7 11:58:24 2013 +0100 + + file-bmp: don't leak file pointer when erroring out + + (cherry picked from commit 6467fbf65dd046ee71e210b664099234e03390b9) + + plug-ins/file-bmp/bmp-read.c | 47 + +++++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 22 deletions(-) + +commit d291de0949c13eb2195158f6fbf41da2afe46cb9 +Author: Nils Philippsen +Date: Thu Nov 7 11:43:38 2013 +0100 + + color-selector-cmyk-lcms: avoid freeing uninitialized pointer + + (cherry picked from commit c028580ae08ccf6408910ee6cf83d54308367f36) + + Conflicts: + modules/color-selector-cmyk.c + + modules/color-selector-cmyk-lcms.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 92a0387adc5a0e78501f6151b1d52c4c96f684a8 +Author: Nils Philippsen +Date: Thu Nov 7 11:33:19 2013 +0100 + + lcms: avoid dereferencing null pointers + + (cherry picked from commit d0f7e713bb4478f2da3a688abf89adfdc2a935ee) + + plug-ins/common/lcms.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +commit dc6ccc17495bcabbd96d4c18616cb4b57bd07ea6 +Author: Michael Natterer +Date: Mon Nov 4 23:17:41 2013 +0100 + + Bug 709857 - Lcms plugin crashes if RGB profile does not exist + + Always check the return value of + lcms_load_profile(config->rgb_profile) + and use the builtin sRGB profile if it returns NULL. + + (cherry picked from commit 961d03d795e1ab32923f31e7f979f601403cdf41) + + plug-ins/common/lcms.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 6ee719557b725e6312991fb395cf53e20df351f9 +Author: Michael Natterer +Date: Sun Nov 3 19:21:36 2013 +0100 + + configure: post-release version bump to 2.8.9 + + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit ae90381387126db0ea9c99f1f1144222080458c1 +Author: Michael Natterer +Date: Sun Nov 3 19:13:46 2013 +0100 + + Bump version to 2.8.8 and commit regenerated files + + configure.ac | 6 +++--- + docs/gimprc.5.in | 2 +- + etc/gimprc | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +commit 76dd14f0a5f64fa53cc68328f8cb2be4ea980a1c +Author: Michael Natterer +Date: Sun Nov 3 17:58:47 2013 +0100 + + NEWS: update for 2.8.8 + + NEWS | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +commit ec5a879001ff06fcd53c540f26650796efded4fb +Author: Michael Natterer +Date: Sun Nov 3 16:04:58 2013 +0100 + + Bug 705797 - Empty right panel cannot be completely closed + + Reduce the minimum width of the "You can drop foo here" label to one + pixel, so it can be hidden as completely as possible while keeping the + label visible. + + (cherry picked from commit fbfaa960e1265a0093a07f1cf6e218c1013c4b47) + + app/widgets/gimppanedbox.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit be45e402183886dc1a8d345486de5301b8b8d32d +Author: Michael Natterer +Date: Sun Nov 3 15:21:22 2013 +0100 + + Bug 711329 - Artifacts on crop tool's passepartout when set to + "allow growing" + + Calculate GimpCanvasPassepartout's extents using a cairo_region_xor() + of the crop rectangle and the image extents, instead of a + cairo_region_subtract(). This fixes the artifacts and has the nice + side effect that the passepartout now colors both the parts of the + image that will be removed *and* the parts of the image that will be + newly added. + + (cherry picked from commit 61c2ef40f711f0e452bd8baa67813c454e5a7658) + + app/display/gimpcanvaspassepartout.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0273d0d88ae4ce76193b08311009c13e013bfc1f +Author: Michael Natterer +Date: Tue Oct 29 19:34:38 2013 +0100 + + Bug 710974 - Convert to Color profile fails on images with layer + groups + + Handle layer groups recursively, and don't convert the group layer + itself. + + (cherry picked from commit 424129cc60cc21bdea27785fbce6d2ed0908a936) + + plug-ins/common/lcms.c | 47 + +++++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 41 insertions(+), 6 deletions(-) + +commit 7e0a8eaca7a427e31f93f0286c3f32844f1ce6d2 +Author: Martin Srebotnjak +Date: Tue Oct 29 19:19:14 2013 +0100 + + Updated Slovenian translation + + po/sl.po | 44 ++++++++++++++++++++++++++------------------ + 1 file changed, 26 insertions(+), 18 deletions(-) + +commit e5356b5ca11bf0c29406dfef656af924a936880d +Author: Enrico Nicoletto +Date: Mon Oct 28 21:00:03 2013 -0200 + + Revert "Updated Brazilian Portuguese translation" + + This reverts commit 29814899c3aa757227f86187524126c267ae329c. + + po-libgimp/pt_BR.po | 529 + ++++++++++++++++++++++++---------------------------- + 1 file changed, 247 insertions(+), 282 deletions(-) + +commit 29814899c3aa757227f86187524126c267ae329c +Author: Enrico Nicoletto +Date: Mon Oct 28 20:59:23 2013 -0200 + + Updated Brazilian Portuguese translation + + po-libgimp/pt_BR.po | 529 + ++++++++++++++++++++++++++++------------------------ + 1 file changed, 282 insertions(+), 247 deletions(-) + +commit 5ed30dceb9bdd974ea3430ebcd4fa33ad0949500 +Author: Marco Ciampa +Date: Fri Oct 25 17:38:25 2013 +0200 + + Updated italian translation. + + po/it.po | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) + +commit d22ab649ff6c2ea790fd75ce3a05319076b970c1 +Author: Piotr Drąg +Date: Thu Oct 24 18:44:52 2013 +0200 + + Updated Polish translation + + po/pl.po | 38 +++++++++++++++++++++++++++----------- + 1 file changed, 27 insertions(+), 11 deletions(-) + +commit 373ef0b5262c995911f3d9ec34d1dd640b1c7390 +Author: Jehan +Date: Fri Oct 11 20:36:26 2013 +1300 + + Bug 709878 - test-session-* skipped when xvfb-run is unavailable. + + Also add a GIMP_EXIT_TEST_SKIPPED #define, to return the SKIP + exit value + documented by automake. + (cherry picked from commit 6ee77e5635ced9a9b48959199eca888104f020e6) + + app/tests.h | 10 ++++++++++ + app/tests/test-session-2-6-compatibility.c | 11 +++++++++++ + app/tests/test-session-2-8-compatibility-multi-window.c | 12 + ++++++++++++ + app/tests/test-session-2-8-compatibility-single-window.c | 11 +++++++++++ + configure.ac | 1 + + 5 files changed, 45 insertions(+) + +commit 7c0b46a2f45b14267113226b318765f4c0c5d975 +Author: Jehan +Date: Fri Oct 25 00:33:11 2013 +1300 + + po: add app/text/gimptextlayout.c to POTFILES.in + (cherry picked from commit 1ea2e7f5888ca51d4725009a6dc9238375e9ccf9) + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit c79e7f5e8755e66696b98628eb9b555e24c7a4eb +Author: Jehan +Date: Sat Aug 31 03:16:44 2013 +1200 + + Bug 662787 - Segfaults when trying to set a large text size + + If a font size is too big for cairo or pango to deal with, nicely back + up from rendering and alert the user via an error dialog. + (cherry picked from commit 2aabbbd9c733a9078d08b15bedef6e9adae1031f) + + app/text/gimptext-vectors.c | 9 ++++++++- + app/text/gimptextlayer.c | 24 ++++++++++++++++++++++-- + app/text/gimptextlayout.c | 41 + ++++++++++++++++++++++++++++++++++++----- + app/text/gimptextlayout.h | 3 ++- + app/tools/gimptexttool.c | 8 +++++++- + 5 files changed, 75 insertions(+), 10 deletions(-) + +commit a06b36fb35c36479412310a4a0d4ee2682b79ab9 +Author: Michael Natterer +Date: Tue Oct 22 20:35:11 2013 +0200 + + plug-ins: use image/jp2 for JPEG 2000, procedures can only have + one mime-type + + (cherry picked from commit 30a389866a801b3d072b73c64fda9a07adf6e6f4) + + plug-ins/common/file-jp2-load.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit d12eb70baeea14680fc671165d6389511279955d +Author: Michael Natterer +Date: Sun Oct 20 18:22:47 2013 +0200 + + app: treat an empty ("" not NULL) plug-in proc_install->menu_path + as NULL + + gimp_plug_in_handle_proc_install(): don't set the new procedure's menu + path nor its menu label if proc_install->menu_path is "", so we don't + run into action and menu creating confusion later. Do it here and not + later so the "" string never enters the system. + + (cherry picked from commit 6e3495ff6969c2c35458292c7ff76fa72913b851) + + app/plug-in/gimpplugin-message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 1c44eae8c81902e53b62e1704dbbda07533f4545 +Author: Jehan +Date: Tue Oct 8 00:17:56 2013 +1300 + + Bug 675554 - fix overriden language environment variables on Windows. + + If any of the locale environment variables used for UI language is set + (LANGUAGE, LC_ALL, LC_MESSAGES and LANG), do not let Windows' + default UI + language override these. + Language set in GIMP preferences still have higher priority. + (cherry picked from commit fe481275e2e42a937618366d18cd6aa03bec3b59) + + app/language.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 4fbe228da91dea54431d8ce58515f1e6c73b55e9 +Author: Daniel Sabo +Date: Fri Oct 11 14:23:01 2013 -0700 + + Update authors.xml + + Add myself, Michael Henning, Jehan, and Téo Mazars + + AUTHORS | 4 ++++ + authors.xml | 4 ++++ + 2 files changed, 8 insertions(+) + +commit b8f05cdb5565c9bbf1d4836ed342315fde0c8f44 +Author: Michael Natterer +Date: Fri Oct 11 22:52:38 2013 +0200 + + libgimpwidgets: return an opaque color from gimp_pick_button_pick()'s + OSX code + + and fiddle with whitespace a bit. + + (cherry picked from commit 5466caa0646ad8da028d189088ed3b21f48ecc3f) + + libgimpwidgets/gimppickbutton.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +commit e2f93a777930916cb9487fd7048c62738f6ea2c8 +Author: Daniel Sabo +Date: Mon May 28 07:36:36 2012 -0700 + + Use the Quartz core graphics API to implement gimp_pick_button_pick + when building with GDK Quartz. + + Signed-off-by: Clayton Walker + + libgimpwidgets/gimppickbutton.c | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit faa233666adf5b907a30712ccd476048ecbc5ba9 +Author: Clayton Walker +Date: Fri Oct 11 12:38:16 2013 -0600 + + Organize OSX build files + + build/osx/README | 104 ++++++++++---------- + build/osx/custom/fonts.conf | 155 ++++++++++++++++++++++++++++++ + build/osx/custom/gimp.desktop | 202 + +++++++++++++++++++++++++++++++++++++++ + build/osx/custom/gimprc | 1 + + build/osx/custom/gtkrc | 14 +++ + build/osx/custom/mimeinfo.cache | 32 +++++++ + build/osx/custom/open.desktop | 7 ++ + build/osx/custom/session.conf | 64 +++++++++++++ + build/osx/fonts.conf | 155 ------------------------------ + build/osx/gimp-2.8-python.bundle | 21 +++- + build/osx/gimprc | 1 - + build/osx/gtkrc | 0 + 12 files changed, 546 insertions(+), 210 deletions(-) + +commit 71ba846f8e858df8bc38925ab8d8c8b2f9ef0306 +Author: Clayton Walker +Date: Fri Oct 11 09:23:00 2013 -0600 + + Update osx build scripts. + + Enable dbus, gvfs, and python for all 2.8.x series builds. Update + libs. + + build/osx/gimp-2.8-python.bundle | 172 ++++++ + build/osx/gimp-2.8.bundle | 187 ------- + build/osx/gimp.modules | 672 ++++++++++++++--------- + build/osx/gimprc | 4 +- + build/osx/info-2.8-python.plist | 1093 + ++++++++++++++++++++++++++++++++++++++ + build/osx/info-2.8.3.plist | 1093 + -------------------------------------- + build/osx/info-2.8.4.plist | 1093 + -------------------------------------- + build/osx/jhbuildrc-gimp | 12 +- + build/osx/launcher-2.8-python.sh | 211 ++++++++ + build/osx/launcher-2.8.sh | 81 --- + 10 files changed, 1901 insertions(+), 2717 deletions(-) + +commit 0bc0078dec2eaec43a5f52fa5bff4db312303935 +Author: Piotr Drąg +Date: Fri Oct 11 15:28:16 2013 +0200 + + Revert "Fix syntaxis in user-visible messages" + + This reverts commit 48e4cb708e99bd17b5f5cf7e511141c65131bb82. + + Please avoid changing strings on the stable branch unless it's + *absolutely* + necessary. Fixing typos on master is enough. + + app/actions/windows-actions.c | 2 +- + app/widgets/gimpdockwindow.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 95b2375ce18a6d5722f582b09e212b89bc0452f7 +Author: Piotr Drąg +Date: Fri Oct 11 15:25:32 2013 +0200 + + Revert "Fix syntaxis in a user-visible message" + + This reverts commit eb3a62c43e012c2914987e1bd3a33c32833d275c. + + Please avoid changing strings on the stable branch unless it's + *absolutely* + necessary. Fixing typos on master is enough. + + app/actions/windows-actions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 5fb359ae82061bb948c8882483c3a215cdfaad46 +Author: Alexandre Prokoudine +Date: Fri Oct 11 10:35:51 2013 +0400 + + Updated Russian translation + + po-libgimp/ru.po | 18 +- + po-plug-ins/ru.po | 2050 +++++++++++++++++++++++----------------------- + po/ru.po | 2319 + +++++++++++++++++++++++++++++------------------------ + 3 files changed, 2283 insertions(+), 2104 deletions(-) + +commit 48e4cb708e99bd17b5f5cf7e511141c65131bb82 +Author: Alexandre Prokoudine +Date: Fri Oct 11 06:33:44 2013 +0400 + + Fix syntaxis in user-visible messages + + Phrases starting with "When enabled" should have a comma. + + app/actions/windows-actions.c | 2 +- + app/widgets/gimpdockwindow.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit eb3a62c43e012c2914987e1bd3a33c32833d275c +Author: Alexandre Prokoudine +Date: Fri Oct 11 06:22:35 2013 +0400 + + Fix syntaxis in a user-visible message + + "When enabled GIMP is in a single-window mode" was missing a comma. + + app/actions/windows-actions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fe5623c75734ff0bc7a5148413ae4ee589f00f4c +Author: Michael Natterer +Date: Sat Oct 5 00:14:14 2013 +0200 + + Bug 703065 - Jpeg file size preview error is back + + Use GIO to get the file size. + + (cherry picked from commit 1f21a28770a548423467d93d85ac514c39e97884) + + plug-ins/file-jpeg/jpeg-save.c | 47 + +++++++++++++++++++++++++++++++----------- + 1 file changed, 35 insertions(+), 12 deletions(-) + +commit a10b60e314bc1c6a7a2248666d7a0fe2dcf11eda +Author: Jehan +Date: Mon Sep 30 05:23:23 2013 +1300 + + Bug 681709 - GimpContainer continuously scrolls on dnd failure + on Windows. + + The scroll timeout is looping forever if the drag ends by a failure + event. For instance when hitting the Esc button during scrolling. + (cherry picked from commit 3e082b356c77d8560fc79f29c77cf7ac17bb745e) + + app/widgets/gimpcontainertreeview-dnd.c | 15 +++++++++++++++ + app/widgets/gimpcontainertreeview-dnd.h | 4 ++++ + app/widgets/gimpcontainertreeview.c | 3 +++ + 3 files changed, 22 insertions(+) + +commit 100ce42c1e2cca9bdeaf1aa6f6bdf039aa030053 +Author: Nils Philippsen +Date: Tue Oct 1 12:16:43 2013 +0200 + + configure: use test in a portable way + + (based on commit c13e73271b77ffc298815e7fee8b22d0750c689e) + + configure.ac | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +commit e69d287be1f0d23193b9088b6c8f86bb311fd8ea +Author: Michael Natterer +Date: Sat Sep 28 17:22:57 2013 +0200 + + Bug 708594 - Alignment Tool Icon not visible on dark background + + Add whiteish borders around the align icon arrows. + + (cherry picked from commit c1095cb406a4bc4bd1b328e4d7ab0fb71f7139d4) + + themes/Default/images/tools/stock-tool-align-16.png | Bin 387 -> + 304 bytes + themes/Default/images/tools/stock-tool-align-22.png | Bin 435 -> + 380 bytes + themes/Default/images/tools/stock-tool-align-22.xcf | Bin 1579 -> + 1901 bytes + 3 files changed, 0 insertions(+), 0 deletions(-) + +commit f37db5bc34cd3d6c2ae97208645eb2d619fb32d1 +Author: Michael Natterer +Date: Mon Sep 23 15:25:47 2013 +0200 + + desktop: indentation and formatting for gimp.appdata.xml + + (cherry picked from commit 9fc03fb8adfbc329907394429a2ccb55201a92bc) + + desktop/gimp.appdata.xml | 67 + +++++++++++++++++++++++++----------------------- + 1 file changed, 35 insertions(+), 32 deletions(-) + +commit d2e00b8bd3688879153f330ed55ac5deafa8f8f6 +Author: Marco Ciampa +Date: Mon Sep 23 11:03:12 2013 +0200 + + Updated italian translation. + + po/it.po | 117 + +++++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 69 insertions(+), 48 deletions(-) + +commit 372284094f66138d2427b021c619dca64d59e89e +Author: Téo Mazars +Date: Sun Sep 22 16:26:10 2013 +0200 + + Bug 677275 - Mosaic Filter produces ugly artifacts + + Fix this by using a real point-segment distance. + Some artifacts remains though, they must come from somewhere else. + + (cherry picked from commit 4caa5a113fe49e57a3861d3dab666da1dd38f2e5) + + plug-ins/common/mosaic.c | 50 + +++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 45 insertions(+), 5 deletions(-) + +commit 1bc91326ce30178f7cce9656993859c70318d8a2 +Author: Balázs Úr +Date: Sun Sep 22 10:29:14 2013 +0200 + + Updated Hungarian translation + + po-plug-ins/hu.po | 1090 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 612 insertions(+), 478 deletions(-) + +commit 23281bc3f06087673f60924ac9cd737522052ad4 +Author: Balázs Úr +Date: Sun Sep 22 10:21:19 2013 +0200 + + Updated Hungarian translation + + po/hu.po | 281 + ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 161 insertions(+), 120 deletions(-) + +commit 9c0f515f284ce93e2abf43d39425afba58a17645 +Author: Jehan +Date: Sat Sep 21 21:51:38 2013 +1200 + + Bug 708521 - Getting rid of cage_complete property on GimpCageTool, + redundant with tool_state. + (cherry picked from commit ac0ac60ca90c12c3f9cc1768ad16b8e1d0904f61) + + app/tools/gimpcagetool.c | 151 + ++++++++++++++++++----------------------------- + app/tools/gimpcagetool.h | 1 - + 2 files changed, 56 insertions(+), 96 deletions(-) + +commit 42de6e065c153e866196e04b21116f881250b910 +Author: Jehan +Date: Sat Sep 21 21:07:29 2013 +1200 + + Bug 708519 - Fix using Backspace to delete a closed cage tool's + points. + (cherry picked from commit 2294b8da26d2c306944c6609e7a1c94e4ec9d77d) + + app/tools/gimpcagetool.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +commit 08c7d90823737a19ec31fb655f2ad3893f78924c +Author: Jehan +Date: Sat Sep 21 20:43:11 2013 +1200 + + Bug 708517: Assertion on cage tool commit with ENTER + fix cage + completion with ENTER. + + The key press handler must return TRUE on successfully processing + the key, + otherwise the handler ends up being run several times. + (cherry picked from commit 5e331e1d252fc5b855ed333a9d74da436930640f) + + app/tools/gimpcagetool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 91738c3b93f456a420334380bd0864a48e8dd0d3 +Author: Michael Henning +Date: Fri Sep 20 19:05:18 2013 -0400 + + plug-ins: Use the standardized value for deflate compression in + tiff-save. + + Ironically, the standardized value is called + COMPRESSION_ADOBE_DEFLATE, + while the vendor-specific value is called COMPRESSION_DEFLATE. + + (cherry picked from commit 4bc51691e52e5813bb10b3e6e4b1e18cdeab5b6d) + + plug-ins/common/file-tiff-save.c | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +commit ebef7983e8fbfab2d6c0bec266ae09e2f91e8a54 +Author: Sven Claussner +Date: Fri Sep 20 20:56:19 2013 +0200 + + Add licence comments to AppData file. + + Explain the meaning of the licence tag and + the GPL compatibility of the used CC0 licence. + + desktop/gimp.appdata.xml | 7 +++++++ + 1 file changed, 7 insertions(+) + +commit dc9fdc5528fbf9f58f0a94ffb0cde6b0586b918f +Author: Timo Jyrinki +Date: Fri Sep 20 21:35:38 2013 +0300 + + Updated Finnish libgimp translation by Juhani Numminen + + po-libgimp/fi.po | 273 + +++++++++++++++---------------------------------------- + 1 file changed, 71 insertions(+), 202 deletions(-) + +commit 09861b85017fa9a19c1a5eb1cabd314a072cee9b +Author: Enrico Nicoletto +Date: Fri Sep 20 14:44:12 2013 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 77 + +++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 47 insertions(+), 30 deletions(-) + +commit a90e9ec5e7fbe5ae08ff0ddd4c8c11c8a01d8e13 +Author: Jehan +Date: Fri Sep 20 01:54:02 2013 +1200 + + app: disallow a theoretical infinite loop if we run out of ids. + + In practice, that's likely impossible to ever happen. This was just + itching my perfectionist self, who enjoys flawless design. + (cherry picked from commit 951393b34e6a33f862c91d38e5ca387d7c76b158) + + app/core/gimpidtable.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +commit dfaa321027e81e7e0be10ace1e2cc84de22f0630 +Author: Nils Philippsen +Date: Thu Sep 19 17:38:46 2013 +0200 + + lcms: pretty code even better if syntactically correct + + Thanks to Jehan for spotting this. + + modules/display-filter-lcms.c | 2 +- + modules/display-filter-proof.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit edfba8edfdf3e3bb6983a2123eb9a1b13f700add +Author: Michael Natterer +Date: Tue Sep 25 20:56:54 2012 +0200 + + app: don't crash when a color profile has no information + + (cherry picked from commit 9d42df5fa2d2ce598c5896cb0f023a5db65c7f2a) + + app/widgets/gimpprofilechooserdialog.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit b2c6bd76145d3c38a01dbd16a5fe587e2f8efbbd +Author: Nils Philippsen +Date: Tue Sep 17 16:43:11 2013 +0200 + + Backport lcms 2.x support from master, making it optional. + + In order to retain support for lcms 1.x, this merges the + lcms2-specific + code as a configurable alternative. + + The user can specify which version to use by specifying + "--with-lcms=lcms1" or "--with-lcms=lcms2" when running configure. If + no + version is specified explicitly, version 1.x will be preferred if both + versions are available. This ensures that GIMP is built with the same + lcms version as an older version, if the same configure switches are + used and the same libraries are available. + + This builds on the following commits from the master branch: + + commit c59ab4d817730430b4b037de07abd28281f1dcf7 + Author: Massimo Valentini + AuthorDate: Tue Sep 4 17:53:06 2012 +0200 + + lcms: oversight + + commit 8bbfc9e5cf4728b9cafc4edf32ab52c32375f9b7 + Author: Michael Natterer + AuthorDate: Mon Sep 3 20:03:53 2012 +0200 + + Bug 675558 - switch from lcms-1 to lcms-2 + + Applied modified patch from Hartmut Kuhse which ports + to lcms-2. + + configure.ac | 49 ++++++++++++++--- + modules/color-selector-cmyk-lcms.c | 64 +++++++++++++++++++++- + modules/display-filter-lcms.c | 107 + ++++++++++++++++++++++++++++++++++++- + modules/display-filter-proof.c | 45 +++++++++++++++- + plug-ins/common/lcms.c | 96 + ++++++++++++++++++++++++++++++--- + plug-ins/file-jpeg/jpeg-load.c | 19 ++++++- + 6 files changed, 360 insertions(+), 20 deletions(-) + +commit c9c927603bd431d67697e263679440ac1e18c956 +Author: Nils Philippsen +Date: Wed Sep 18 13:46:13 2013 +0200 + + include missing header + + modules/display-filter-lcms.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 803c2d2b32e6282c389660613f8fa9922a142cac +Author: Dimitris Spingos +Date: Wed Sep 18 07:22:05 2013 +0300 + + Updated Greek translation + + po/el.po | 115 + ++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 70 insertions(+), 45 deletions(-) + +commit cee54bd992a10790e7ae52c04a26ff27826f5e38 +Author: Aurimas Černius +Date: Fri Sep 13 22:28:47 2013 +0300 + + Updated Lithuanian plug-ins translation + + po-plug-ins/lt.po | 504 + ++++++++++++++++++++---------------------------------- + 1 file changed, 184 insertions(+), 320 deletions(-) + +commit 42b40d1e4813cd8db08c26c402c6ed90a81c18da +Author: Aurimas Černius +Date: Fri Sep 13 22:26:53 2013 +0300 + + Updated Lithuanian translation + + po/lt.po | 287 + +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 159 insertions(+), 128 deletions(-) + +commit bf1b779b254e25dae17ab2a2167623eecaf793f8 +Author: A S Alam +Date: Fri Sep 13 11:06:05 2013 -0500 + + update Punjabi Translaiton + + po/pa.po | 883 + +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 430 insertions(+), 453 deletions(-) + +commit a14ce157f33837a70a2dcb166a0c69d0dffa7376 +Author: Matej Urbančič +Date: Tue Sep 10 21:19:37 2013 +0200 + + Updated Slovenian translation + + po/sl.po | 2140 + +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 1213 insertions(+), 927 deletions(-) + +commit 3c76d330196bfc2aac1a3f8c09be0876bec09433 +Author: Michael Natterer +Date: Tue Sep 10 12:06:55 2013 +0200 + + tools: make sure clang is not considered to be visual studio + + just because it starts with "cl". Spotted by Joerg Sonnenberger. + + (cherry picked from commit ac808b8b6b25596f28b81f9a30738d2cb31ce4a4) + + tools/gimptool.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit c8a7be593bbd27632f655bc61e76f021d04bd5f1 +Author: Sven Claussner +Date: Fri Sep 6 15:36:42 2013 +0200 + + German UI translation: fix some inconsistencies + + Fix typos in Vectors, Gradients, Dynamics, Buffers, + Document History, Error console dialogs. + Use 'Zeichendynamik' consistently as translation of + 'Dynamics'. Make plural forms clearer. + + po/de.po | 77 + ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 39 insertions(+), 38 deletions(-) + +commit 31601b3a6b6fc1fd87da9f705fa771f7d4764fa7 +Author: Richard Hughes +Date: Thu Sep 5 15:46:07 2013 +0100 + + Add an AppData file for GIMP + + (cherry picked from commit 5e37536d77310673dac9a720cef761c9372049f0) + + desktop/Makefile.am | 3 +++ + desktop/gimp.appdata.xml | 28 ++++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+) + +commit 0f8496d873d05dabdd1f6430b0faa75245f8de88 +Author: Jehan +Date: Thu Sep 5 23:35:27 2013 +1200 + + Bug 707255 - Open preferences when quitting causes assertion failure + + When removing the container of a GimpContainerView, + gimp_container_view_remove_container() must be the last call. It was + causing a `GIMP_IS_CONTAINER (container)' failure in subsequent + gimp_container_get_children_type(). + For good practice, unsetting a container works now the exact reversed + order as the setting of a container. + (cherry picked from commit 338e0ddf8d1c128e3873d6e9ad9a52577b48b1dd) + + app/widgets/gimpcontainerview.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 175852a407871afdc50e71c2f1f2923a67d89f78 +Author: Jehan +Date: Thu Sep 5 22:10:24 2013 +1200 + + Bug 707255 - Open preferences when quitting causes assertion failure. + + Wrong order of destruction functions were causing critical warnings on + g_signal_handlers_disconnect_by_func() calls. + Also g_object_ref/unref() the container because the tree handler might + hold the last ref to the container, once it's disconnected the + container + could be gone. + (cherry picked from commit 04a3c65aa1f68c99538d86c97649ec4884822030) + + app/widgets/gimpcontainerview.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +commit 742da269ee8a03661ed4dd2db31891f9c073af4e +Merge: aa5c186 e1564c4 +Author: Sven Claussner +Date: Tue Sep 3 19:34:02 2013 +0200 + + Remove dead item gimptoolpresets.xml in app-docs.sgml + + This item caused builds with --enable-gtk-doc-app to + fail because of a typo and it was also misplaced in + app-core-containers. + +commit aa5c186a3dc211fd8c17c55f915edc12a4f658df +Author: Michael Natterer +Date: Tue Sep 3 16:00:09 2013 +0200 + + Bug 707354 - Bump Map offsets only go to 1000 regardless of image size + + Allow ranges from -10000 to 10000, still arbitrary but more + real-world. The scales still go -1000 to 1000, but the spinbuttons + allow for the full range. + + (cherry picked from commit af0cfacfb3fdd4308dc28167a8be74e5141fc1eb) + + plug-ins/common/bump-map.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit e1564c44a8f20fb704e29e317f167cf95fe1dc9f +Author: Sven Claussner +Date: Mon Sep 2 22:28:30 2013 +0200 + + Remove dead item gimptoolpresets.xml in app-docs.sgml + + This item caused builds with --enable-gtk-doc-app to + fail because of a typo and it was also misplaced in + app-core-containers. + + devel-docs/app/app-docs.sgml | 1 - + 1 file changed, 1 deletion(-) + +commit 3049999de9ef10eeaaa4b8fc687faa17bc74cd46 +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 28 21:14:13 2013 +0200 + + Updated Basque language + + po-libgimp/eu.po | 101 + ++++++++++++++++++++++++++++++------------------------- + 1 file changed, 55 insertions(+), 46 deletions(-) + +commit 356e8a3ff26ce8ef8147ac7aa519227d5abc6115 +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 28 21:13:15 2013 +0200 + + Updated Basque language + + po-tags/eu.po | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +commit f6a59f2669103268d89bafb022dcb0f2a8fe066d +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 28 21:12:16 2013 +0200 + + Updated Basque language + + po-tips/eu.po | 430 + +++++++++++++++++++++++++++++----------------------------- + 1 file changed, 215 insertions(+), 215 deletions(-) + +commit d7a7ae051c6b84d3b6028e682336afa89076cd88 +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 28 21:10:55 2013 +0200 + + Updated Basque language + + po-plug-ins/eu.po | 2944 + ++++++++++++++++++++++++++++++----------------------- + 1 file changed, 1674 insertions(+), 1270 deletions(-) + +commit c7b81f1f8ac8f65bfffb0cd974c868f2a8a0c051 +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 28 21:01:32 2013 +0200 + + Updated Basque language + + po/eu.po | 2475 + +++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 1311 insertions(+), 1164 deletions(-) + +commit 94db7d46d030e6e8075e106c6118e10acdd1c994 +Author: Daniel Mustieles +Date: Tue Aug 27 19:42:16 2013 +0200 + + Updated Spanish translation + + po/es.po | 192 + ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 110 insertions(+), 82 deletions(-) + +commit 4d468af5cb15b1c4e3d7c81a383f67a6c46edfe5 +Author: Piotr Drąg +Date: Sat Aug 24 02:19:54 2013 +0200 + + Updated Polish translation + + po/pl.po | 77 + +++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 47 insertions(+), 30 deletions(-) + +commit d93fd0a84e70d20e953a42cc8a0c338140d7e858 +Author: Michael Natterer +Date: Fri Aug 23 20:35:24 2013 +0200 + + Bug 706221 - File/Save (As) dialog: add a link to the Export dialog... + + ...for Non-XCF files. + + When the entered extension in save or export is on the other group, + add a link to the warning dialog which allows to jump directly to the + export or save dialog, with the same filename pre-entered. + + (cherry picked from commit b56145626e1e83ed9e1ffea161fa66aadb9fea24) + + app/actions/file-commands.c | 146 ++++++++++++++++++++++------- + app/dialogs/file-save-dialog.c | 205 + +++++++++++++++++++++++++++++++++-------- + app/dialogs/file-save-dialog.h | 3 + + 3 files changed, 280 insertions(+), 74 deletions(-) + +commit ded05240e2f1111ead34151fa13e7411b94346d7 +Author: Enrico Nicoletto +Date: Fri Aug 23 16:02:22 2013 -0300 + + Revert "Updated Brazilian Portuguese translation" + + po-libgimp will be placed in the correct branch! + + This reverts commit d6f50ab1df895aa61dd6a8c0c7c58384f9c4ea7d. + + po-libgimp/pt_BR.po | 488 + ++++++++++++++++++++++++++-------------------------- + 1 file changed, 247 insertions(+), 241 deletions(-) + +commit d6f50ab1df895aa61dd6a8c0c7c58384f9c4ea7d +Author: Enrico Nicoletto +Date: Fri Aug 23 15:58:09 2013 -0300 + + Updated Brazilian Portuguese translation + + po-libgimp/pt_BR.po | 488 + ++++++++++++++++++++++++++-------------------------- + 1 file changed, 241 insertions(+), 247 deletions(-) + +commit 4758321f35bc024eb448209cb575966e33c110fb +Author: Enrico Nicoletto +Date: Wed Aug 14 12:34:21 2013 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 53 ++++++++++++++++++++++++++++------------------------- + 1 file changed, 28 insertions(+), 25 deletions(-) + +commit 0d57efb47fd8481a67343c4c9ee118c569ae7709 +Author: Daniel Mustieles +Date: Wed Aug 14 14:10:37 2013 +0200 + + Updated Spanish translation + + po/es.po | 36 +++++++++++++++++++----------------- + 1 file changed, 19 insertions(+), 17 deletions(-) + +commit b7e676d5f737fadbd034dfc34ba8b5a557a77079 +Author: Piotr Drąg +Date: Sun Aug 11 01:06:40 2013 +0200 + + Updated Polish translation + + po/pl.po | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +commit 1ecc25a260aac95344c984e4014e429812cafec3 +Author: Michael Natterer +Date: Fri Aug 9 21:31:55 2013 +0200 + + app: return a GError when flattening the image failed + + (cherry picked from commit c32c1208b09c3383435fd038a3bd21932d663a47) + + app/actions/image-commands.c | 13 ++++++++++++- + app/core/gimpimage-merge.c | 12 +++++++++--- + app/core/gimpimage-merge.h | 3 ++- + app/pdb/image-cmds.c | 2 +- + tools/pdbgen/pdb/image.pdb | 2 +- + 5 files changed, 25 insertions(+), 7 deletions(-) + +commit d3763fe8b2b0715226ee179b15667c9eb866dbb1 +Author: Simon Budig +Date: Fri Aug 9 21:32:42 2013 +0200 + + app: fix crash when flattening an image with no visible layers + + (cherry picked from commit 514f22f53d61fd9e8105c495745503a63efdd8b0) + + app/core/gimpimage-merge.c | 44 + +++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) + +commit ed6a87b3df2c29081767b93e3327741877aa82c0 +Author: Marco Ciampa +Date: Thu Aug 8 16:00:15 2013 +0200 + + Updated italian translation. + + po/it.po | 90 + ++++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 48 insertions(+), 42 deletions(-) + +commit 89cea63de41c110dfa1b80867babc92e5f7c2c13 +Author: Enrico Nicoletto +Date: Tue Aug 6 09:45:08 2013 -0300 + + Updated partial Brazilian Portuguese translation + + po/pt_BR.po | 134 + +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 70 insertions(+), 64 deletions(-) + +commit 5874a6dbc79c9ef5a96df9fbf6db757d81f5b554 +Author: Michael Natterer +Date: Sun Aug 4 16:51:31 2013 +0200 + + app: port mtime code in gimp_data_save() to GIO + + because it gets its stat() calls right. + + (cherry picked from commit e72cf05ccba15c30dace0deeda5921b02245822a) + + app/core/gimpdata.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +commit d59a31867ab9cde8eff81ad5f68968ba08b4f07c +Author: Téo Mazars +Date: Sat Apr 13 17:16:56 2013 +0200 + + Bug 674391 - Indexed colours not exported when save a .bmp + + It's about importing in fact. + + Parse BITMAPV4HEADER / BITMAPV5HEADER and use GIMP's BMP + implementation instead of using gdk_pixbuf. + + Also, remove an old hack about 32bits bmp v3 + alpha. The alpha + channel is already ignored in that case. + + (cherry picked from commit 56f065321ce42f907879dfa4a76e57de18b058eb) + + plug-ins/file-bmp/bmp-read.c | 199 + ++++++++++++++++++++----------------------- + 1 file changed, 91 insertions(+), 108 deletions(-) + +commit 4fb7a436bca3e11abfda8bc23818af0f09714b9d +Author: Michael Natterer +Date: Fri Aug 2 16:50:00 2013 +0200 + + Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or + directory + + Apply patch from Amadeusz Slawinski that checks for execinfo.h and + builds the code that needs it conditionally. + + app/base/base-utils.c | 4 ++-- + configure.ac | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +commit 02a1e57442793d58167dc08b683665e987c905b3 +Author: Michael Natterer +Date: Sun Jul 28 02:50:33 2013 +0200 + + Bug 704896 - pop ups are annoying when opening multiple files from... + + the command line on some platforms/window managers + + Don't let the progress windows steal the focus, and always center + them. + + (cherry picked from commit 013c9d337b27f7846321fb7a374a3a17879d6f14) + + app/widgets/gimpprogressdialog.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit 58931c135d7b349f865520e19481f386917d66bc +Author: Martin Srebotnjak +Date: Fri Jul 26 21:20:14 2013 +0200 + + Updated Slovenian translation + + po/sl.po | 130 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 67 insertions(+), 63 deletions(-) + +commit 5b995df2ea3d8d526271875ec36684dee43375f3 +Author: Dimitris Spingos +Date: Tue Jul 23 17:25:17 2013 +0300 + + Updated Greek translation + + po/el.po | 95 + +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 49 insertions(+), 46 deletions(-) + +commit c1d9d0c1298623c161c125743cc3565a3a546b8f +Author: Daniel Mustieles +Date: Mon Jul 22 13:45:43 2013 +0200 + + Updated Spanish translation + + po/es.po | 109 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 56 insertions(+), 53 deletions(-) + +commit ba7e75bd58303c79b50e417f417d933a1d2b2bf5 +Author: Piotr Drąg +Date: Tue Jul 16 18:35:29 2013 +0200 + + Bug 679083: proper docs for plug-in-autocrop-layer without string + changes + + Based on patch dedb0250194d3760c6b89d91d4f739dbd7ed8aaf by Jehan + . + + plug-ins/common/crop-auto.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 5069b788fb2bcadcb05f393ba8a3bec174dcc6f5 +Author: Jehan +Date: Tue Jul 16 09:24:09 2013 +0900 + + Revert "Bug 679083: proper documentation for plug-in-autocrop-layer" + + This reverts commit dedb0250194d3760c6b89d91d4f739dbd7ed8aaf. + I did not know there was a policy not to change translatable strings + in stable. + Sorry! + + plug-ins/common/crop-auto.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +commit 2e991eb4e01a3b2fe18eaa5a85d6a5e248ed12c1 +Author: Piotr Drąg +Date: Mon Jul 15 22:36:22 2013 +0200 + + Updated Polish translation + + po/pl.po | 103 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 54 insertions(+), 49 deletions(-) + +commit 653c4e98df693dbe093d703c93d10582d51b4c9f +Author: Michael Natterer +Date: Mon Jul 15 01:22:14 2013 +0200 + + Bug 679195 - Foreground Select Tool Mask Inverted + + render_image_alpha(): invert the mask so it masks what is *not* the + foreground object. + + app/display/gimpdisplayshell-render.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 60bf4e367d0357df8eef5dc034f997167aee4d69 +Author: Michael Natterer +Date: Mon Jul 15 00:41:43 2013 +0200 + + Bug 700193 - undoing paint tools doesn't update last_coords properly + + paint_core->start_coords is in fact the last stroke's endpoint and + only used for storing it in GimpPaintCoreUndo, so the last endpoint + can be resotred for straight-line painting after an undo. Make the + code actually doing that. + + (cherry picked from commit d1795ac2047de73b7a7d4c9fd2666a8b0b4bd12b) + + app/paint/gimppaintcore-stroke.c | 13 +++++-------- + app/paint/gimppaintcore.c | 4 +++- + app/paint/gimppaintcore.h | 2 +- + app/tools/gimppainttool.c | 15 ++++++++------- + 4 files changed, 17 insertions(+), 17 deletions(-) + +commit cb2b4b6751d6621ad3d40ceadbd6514603cce892 +Author: Seong-ho Cho +Date: Mon Jul 15 06:50:11 2013 +0900 + + Updated Korean translation + + po/ko.po | 398 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 210 insertions(+), 188 deletions(-) + +commit a1cd4144dffb3f183249b2af17efed6ad11aa6ad +Author: Michael Natterer +Date: Sun Jul 14 22:25:44 2013 +0200 + + Bug 704118 - crash on invalid number of PLTE entries + + Make sure an indexed image always has a colormap. This was the case + before, except one could set a NULL colormap via the PDB. + + Add gimp_image_unset_colormap(), and make gimp_image_set_colormap() + never set the colormap to NULL, even if NULL is passed. Change the + only places where actual unsetting makes sense to use unset(). + + Make some GUI places deal gracefully with palettes/colormaps with zero + entries. + + (cherry picked from commit 37372555e5820f7f0c3a98ce9975ef66c2d8422c) + + app/actions/colormap-actions.c | 2 +- + app/core/gimpimage-colormap.c | 36 ++++++++++++++++++++++++++++-------- + app/core/gimpimage-colormap.h | 2 ++ + app/core/gimpimage-convert.c | 2 +- + app/core/gimpimageundo.c | 9 ++++++--- + app/widgets/gimppaletteview.c | 2 +- + 6 files changed, 39 insertions(+), 14 deletions(-) + +commit 616e8f2d82ffcf40eaec8034770447e754dbda80 +Author: Michael Natterer +Date: Sun Jul 14 13:46:00 2013 +0200 + + Bug 703692 - Unable to Resize Large Left Dock Area + + Merge all color-selector-wheel changes from master, which turns the + thing into a properly reqizable widget and fixes the issues with left + dock resizability. + + modules/Makefile.am | 2 +- + modules/color-selector-wheel.c | 52 +- + modules/gimpcolorwheel.c | 1484 + ++++++++++++++++++++++++++++++++++++++++ + modules/gimpcolorwheel.h | 97 +++ + 4 files changed, 1595 insertions(+), 40 deletions(-) + +commit 3632680049fae535696caffb9d273c1419e99896 +Author: Michael Natterer +Date: Sun Jul 14 13:27:57 2013 +0200 + + Bug 703692 - Unable to Resize Large Left Dock Area + + Small fix for the last commit: set a silly small initial size request + on the wrap_box so it doesn't initially request too much and breaks + dock layout deserialization. + + (cherry picked from commit a2334b0b1592d0ea7cc8b37fec1e21b6a863a212) + + app/widgets/gimpcontainergridview.c | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 38ab5f9d64b6e6dadf9468b6bae9b10f07456317 +Author: Michael Natterer +Date: Sat Jul 13 18:50:55 2013 +0200 + + Bug 703692 - Unable to Resize Large Left Dock Area + + gimp_container_grid_view_viewport_resized(): set the wrap_box' + required width to just one cell_width, not cell_width * columns. This + way it can shrink also when attached to a toolbox dock. It remains + unclear why it could nicely shrink in all other dock columns. + + (cherry picked from commit 6a5e37b68d4a3c136c9a67c86d238f90b8e07263) + + app/widgets/gimpcontainergridview.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +commit b283facb890ded45c404749165deeb7413b35ab0 +Author: Jehan +Date: Mon Jul 8 22:21:03 2013 +0900 + + Bug 703787 - Crash during switch from multi to single window mode + + Shells can now travel from one window to another. Canvas position code + should therefore not keep track of the image window for a specific + shell + but must use whatever is the current window for this shell (even + though + it may be a different one before and after the size-allocate). + This also partly fixes some positioning issue during mode switch. + (cherry picked from commit 7e513faa50a1b45f2b216a721c0dce938d0dd52a) + + app/display/gimpimagewindow.c | 41 + ++++++++++++++++++++--------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +commit 26fb257a191885068b7a478a63009a092aff62f4 +Author: Michael Natterer +Date: Fri Jul 12 15:18:38 2013 +0200 + + Bug 703113 - Plug-ins are queried on every launch + + Port gimp_datafiles_read_directories() to GIO which seems to get + its stat() calls right on all platforms. + + (cherry picked from commit 767a5a321708c4ca19bbf1e103a3988fcc404cc5) + + libgimpbase/Makefile.am | 4 +-- + libgimpbase/gimpdatafiles.c | 65 + +++++++++++++++++++++++++++------------------ + 2 files changed, 41 insertions(+), 28 deletions(-) + +commit f7fe056e1968c151795be40aa04807b5f06ccedf +Author: Jehan +Date: Mon Jul 8 21:19:01 2013 +0900 + + app - call to keep the active shell in single window mode switch + out of loop. + + Small fix from commit 2697b29. This previous commit was working + well, but + implied calling this method as many time as there are opened shells, + whereas once is enough. + (cherry picked from commit 8ef5fca0622447b7f36afd17e93248c754216572) + + app/gui/gimpuiconfigurer.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit cc836e7c845b2e4035382cc2cc73064bced55dc5 +Author: Massimo Valentini +Date: Tue Jul 9 19:41:52 2013 +0200 + + Bug 703806: GIMP crashes when scaling an image + + during an image rescale, while spinning the main-loop, + layer-groups preview generation used to start before their + layers were fully rescaled, so it tried to access tiles that + were not yet there + (cherry picked from commit 3cc923d5a50287b2a7ab77dce381aabab3e37418) + + app/core/gimpimage-scale.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +commit 588012f48c5c211fd4c535282dd444d2719f2328 +Author: Daniel Mustieles +Date: Mon Jul 8 14:03:43 2013 +0200 + + Updated Spanish translation + + po-plug-ins/es.po | 106 + ++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 63 insertions(+), 43 deletions(-) + +commit 0c4e7686e856a78bc10e7f9bab148c9c1c45e867 +Author: Jehan +Date: Sun Jul 7 13:47:37 2013 +0900 + + Bug 703736: when switching from multi to single window mode, tab + order is lost. + (cherry picked from commit 112fa537305b6913d7c804ba06cf6fae506f4e6a) + + app/display/gimpimagewindow.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 893c73cea48f8788b02567c1f9b995173195eee3 +Author: Jehan +Date: Sun Jul 7 23:10:33 2013 +0900 + + Bug 703738: when switching between multi and single window mode, + keep the same active shell. + (cherry picked from commit 2697b29963165c3c347bab87f0ab974364c336ab) + + app/gui/gimpuiconfigurer.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +commit 42e370e20822b248b86fe2012663109aaa7f7808 +Author: Massimo Valentini +Date: Fri Jul 5 18:13:46 2013 +0200 + + app: don't pass NULL to g_object_add_weak_pointer + + opening many images from the command line used to print: + + (gimp-2.9:): GLib-GObject-CRITICAL **: g_object_add_weak_pointer: + assertion 'G_IS_OBJECT (object)' failed + + because only the first finds the empty display + (cherry picked from commit 8a7d5c9d165514f4ee9afdc30cffd6c130aa7588) + + app/file/file-open.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 80d11a46a84460ee9ada53266064b0210148fa3c +Author: Jehan +Date: Thu Jul 4 22:11:47 2013 +0900 + + Bug 672100: gimptool returns wrong system plugin dir if libdir has + been customized. + + On UNIX platforms, use the actual libdir value, which has been set + at compile time. + (cherry picked from commit 97d14ebda3d5790b92f8bfa2a4b3291ccb9289e6) + + tools/gimptool.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit dedb0250194d3760c6b89d91d4f739dbd7ed8aaf +Author: Jehan +Date: Fri Jul 5 23:58:48 2013 +0900 + + Bug 679083: proper documentation for plug-in-autocrop-layer + + The current documentation have users think the argument layer is going + to be cropped, whereas it actually only serves as a base for + determining + cropping extents. The active layer is the one to be cropped. + Slightly more complete documentation explaining this. + + plug-ins/common/crop-auto.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +commit 4e664a011d5b5142c65dd813ee3cb4a324e97ac6 +Author: Massimo Valentini +Date: Thu Jul 4 21:36:40 2013 +0200 + + Bug 629941 - GIMP doesn't exit properly when quitting while loading + images + + GIMP's "exit" signal was emitted before the handler was connected. + + Don't start loading command line images or batch processing before + app_exit_after_callback() is connected. Make sure we don't use + dangling main loop pointers or try to stop a non-running main loop. + + (cherry picked from commit 09682d62ae675125e91d537c3ccbdd4571a0b28e) + + app/app.c | 53 ++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 32 insertions(+), 21 deletions(-) + +commit dea99e516b6c796e423da579ea387997a13d4e13 +Author: Massimo Valentini +Date: Thu Jul 4 21:05:25 2013 +0200 + + app: file_open_from_command_line(): don't access a dangling display + pointer + + Happens if GIMP is quit while the image is being loaded. + + (cherry picked from commit 6c62eb2238d2167ebe20ee02ad32ef733db475b1) + + app/file/file-open.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +commit 92e9de96ae5e8a8b1ba917db35aaa281c333c058 +Author: Michael Natterer +Date: Wed Jul 3 09:26:03 2013 +0200 + + app: view_close_cmd_callback(): don't forbid to close images without + layers + + Also no need to check for shell != NULL. + + app/actions/view-commands.c | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 16e548c12fe90c88751d1cb835887be99215b773 +Author: Michael Natterer +Date: Mon Jul 1 19:05:14 2013 +0200 + + libgimpthumb: add GIO_LIBS also to libgimpthumb_2_0_la_LIBADD + + libgimpthumb/Makefile.am | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 2654d0d4997c8864284aac1835a5d84a08f7ad1f +Author: Michael Natterer +Date: Sat Jun 29 18:14:12 2013 +0200 + + libgimpthumb: use GIO_CFLAGS/LIBS not GLIB_CFLAGS/LIBS + + libgimpthumb/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 4d2316cb3e0395a57821c461135b2e3e3788408d +Author: Michael Natterer +Date: Fri Jun 28 22:44:19 2013 +0200 + + Bug 683152 - Preview thumbnails in file open dialog causes error + in 2.8.2 + + Port gimp_thumb_file_test() to GIO which seems to get its stat() + calls right on all platforms. + + (cherry picked from commit bb755960620ad648a264a99b5edb67357c513e04) + + libgimpthumb/gimpthumb-utils.c | 67 + +++++++++++++++++++++++++++++------------- + 1 file changed, 46 insertions(+), 21 deletions(-) + +commit 3a9f5a354ba006df90a20cd1f4ebbe35a6e38f7d +Author: Alexandre Prokoudine +Date: Fri Jun 28 12:29:38 2013 +0400 + + Updates and fixes to Russian translation + + po-script-fu/ru.po | 232 + ++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 169 insertions(+), 63 deletions(-) + +commit 24223d6663a706b5bca472feda657fb2e58a528a +Author: Sven Claussner +Date: Fri Jun 28 09:17:57 2013 +0200 + + Bug 703218 - Typo in German translation + + In Edit/Preferences/Tool Options, mouseover text + over 'Set layer or path as active': + replace 'Eben' by 'Ebene' + + po/de.po | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +commit 3ce15deed94df58ddb4b1e4c9d7f3f713812447f +Author: Michael Henning +Date: Wed Jun 26 11:40:01 2013 -0400 + + autogen.sh: also look for automake 1.14 + + (cherry picked from commit 9a6b42a4fd26b4f394e0b8f5ac58127a76c98c58) + + autogen.sh | 3 +++ + 1 file changed, 3 insertions(+) + +commit bd91caf778602774d6b90fb574fca336c7e03af6 +Author: Michael Natterer +Date: Tue Jun 25 19:08:12 2013 +0200 + + app: port GimpImagePropView's file size querying to GIO + + app/widgets/gimpimagepropview.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +commit 16b1ff9a09398b2617c6b018ec2e1579157bf2b7 +Author: Jernej Simončič +Date: Mon Jun 24 11:11:24 2013 +0200 + + Installer: add libharfbuzz-0.dll to the list of required 32-bit + libraries + + build/windows/installer/32on64.list | 1 + + 1 file changed, 1 insertion(+) + +commit 8937d9eb2864ca0d7335b3c6e2463eda86c3969c +Author: Michael Natterer +Date: Sat Jun 22 00:12:59 2013 +0200 + + configure: post-release version bump to 2.8.7 + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + commit 82888aaa4b1e65ae23ec0ee591ebed4685df55e8 Author: Michael Natterer -Date: Fri Jun 21 23:22:49 2013 +0200 +Date: Fri Jun 21 23:22:49 2013 +0200 Bump version to 2.8.6 and commit regenerated files - NEWS | 2 +- - configure.ac | 4 ++-- + NEWS | 2 +- + configure.ac | 4 ++-- docs/gimprc.5.in | 2 +- - etc/gimprc | 2 +- + etc/gimprc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) commit 20e4a9c2c35f9bac011f9eb55318719759231267 Author: Téo Mazars -Date: Fri Jun 21 22:27:47 2013 +0200 +Date: Fri Jun 21 22:27:47 2013 +0200 NEWS: add api introduction and fix typo @@ -21,7 +2278,7 @@ Date: Fri Jun 21 22:27:47 2013 +0200 commit f7cbd9de654cd4e94d0b83315482dab2c67b1b82 Author: Téo Mazars -Date: Fri Jun 21 20:09:18 2013 +0200 +Date: Fri Jun 21 20:09:18 2013 +0200 Bug 701410 - Small artifacts appear when performing a selection @@ -33,7 +2290,7 @@ Date: Fri Jun 21 20:09:18 2013 +0200 commit 32c9903a58f67e1eed3cd392e59999826cbd03e2 Author: Michael Natterer -Date: Fri Jun 21 12:44:38 2013 +0200 +Date: Fri Jun 21 12:44:38 2013 +0200 NEWS: updates @@ -42,20 +2299,20 @@ Date: Fri Jun 21 12:44:38 2013 +0200 commit dd9f57f8de34397bf1dddd9f7e274e5af3150053 Author: Michael Natterer -Date: Fri Jun 21 12:43:29 2013 +0200 +Date: Fri Jun 21 12:43:29 2013 +0200 Bug 701335 - Gimp crashing on creating huge clipboard brush Change the maximum size of clipboard patterns and brushes to 1024x1024. - app/core/gimpbrushclipboard.c | 4 ++-- + app/core/gimpbrushclipboard.c | 4 ++-- app/core/gimppatternclipboard.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit ef649f48275dcb1850c2d0c0a60e33b244a8eb42 Author: Michael Natterer -Date: Tue Jun 18 19:05:54 2013 +0200 +Date: Tue Jun 18 19:05:54 2013 +0200 Bug 701803 - Cage Transform raises segmentation fault... @@ -71,28 +2328,28 @@ Date: Tue Jun 18 19:05:54 2013 +0200 commit 731ee3218cbdd3e25303df0ae7e855035f64619b Author: Marco Ciampa -Date: Fri Jun 7 22:28:27 2013 +0200 +Date: Fri Jun 7 22:28:27 2013 +0200 Updated italian translation po-plug-ins/it.po | 470 ++++++++++++++++++++++++++++-------------------------- - po/it.po | 219 +++++++++++++------------ + po/it.po | 219 +++++++++++++------------ 2 files changed, 357 insertions(+), 332 deletions(-) commit bb5f7d6525358a494870888ff7047ecf48e96a5b Author: Stanislav Petrek -Date: Wed Jun 5 21:27:40 2013 +0200 +Date: Wed Jun 5 21:27:40 2013 +0200 Updated slovak translation po-tags/LINGUAS | 2 ++ - po-tags/sk.po | 31 +++++++++++++++++++++++++++++++ + po-tags/sk.po | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) commit 8b7ad24892309ad8dac1c48f7b876ba0a3755cbf Author: Dimitris Spingos -Date: Wed Jun 5 15:15:39 2013 +0300 +Date: Wed Jun 5 15:15:39 2013 +0300 Updated Greek translation @@ -102,7 +2359,7 @@ Date: Wed Jun 5 15:15:39 2013 +0300 commit 4b957cf404e0b9f636befd8cba4726d341852be2 Author: Michael Natterer -Date: Tue Jun 4 16:48:41 2013 +0200 +Date: Tue Jun 4 16:48:41 2013 +0200 Bug 701594 - gimp-image-select-item does not recognize path transformations @@ -117,7 +2374,7 @@ Date: Tue Jun 4 16:48:41 2013 +0200 commit bc411d97c926e0824c5a77ef96416cb6365f1684 Author: Massimo Valentini -Date: Sat Jun 1 17:30:43 2013 +0200 +Date: Sat Jun 1 17:30:43 2013 +0200 Bug 701120: Opening fuzzed .pnm-file causes stack buffer overflow @@ -130,7 +2387,7 @@ Date: Sat Jun 1 17:30:43 2013 +0200 commit ba98aedcb1f03b7307e22b20487d5cc9e7665f54 Author: Massimo Valentini -Date: Sat Jun 1 17:07:24 2013 +0200 +Date: Sat Jun 1 17:07:24 2013 +0200 Bug 680290: -90 degree rotation distortion of layer @@ -142,13 +2399,13 @@ Date: Sat Jun 1 17:07:24 2013 +0200 consistent with INTERPOLATION_NONE app/core/gimp-transform-region.c | 9 +++++++-- - libgimpmath/gimpmatrix.c | 38 + libgimpmath/gimpmatrix.c | 38 ++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 18 deletions(-) commit dd8aeeec92a64390a8ece059c62368821a172bfe Author: Michael Natterer -Date: Wed May 29 22:23:38 2013 +0200 +Date: Wed May 29 22:23:38 2013 +0200 Bug 700215 - Gradient name changes do not persist across sessions... @@ -164,7 +2421,7 @@ Date: Wed May 29 22:23:38 2013 +0200 commit 27dd1c167bb3c71d9b8a338f26cc78fa96e2c442 Author: Daniel Mustieles -Date: Mon May 27 16:46:41 2013 +0200 +Date: Mon May 27 16:46:41 2013 +0200 Updated Spanish translation @@ -174,7 +2431,7 @@ Date: Mon May 27 16:46:41 2013 +0200 commit 45644a44bad32c4294d57cc33a41ab68d9b005bf Author: Piotr Drąg -Date: Sat May 25 18:29:47 2013 +0200 +Date: Sat May 25 18:29:47 2013 +0200 Updated Polish translation @@ -183,7 +2440,7 @@ Date: Sat May 25 18:29:47 2013 +0200 commit aa16efe4c96d6e39be8fea4ee6443067b90cae9b Author: Michael Natterer -Date: Sat May 25 16:11:15 2013 +0200 +Date: Sat May 25 16:11:15 2013 +0200 Bug 578695 - gimptool-2.0 does not respect $DESTDIR @@ -195,7 +2452,7 @@ Date: Sat May 25 16:11:15 2013 +0200 commit a57ad1a9971ec544c7f934513252a7bb921f47f4 Author: Michael Natterer -Date: Sat May 25 11:21:15 2013 +0200 +Date: Sat May 25 11:21:15 2013 +0200 Bug 700707 - Missing time data in tool-options/*.settings files @@ -208,7 +2465,7 @@ Date: Sat May 25 11:21:15 2013 +0200 commit c947260d2db0d761668dd7b16f195f9ed3d458c6 Author: Jehan -Date: Wed Dec 12 15:14:42 2012 +0900 +Date: Wed Dec 12 15:14:42 2012 +0900 actions: dock-close had a default shortcut colliding with view-close. @@ -224,7 +2481,7 @@ Date: Wed Dec 12 15:14:42 2012 +0900 commit 6cda75205a1c1d444efbe1e43ad85f68565f7912 Author: Michael Natterer -Date: Fri Dec 14 09:54:17 2012 +0100 +Date: Fri Dec 14 09:54:17 2012 +0100 app: add the "view" action group to all docks @@ -236,7 +2493,7 @@ Date: Fri Dec 14 09:54:17 2012 +0100 commit ae8749a9a7cfcdf294873bada2c0e664ec0914b5 Author: Michael Natterer -Date: Wed Dec 12 23:26:46 2012 +0100 +Date: Wed Dec 12 23:26:46 2012 +0100 app: can't call view_actions_setup() from file_actions_setup() @@ -249,7 +2506,7 @@ Date: Wed Dec 12 23:26:46 2012 +0100 commit 1380b0696cbae20cbe04742da6ab3926a67674cb Author: Jehan -Date: Wed Dec 12 16:05:39 2012 +0900 +Date: Wed Dec 12 16:05:39 2012 +0900 actions: forgot an include which was triggering an "implicit declaration" warning. @@ -260,7 +2517,7 @@ Date: Wed Dec 12 16:05:39 2012 +0900 commit 22d4cd02fc6b56e342d4645921575b7f3f462a90 Author: Jehan -Date: Mon Nov 26 00:18:00 2012 +0900 +Date: Mon Nov 26 00:18:00 2012 +0900 Bug 685559 - view-close action modified to close only an image view. @@ -270,15 +2527,15 @@ Date: Mon Nov 26 00:18:00 2012 +0900 Additionally all other view actions are available on dock focus. (cherry picked from commit 2ad8634c06814219728bb10fbe59a63afc42fdea) - app/actions/file-actions.c | 3 +++ - app/actions/view-actions.c | 6 +++--- + app/actions/file-actions.c | 3 +++ + app/actions/view-actions.c | 6 +++--- app/actions/view-commands.c | 20 ++++++++++++++++++++ - app/actions/view-commands.h | 2 ++ + app/actions/view-commands.h | 2 ++ 4 files changed, 28 insertions(+), 3 deletions(-) commit 5207a4fcd8fbc97287ba3292965d5e9c81718670 Author: Michael Natterer -Date: Fri May 24 09:23:52 2013 +0200 +Date: Fri May 24 09:23:52 2013 +0200 Bug 700675 - Missing menu locations for registration and other menu... @@ -293,7 +2550,7 @@ Date: Fri May 24 09:23:52 2013 +0200 commit b47f4eb777133a706ffb24b8b6726bffe5d9eeca Author: Dov Grobgeld -Date: Sun May 19 23:53:33 2013 +0300 +Date: Sun May 19 23:53:33 2013 +0300 Updated dicom plugin to solve problems with import into external programs (e.g. OsiriX) @@ -303,7 +2560,7 @@ Date: Sun May 19 23:53:33 2013 +0300 commit 40726a341d00e4874b1ae24c842a7584a4a087ee Author: Michael Natterer -Date: Sun May 19 21:42:50 2013 +0200 +Date: Sun May 19 21:42:50 2013 +0200 Bug 700653 - Duplicate "(time ...)" values in gimp-curves-tool.settings @@ -315,13 +2572,13 @@ Date: Sun May 19 21:42:50 2013 +0200 property doesn't end up in the config file once per channel. (cherry picked from commit 6781439fdc058754a0477dd1fc7b1d654fb90bf7) - app/gegl/gimpcurvesconfig.c | 9 ++++++++- + app/gegl/gimpcurvesconfig.c | 9 ++++++++- app/gegl/gimplevelsconfig.c | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) commit 7ee3235bd03e7109d9ae4f856efb0e1f2683ef6c Author: Michael Natterer -Date: Fri May 17 14:41:11 2013 +0200 +Date: Fri May 17 14:41:11 2013 +0200 Bug 688537 - Toolbox occasionally has spaces or tool names after the icons @@ -335,7 +2592,7 @@ Date: Fri May 17 14:41:11 2013 +0200 commit 7b42013baef4a24a6242f9fa1be4f84daff0833b Author: Michael Natterer -Date: Tue May 14 02:00:20 2013 +0200 +Date: Tue May 14 02:00:20 2013 +0200 Bug 695687 - GimpSpinScale's label is unreadable on dark themes @@ -349,7 +2606,7 @@ Date: Tue May 14 02:00:20 2013 +0200 commit ecb06953ef22e4532b9a449d9d0694452fc3bba9 Author: Michael Henning -Date: Sun May 12 19:36:27 2013 -0400 +Date: Sun May 12 19:36:27 2013 -0400 tests: fix running make check with both parallel make and xvfb @@ -362,7 +2619,7 @@ Date: Sun May 12 19:36:27 2013 -0400 commit eb28d90866c8f1dd2955d4b3fd0c0815da1e7f96 Author: Michael Natterer -Date: Mon May 13 00:00:57 2013 +0200 +Date: Mon May 13 00:00:57 2013 +0200 app: change serialization of the right docks width in SWM (again) @@ -373,15 +2630,15 @@ Date: Mon May 13 00:00:57 2013 +0200 the deserialization code which might fix bug #700147. (cherry picked from commit a078ca3f5fb2a43191dd2d4de22aefc493edf1ba) - app/display/gimpimagewindow.c | 78 + app/display/gimpimagewindow.c | 78 +++++++++++++--------- - app/tests/gimpdir/sessionrc-2-8-single-window | 2 +- + app/tests/gimpdir/sessionrc-2-8-single-window | 2 +- app/tests/gimpdir/sessionrc-expected-single-window | 2 +- 3 files changed, 47 insertions(+), 35 deletions(-) commit a98b6581e6c2add3d6cb895d7b71d581c236b361 Author: Jehan -Date: Mon Apr 29 07:03:20 2013 +0900 +Date: Mon Apr 29 07:03:20 2013 +0900 Bug 699185 - when moving the pointer fast out of guide scope, do not keep it highlighted. @@ -402,7 +2659,7 @@ Date: Mon Apr 29 07:03:20 2013 +0900 commit 714c232eee4d966f782d8e882cb5645a8feed0f4 Author: Jehan -Date: Sat May 11 09:04:33 2013 +0900 +Date: Sat May 11 09:04:33 2013 +0900 Bug 664584: WM DELETE event in single window mode is synonym to file-quit. @@ -420,7 +2677,7 @@ Date: Sat May 11 09:04:33 2013 +0900 commit 7205a25112982ad361795006cccd9022b75e2d6a Author: Michael Natterer -Date: Sat May 11 20:44:04 2013 +0200 +Date: Sat May 11 20:44:04 2013 +0200 app: fix include in test-core, re-closes bug 622054 @@ -429,7 +2686,7 @@ Date: Sat May 11 20:44:04 2013 +0200 commit 9625dd92b413b15b146d294434a4d574fcac6b1e Author: Sven Claussner -Date: Thu May 9 02:35:34 2013 +0200 +Date: Thu May 9 02:35:34 2013 +0200 Bug 699886 - Missing menu location for script/plugin diff --git a/Makefile.in b/Makefile.in index c6195813f1..3751326b87 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -363,6 +363,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -389,6 +391,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -666,8 +672,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -906,10 +912,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) diff --git a/NEWS b/NEWS index 465ac66d49..6b842d01dd 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,84 @@ This is the stable branch of GIMP. No new features are being added here, just bug-fixes. +Overview of Changes from GIMP 2.8.8 to GIMP 2.8.10 +================================================== + + +Core: + + - Set manifest as Windows 8 compatible + + +GUI: + + - Indicate if a file was exported in the Quit dialog + - Add shortcuts and hint labels to the close and quit dialogs + that make closing and quitting easier and more consistent + - Rename the File->Export menu labels to match Save/Save as + - Fix keyboard shortcuts on OSX Mavericks + - Don't open lots of progress popups when opening many files + - Correctly restore the hidden state of docks in single window mode + + +Libgimp: + + - Fix exporting an image consisting of a single layer group + - Don't attempt to pick transparent colors + + +Plug-ins: + + - Fix crash in LCMS plugin if RGB profile was missing + + +General: + + - Fix compile on NetBSD (missing -lexecinfo) + - Bug fixes + - Translation updates + + +Overview of Changes from GIMP 2.8.6 to GIMP 2.8.8 +================================================= + + +Core: + + - Make sure indexed images always have a colormap + - Fix language selection via preferences on Windows + - Don't crash on setting a large text size + + +GUI: + + - Keep the same image active when switching between MWM and SWM + - Make sure all dockables are properly resizable (particularly shrinkable) + - Add links to jump directly to Save/Export from the Export/Save + file extension warning dialogs + + +Libgimp: + + - Fix GimpPickButton on OSX + + +Plug-ins: + + - Properly document plug-in-autocrop-layer's PDB interface + - Fix importing of indexed BMPs + + +General: + + - Fix lots of places to use GIO to get proper file sizes and times on windows + - Add an AppData file for GIMP + - Backport lcms2 support from master, because lcms1 is not getting + bug fixes any longer + - Lots of bug fixes + - Lots of translation updates + + Overview of Changes from GIMP 2.8.4 to GIMP 2.8.6 ================================================= diff --git a/aclocal.m4 b/aclocal.m4 index 586b425c7a..17d2754f02 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -225,10 +225,10 @@ fi[]dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -244,7 +244,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -631,6 +631,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -739,7 +745,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -747,7 +794,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -895,38 +941,6 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -1003,6 +1017,53 @@ AC_DEFUN([_AM_IF_OPTION], # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -1672,13 +1733,10 @@ int main () { unsigned int major, minor, micro; - char *tmp_version; fclose (fopen ("conf.glibtest", "w")); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_glib_version"); exit(1); } diff --git a/app/Makefile.am b/app/Makefile.am index a4ef552357..243f08af5f 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -90,7 +90,7 @@ gimp_2_8_SOURCES = $(libapp_sources) main.c if PLATFORM_OSX -framework_carbon = -framework Carbon +framework_cocoa = -framework Cocoa endif if OS_WIN32 @@ -186,20 +186,21 @@ gimpconsoleldadd = \ gimp_2_8_LDFLAGS = \ $(AM_LDFLAGS) \ $(win32_ldflags) \ - $(framework_carbon) + $(framework_cocoa) gimp_2_8_LDADD = \ - gui/libappgui.a \ - menus/libappmenus.a \ - actions/libappactions.a \ - dialogs/libappdialogs.a \ - tools/libapptools.a \ - display/libappdisplay.a \ - widgets/libappwidgets.a \ - $(libgimpwidgets) \ - $(GTK_LIBS) \ - $(DBUS_GLIB_LIBS) \ - $(gimpconsoleldadd) \ + gui/libappgui.a \ + menus/libappmenus.a \ + actions/libappactions.a \ + dialogs/libappdialogs.a \ + tools/libapptools.a \ + display/libappdisplay.a \ + widgets/libappwidgets.a \ + $(libgimpwidgets) \ + $(GTK_LIBS) \ + $(GTK_MAC_INTEGRATION_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(gimpconsoleldadd) \ $(GIMPRC) diff --git a/app/Makefile.in b/app/Makefile.in index 00ce31e7f0..f1064320fb 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -145,7 +145,7 @@ gimp_2_8_DEPENDENCIES = gui/libappgui.a menus/libappmenus.a \ tools/libapptools.a display/libappdisplay.a \ widgets/libappwidgets.a $(libgimpwidgets) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(GIMPRC) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) $(GIMPRC) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -409,6 +409,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -435,6 +437,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -684,7 +690,7 @@ BUILT_SOURCES = $(libapp_generated_sources) CLEANFILES = $(libapp_generated_sources) libapp_a_SOURCES = $(libapp_sources) $(libapp_generated_sources) gimp_2_8_SOURCES = $(libapp_sources) main.c -@PLATFORM_OSX_TRUE@framework_carbon = -framework Carbon +@PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa @OS_WIN32_TRUE@win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE) @USE_BINRELOC_TRUE@munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib' @HAVE_WINDRES_TRUE@GIMPAPPRC = $(top_srcdir)/build/windows/gimp.rc @@ -774,20 +780,21 @@ gimpconsoleldadd = \ gimp_2_8_LDFLAGS = \ $(AM_LDFLAGS) \ $(win32_ldflags) \ - $(framework_carbon) + $(framework_cocoa) gimp_2_8_LDADD = \ - gui/libappgui.a \ - menus/libappmenus.a \ - actions/libappactions.a \ - dialogs/libappdialogs.a \ - tools/libapptools.a \ - display/libappdisplay.a \ - widgets/libappwidgets.a \ - $(libgimpwidgets) \ - $(GTK_LIBS) \ - $(DBUS_GLIB_LIBS) \ - $(gimpconsoleldadd) \ + gui/libappgui.a \ + menus/libappmenus.a \ + actions/libappactions.a \ + dialogs/libappdialogs.a \ + tools/libapptools.a \ + display/libappdisplay.a \ + widgets/libappwidgets.a \ + $(libgimpwidgets) \ + $(GTK_LIBS) \ + $(GTK_MAC_INTEGRATION_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(gimpconsoleldadd) \ $(GIMPRC) @ENABLE_GIMP_CONSOLE_TRUE@gimp_console_2_8_SOURCES = $(libapp_sources) main.c @@ -939,14 +946,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/actions/Makefile.in b/app/actions/Makefile.in index 4ebde6e390..1aa6e0f0df 100644 --- a/app/actions/Makefile.in +++ b/app/actions/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -345,6 +345,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -371,6 +373,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -867,14 +873,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c index 6cd2ead52f..0dcda8d3b3 100644 --- a/app/actions/colormap-actions.c +++ b/app/actions/colormap-actions.c @@ -109,7 +109,7 @@ colormap_actions_update (GimpActionGroup *group, gimp_action_group_set_action_color (group, action, color, FALSE); SET_SENSITIVE ("colormap-edit-color", - image && indexed); + image && indexed && num_colors > 0); SET_SENSITIVE ("colormap-add-color-from-fg", image && indexed && num_colors < 256); SET_SENSITIVE ("colormap-add-color-from-bg", diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c index 45185a2ceb..1235b8b371 100644 --- a/app/actions/file-actions.c +++ b/app/actions/file-actions.c @@ -143,7 +143,7 @@ static const GimpEnumActionEntry file_save_actions[] = GIMP_HELP_FILE_SAVE }, { "file-export-to", NULL, - NC_("file-action", "Export to"), "E", + NC_("file-action", "Export"), "E", NC_("file-action", "Export the image again"), GIMP_SAVE_MODE_EXPORT_TO, FALSE, GIMP_HELP_FILE_EXPORT_TO }, @@ -155,7 +155,7 @@ static const GimpEnumActionEntry file_save_actions[] = GIMP_HELP_FILE_OVERWRITE }, { "file-export", NULL, - NC_("file-action", "Export..."), "E", + NC_("file-action", "Export As..."), "E", NC_("file-action", "Export the image to various file formats such as PNG or JPEG"), GIMP_SAVE_MODE_EXPORT, FALSE, GIMP_HELP_FILE_EXPORT } @@ -303,7 +303,7 @@ file_actions_update (GimpActionGroup *group, else { gimp_action_group_set_action_label (group, - "file-export-to", _("Export to")); + "file-export-to", _("Export")); } /* needed for the empty display */ diff --git a/app/actions/file-commands.c b/app/actions/file-commands.c index eec3ab605d..3b38ba3172 100644 --- a/app/actions/file-commands.c +++ b/app/actions/file-commands.c @@ -65,32 +65,38 @@ /* local function prototypes */ -static void file_open_dialog_show (Gimp *gimp, - GtkWidget *parent, - const gchar *title, - GimpImage *image, - const gchar *uri, - gboolean open_as_layers); -static void file_save_dialog_show (Gimp *gimp, - GimpImage *image, - GtkWidget *parent, - const gchar *title, - gboolean save_a_copy, - gboolean close_after_saving, - GimpDisplay *display); -static void file_export_dialog_show (Gimp *gimp, - GimpImage *image, - GtkWidget *parent); -static void file_save_dialog_destroyed (GtkWidget *dialog, - GimpImage *image); -static void file_export_dialog_destroyed (GtkWidget *dialog, - GimpImage *image); -static void file_new_template_callback (GtkWidget *widget, - const gchar *name, - gpointer data); -static void file_revert_confirm_response (GtkWidget *dialog, - gint response_id, - GimpDisplay *display); +static void file_open_dialog_show (Gimp *gimp, + GtkWidget *parent, + const gchar *title, + GimpImage *image, + const gchar *uri, + gboolean open_as_layers); +static GtkWidget * file_save_dialog_show (Gimp *gimp, + GimpImage *image, + GtkWidget *parent, + const gchar *title, + gboolean save_a_copy, + gboolean close_after_saving, + GimpDisplay *display); +static GtkWidget * file_export_dialog_show (Gimp *gimp, + GimpImage *image, + GtkWidget *parent); +static void file_save_dialog_response (GtkWidget *dialog, + gint response_id, + gpointer data); +static void file_save_dialog_destroyed (GtkWidget *dialog, + GimpImage *image); +static void file_export_dialog_response (GtkWidget *dialog, + gint response_id, + gpointer data); +static void file_export_dialog_destroyed (GtkWidget *dialog, + GimpImage *image); +static void file_new_template_callback (GtkWidget *widget, + const gchar *name, + gpointer data); +static void file_revert_confirm_response (GtkWidget *dialog, + gint response_id, + GimpDisplay *display); @@ -530,7 +536,7 @@ file_open_dialog_show (Gimp *gimp, } } -static void +static GtkWidget * file_save_dialog_show (Gimp *gimp, GimpImage *image, GtkWidget *parent, @@ -559,6 +565,9 @@ file_save_dialog_show (Gimp *gimp, g_object_set_data_full (G_OBJECT (image), "gimp-file-save-dialog", dialog, (GDestroyNotify) gtk_widget_destroy); + g_signal_connect (dialog, "response", + G_CALLBACK (file_save_dialog_response), + image); g_signal_connect (dialog, "destroy", G_CALLBACK (file_save_dialog_destroyed), image); @@ -575,6 +584,40 @@ file_save_dialog_show (Gimp *gimp, gtk_window_present (GTK_WINDOW (dialog)); } + + return dialog; +} + +static void +file_save_dialog_response (GtkWidget *dialog, + gint response_id, + gpointer data) +{ + if (response_id == FILE_SAVE_RESPONSE_OTHER_DIALOG) + { + GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog); + GtkWindow *parent; + GtkWidget *other; + gchar *folder; + gchar *uri; + gchar *name; + + parent = gtk_window_get_transient_for (GTK_WINDOW (dialog)); + folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog)); + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + name = file_utils_uri_display_basename (uri); + g_free (uri); + + other = file_export_dialog_show (file_dialog->image->gimp, + file_dialog->image, + GTK_WIDGET (parent)); + + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (other), folder); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), name); + + g_free (folder); + g_free (name); + } } static void @@ -585,7 +628,7 @@ file_save_dialog_destroyed (GtkWidget *dialog, g_object_set_data (G_OBJECT (image), "gimp-file-save-dialog", NULL); } -static void +static GtkWidget * file_export_dialog_show (Gimp *gimp, GimpImage *image, GtkWidget *parent) @@ -610,6 +653,9 @@ file_export_dialog_show (Gimp *gimp, g_object_set_data_full (G_OBJECT (image), "gimp-file-export-dialog", dialog, (GDestroyNotify) gtk_widget_destroy); + g_signal_connect (dialog, "response", + G_CALLBACK (file_export_dialog_response), + image); g_signal_connect (dialog, "destroy", G_CALLBACK (file_export_dialog_destroyed), image); @@ -619,15 +665,47 @@ file_export_dialog_show (Gimp *gimp, if (dialog) { gimp_file_dialog_set_save_image (GIMP_FILE_DIALOG (dialog), - gimp, - image, - FALSE, - TRUE, - FALSE, - NULL); + gimp, image, FALSE, TRUE, + FALSE, NULL); gtk_window_present (GTK_WINDOW (dialog)); } + + return dialog; +} + +static void +file_export_dialog_response (GtkWidget *dialog, + gint response_id, + gpointer data) +{ + if (response_id == FILE_SAVE_RESPONSE_OTHER_DIALOG) + { + GimpFileDialog *file_dialog = GIMP_FILE_DIALOG (dialog); + GtkWindow *parent; + GtkWidget *other; + gchar *folder; + gchar *uri; + gchar *name; + + parent = gtk_window_get_transient_for (GTK_WINDOW (dialog)); + folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog)); + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + name = file_utils_uri_display_basename (uri); + g_free (uri); + + other = file_save_dialog_show (file_dialog->image->gimp, + file_dialog->image, + GTK_WIDGET (parent), + _("Save Image"), + FALSE, FALSE, NULL); + + gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (other), folder); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), name); + + g_free (folder); + g_free (name); + } } static void diff --git a/app/actions/image-commands.c b/app/actions/image-commands.c index 2526b1e790..3b45ac8324 100644 --- a/app/actions/image-commands.c +++ b/app/actions/image-commands.c @@ -487,9 +487,20 @@ image_flatten_image_cmd_callback (GtkAction *action, gpointer data) { GimpImage *image; + GtkWidget *widget; + GError *error = NULL; return_if_no_image (image, data); + return_if_no_widget (widget, data); + + if (! gimp_image_flatten (image, action_data_get_context (data), &error)) + { + gimp_message_literal (image->gimp, + G_OBJECT (widget), GIMP_MESSAGE_WARNING, + error->message); + g_clear_error (&error); + return; + } - gimp_image_flatten (image, action_data_get_context (data)); gimp_image_flush (image); } diff --git a/app/actions/view-commands.c b/app/actions/view-commands.c index ccbc3bda4f..bc8791f851 100644 --- a/app/actions/view-commands.c +++ b/app/actions/view-commands.c @@ -100,15 +100,13 @@ view_close_cmd_callback (GtkAction *action, GimpDisplay *display; GimpDisplayShell *shell; GimpImage *image; - return_if_no_display (display, data); - shell = gimp_display_get_shell(display); + + shell = gimp_display_get_shell (display); image = gimp_display_get_image (display); - /* Check for active image so we don't close the last display. */ - if (! GIMP_IS_IMAGE (image) || ! gimp_image_get_active_drawable (image)) - return; - if (shell) + /* Check for the image so we don't close the last display. */ + if (image) gimp_display_shell_close (shell, FALSE); } diff --git a/app/app.c b/app/app.c index e6b74078ad..dbbc1b3b07 100644 --- a/app/app.c +++ b/app/app.c @@ -72,12 +72,12 @@ /* local prototypes */ -static void app_init_update_noop (const gchar *text1, - const gchar *text2, - gdouble percentage); -static gboolean app_exit_after_callback (Gimp *gimp, - gboolean kill_it, - GMainLoop *loop); +static void app_init_update_noop (const gchar *text1, + const gchar *text2, + gdouble percentage); +static gboolean app_exit_after_callback (Gimp *gimp, + gboolean kill_it, + GMainLoop **loop); /* public functions */ @@ -149,6 +149,7 @@ app_run (const gchar *full_prog_name, Gimp *gimp; GimpBaseConfig *config; GMainLoop *loop; + GMainLoop *run_loop; gboolean swap_is_ok; /* Create an instance of the "Gimp" object which is the root of the @@ -234,6 +235,12 @@ app_run (const gchar *full_prog_name, */ gimp_rc_set_autosave (GIMP_RC (gimp->edit_config), TRUE); + loop = run_loop = g_main_loop_new (NULL, FALSE); + + g_signal_connect_after (gimp, "exit", + G_CALLBACK (app_exit_after_callback), + &run_loop); + /* Load the images given on the command-line. */ if (filenames) @@ -241,20 +248,21 @@ app_run (const gchar *full_prog_name, gint i; for (i = 0; filenames[i] != NULL; i++) - file_open_from_command_line (gimp, filenames[i], as_new); + { + if (run_loop) + file_open_from_command_line (gimp, filenames[i], as_new); + } } - batch_run (gimp, batch_interpreter, batch_commands); + if (run_loop) + batch_run (gimp, batch_interpreter, batch_commands); - loop = g_main_loop_new (NULL, FALSE); - - g_signal_connect_after (gimp, "exit", - G_CALLBACK (app_exit_after_callback), - loop); - - gimp_threads_leave (gimp); - g_main_loop_run (loop); - gimp_threads_enter (gimp); + if (run_loop) + { + gimp_threads_leave (gimp); + g_main_loop_run (loop); + gimp_threads_enter (gimp); + } g_main_loop_unref (loop); @@ -279,9 +287,9 @@ app_init_update_noop (const gchar *text1, } static gboolean -app_exit_after_callback (Gimp *gimp, - gboolean kill_it, - GMainLoop *loop) +app_exit_after_callback (Gimp *gimp, + gboolean kill_it, + GMainLoop **loop) { if (gimp->be_verbose) g_print ("EXIT: %s\n", G_STRFUNC); @@ -297,7 +305,10 @@ app_exit_after_callback (Gimp *gimp, #ifdef GIMP_UNSTABLE - g_main_loop_quit (loop); + if (g_main_loop_is_running (*loop)) + g_main_loop_quit (*loop); + + *loop = NULL; #else diff --git a/app/base/Makefile.in b/app/base/Makefile.in index 0a4ec3f207..d1d1ee10cc 100644 --- a/app/base/Makefile.in +++ b/app/base/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -312,6 +312,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -338,6 +340,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -671,14 +677,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/base/base-utils.c b/app/base/base-utils.c index 757f58d63f..44a9e896ff 100644 --- a/app/base/base-utils.c +++ b/app/base/base-utils.c @@ -29,7 +29,7 @@ #include #endif -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H) /* For get_backtrace() */ #include #include @@ -112,7 +112,7 @@ get_physical_memory_size (void) char * get_backtrace (void) { -#ifdef G_OS_UNIX +#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H) void *functions[MAX_FUNC]; char **function_names; int n_functions; diff --git a/app/composite/Makefile.in b/app/composite/Makefile.in index 21ee8ba1fd..34ff82035e 100644 --- a/app/composite/Makefile.in +++ b/app/composite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -611,6 +611,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -637,6 +639,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1107,14 +1113,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/config/Makefile.in b/app/config/Makefile.in index ac32f9dc2e..e7d00c1b6f 100644 --- a/app/config/Makefile.in +++ b/app/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -522,6 +522,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -548,6 +550,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -905,14 +911,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/core/Makefile.in b/app/core/Makefile.in index c9bd9d6154..c3a7b22a34 100644 --- a/app/core/Makefile.in +++ b/app/core/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -400,6 +400,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -426,6 +428,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1242,14 +1248,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c index 830d17a2aa..e7c353b0fe 100644 --- a/app/core/gimpbrush-load.c +++ b/app/core/gimpbrush-load.c @@ -343,6 +343,23 @@ gimp_brush_load_brush (GimpContext *context, } break; + case 3: + /* The obsolete .gbp format had a 3-byte pattern following a + * 1-byte brush, when embedded in a brush pipe, the current code + * tries to load that pattern as a brush, and encounters the '3' + * in the header. + */ + g_object_unref (brush); + g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, + _("Fatal parse error in brush file '%s': " + "Unsupported brush depth %d\n" + "GIMP brushes must be GRAY or RGBA.\n" + "This might be an obsolete GIMP brush file, try " + "loading it as image and save it again."), + gimp_filename_to_utf8 (filename), header.bytes); + return NULL; + break; + case 4: { guchar buf[8 * 1024]; diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c index 56a3b6d7a2..0607b1d2ac 100644 --- a/app/core/gimpbrushpipe-load.c +++ b/app/core/gimpbrushpipe-load.c @@ -210,8 +210,11 @@ gimp_brush_pipe_load (GimpContext *context, while (pipe->n_brushes < num_of_brushes) { + GError *my_error = NULL; + pipe->brushes[pipe->n_brushes] = gimp_brush_load_brush (context, - fd, filename, NULL); + fd, filename, + &my_error); if (pipe->brushes[pipe->n_brushes]) { @@ -220,10 +223,7 @@ gimp_brush_pipe_load (GimpContext *context, } else { - g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, - _("Fatal parse error in brush file '%s': " - "File is corrupt."), - gimp_filename_to_utf8 (filename)); + g_propagate_error (error, my_error); close (fd); g_object_unref (pipe); return NULL; diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c index 47d13084b1..711d38f4b2 100644 --- a/app/core/gimpdata.c +++ b/app/core/gimpdata.c @@ -531,11 +531,20 @@ gimp_data_save (GimpData *data, if (success) { - struct stat filestat; + GFile *file = g_file_new_for_path (private->filename); + GFileInfo *info = g_file_query_info (file, "time::*", + G_FILE_QUERY_INFO_NONE, + NULL, NULL); + if (info) + { + private->mtime = + g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_MODIFIED); + g_object_unref (info); + } - g_stat (private->filename, &filestat); + g_object_unref (file); - private->mtime = filestat.st_mtime; private->dirty = FALSE; } diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c index ab341b3785..97fc7a4e5f 100644 --- a/app/core/gimpdrawable.c +++ b/app/core/gimpdrawable.c @@ -546,35 +546,37 @@ gimp_drawable_resize (GimpItem *item, gint new_offset_y; gint copy_x, copy_y; gint copy_width, copy_height; + gboolean intersect; /* if the size doesn't change, this is a nop */ if (new_width == gimp_item_get_width (item) && new_height == gimp_item_get_height (item) && - offset_x == 0 && + offset_x == 0 && offset_y == 0) return; new_offset_x = gimp_item_get_offset_x (item) - offset_x; new_offset_y = gimp_item_get_offset_y (item) - offset_y; - gimp_rectangle_intersect (gimp_item_get_offset_x (item), - gimp_item_get_offset_y (item), - gimp_item_get_width (item), - gimp_item_get_height (item), - new_offset_x, - new_offset_y, - new_width, - new_height, - ©_x, - ©_y, - ©_width, - ©_height); + intersect = gimp_rectangle_intersect (gimp_item_get_offset_x (item), + gimp_item_get_offset_y (item), + gimp_item_get_width (item), + gimp_item_get_height (item), + new_offset_x, + new_offset_y, + new_width, + new_height, + ©_x, + ©_y, + ©_width, + ©_height); new_tiles = tile_manager_new (new_width, new_height, gimp_drawable_bytes (drawable)); /* Determine whether the new tiles need to be initially cleared */ - if (copy_width != new_width || + if (! intersect || + copy_width != new_width || copy_height != new_height) { guchar bg[MAX_CHANNELS] = { 0, }; @@ -592,7 +594,7 @@ gimp_drawable_resize (GimpItem *item, } /* Determine whether anything needs to be copied */ - if (copy_width && copy_height) + if (intersect && copy_width && copy_height) { pixel_region_init (&srcPR, gimp_drawable_get_tiles (drawable), diff --git a/app/core/gimpidtable.c b/app/core/gimpidtable.c index be5bc5b36a..afa1d6f2a6 100644 --- a/app/core/gimpidtable.c +++ b/app/core/gimpidtable.c @@ -127,15 +127,27 @@ gint gimp_id_table_insert (GimpIdTable *id_table, gpointer data) { gint new_id; + gint start_id; g_return_val_if_fail (GIMP_IS_ID_TABLE (id_table), 0); + start_id = id_table->priv->next_id; + do { new_id = id_table->priv->next_id++; if (id_table->priv->next_id == GIMP_ID_TABLE_END_ID) id_table->priv->next_id = GIMP_ID_TABLE_START_ID; + + if (start_id == id_table->priv->next_id) + { + /* We looped once over all used ids. Very unlikely to happen. + And if it does, there is probably not much to be done. + It is just good design not to allow a theoretical infinite loop. */ + g_error ("%s: out of ids!", G_STRFUNC); + break; + } } while (gimp_id_table_lookup (id_table, new_id)); diff --git a/app/core/gimpimage-colormap.c b/app/core/gimpimage-colormap.c index 0a0e7e55a6..e2e0ea8042 100644 --- a/app/core/gimpimage-colormap.c +++ b/app/core/gimpimage-colormap.c @@ -40,8 +40,8 @@ /* local function prototype */ -void gimp_image_colormap_set_palette_entry (GimpImage *image, - gint index); +static void gimp_image_colormap_set_palette_entry (GimpImage *image, + gint index); /* public functions */ @@ -173,11 +173,6 @@ gimp_image_set_colormap (GimpImage *image, memcpy (private->colormap, colormap, n_colors * 3); } - else if (private->colormap) - { - gimp_image_colormap_dispose (image); - gimp_image_colormap_free (image); - } private->n_colors = n_colors; @@ -200,6 +195,31 @@ gimp_image_set_colormap (GimpImage *image, gimp_image_colormap_changed (image, -1); } +void +gimp_image_unset_colormap (GimpImage *image, + gboolean push_undo) +{ + GimpImagePrivate *private; + + g_return_if_fail (GIMP_IS_IMAGE (image)); + + private = GIMP_IMAGE_GET_PRIVATE (image); + + if (push_undo) + gimp_image_undo_push_image_colormap (image, + C_("undo-type", "Unset Colormap")); + + if (private->colormap) + { + gimp_image_colormap_dispose (image); + gimp_image_colormap_free (image); + } + + private->n_colors = 0; + + gimp_image_colormap_changed (image, -1); +} + void gimp_image_get_colormap_entry (GimpImage *image, gint color_index, @@ -286,7 +306,7 @@ gimp_image_add_colormap_entry (GimpImage *image, /* private functions */ -void +static void gimp_image_colormap_set_palette_entry (GimpImage *image, gint index) { diff --git a/app/core/gimpimage-colormap.h b/app/core/gimpimage-colormap.h index 54be91eac7..5fc97be4ba 100644 --- a/app/core/gimpimage-colormap.h +++ b/app/core/gimpimage-colormap.h @@ -34,6 +34,8 @@ void gimp_image_set_colormap (GimpImage *image, const guchar *colormap, gint n_colors, gboolean push_undo); +void gimp_image_unset_colormap (GimpImage *image, + gboolean push_undo); void gimp_image_get_colormap_entry (GimpImage *image, gint color_index, diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c index 85b27905b5..b45cd2173e 100644 --- a/app/core/gimpimage-convert.c +++ b/app/core/gimpimage-convert.c @@ -1002,7 +1002,7 @@ gimp_image_convert (GimpImage *image, case GIMP_RGB: case GIMP_GRAY: if (old_type == GIMP_INDEXED) - gimp_image_set_colormap (image, NULL, 0, TRUE); + gimp_image_unset_colormap (image, TRUE); break; case GIMP_INDEXED: diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index 28eed3a54e..effde79985 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -161,8 +161,9 @@ gimp_image_merge_visible_layers (GimpImage *image, } GimpLayer * -gimp_image_flatten (GimpImage *image, - GimpContext *context) +gimp_image_flatten (GimpImage *image, + GimpContext *context, + GError **error) { GList *list; GSList *merge_list = NULL; @@ -170,16 +171,7 @@ gimp_image_flatten (GimpImage *image, g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL); - - gimp_set_busy (image->gimp); - - gimp_image_undo_group_start (image, - GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, - C_("undo-type", "Flatten Image")); - - /* if there's a floating selection, anchor it */ - if (gimp_image_get_floating_selection (image)) - floating_sel_anchor (gimp_image_get_floating_selection (image)); + g_return_val_if_fail (error == NULL || *error == NULL, NULL); for (list = gimp_image_get_layer_iter (image); list; @@ -187,23 +179,43 @@ gimp_image_flatten (GimpImage *image, { layer = list->data; + if (gimp_layer_is_floating_sel (layer)) + continue; + if (gimp_item_get_visible (GIMP_ITEM (layer))) merge_list = g_slist_append (merge_list, layer); } - layer = gimp_image_merge_layers (image, - gimp_image_get_layers (image), - merge_list, context, - GIMP_FLATTEN_IMAGE); - g_slist_free (merge_list); + if (merge_list) + { + gimp_set_busy (image->gimp); - gimp_image_alpha_changed (image); + gimp_image_undo_group_start (image, + GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, + C_("undo-type", "Flatten Image")); - gimp_image_undo_group_end (image); + /* if there's a floating selection, anchor it */ + if (gimp_image_get_floating_selection (image)) + floating_sel_anchor (gimp_image_get_floating_selection (image)); - gimp_unset_busy (image->gimp); + layer = gimp_image_merge_layers (image, + gimp_image_get_layers (image), + merge_list, context, + GIMP_FLATTEN_IMAGE); + g_slist_free (merge_list); - return layer; + gimp_image_alpha_changed (image); + + gimp_image_undo_group_end (image); + + gimp_unset_busy (image->gimp); + + return layer; + } + + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("Cannot flatten an image without any visible layer.")); + return NULL; } GimpLayer * diff --git a/app/core/gimpimage-merge.h b/app/core/gimpimage-merge.h index 35bdce1fdb..f5031ef7da 100644 --- a/app/core/gimpimage-merge.h +++ b/app/core/gimpimage-merge.h @@ -33,7 +33,8 @@ GimpLayer * gimp_image_merge_group_layer (GimpImage *image, GimpGroupLayer *group); GimpLayer * gimp_image_flatten (GimpImage *image, - GimpContext *context); + GimpContext *context, + GError **error); GimpVectors * gimp_image_merge_visible_vectors (GimpImage *image, GError **error); diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c index bab1c65224..dd3d274520 100644 --- a/app/core/gimpimage-scale.c +++ b/app/core/gimpimage-scale.c @@ -26,6 +26,7 @@ #include "gimp.h" #include "gimpcontainer.h" #include "gimpguide.h" +#include "gimpgrouplayer.h" #include "gimpimage.h" #include "gimpimage-guides.h" #include "gimpimage-item-list.h" @@ -155,7 +156,10 @@ gimp_image_scale (GimpImage *image, /* group layers are updated automatically */ if (gimp_viewable_get_children (GIMP_VIEWABLE (item))) - continue; + { + gimp_group_layer_suspend_resize (GIMP_GROUP_LAYER (item), FALSE); + continue; + } if (! gimp_item_scale_by_factors (item, img_scale_w, img_scale_h, @@ -170,6 +174,11 @@ gimp_image_scale (GimpImage *image, } } + for (list = all_layers; list; list = g_list_next (list)) + if (gimp_viewable_get_children (list->data)) + gimp_group_layer_resume_resize (list->data, FALSE); + + /* Scale all Guides */ for (list = gimp_image_get_guides (image); list; diff --git a/app/core/gimpimageundo.c b/app/core/gimpimageundo.c index f67a59f5b0..99d1d40b0c 100644 --- a/app/core/gimpimageundo.c +++ b/app/core/gimpimageundo.c @@ -415,9 +415,12 @@ gimp_image_undo_pop (GimpUndo *undo, colormap = g_memdup (gimp_image_get_colormap (image), GIMP_IMAGE_COLORMAP_SIZE); - gimp_image_set_colormap (image, - image_undo->colormap, image_undo->num_colors, - FALSE); + if (image_undo->colormap) + gimp_image_set_colormap (image, + image_undo->colormap, image_undo->num_colors, + FALSE); + else + gimp_image_unset_colormap (image, FALSE); if (image_undo->colormap) g_free (image_undo->colormap); diff --git a/app/dialogs/Makefile.in b/app/dialogs/Makefile.in index ca8a9741dd..0cc38c57ac 100644 --- a/app/dialogs/Makefile.in +++ b/app/dialogs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -323,6 +323,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -349,6 +351,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -710,14 +716,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/dialogs/authors.h b/app/dialogs/authors.h index b97389adf9..f30c01d492 100644 --- a/app/dialogs/authors.h +++ b/app/dialogs/authors.h @@ -45,6 +45,7 @@ static const gchar * const authors[] = "Eric Grivel", "Stephen Griffiths", "Tim Harder", + "Michael Henning", "Lukasz Hladowski", "Patrick Horgan", "Daniel Hornung", @@ -53,6 +54,7 @@ static const gchar * const authors[] = "Barak Itkin", "Javier Jardón", "Tim Jedlicka", + "Jehan", "Róman Joost", "Alexander Jones", "Aurimas Juška", @@ -68,6 +70,7 @@ static const gchar * const authors[] = "Mikael Magnusson", "Luidnel Maignan", "Takeshi Matsuyama", + "Téo Mazars", "Mike Melancon", "Christopher Montgomery", "Tobias Mueller", @@ -89,6 +92,7 @@ static const gchar * const authors[] = "Gilles Rochefort", "Marco Rossini", "Karthikeyan S", + "Daniel Sabo", "Enrico Schröder", "Michael Schumacher", "Peter Sikking", diff --git a/app/dialogs/file-save-dialog.c b/app/dialogs/file-save-dialog.c index 762b00b5b9..8b0873f72e 100644 --- a/app/dialogs/file-save-dialog.c +++ b/app/dialogs/file-save-dialog.c @@ -54,6 +54,14 @@ #include "gimp-intl.h" +typedef enum +{ + CHECK_URI_FAIL, + CHECK_URI_OK, + CHECK_URI_SWITCH_DIALOGS +} CheckUriResult; + + /* local function prototypes */ static GtkFileChooserConfirmation @@ -62,7 +70,7 @@ static GtkFileChooserConfirmation static void file_save_dialog_response (GtkWidget *save_dialog, gint response_id, Gimp *gimp); -static gboolean file_save_dialog_check_uri (GtkWidget *save_dialog, +static CheckUriResult file_save_dialog_check_uri (GtkWidget *save_dialog, Gimp *gimp, gchar **ret_uri, gchar **ret_basename, @@ -72,7 +80,7 @@ static gboolean file_save_dialog_no_overwrite_confirmation (GimpFileDialog static gchar * file_save_dialog_get_uri (GimpFileDialog *dialog); static GSList * file_save_dialog_get_procs (GimpFileDialog *dialog, Gimp *gimp); -static void file_save_dialog_unknown_ext_msg (GimpFileDialog *dialog, +static gboolean file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog, Gimp *gimp, const gchar *basename); static gboolean file_save_dialog_use_extension (GtkWidget *save_dialog, @@ -179,9 +187,13 @@ file_save_dialog_response (GtkWidget *save_dialog, G_CALLBACK (gtk_widget_destroyed), &dialog); - if (file_save_dialog_check_uri (save_dialog, gimp, - &uri, &basename, &save_proc)) + switch (file_save_dialog_check_uri (save_dialog, gimp, + &uri, &basename, &save_proc)) { + case CHECK_URI_FAIL: + break; + + case CHECK_URI_OK: gimp_file_dialog_set_sensitive (dialog, FALSE); if (file_save_dialog_save_image (GIMP_PROGRESS (save_dialog), @@ -219,8 +231,12 @@ file_save_dialog_response (GtkWidget *save_dialog, if (dialog->close_after_saving && dialog->display_to_close) { GimpDisplay *display = GIMP_DISPLAY (dialog->display_to_close); - if (display && ! gimp_image_is_dirty (gimp_display_get_image (display))) - gimp_display_close (display); + + if (display && + ! gimp_image_is_dirty (gimp_display_get_image (display))) + { + gimp_display_close (display); + } } gtk_widget_destroy (save_dialog); @@ -231,19 +247,28 @@ file_save_dialog_response (GtkWidget *save_dialog, if (dialog) gimp_file_dialog_set_sensitive (dialog, TRUE); + + break; + + case CHECK_URI_SWITCH_DIALOGS: + dialog->busy = TRUE; /* prevent destruction */ + gtk_dialog_response (GTK_DIALOG (dialog), FILE_SAVE_RESPONSE_OTHER_DIALOG); + dialog->busy = FALSE; + + gtk_widget_destroy (save_dialog); + break; } if (dialog) g_signal_handler_disconnect (dialog, handler_id); } -/* - * IMPORTANT: When changing this function, keep - * file_save_dialog_no_overwrite_confirmation() up to date. It is difficult to - * move logic to a common place due to how the dialog is implemented - * in GTK+ in combination with how we use it. +/* IMPORTANT: When changing this function, keep + * file_save_dialog_no_overwrite_confirmation() up to date. It is + * difficult to move logic to a common place due to how the dialog is + * implemented in GTK+ in combination with how we use it. */ -static gboolean +static CheckUriResult file_save_dialog_check_uri (GtkWidget *save_dialog, Gimp *gimp, gchar **ret_uri, @@ -260,7 +285,7 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, uri = file_save_dialog_get_uri (dialog); if (! uri) - return FALSE; + return CHECK_URI_FAIL; basename = file_utils_uri_display_basename (uri); @@ -331,7 +356,7 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, g_free (basename); - return FALSE; + return CHECK_URI_FAIL; } else { @@ -352,11 +377,18 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, GIMP_LOG (SAVE_DIALOG, "unable to figure save_proc, bailing out"); - file_save_dialog_unknown_ext_msg (dialog, gimp, basename); + if (file_save_dialog_switch_dialogs (dialog, gimp, basename)) + { + g_free (uri); + g_free (basename); + + return CHECK_URI_SWITCH_DIALOGS; + } g_free (uri); g_free (basename); - return FALSE; + + return CHECK_URI_FAIL; } } else if (save_proc && ! save_proc->extensions_list) @@ -385,11 +417,18 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, GIMP_LOG (SAVE_DIALOG, "basename has no useful extension, bailing out"); - file_save_dialog_unknown_ext_msg (dialog, gimp, basename); + if (file_save_dialog_switch_dialogs (dialog, gimp, basename)) + { + g_free (uri); + g_free (basename); + + return CHECK_URI_SWITCH_DIALOGS; + } g_free (uri); g_free (basename); - return FALSE; + + return CHECK_URI_FAIL; } GIMP_LOG (SAVE_DIALOG, "use URI's proc '%s' so indirect saving works", @@ -423,7 +462,8 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, "extension at all.")); g_free (uri); g_free (basename); - return FALSE; + + return CHECK_URI_FAIL; } else { @@ -436,7 +476,8 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, { g_free (uri); g_free (basename); - return FALSE; + + return CHECK_URI_FAIL; } } } @@ -456,14 +497,15 @@ file_save_dialog_check_uri (GtkWidget *save_dialog, if (! save_proc) { g_warning ("%s: EEEEEEK", G_STRFUNC); - return FALSE; + + return CHECK_URI_FAIL; } *ret_uri = uri; *ret_basename = basename; *ret_save_proc = save_proc; - return TRUE; + return CHECK_URI_OK; } /* @@ -526,41 +568,120 @@ file_save_dialog_get_procs (GimpFileDialog *dialog, gimp->plug_in_manager->export_procs); } -static void -file_save_dialog_unknown_ext_msg (GimpFileDialog *dialog, - Gimp *gimp, - const gchar *basename) +static gboolean +file_save_other_dialog_activated (GtkWidget *label, + const gchar *uri, + GtkDialog *dialog) +{ + gtk_dialog_response (dialog, FILE_SAVE_RESPONSE_OTHER_DIALOG); + + return TRUE; +} + +static gboolean +file_save_dialog_switch_dialogs (GimpFileDialog *file_dialog, + Gimp *gimp, + const gchar *basename) { GimpPlugInProcedure *proc_in_other_group; + gboolean switch_dialogs = FALSE; proc_in_other_group = - file_procedure_find ((dialog->export ? - gimp->plug_in_manager->save_procs : - gimp->plug_in_manager->export_procs), + file_procedure_find (file_dialog->export ? + gimp->plug_in_manager->save_procs : + gimp->plug_in_manager->export_procs, basename, NULL); - if (dialog->export && proc_in_other_group) + if (proc_in_other_group) { - gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_WARNING, - _("You can use this dialog to export to various file formats. " + GtkWidget *dialog; + const gchar *primary; + const gchar *message; + const gchar *link; + + if (file_dialog->export) + { + primary = _("The given filename cannot be used for exporting"); + message = _("You can use this dialog to export to various file formats. " "If you want to save the image to the GIMP XCF format, use " - "File→Save instead.")); - } - else if (! dialog->export && proc_in_other_group) - { - gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_WARNING, - _("You can use this dialog to save to the GIMP XCF " - "format. Use File→Export to export to other file formats.")); + "File→Save instead."); + link = _("Take me to the Save dialog"); + } + else + { + primary = _("The given filename cannot be used for saving"); + message = _("You can use this dialog to save to the GIMP XCF " + "format. Use File→Export to export to other file formats."); + link = _("Take me to the Export dialog"); + } + + dialog = gimp_message_dialog_new (_("Extension Mismatch"), + GIMP_STOCK_WARNING, + GTK_WIDGET (file_dialog), + GTK_DIALOG_DESTROY_WITH_PARENT, + gimp_standard_help_func, NULL, + + GTK_STOCK_OK, GTK_RESPONSE_OK, + + NULL); + + gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, + "%s", primary); + + gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, + "%s", message); + + if (! file_dialog->save_a_copy && ! file_dialog->close_after_saving) + { + GtkWidget *label; + gchar *markup; + + markup = g_strdup_printf ("%s", link); + label = gtk_label_new (markup); + g_free (markup); + + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_box_pack_start (GTK_BOX (GIMP_MESSAGE_DIALOG (dialog)->box), label, + FALSE, FALSE, 0); + gtk_widget_show (label); + + g_signal_connect (label, "activate-link", + G_CALLBACK (file_save_other_dialog_activated), + dialog); + } + + gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog), + GTK_RESPONSE_CANCEL, FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog), + GTK_RESPONSE_OK, FALSE); + + g_object_ref (dialog); + + if (gimp_dialog_run (GIMP_DIALOG (dialog)) == FILE_SAVE_RESPONSE_OTHER_DIALOG) + { + switch_dialogs = TRUE; + } + + gtk_widget_destroy (dialog); + g_object_unref (dialog); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog), + GTK_RESPONSE_CANCEL, TRUE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (file_dialog), + GTK_RESPONSE_OK, TRUE); } else { - gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_WARNING, + gimp_message (gimp, G_OBJECT (file_dialog), GIMP_MESSAGE_WARNING, _("The given filename does not have any known " "file extension. Please enter a known file " "extension or select a file format from the " "file format list.")); } + + return switch_dialogs; } static gboolean @@ -595,6 +716,8 @@ file_save_dialog_use_extension (GtkWidget *save_dialog, gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog), GTK_RESPONSE_CANCEL, FALSE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog), + GTK_RESPONSE_OK, FALSE); g_object_ref (dialog); @@ -605,6 +728,8 @@ file_save_dialog_use_extension (GtkWidget *save_dialog, gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog), GTK_RESPONSE_CANCEL, TRUE); + gtk_dialog_set_response_sensitive (GTK_DIALOG (save_dialog), + GTK_RESPONSE_OK, TRUE); return use_name; } diff --git a/app/dialogs/file-save-dialog.h b/app/dialogs/file-save-dialog.h index 70934a0e2d..81d2bb06f2 100644 --- a/app/dialogs/file-save-dialog.h +++ b/app/dialogs/file-save-dialog.h @@ -19,6 +19,9 @@ #define __FILE_SAVE_DIALOG_H__ +#define FILE_SAVE_RESPONSE_OTHER_DIALOG -23 + + GtkWidget * file_save_dialog_new (Gimp *gimp, gboolean export); diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c index 802db10b89..f4b50ee998 100644 --- a/app/dialogs/quit-dialog.c +++ b/app/dialogs/quit-dialog.c @@ -30,35 +30,74 @@ #include "core/gimp.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" +#include "core/gimpimage.h" + +#include "file/file-utils.h" #include "display/gimpdisplay.h" #include "display/gimpdisplay-foreach.h" #include "display/gimpdisplayshell.h" +#include "widgets/gimpcontainertreestore.h" #include "widgets/gimpcontainertreeview.h" #include "widgets/gimpcontainerview.h" #include "widgets/gimpdnd.h" #include "widgets/gimphelp-ids.h" #include "widgets/gimpmessagebox.h" #include "widgets/gimpmessagedialog.h" +#include "widgets/gimpviewrenderer.h" +#include "widgets/gimpwidgets-utils.h" #include "quit-dialog.h" #include "gimp-intl.h" +typedef struct _QuitDialog QuitDialog; + +struct _QuitDialog +{ + Gimp *gimp; + GimpContainer *images; + GimpContext *context; + + gboolean do_quit; + + GtkWidget *dialog; + GtkWidget *ok_button; + GimpMessageBox *box; + GtkWidget *lost_label; + GtkWidget *hint_label; + + guint accel_key; + GdkModifierType accel_mods; +}; + + static GtkWidget * quit_close_all_dialog_new (Gimp *gimp, gboolean do_quit); -static void quit_close_all_dialog_response (GtkWidget *dialog, +static void quit_close_all_dialog_free (QuitDialog *dialog); +static void quit_close_all_dialog_response (GtkWidget *widget, gint response_id, - Gimp *gimp); + QuitDialog *dialog); +static void quit_close_all_dialog_accel_marshal (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); static void quit_close_all_dialog_container_changed (GimpContainer *images, GimpObject *image, - GimpMessageBox *box); + GtkWidget *widget); static void quit_close_all_dialog_image_activated (GimpContainerView *view, GimpImage *image, gpointer insert_data, - Gimp *gimp); + QuitDialog *dialog); +static void quit_close_all_dialog_name_cell_func (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data); /* public functions */ @@ -79,28 +118,29 @@ static GtkWidget * quit_close_all_dialog_new (Gimp *gimp, gboolean do_quit) { - GimpContainer *images; - GimpContext *context; - GimpMessageBox *box; - GtkWidget *dialog; - GtkWidget *label; - GtkWidget *button; - GtkWidget *view; - GtkWidget *dnd_widget; - gint rows; - gint view_size; + QuitDialog *dialog; + GtkWidget *view; + GimpContainerTreeView *tree_view; + GtkCellRenderer *renderer; + GtkWidget *dnd_widget; + GtkAccelGroup *accel_group; + GClosure *closure; + gint rows; + gint view_size; g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); - /* FIXME: need container of dirty images */ + dialog = g_new0 (QuitDialog, 1); - images = gimp_displays_get_dirty_images (gimp); - context = gimp_context_new (gimp, "close-all-dialog", - gimp_get_user_context (gimp)); + dialog->gimp = gimp; + dialog->do_quit = do_quit; + dialog->images = gimp_displays_get_dirty_images (gimp); + dialog->context = gimp_context_new (gimp, "close-all-dialog", + gimp_get_user_context (gimp)); - g_return_val_if_fail (images != NULL, NULL); + g_return_val_if_fail (dialog->images != NULL, NULL); - dialog = + dialog->dialog = gimp_message_dialog_new (do_quit ? _("Quit GIMP") : _("Close All Images"), GIMP_STOCK_WARNING, NULL, 0, @@ -112,47 +152,56 @@ quit_close_all_dialog_new (Gimp *gimp, NULL); - g_object_set_data_full (G_OBJECT (dialog), "dirty-images", - images, (GDestroyNotify) g_object_unref); - g_object_set_data_full (G_OBJECT (dialog), "dirty-images-context", - context, (GDestroyNotify) g_object_unref); + g_object_set_data_full (G_OBJECT (dialog->dialog), "quit-dialog", + dialog, (GDestroyNotify) quit_close_all_dialog_free); - g_signal_connect (dialog, "response", - G_CALLBACK (quit_close_all_dialog_response), - gimp); + dialog->ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog), + "", GTK_RESPONSE_OK); - box = GIMP_MESSAGE_DIALOG (dialog)->box; - - button = gtk_dialog_add_button (GTK_DIALOG (dialog), "", GTK_RESPONSE_OK); - - g_object_set_data (G_OBJECT (box), "ok-button", button); - g_object_set_data (G_OBJECT (box), "do-quit", GINT_TO_POINTER (do_quit)); - - g_signal_connect_object (images, "add", - G_CALLBACK (quit_close_all_dialog_container_changed), - box, 0); - g_signal_connect_object (images, "remove", - G_CALLBACK (quit_close_all_dialog_container_changed), - box, 0); - - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); - view_size = gimp->config->layer_preview_size; - rows = CLAMP (gimp_container_get_n_children (images), 3, 6); + g_signal_connect (dialog->dialog, "response", + G_CALLBACK (quit_close_all_dialog_response), + dialog); - view = gimp_container_tree_view_new (images, context, view_size, 1); + /* connect D to the quit/close button */ + accel_group = gtk_accel_group_new (); + gtk_window_add_accel_group (GTK_WINDOW (dialog->dialog), accel_group); + g_object_unref (accel_group); + + closure = g_closure_new_object (sizeof (GClosure), G_OBJECT (dialog->dialog)); + g_closure_set_marshal (closure, quit_close_all_dialog_accel_marshal); + gtk_accelerator_parse ("D", + &dialog->accel_key, &dialog->accel_mods); + gtk_accel_group_connect (accel_group, + dialog->accel_key, dialog->accel_mods, + 0, closure); + + dialog->box = GIMP_MESSAGE_DIALOG (dialog->dialog)->box; + + view_size = gimp->config->layer_preview_size; + rows = CLAMP (gimp_container_get_n_children (dialog->images), 3, 6); + + view = gimp_container_tree_view_new (dialog->images, dialog->context, + view_size, 1); + tree_view = GIMP_CONTAINER_TREE_VIEW (view); + renderer = gimp_container_tree_view_get_name_cell (tree_view); + gtk_tree_view_column_set_cell_data_func (tree_view->main_column, + renderer, + quit_close_all_dialog_name_cell_func, + NULL, NULL); gimp_container_box_set_size_request (GIMP_CONTAINER_BOX (view), -1, rows * (view_size + 2)); - gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (dialog->box), view, TRUE, TRUE, 0); gtk_widget_show (view); g_signal_connect (view, "activate-item", G_CALLBACK (quit_close_all_dialog_image_activated), - gimp); + dialog); dnd_widget = gimp_container_view_get_dnd_widget (GIMP_CONTAINER_VIEW (view)); gimp_dnd_xds_source_add (dnd_widget, @@ -160,34 +209,55 @@ quit_close_all_dialog_new (Gimp *gimp, NULL); if (do_quit) - label = gtk_label_new (_("If you quit GIMP now, " - "these changes will be lost.")); + dialog->lost_label = gtk_label_new (_("If you quit GIMP now, " + "these changes will be lost.")); else - label = gtk_label_new (_("If you close these images now, " - "changes will be lost.")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); - gtk_widget_show (label); + dialog->lost_label = gtk_label_new (_("If you close these images now, " + "changes will be lost.")); + gtk_misc_set_alignment (GTK_MISC (dialog->lost_label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (dialog->lost_label), TRUE); + gtk_box_pack_start (GTK_BOX (dialog->box), dialog->lost_label, + FALSE, FALSE, 0); + gtk_widget_show (dialog->lost_label); - g_object_set_data (G_OBJECT (box), "lost-label", label); + dialog->hint_label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (dialog->hint_label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (dialog->hint_label), TRUE); + gtk_box_pack_start (GTK_BOX (dialog->box), dialog->hint_label, + FALSE, FALSE, 0); + gtk_widget_show (dialog->hint_label); - quit_close_all_dialog_container_changed (images, NULL, - GIMP_MESSAGE_DIALOG (dialog)->box); + g_signal_connect_object (dialog->images, "add", + G_CALLBACK (quit_close_all_dialog_container_changed), + dialog->dialog, 0); + g_signal_connect_object (dialog->images, "remove", + G_CALLBACK (quit_close_all_dialog_container_changed), + dialog->dialog, 0); - return dialog; + quit_close_all_dialog_container_changed (dialog->images, NULL, + dialog->dialog); + + return dialog->dialog; } static void -quit_close_all_dialog_response (GtkWidget *dialog, - gint response_id, - Gimp *gimp) +quit_close_all_dialog_free (QuitDialog *dialog) { - GimpMessageBox *box = GIMP_MESSAGE_DIALOG (dialog)->box; - gboolean do_quit = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (box), - "do-quit")); + g_object_unref (dialog->images); + g_object_unref (dialog->context); - gtk_widget_destroy (dialog); + g_free (dialog); +} + +static void +quit_close_all_dialog_response (GtkWidget *widget, + gint response_id, + QuitDialog *dialog) +{ + Gimp *gimp = dialog->gimp; + gboolean do_quit = dialog->do_quit; + + gtk_widget_destroy (dialog->dialog); if (response_id == GTK_RESPONSE_OK) { @@ -198,18 +268,35 @@ quit_close_all_dialog_response (GtkWidget *dialog, } } +static void +quit_close_all_dialog_accel_marshal (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + gtk_dialog_response (GTK_DIALOG (closure->data), GTK_RESPONSE_OK); + + /* we handled the accelerator */ + g_value_set_boolean (return_value, TRUE); +} + static void quit_close_all_dialog_container_changed (GimpContainer *images, GimpObject *image, - GimpMessageBox *box) + GtkWidget *widget) { - gint num_images = gimp_container_get_n_children (images); - GtkWidget *label = g_object_get_data (G_OBJECT (box), "lost-label"); - GtkWidget *button = g_object_get_data (G_OBJECT (box), "ok-button"); - GtkWidget *dialog = gtk_widget_get_toplevel (button); - gboolean do_quit = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (box), - "do-quit")); - gimp_message_box_set_primary_text (box, + QuitDialog *dialog = g_object_get_data (G_OBJECT (widget), "quit-dialog"); + gint num_images = gimp_container_get_n_children (images); + gchar *accel_string; + gchar *hint; + gchar *markup; + + accel_string = gtk_accelerator_get_label (dialog->accel_key, + dialog->accel_mods); + + gimp_message_box_set_primary_text (dialog->box, ngettext ("There is one image with " "unsaved changes:", "There are %d images with " @@ -218,38 +305,66 @@ quit_close_all_dialog_container_changed (GimpContainer *images, if (num_images == 0) { - gtk_widget_hide (label); - g_object_set (button, - "label", do_quit ? GTK_STOCK_QUIT : GTK_STOCK_CLOSE, + gtk_widget_hide (dialog->lost_label); + + if (dialog->do_quit) + hint = g_strdup_printf (_("Press %s to quit."), + accel_string); + else + hint = g_strdup_printf (_("Press %s to close all images."), + accel_string); + + g_object_set (dialog->ok_button, + "label", dialog->do_quit ? GTK_STOCK_QUIT : GTK_STOCK_CLOSE, "use-stock", TRUE, "image", NULL, NULL); - gtk_widget_grab_default (button); + + gtk_widget_grab_default (dialog->ok_button); } else { - GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_DELETE, - GTK_ICON_SIZE_BUTTON); - gtk_widget_show (label); - g_object_set (button, + GtkWidget *icon; + + if (dialog->do_quit) + hint = g_strdup_printf (_("Press %s to discard all changes and quit."), + accel_string); + else + hint = g_strdup_printf (_("Press %s to discard all changes and close all images."), + accel_string); + + gtk_widget_show (dialog->lost_label); + + icon = gtk_image_new_from_stock (GTK_STOCK_DELETE, + GTK_ICON_SIZE_BUTTON); + g_object_set (dialog->ok_button, "label", _("_Discard Changes"), "use-stock", FALSE, "image", icon, NULL); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), + + gtk_dialog_set_default_response (GTK_DIALOG (dialog->dialog), GTK_RESPONSE_CANCEL); } + + markup = g_strdup_printf ("%s", hint); + + gtk_label_set_markup (GTK_LABEL (dialog->hint_label), markup); + + g_free (markup); + g_free (hint); + g_free (accel_string); } static void quit_close_all_dialog_image_activated (GimpContainerView *view, GimpImage *image, gpointer insert_data, - Gimp *gimp) + QuitDialog *dialog) { GList *list; - for (list = gimp_get_display_iter (gimp); + for (list = gimp_get_display_iter (dialog->gimp); list; list = g_list_next (list)) { @@ -259,3 +374,67 @@ quit_close_all_dialog_image_activated (GimpContainerView *view, gimp_display_shell_present (gimp_display_get_shell (display)); } } + +static void +quit_close_all_dialog_name_cell_func (GtkTreeViewColumn *tree_column, + GtkCellRenderer *cell, + GtkTreeModel *tree_model, + GtkTreeIter *iter, + gpointer data) +{ + GimpViewRenderer *renderer; + GimpImage *image; + gchar *name; + + gtk_tree_model_get (tree_model, iter, + GIMP_CONTAINER_TREE_STORE_COLUMN_RENDERER, &renderer, + GIMP_CONTAINER_TREE_STORE_COLUMN_NAME, &name, + -1); + + image = GIMP_IMAGE (renderer->viewable); + + if (gimp_image_is_export_dirty (image)) + { + g_object_set (cell, + "markup", NULL, + "text", name, + NULL); + } + else + { + const gchar *uri; + gchar *filename; + gchar *escaped_name; + gchar *escaped_filename; + gchar *exported; + gchar *markup; + + uri = gimp_image_get_exported_uri (image); + if (! uri) + uri = gimp_image_get_imported_uri (image); + + filename = file_utils_uri_to_utf8_filename (uri); + + escaped_name = g_markup_escape_text (name, -1); + escaped_filename = g_markup_escape_text (filename, -1); + + g_free (filename); + + exported = g_strdup_printf (_("Exported to %s"), escaped_filename); + markup = g_strdup_printf ("%s\n%s", escaped_name, exported); + g_free (exported); + + g_free (escaped_name); + g_free (escaped_filename); + + g_object_set (cell, + "text", NULL, + "markup", markup, + NULL); + + g_free (markup); + } + + g_object_unref (renderer); + g_free (name); +} diff --git a/app/display/Makefile.in b/app/display/Makefile.in index b8bd8e258f..621c9a2f65 100644 --- a/app/display/Makefile.in +++ b/app/display/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -348,6 +348,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -374,6 +376,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -820,14 +826,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/display/gimpcanvaspassepartout.c b/app/display/gimpcanvaspassepartout.c index 7bb653dd88..3d4dc1c442 100644 --- a/app/display/gimpcanvaspassepartout.c +++ b/app/display/gimpcanvaspassepartout.c @@ -97,7 +97,7 @@ gimp_canvas_passe_partout_get_extents (GimpCanvasItem *item, inner = GIMP_CANVAS_ITEM_CLASS (parent_class)->get_extents (item, shell); - cairo_region_subtract (outer, inner); + cairo_region_xor (outer, inner); return outer; } diff --git a/app/display/gimpdisplayshell-close.c b/app/display/gimpdisplayshell-close.c index b201117d2c..6857e50875 100644 --- a/app/display/gimpdisplayshell-close.c +++ b/app/display/gimpdisplayshell-close.c @@ -39,6 +39,7 @@ #include "widgets/gimpmessagebox.h" #include "widgets/gimpmessagedialog.h" #include "widgets/gimpuimanager.h" +#include "widgets/gimpwidgets-utils.h" #include "gimpdisplay.h" #include "gimpdisplayshell.h" @@ -61,9 +62,15 @@ static gboolean gimp_display_shell_close_time_changed (GimpMessageBox *box); static void gimp_display_shell_close_response (GtkWidget *widget, gboolean close, GimpDisplayShell *shell); -static void gimp_time_since (guint then, - gint *hours, - gint *minutes); +static void gimp_display_shell_close_accel_marshal(GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); +static void gimp_time_since (guint then, + gint *hours, + gint *minutes); /* public functions */ @@ -138,12 +145,19 @@ static void gimp_display_shell_close_dialog (GimpDisplayShell *shell, GimpImage *image) { - GtkWidget *dialog; - GimpMessageBox *box; - GClosure *closure; - GSource *source; - gchar *title; - const gchar *uri; + GtkWidget *dialog; + GimpMessageBox *box; + GtkWidget *label; + GtkAccelGroup *accel_group; + GClosure *closure; + GSource *source; + guint accel_key; + GdkModifierType accel_mods; + gchar *title; + gchar *accel_string; + gchar *hint; + gchar *markup; + const gchar *uri; if (shell->close_dialog) { @@ -164,11 +178,11 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, g_free (title); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - _("Close _without Saving"), GTK_RESPONSE_CLOSE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Discard Changes"), GTK_RESPONSE_CLOSE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, (uri ? GTK_STOCK_SAVE : - GTK_STOCK_SAVE_AS), RESPONSE_SAVE, + GTK_STOCK_SAVE_AS), RESPONSE_SAVE, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); @@ -187,8 +201,35 @@ gimp_display_shell_close_dialog (GimpDisplayShell *shell, G_CALLBACK (gimp_display_shell_close_response), shell); + /* connect D to the quit/close button */ + accel_group = gtk_accel_group_new (); + gtk_window_add_accel_group (GTK_WINDOW (shell->close_dialog), accel_group); + g_object_unref (accel_group); + + closure = g_closure_new_object (sizeof (GClosure), + G_OBJECT (shell->close_dialog)); + g_closure_set_marshal (closure, gimp_display_shell_close_accel_marshal); + gtk_accelerator_parse ("D", &accel_key, &accel_mods); + gtk_accel_group_connect (accel_group, accel_key, accel_mods, 0, closure); + box = GIMP_MESSAGE_DIALOG (dialog)->box; + accel_string = gtk_accelerator_get_label (accel_key, accel_mods); + hint = g_strdup_printf (_("Press %s to discard all changes and close the image."), + accel_string); + markup = g_strdup_printf ("%s", hint); + + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + gtk_label_set_markup (GTK_LABEL (label), markup); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); + gtk_widget_show (label); + + g_free (markup); + g_free (hint); + g_free (accel_string); + g_signal_connect_object (image, "name-changed", G_CALLBACK (gimp_display_shell_close_name_changed), box, 0); @@ -302,14 +343,19 @@ gimp_display_shell_close_time_changed (GimpMessageBox *box) if (! gimp_image_is_export_dirty (image)) { - const gchar *exported_uri = gimp_image_get_exported_uri (image); + const gchar *uri; + gchar *filename; - if (! exported_uri) - exported_uri = gimp_image_get_imported_uri (image); + uri = gimp_image_get_exported_uri (image); + if (! uri) + uri = gimp_image_get_imported_uri (image); - export_text = - g_strdup_printf (_("The image has been exported to '%s'."), - exported_uri); + filename = file_utils_uri_to_utf8_filename (uri); + + export_text = g_strdup_printf (_("The image has been exported to '%s'."), + filename); + + g_free (filename); } if (time_text && export_text) @@ -359,6 +405,20 @@ gimp_display_shell_close_response (GtkWidget *widget, } } +static void +gimp_display_shell_close_accel_marshal (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data) +{ + gtk_dialog_response (GTK_DIALOG (closure->data), GTK_RESPONSE_CLOSE); + + /* we handled the accelerator */ + g_value_set_boolean (return_value, TRUE); +} + static void gimp_time_since (guint then, gint *hours, diff --git a/app/display/gimpdisplayshell-render.c b/app/display/gimpdisplayshell-render.c index a8811ec3a4..ac6aaeb098 100644 --- a/app/display/gimpdisplayshell-render.c +++ b/app/display/gimpdisplayshell-render.c @@ -262,7 +262,7 @@ render_image_alpha (RenderInfo *info) for (x = info->x; x < xe; x++, src++, dest++) { - *dest = *src; + *dest = 255 - *src; } if (++y == ye) diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c index 71d89ac8be..89aebc5225 100644 --- a/app/display/gimpimagewindow.c +++ b/app/display/gimpimagewindow.c @@ -113,7 +113,6 @@ struct _GimpImageWindowPrivate typedef struct { - GimpImageWindow *window; gint x; gint y; } PosCorrectionData; @@ -974,7 +973,7 @@ gimp_image_window_new (Gimp *gimp, GTK_WIN_POS_CENTER, NULL); - gimp->image_windows = g_list_prepend (gimp->image_windows, window); + gimp->image_windows = g_list_append (gimp->image_windows, window); return window; } @@ -1460,12 +1459,12 @@ gimp_image_window_get_default_dockbook (GimpImageWindow *window) * gimp_image_window_keep_canvas_pos: * @window: * - * Stores the coordinate of the current shell image origin in - * GtkWindow coordinates and on the first size-allocate sets the - * offsets in the shell so the image origin remains the same in - * GtkWindow coordinates. + * Stores the coordinates of the current image canvas origin relatively + * its GtkWindow; and on the first size-allocate sets the offsets in + * the shell so that the image origin remains the same (even on another + * GtkWindow). * - * Exampe use case: The user hides docks attached to the side of image + * Example use case: The user hides docks attached to the side of image * windows. You want the image to remain fixed on the screen though, * so you use this function to keep the image fixed after the docks * have been hidden. @@ -1493,7 +1492,6 @@ gimp_image_window_keep_canvas_pos (GimpImageWindow *window) { PosCorrectionData *data = g_new0 (PosCorrectionData, 1); - data->window = window; data->x = image_origin_window_x; data->y = image_origin_window_y; @@ -1581,23 +1579,24 @@ gimp_image_window_shell_size_allocate (GimpDisplayShell *shell, GtkAllocation *allocation, PosCorrectionData *data) { - GimpImageWindow *window = data->window; + GimpImageWindow *window = gimp_display_shell_get_window (shell); gint image_origin_shell_x = -1; gint image_origin_shell_y = -1; - gtk_widget_translate_coordinates (GTK_WIDGET (window), - GTK_WIDGET (shell->canvas), - data->x, data->y, - &image_origin_shell_x, - &image_origin_shell_y); - - /* Note that the shell offset isn't the offset of the image into the - * shell, but the offset of the shell relative to the image, - * therefore we need to negate - */ - gimp_display_shell_scroll_set_offset (shell, - -image_origin_shell_x, - -image_origin_shell_y); + if (gtk_widget_translate_coordinates (GTK_WIDGET (window), + GTK_WIDGET (shell->canvas), + data->x, data->y, + &image_origin_shell_x, + &image_origin_shell_y)) + { + /* Note that the shell offset isn't the offset of the image into the + * shell, but the offset of the shell relative to the image, + * therefore we need to negate + */ + gimp_display_shell_scroll_set_offset (shell, + -image_origin_shell_x, + -image_origin_shell_y); + } g_signal_handlers_disconnect_by_func (shell, gimp_image_window_shell_size_allocate, diff --git a/app/display/gimpmotionbuffer.c b/app/display/gimpmotionbuffer.c index b8bd566212..cb73a6ca83 100644 --- a/app/display/gimpmotionbuffer.c +++ b/app/display/gimpmotionbuffer.c @@ -264,8 +264,6 @@ gimp_motion_buffer_motion_event (GimpMotionBuffer *buffer, gdouble delta_time = 0.001; gdouble delta_x = 0.0; gdouble delta_y = 0.0; - gdouble dir_delta_x = 0.0; - gdouble dir_delta_y = 0.0; gdouble distance = 1.0; g_return_val_if_fail (GIMP_IS_MOTION_BUFFER (buffer), FALSE); @@ -292,6 +290,8 @@ gimp_motion_buffer_motion_event (GimpMotionBuffer *buffer, gdouble filter; gdouble dist; gdouble delta_dir; + gdouble dir_delta_x = 0.0; + gdouble dir_delta_y = 0.0; delta_x = last_dir_event.x - coords->x; delta_y = last_dir_event.y - coords->y; diff --git a/app/file/Makefile.in b/app/file/Makefile.in index 7bf896623f..bee337f2ef 100644 --- a/app/file/Makefile.in +++ b/app/file/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -303,6 +303,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -329,6 +331,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -584,14 +590,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/file/file-open.c b/app/file/file-open.c index 8abb19e707..e8a29d4b8f 100644 --- a/app/file/file-open.c +++ b/app/file/file-open.c @@ -562,6 +562,13 @@ file_open_from_command_line (Gimp *gimp, GimpObject *display = gimp_get_empty_display (gimp); GimpPDBStatusType status; + /* show the progress in the last opened display, see bug #704896 */ + if (! display) + display = gimp_context_get_display (gimp_get_user_context (gimp)); + + if (display) + g_object_add_weak_pointer (G_OBJECT (display), (gpointer) &display); + image = file_open_with_display (gimp, gimp_get_user_context (gimp), GIMP_PROGRESS (display), @@ -575,7 +582,7 @@ file_open_from_command_line (Gimp *gimp, g_object_set_data_full (G_OBJECT (gimp), GIMP_FILE_OPEN_LAST_URI_KEY, uri, (GDestroyNotify) g_free); } - else if (status != GIMP_PDB_CANCEL) + else if (status != GIMP_PDB_CANCEL && display) { gchar *filename = file_utils_uri_display_name (uri); @@ -587,6 +594,9 @@ file_open_from_command_line (Gimp *gimp, g_free (filename); g_free (uri); } + + if (display) + g_object_remove_weak_pointer (G_OBJECT (display), (gpointer) &display); } else { diff --git a/app/gegl/Makefile.in b/app/gegl/Makefile.in index 39fd957320..01bfa68fd3 100644 --- a/app/gegl/Makefile.in +++ b/app/gegl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -350,6 +350,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -376,6 +378,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -794,14 +800,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/git-version.h b/app/git-version.h index 3fa9ec584e..d6f91d11b5 100644 --- a/app/git-version.h +++ b/app/git-version.h @@ -1,5 +1,5 @@ #ifndef __GIT_VERSION_H__ #define __GIT_VERSION_H__ -#define GIMP_GIT_VERSION "GIMP_2_8_4-123-g82888aa" +#define GIMP_GIT_VERSION "GIMP_2_8_8-55-g9bb7eb0" #define GIMP_GIT_LAST_COMMIT_YEAR "2013" #endif /* __GIT_VERSION_H__ */ diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am index 10f9c3265d..d2b07d5222 100644 --- a/app/gui/Makefile.am +++ b/app/gui/Makefile.am @@ -1,17 +1,23 @@ ## Process this file with automake to produce Makefile.in +if PLATFORM_OSX +xobjective_c = "-xobjective-c" +endif + AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gimp-GUI\" \ -DGIMP_COMMAND=\"@GIMP_COMMAND@\" INCLUDES = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_builddir)/app \ - -I$(top_srcdir)/app \ - $(GEGL_CFLAGS) \ - $(GTK_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_builddir)/app \ + -I$(top_srcdir)/app \ + $(xobjective_c) \ + $(GEGL_CFLAGS) \ + $(GTK_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(GTK_MAC_INTEGRATION_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libappgui.a @@ -37,9 +43,7 @@ libappgui_a_sources = \ splash.c \ splash.h \ themes.c \ - themes.h \ - ige-mac-menu.c \ - ige-mac-menu.h + themes.h libappgui_a_built_sources = gimpdbusservice-glue.h diff --git a/app/gui/Makefile.in b/app/gui/Makefile.in index ebe8f31a29..ad7c661b99 100644 --- a/app/gui/Makefile.in +++ b/app/gui/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -112,7 +112,7 @@ am__objects_1 = am__objects_2 = color-history.$(OBJEXT) gimpdbusservice.$(OBJEXT) \ gimpuiconfigurer.$(OBJEXT) gui.$(OBJEXT) gui-message.$(OBJEXT) \ gui-unique.$(OBJEXT) gui-vtable.$(OBJEXT) session.$(OBJEXT) \ - splash.$(OBJEXT) themes.$(OBJEXT) ige-mac-menu.$(OBJEXT) + splash.$(OBJEXT) themes.$(OBJEXT) am_libappgui_a_OBJECTS = $(am__objects_1) $(am__objects_2) libappgui_a_OBJECTS = $(am_libappgui_a_OBJECTS) AM_V_P = $(am__v_P_@AM_V@) @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -505,18 +511,21 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c" AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Gimp-GUI\" \ -DGIMP_COMMAND=\"@GIMP_COMMAND@\" INCLUDES = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -I$(top_builddir)/app \ - -I$(top_srcdir)/app \ - $(GEGL_CFLAGS) \ - $(GTK_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_builddir)/app \ + -I$(top_srcdir)/app \ + $(xobjective_c) \ + $(GEGL_CFLAGS) \ + $(GTK_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(GTK_MAC_INTEGRATION_CFLAGS) \ -I$(includedir) noinst_LIBRARIES = libappgui.a @@ -541,9 +550,7 @@ libappgui_a_sources = \ splash.c \ splash.h \ themes.c \ - themes.h \ - ige-mac-menu.c \ - ige-mac-menu.h + themes.h libappgui_a_built_sources = gimpdbusservice-glue.h libappgui_a_SOURCES = $(libappgui_a_built_sources) $(libappgui_a_sources) @@ -613,7 +620,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-unique.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui-vtable.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ige-mac-menu.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/session.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/themes.Po@am__quote@ @@ -623,14 +629,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c index 1f67224bee..dcae42e7d9 100644 --- a/app/gui/gimpuiconfigurer.c +++ b/app/gui/gimpuiconfigurer.c @@ -414,6 +414,9 @@ static void gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer, GimpImageWindow *source_image_window) { + GimpDisplayShell *active_shell = gimp_image_window_get_active_shell (source_image_window); + GimpImageWindow *active_window = NULL; + /* The last display shell remains in its window */ while (gimp_image_window_get_n_shells (source_image_window) > 1) { @@ -428,6 +431,9 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer, /* Move the shell there */ shell = gimp_image_window_get_shell (source_image_window, 1); + if (shell == active_shell) + active_window = new_image_window; + g_object_ref (shell); gimp_image_window_remove_shell (source_image_window, shell); gimp_image_window_add_shell (new_image_window, shell); @@ -441,6 +447,13 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer, /* Show after we have added the shell */ gtk_widget_show (GTK_WIDGET (new_image_window)); } + + /* If none of the shells were active, I assume the first one is. */ + if (active_window == NULL) + active_window = source_image_window; + + /* The active tab must stay at the top of the windows stack. */ + gtk_window_present (GTK_WINDOW (active_window)); } /** @@ -452,10 +465,12 @@ gimp_ui_configurer_separate_shells (GimpUIConfigurer *ui_configurer, static void gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer *ui_configurer) { - Gimp *gimp = ui_configurer->p->gimp; - GList *windows = gimp_get_image_windows (gimp); - GList *iter = NULL; - GimpImageWindow *uber_image_window = NULL; + Gimp *gimp = ui_configurer->p->gimp; + GList *windows = gimp_get_image_windows (gimp); + GList *iter = NULL; + GimpImageWindow *uber_image_window = NULL; + GimpDisplay *active_display = gimp_context_get_display (gimp_get_user_context (gimp)); + GimpDisplayShell *active_shell = gimp_display_get_shell (active_display); /* Get and setup the window to put everything in */ uber_image_window = gimp_ui_configurer_get_uber_window (ui_configurer); @@ -479,11 +494,13 @@ gimp_ui_configurer_configure_for_single_window (GimpUIConfigurer *ui_configurer) gimp_ui_configurer_move_shells (ui_configurer, image_window, uber_image_window); - /* Destroy the window */ gimp_image_window_destroy (image_window); } + /* Ensure the context shell remains active after mode switch. */ + gimp_image_window_set_active_shell (uber_image_window, active_shell); + g_list_free (windows); } diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c index 122d0f63f1..5218d78692 100644 --- a/app/gui/gui-unique.c +++ b/app/gui/gui-unique.c @@ -24,8 +24,8 @@ #endif #ifdef GDK_WINDOWING_QUARTZ -#include -#include +#import +#include #endif #if HAVE_DBUS_GLIB @@ -63,11 +63,16 @@ static HWND proxy_window = NULL; #endif #ifdef GDK_WINDOWING_QUARTZ -static void gui_unique_mac_init (Gimp *gimp); -static void gui_unique_mac_exit (void); +static void gui_unique_quartz_init (Gimp *gimp); +static void gui_unique_quartz_exit (void); -static Gimp *unique_gimp = NULL; -AEEventHandlerUPP open_document_callback_proc; +@interface GimpAppleEventHandler : NSObject {} +- (void) handleEvent:(NSAppleEventDescriptor *) inEvent + andReplyWith:(NSAppleEventDescriptor *) replyEvent; +@end + +static Gimp *unique_gimp = NULL; +static GimpAppleEventHandler *event_handler = NULL; #endif @@ -76,13 +81,11 @@ gui_unique_init (Gimp *gimp) { #ifdef G_OS_WIN32 gui_unique_win32_init (gimp); -#elif HAVE_DBUS_GLIB +#elif defined (GDK_WINDOWING_QUARTZ) + gui_unique_quartz_init (gimp); +#elif defined (HAVE_DBUS_GLIB) gui_dbus_service_init (gimp); #endif - -#ifdef GDK_WINDOWING_QUARTZ - gui_unique_mac_init (gimp); -#endif } void @@ -90,13 +93,11 @@ gui_unique_exit (void) { #ifdef G_OS_WIN32 gui_unique_win32_exit (); -#elif HAVE_DBUS_GLIB +#elif defined (GDK_WINDOWING_QUARTZ) + gui_unique_quartz_exit (); +#elif defined (HAVE_DBUS_GLIB) gui_dbus_service_exit (); #endif - -#ifdef GDK_WINDOWING_QUARTZ - gui_unique_mac_exit (); -#endif } @@ -280,7 +281,7 @@ gui_unique_win32_exit (void) #ifdef GDK_WINDOWING_QUARTZ static gboolean -gui_unique_mac_idle_open (gchar *data) +gui_unique_quartz_idle_open (gchar *path) { /* We want to be called again later in case that GIMP is not fully * started yet. @@ -288,94 +289,126 @@ gui_unique_mac_idle_open (gchar *data) if (! gimp_is_restored (unique_gimp)) return TRUE; - if (data) + if (path) { - file_open_from_command_line (unique_gimp, data, FALSE); + file_open_from_command_line (unique_gimp, path, FALSE); } return FALSE; } -/* Handle the kAEOpenDocuments Apple events. This will register - * an idle source callback for each filename in the event. - */ -static pascal OSErr -gui_unique_mac_open_documents (const AppleEvent *inAppleEvent, - AppleEvent *outAppleEvent, - long handlerRefcon) +static gboolean +gui_unique_quartz_nsopen_file_callback (GtkosxApplication *osx_app, + gchar *path, + gpointer user_data) { - OSStatus status; - AEDescList documents; - gchar path[MAXPATHLEN]; + gchar *callback_path; + GSource *source; + GClosure *closure; - status = AEGetParamDesc (inAppleEvent, - keyDirectObject, typeAEList, - &documents); - if (status == noErr) - { - long count = 0; - int i; + callback_path = g_strdup (path); - AECountItems (&documents, &count); + closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open), + (gpointer) callback_path, + (GClosureNotify) g_free); - for (i = 0; i < count; i++) - { - FSRef ref; - gchar *callback_path; - GSource *source; - GClosure *closure; + g_object_watch_closure (G_OBJECT (unique_gimp), closure); - status = AEGetNthPtr (&documents, i + 1, typeFSRef, - 0, 0, &ref, sizeof (ref), - 0); - if (status != noErr) - continue; + source = g_idle_source_new (); - FSRefMakePath (&ref, (UInt8 *) path, MAXPATHLEN); + g_source_set_priority (source, G_PRIORITY_LOW); + g_source_set_closure (source, closure); + g_source_attach (source, NULL); + g_source_unref (source); - callback_path = g_strdup (path); - - closure = g_cclosure_new (G_CALLBACK (gui_unique_mac_idle_open), - (gpointer) callback_path, - (GClosureNotify) g_free); - - g_object_watch_closure (G_OBJECT (unique_gimp), closure); - - source = g_idle_source_new (); - g_source_set_priority (source, G_PRIORITY_LOW); - g_source_set_closure (source, closure); - g_source_attach (source, NULL); - g_source_unref (source); - } - } - - return status; + return TRUE; } -static void -gui_unique_mac_init (Gimp *gimp) +@implementation GimpAppleEventHandler +- (void) handleEvent: (NSAppleEventDescriptor *) inEvent + andReplyWith: (NSAppleEventDescriptor *) replyEvent { + const gchar *path; + NSURL *url; + NSAutoreleasePool *urlpool; + NSInteger count; + NSInteger i; + + urlpool = [[NSAutoreleasePool alloc] init]; + + count = [inEvent numberOfItems]; + + for (i = 1; i <= count; i++) + { + gchar *callback_path; + GSource *source; + GClosure *closure; + + url = [NSURL URLWithString: [[inEvent descriptorAtIndex: i] stringValue]]; + path = [[url path] UTF8String]; + + callback_path = g_strdup (path); + closure = g_cclosure_new (G_CALLBACK (gui_unique_quartz_idle_open), + (gpointer) callback_path, + (GClosureNotify) g_free); + + g_object_watch_closure (G_OBJECT (unique_gimp), closure); + + source = g_idle_source_new (); + g_source_set_priority (source, G_PRIORITY_LOW); + g_source_set_closure (source, closure); + g_source_attach (source, NULL); + g_source_unref (source); + } + + [urlpool drain]; +} +@end + +static void +gui_unique_quartz_init (Gimp *gimp) +{ + GtkosxApplication *osx_app; + g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (unique_gimp == NULL); + osx_app = gtkosx_application_get (); + unique_gimp = gimp; - open_document_callback_proc = NewAEEventHandlerUPP(gui_unique_mac_open_documents); + g_signal_connect (osx_app, "NSApplicationOpenFile", + G_CALLBACK (gui_unique_quartz_nsopen_file_callback), + gimp); - AEInstallEventHandler (kCoreEventClass, kAEOpenDocuments, - open_document_callback_proc, - 0L, TRUE); + /* Using the event handler is a hack, it is neccesary becuase + * gtkosx_application will drop the file open events if any + * event processing is done before gtkosx_application_ready is + * called, which we unfortuantly can't avoid doing right now. + */ + event_handler = [[GimpAppleEventHandler alloc] init]; + + [[NSAppleEventManager sharedAppleEventManager] + setEventHandler: event_handler + andSelector: @selector (handleEvent: andReplyWith:) + forEventClass: kCoreEventClass + andEventID: kAEOpenDocuments]; } static void -gui_unique_mac_exit (void) +gui_unique_quartz_exit (void) { + g_return_if_fail (GIMP_IS_GIMP (unique_gimp)); + unique_gimp = NULL; - AERemoveEventHandler (kCoreEventClass, kAEOpenDocuments, - open_document_callback_proc, TRUE); + [[NSAppleEventManager sharedAppleEventManager] + removeEventHandlerForEventClass: kCoreEventClass + andEventID: kAEOpenDocuments]; - DisposeAEEventHandlerUPP(open_document_callback_proc); + [event_handler release]; + + event_handler = NULL; } #endif /* GDK_WINDOWING_QUARTZ */ diff --git a/app/gui/gui.c b/app/gui/gui.c index f3ad11718d..faaa91b981 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -77,7 +77,7 @@ #include "splash.h" #include "themes.h" #ifdef GDK_WINDOWING_QUARTZ -#include "ige-mac-menu.h" +#include #endif /* GDK_WINDOWING_QUARTZ */ #include "gimp-intl.h" @@ -427,17 +427,26 @@ gui_restore_callback (Gimp *gimp, #ifdef GDK_WINDOWING_QUARTZ static void -gui_add_to_app_menu (GimpUIManager *ui_manager, - IgeMacMenuGroup *group, - const gchar *action_path, - const gchar *label) +gui_add_to_app_menu (GimpUIManager *ui_manager, + GtkosxApplication *osx_app, + const gchar *action_path, + gint index) { GtkWidget *item; item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (ui_manager), action_path); if (GTK_IS_MENU_ITEM (item)) - ige_mac_menu_add_app_menu_item (group, GTK_MENU_ITEM (item), label); + gtkosx_application_insert_app_menu_item (osx_app, GTK_WIDGET (item), index); +} + +static gboolean +gui_quartz_quit_callback (GtkosxApplication *osx_app, + GimpUIManager *ui_manager) +{ + gimp_ui_manager_activate_action (ui_manager, "file", "file-quit"); + + return TRUE; } #endif @@ -468,47 +477,50 @@ gui_restore_after_callback (Gimp *gimp, #ifdef GDK_WINDOWING_QUARTZ { - IgeMacMenuGroup *group; - GtkWidget *menu; - GtkWidget *item; + GtkosxApplication *osx_app; + GtkWidget *menu; + GtkWidget *item; + + osx_app = gtkosx_application_get (); menu = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager), - "/dummy-menubar/image-popup"); - + "/image-menubar"); if (GTK_IS_MENU_ITEM (menu)) menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu)); - ige_mac_menu_set_menu_bar (GTK_MENU_SHELL (menu)); + gtkosx_application_set_menu_bar (osx_app, GTK_MENU_SHELL (menu)); + gtkosx_application_set_use_quartz_accelerators (osx_app, FALSE); - item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager), - "/dummy-menubar/image-popup/File/file-quit"); - if (GTK_IS_MENU_ITEM (item)) - ige_mac_menu_set_quit_menu_item (GTK_MENU_ITEM (item)); + gui_add_to_app_menu (image_ui_manager, osx_app, + "/image-menubar/Help/dialogs-about", 0); - /* the about group */ - group = ige_mac_menu_add_app_menu_group (); +#define PREFERENCES "/image-menubar/Edit/Preferences/" - gui_add_to_app_menu (image_ui_manager, group, - "/dummy-menubar/image-popup/Help/dialogs-about", - _("About GIMP")); - - /* the preferences group */ - group = ige_mac_menu_add_app_menu_group (); - -#define PREFERENCES "/dummy-menubar/image-popup/Edit/Preferences/" - - gui_add_to_app_menu (image_ui_manager, group, - PREFERENCES "dialogs-preferences", NULL); - gui_add_to_app_menu (image_ui_manager, group, - PREFERENCES "dialogs-input-devices", NULL); - gui_add_to_app_menu (image_ui_manager, group, - PREFERENCES "dialogs-keyboard-shortcuts", NULL); - gui_add_to_app_menu (image_ui_manager, group, - PREFERENCES "dialogs-module-dialog", NULL); - gui_add_to_app_menu (image_ui_manager, group, - PREFERENCES "plug-in-unit-editor", NULL); + gui_add_to_app_menu (image_ui_manager, osx_app, + PREFERENCES "dialogs-preferences", 2); + gui_add_to_app_menu (image_ui_manager, osx_app, + PREFERENCES "dialogs-input-devices", 3); + gui_add_to_app_menu (image_ui_manager, osx_app, + PREFERENCES "dialogs-keyboard-shortcuts", 4); + gui_add_to_app_menu (image_ui_manager, osx_app, + PREFERENCES "dialogs-module-dialog", 5); + gui_add_to_app_menu (image_ui_manager, osx_app, + PREFERENCES "plug-in-unit-editor", 6); #undef PREFERENCES + + item = gtk_separator_menu_item_new (); + gtkosx_application_insert_app_menu_item (osx_app, item, 7); + + item = gtk_ui_manager_get_widget (GTK_UI_MANAGER (image_ui_manager), + "/image-menubar/File/file-quit"); + gtk_widget_hide (item); + + g_signal_connect (osx_app, "NSApplicationBlockTermination", + G_CALLBACK (gui_quartz_quit_callback), + image_ui_manager); + + gtkosx_application_ready (osx_app); } #endif /* GDK_WINDOWING_QUARTZ */ diff --git a/app/gui/ige-mac-menu.c b/app/gui/ige-mac-menu.c deleted file mode 100644 index c352f8feee..0000000000 --- a/app/gui/ige-mac-menu.c +++ /dev/null @@ -1,988 +0,0 @@ -/* GTK+ Integration for the Mac OS X Menubar. - * - * Copyright (C) 2007 Pioneer Research Center USA, Inc. - * Copyright (C) 2007 Imendio AB - * - * For further information, see: - * http://developer.imendio.com/projects/gtk-macosx/menubar - * - * This library is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#include "config.h" - -#include - -#ifdef GDK_WINDOWING_QUARTZ - -#include -#include - -#include "ige-mac-menu.h" - -/* TODO - * - * - Adding a standard Window menu (Minimize etc)? - * - Sync reordering items? Does that work now? - * - Create on demand? (can this be done with gtk+? ie fill in menu - items when the menu is opened) - * - Figure out what to do per app/window... - * - */ - -#define IGE_QUARTZ_MENU_CREATOR 'IGEC' -#define IGE_QUARTZ_ITEM_WIDGET 'IWID' - - -static void sync_menu_shell (GtkMenuShell *menu_shell, - MenuRef carbon_menu, - gboolean toplevel, - gboolean debug); - - -/* - * utility functions - */ - -static GtkWidget * -find_menu_label (GtkWidget *widget) -{ - GtkWidget *label = NULL; - - if (GTK_IS_LABEL (widget)) - return widget; - - if (GTK_IS_CONTAINER (widget)) - { - GList *children; - GList *l; - - children = gtk_container_get_children (GTK_CONTAINER (widget)); - - for (l = children; l; l = l->next) - { - label = find_menu_label (l->data); - if (label) - break; - } - - g_list_free (children); - } - - return label; -} - -static const gchar * -get_menu_label_text (GtkWidget *menu_item, - GtkWidget **label) -{ - GtkWidget *my_label; - - my_label = find_menu_label (menu_item); - if (label) - *label = my_label; - - if (my_label) - return gtk_label_get_text (GTK_LABEL (my_label)); - - return NULL; -} - -static gboolean -accel_find_func (GtkAccelKey *key, - GClosure *closure, - gpointer data) -{ - return (GClosure *) data == closure; -} - - -/* - * CarbonMenu functions - */ - -typedef struct -{ - MenuRef menu; - guint toplevel : 1; -} CarbonMenu; - -static GQuark carbon_menu_quark = 0; - -static CarbonMenu * -carbon_menu_new (void) -{ - return g_slice_new0 (CarbonMenu); -} - -static void -carbon_menu_free (CarbonMenu *menu) -{ - g_slice_free (CarbonMenu, menu); -} - -static CarbonMenu * -carbon_menu_get (GtkWidget *widget) -{ - return g_object_get_qdata (G_OBJECT (widget), carbon_menu_quark); -} - -static void -carbon_menu_connect (GtkWidget *menu, - MenuRef menuRef, - gboolean toplevel) -{ - CarbonMenu *carbon_menu = carbon_menu_get (menu); - - if (!carbon_menu) - { - carbon_menu = carbon_menu_new (); - - g_object_set_qdata_full (G_OBJECT (menu), carbon_menu_quark, - carbon_menu, - (GDestroyNotify) carbon_menu_free); - } - - carbon_menu->menu = menuRef; - carbon_menu->toplevel = toplevel; -} - - -/* - * CarbonMenuItem functions - */ - -typedef struct -{ - MenuRef menu; - MenuItemIndex index; - MenuRef submenu; - GClosure *accel_closure; -} CarbonMenuItem; - -static GQuark carbon_menu_item_quark = 0; - -static CarbonMenuItem * -carbon_menu_item_new (void) -{ - return g_slice_new0 (CarbonMenuItem); -} - -static void -carbon_menu_item_free (CarbonMenuItem *menu_item) -{ - if (menu_item->accel_closure) - g_closure_unref (menu_item->accel_closure); - - g_slice_free (CarbonMenuItem, menu_item); -} - -static CarbonMenuItem * -carbon_menu_item_get (GtkWidget *widget) -{ - return g_object_get_qdata (G_OBJECT (widget), carbon_menu_item_quark); -} - -static void -carbon_menu_item_update_state (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - gboolean sensitive; - gboolean visible; - UInt32 set_attrs = 0; - UInt32 clear_attrs = 0; - - g_object_get (widget, - "sensitive", &sensitive, - "visible", &visible, - NULL); - - if (!sensitive) - set_attrs |= kMenuItemAttrDisabled; - else - clear_attrs |= kMenuItemAttrDisabled; - - if (!visible) - set_attrs |= kMenuItemAttrHidden; - else - clear_attrs |= kMenuItemAttrHidden; - - ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, - set_attrs, clear_attrs); -} - -static void -carbon_menu_item_update_active (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - gboolean active; - - g_object_get (widget, - "active", &active, - NULL); - - CheckMenuItem (carbon_item->menu, carbon_item->index, - active); -} - -static void -carbon_menu_item_update_submenu (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkWidget *submenu; - - submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (widget)); - - if (submenu) - { - const gchar *label_text; - CFStringRef cfstr = NULL; - - label_text = get_menu_label_text (widget, NULL); - if (label_text) - cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - - CreateNewMenu (0, 0, &carbon_item->submenu); - SetMenuTitleWithCFString (carbon_item->submenu, cfstr); - SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, - carbon_item->submenu); - - sync_menu_shell (GTK_MENU_SHELL (submenu), carbon_item->submenu, FALSE, FALSE); - - if (cfstr) - CFRelease (cfstr); - } - else - { - SetMenuItemHierarchicalMenu (carbon_item->menu, carbon_item->index, - NULL); - carbon_item->submenu = NULL; - } -} - -static void -carbon_menu_item_update_label (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - const gchar *label_text; - CFStringRef cfstr = NULL; - - label_text = get_menu_label_text (widget, NULL); - if (label_text) - cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - - SetMenuItemTextWithCFString (carbon_item->menu, carbon_item->index, - cfstr); - - if (cfstr) - CFRelease (cfstr); -} - -static void -carbon_menu_item_update_accelerator (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (GTK_IS_ACCEL_LABEL (label)) - { - GClosure *closure; - - g_object_get (label, "accel-closure", &closure, NULL); - - if (closure) - { - GtkAccelGroup *group; - GtkAccelKey *key; - - group = gtk_accel_group_from_accel_closure (closure); - key = gtk_accel_group_find (group, accel_find_func, closure); - - g_closure_unref (closure); - - if (key && - key->accel_key && - key->accel_flags & GTK_ACCEL_VISIBLE) - { - GdkDisplay *display = gtk_widget_get_display (widget); - GdkKeymap *keymap = gdk_keymap_get_for_display (display); - GdkKeymapKey *keys; - gint n_keys; - - if (gdk_keymap_get_entries_for_keyval (keymap, key->accel_key, - &keys, &n_keys)) - { - UInt8 modifiers = 0; - - SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, - true, keys[0].keycode); - - g_free (keys); - - if (key->accel_mods) - { - if (key->accel_mods & GDK_SHIFT_MASK) - modifiers |= kMenuShiftModifier; - - if (key->accel_mods & GDK_MOD1_MASK) - modifiers |= kMenuOptionModifier; - } - - if (!(key->accel_mods & GDK_META_MASK)) - { - modifiers |= kMenuNoCommandModifier; - } - - SetMenuItemModifiers (carbon_item->menu, carbon_item->index, - modifiers); - - return; - } - } - } - } - - /* otherwise, clear the menu shortcut */ - SetMenuItemModifiers (carbon_item->menu, carbon_item->index, - kMenuNoModifiers | kMenuNoCommandModifier); - ChangeMenuItemAttributes (carbon_item->menu, carbon_item->index, - 0, kMenuItemAttrUseVirtualKey); - SetMenuItemCommandKey (carbon_item->menu, carbon_item->index, - false, 0); -} - -static void -carbon_menu_item_accel_changed (GtkAccelGroup *accel_group, - guint keyval, - GdkModifierType modifier, - GClosure *accel_closure, - GtkWidget *widget) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (widget); - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (GTK_IS_ACCEL_LABEL (label)) - { - GClosure *closure; - - g_object_get (label, "accel-closure", &closure, NULL); - - if (closure) - { - if (closure == accel_closure) - carbon_menu_item_update_accelerator (carbon_item, widget); - - g_closure_unref (closure); - } - } -} - -static void -carbon_menu_item_update_accel_closure (CarbonMenuItem *carbon_item, - GtkWidget *widget) -{ - GtkAccelGroup *group; - GtkWidget *label; - - get_menu_label_text (widget, &label); - - if (carbon_item->accel_closure) - { - group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); - - g_signal_handlers_disconnect_by_func (group, - carbon_menu_item_accel_changed, - widget); - - g_closure_unref (carbon_item->accel_closure); - carbon_item->accel_closure = NULL; - } - - if (GTK_IS_ACCEL_LABEL (label)) - g_object_get (label, "accel-closure", &carbon_item->accel_closure, NULL); - - if (carbon_item->accel_closure) - { - group = gtk_accel_group_from_accel_closure (carbon_item->accel_closure); - - g_signal_connect_object (group, "accel-changed", - G_CALLBACK (carbon_menu_item_accel_changed), - widget, 0); - } - - carbon_menu_item_update_accelerator (carbon_item, widget); -} - -static void -carbon_menu_item_notify (GObject *object, - GParamSpec *pspec, - CarbonMenuItem *carbon_item) -{ - if (!strcmp (pspec->name, "sensitive") || - !strcmp (pspec->name, "visible")) - { - carbon_menu_item_update_state (carbon_item, GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "active")) - { - carbon_menu_item_update_active (carbon_item, GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "submenu")) - { - carbon_menu_item_update_submenu (carbon_item, GTK_WIDGET (object)); - } -} - -static void -carbon_menu_item_notify_label (GObject *object, - GParamSpec *pspec, - gpointer data) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (GTK_WIDGET (object)); - - if (!strcmp (pspec->name, "label")) - { - carbon_menu_item_update_label (carbon_item, - GTK_WIDGET (object)); - } - else if (!strcmp (pspec->name, "accel-closure")) - { - carbon_menu_item_update_accel_closure (carbon_item, - GTK_WIDGET (object)); - } -} - -static CarbonMenuItem * -carbon_menu_item_connect (GtkWidget *menu_item, - GtkWidget *label, - MenuRef menu, - MenuItemIndex index) -{ - CarbonMenuItem *carbon_item = carbon_menu_item_get (menu_item); - - if (!carbon_item) - { - carbon_item = carbon_menu_item_new (); - - g_object_set_qdata_full (G_OBJECT (menu_item), carbon_menu_item_quark, - carbon_item, - (GDestroyNotify) carbon_menu_item_free); - - g_signal_connect (menu_item, "notify", - G_CALLBACK (carbon_menu_item_notify), - carbon_item); - - if (label) - g_signal_connect_swapped (label, "notify::label", - G_CALLBACK (carbon_menu_item_notify_label), - menu_item); - } - - carbon_item->menu = menu; - carbon_item->index = index; - - return carbon_item; -} - -static gboolean -menu_event_activate_callback (GtkMenuItem *widget) -{ - gtk_menu_item_activate (GTK_MENU_ITEM (widget)); - - return FALSE; -} - -/* - * carbon event handler - */ - -static OSStatus -menu_event_handler_func (EventHandlerCallRef event_handler_call_ref, - EventRef event_ref, - void *data) -{ - UInt32 event_class = GetEventClass (event_ref); - UInt32 event_kind = GetEventKind (event_ref); - MenuRef menu_ref; - - switch (event_class) - { - case kEventClassCommand: - /* This is called when activating (is that the right GTK+ term?) - * a menu item. - */ - if (event_kind == kEventCommandProcess) - { - HICommand command; - OSStatus err; - - /*g_printerr ("Menu: kEventClassCommand/kEventCommandProcess\n");*/ - - err = GetEventParameter (event_ref, kEventParamDirectObject, - typeHICommand, 0, - sizeof (command), 0, &command); - - if (err == noErr) - { - GtkWidget *widget = NULL; - - /* Get any GtkWidget associated with the item. */ - err = GetMenuItemProperty (command.menu.menuRef, - command.menu.menuItemIndex, - IGE_QUARTZ_MENU_CREATOR, - IGE_QUARTZ_ITEM_WIDGET, - sizeof (widget), 0, &widget); - if (err == noErr && GTK_IS_WIDGET (widget)) - { - GSource *source; - GClosure *closure; - - closure = g_cclosure_new (G_CALLBACK (menu_event_activate_callback), - widget, NULL); - - g_object_watch_closure (G_OBJECT (widget), closure); - - source = g_idle_source_new (); - g_source_set_priority (source, G_PRIORITY_HIGH); - g_source_set_closure (source, closure); - g_source_attach (source, NULL); - g_source_unref (source); - - return noErr; - } - } - } - break; - - case kEventClassMenu: - GetEventParameter (event_ref, - kEventParamDirectObject, - typeMenuRef, - NULL, - sizeof (menu_ref), - NULL, - &menu_ref); - - switch (event_kind) - { - case kEventMenuTargetItem: - /* This is called when an item is selected (what is the - * GTK+ term? prelight?) - */ - /*g_printerr ("kEventClassMenu/kEventMenuTargetItem\n");*/ - break; - - case kEventMenuOpening: - /* Is it possible to dynamically build the menu here? We - * can at least set visibility/sensitivity. - */ - /*g_printerr ("kEventClassMenu/kEventMenuOpening\n");*/ - break; - - case kEventMenuClosed: - /*g_printerr ("kEventClassMenu/kEventMenuClosed\n");*/ - break; - - default: - break; - } - - break; - - default: - break; - } - - return CallNextEventHandler (event_handler_call_ref, event_ref); -} - -static void -setup_menu_event_handler (void) -{ - static gboolean is_setup = FALSE; - - EventHandlerUPP menu_event_handler_upp; - EventHandlerRef menu_event_handler_ref; - const EventTypeSpec menu_events[] = { - { kEventClassCommand, kEventCommandProcess }, - { kEventClassMenu, kEventMenuTargetItem }, - { kEventClassMenu, kEventMenuOpening }, - { kEventClassMenu, kEventMenuClosed } - }; - - if (is_setup) - return; - - /* FIXME: We might have to install one per window? */ - - menu_event_handler_upp = NewEventHandlerUPP (menu_event_handler_func); - InstallEventHandler (GetApplicationEventTarget (), menu_event_handler_upp, - GetEventTypeCount (menu_events), menu_events, 0, - &menu_event_handler_ref); - -#if 0 - /* FIXME: Remove the handler with: */ - RemoveEventHandler(menu_event_handler_ref); - DisposeEventHandlerUPP(menu_event_handler_upp); -#endif - - is_setup = TRUE; -} - -static void -sync_menu_shell (GtkMenuShell *menu_shell, - MenuRef carbon_menu, - gboolean toplevel, - gboolean debug) -{ - GList *children; - GList *l; - MenuItemIndex carbon_index = 1; - - if (debug) - g_printerr ("%s: syncing shell %p\n", G_STRFUNC, menu_shell); - - carbon_menu_connect (GTK_WIDGET (menu_shell), carbon_menu, toplevel); - - children = gtk_container_get_children (GTK_CONTAINER (menu_shell)); - - for (l = children; l; l = l->next) - { - GtkWidget *menu_item = l->data; - CarbonMenuItem *carbon_item; - - if (GTK_IS_TEAROFF_MENU_ITEM (menu_item)) - continue; - - if (toplevel && g_object_get_data (G_OBJECT (menu_item), - "gtk-empty-menu-item")) - continue; - - carbon_item = carbon_menu_item_get (menu_item); - - if (debug) - g_printerr ("%s: carbon_item %d for menu_item %d (%s, %s)\n", - G_STRFUNC, carbon_item ? carbon_item->index : -1, - carbon_index, get_menu_label_text (menu_item, NULL), - g_type_name (G_TYPE_FROM_INSTANCE (menu_item))); - - if (carbon_item && carbon_item->index != carbon_index) - { - if (debug) - g_printerr ("%s: -> not matching, deleting\n", G_STRFUNC); - - DeleteMenuItem (carbon_item->menu, carbon_index); - carbon_item = NULL; - } - - if (!carbon_item) - { - GtkWidget *label = NULL; - const gchar *label_text; - CFStringRef cfstr = NULL; - MenuItemAttributes attributes = 0; - - if (debug) - g_printerr ("%s: -> creating new\n", G_STRFUNC); - - label_text = get_menu_label_text (menu_item, &label); - if (label_text) - cfstr = CFStringCreateWithCString (NULL, label_text, - kCFStringEncodingUTF8); - - if (GTK_IS_SEPARATOR_MENU_ITEM (menu_item)) - attributes |= kMenuItemAttrSeparator; - - if (!gtk_widget_is_sensitive (menu_item)) - attributes |= kMenuItemAttrDisabled; - - if (!gtk_widget_get_visible (menu_item)) - attributes |= kMenuItemAttrHidden; - - InsertMenuItemTextWithCFString (carbon_menu, cfstr, - carbon_index - 1, - attributes, 0); - SetMenuItemProperty (carbon_menu, carbon_index, - IGE_QUARTZ_MENU_CREATOR, - IGE_QUARTZ_ITEM_WIDGET, - sizeof (menu_item), &menu_item); - - if (cfstr) - CFRelease (cfstr); - - carbon_item = carbon_menu_item_connect (menu_item, label, - carbon_menu, - carbon_index); - - if (GTK_IS_CHECK_MENU_ITEM (menu_item)) - carbon_menu_item_update_active (carbon_item, menu_item); - - carbon_menu_item_update_accel_closure (carbon_item, menu_item); - - if (gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu_item))) - carbon_menu_item_update_submenu (carbon_item, menu_item); - } - - carbon_index++; - } - - g_list_free (children); -} - -static gulong emission_hook_id = 0; -static gint emission_hook_count = 0; - -static gboolean -parent_set_emission_hook (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, - gpointer data) -{ - GtkWidget *instance = g_value_get_object (param_values); - - if (GTK_IS_MENU_ITEM (instance)) - { - GtkWidget *previous_parent = g_value_get_object (param_values + 1); - GtkWidget *menu_shell = NULL; - - if (GTK_IS_MENU_SHELL (previous_parent)) - { - menu_shell = previous_parent; - } - else - { - GtkWidget *parent; - - parent = gtk_widget_get_parent (instance); - - if (GTK_IS_MENU_SHELL (parent)) - { - menu_shell = parent; - } - } - - if (menu_shell) - { - CarbonMenu *carbon_menu = carbon_menu_get (menu_shell); - - if (carbon_menu) - { -#if 0 - g_printerr ("%s: item %s %p (%s, %s)\n", G_STRFUNC, - previous_parent ? "removed from" : "added to", - menu_shell, - get_menu_label_text (instance, NULL), - g_type_name (G_TYPE_FROM_INSTANCE (instance))); -#endif - - sync_menu_shell (GTK_MENU_SHELL (menu_shell), - carbon_menu->menu, - carbon_menu->toplevel, - FALSE); - } - } - } - - return TRUE; -} - -static void -parent_set_emission_hook_remove (GtkWidget *widget, - gpointer data) -{ - emission_hook_count--; - - if (emission_hook_count > 0) - return; - - g_signal_remove_emission_hook (g_signal_lookup ("parent-set", - GTK_TYPE_WIDGET), - emission_hook_id); - emission_hook_id = 0; -} - - -/* - * public functions - */ - -void -ige_mac_menu_set_menu_bar (GtkMenuShell *menu_shell) -{ - CarbonMenu *current_menu; - MenuRef carbon_menubar; - - g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); - - if (carbon_menu_quark == 0) - carbon_menu_quark = g_quark_from_static_string ("CarbonMenu"); - - if (carbon_menu_item_quark == 0) - carbon_menu_item_quark = g_quark_from_static_string ("CarbonMenuItem"); - - current_menu = carbon_menu_get (GTK_WIDGET (menu_shell)); - if (current_menu) - { - SetRootMenu (current_menu->menu); - return; - } - - CreateNewMenu (0 /*id*/, 0 /*options*/, &carbon_menubar); - SetRootMenu (carbon_menubar); - - setup_menu_event_handler (); - - if (emission_hook_id == 0) - { - emission_hook_id = - g_signal_add_emission_hook (g_signal_lookup ("parent-set", - GTK_TYPE_WIDGET), - 0, - parent_set_emission_hook, - NULL, NULL); - } - - emission_hook_count++; - - g_signal_connect (menu_shell, "destroy", - G_CALLBACK (parent_set_emission_hook_remove), - NULL); - - sync_menu_shell (menu_shell, carbon_menubar, TRUE, FALSE); -} - -void -ige_mac_menu_set_quit_menu_item (GtkMenuItem *menu_item) -{ - MenuRef appmenu; - MenuItemIndex index; - - g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); - - setup_menu_event_handler (); - - if (GetIndMenuItemWithCommandID (NULL, kHICommandQuit, 1, - &appmenu, &index) == noErr) - { - SetMenuItemCommandID (appmenu, index, 0); - SetMenuItemProperty (appmenu, index, - IGE_QUARTZ_MENU_CREATOR, - IGE_QUARTZ_ITEM_WIDGET, - sizeof (menu_item), &menu_item); - - gtk_widget_hide (GTK_WIDGET (menu_item)); - } -} - - -struct _IgeMacMenuGroup -{ - GList *items; -}; - -static GList *app_menu_groups = NULL; - -IgeMacMenuGroup * -ige_mac_menu_add_app_menu_group (void) -{ - IgeMacMenuGroup *group = g_slice_new0 (IgeMacMenuGroup); - - app_menu_groups = g_list_append (app_menu_groups, group); - - return group; -} - -void -ige_mac_menu_add_app_menu_item (IgeMacMenuGroup *group, - GtkMenuItem *menu_item, - const gchar *label) -{ - MenuRef appmenu; - GList *list; - gint index = 0; - - g_return_if_fail (group != NULL); - g_return_if_fail (GTK_IS_MENU_ITEM (menu_item)); - - setup_menu_event_handler (); - - if (GetIndMenuItemWithCommandID (NULL, kHICommandHide, 1, - &appmenu, NULL) != noErr) - { - g_warning ("%s: retrieving app menu failed", - G_STRFUNC); - return; - } - - for (list = app_menu_groups; list; list = g_list_next (list)) - { - IgeMacMenuGroup *list_group = list->data; - - index += g_list_length (list_group->items); - - /* adjust index for the separator between groups, but not - * before the first group - */ - if (list_group->items && list->prev) - index++; - - if (group == list_group) - { - CFStringRef cfstr; - - /* add a separator before adding the first item, but not - * for the first group - */ - if (!group->items && list->prev) - { - InsertMenuItemTextWithCFString (appmenu, NULL, index, - kMenuItemAttrSeparator, 0); - index++; - } - - if (!label) - label = get_menu_label_text (GTK_WIDGET (menu_item), NULL); - - cfstr = CFStringCreateWithCString (NULL, label, - kCFStringEncodingUTF8); - - InsertMenuItemTextWithCFString (appmenu, cfstr, index, 0, 0); - SetMenuItemProperty (appmenu, index + 1, - IGE_QUARTZ_MENU_CREATOR, - IGE_QUARTZ_ITEM_WIDGET, - sizeof (menu_item), &menu_item); - - CFRelease (cfstr); - - gtk_widget_hide (GTK_WIDGET (menu_item)); - - group->items = g_list_append (group->items, menu_item); - - return; - } - } - - if (!list) - g_warning ("%s: app menu group %p does not exist", - G_STRFUNC, group); -} - -#endif /* GDK_WINDOWING_QUARTZ */ diff --git a/app/gui/ige-mac-menu.h b/app/gui/ige-mac-menu.h deleted file mode 100644 index b7def85665..0000000000 --- a/app/gui/ige-mac-menu.h +++ /dev/null @@ -1,43 +0,0 @@ -/* GTK+ Integration for the Mac OS X Menubar. - * - * Copyright (C) 2007 Pioneer Research Center USA, Inc. - * Copyright (C) 2007 Imendio AB - * - * For further information, see: - * http://developer.imendio.com/projects/gtk-macosx/menubar - * - * This library is free software: you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#ifndef __IGE_MAC_MENU_H__ -#define __IGE_MAC_MENU_H__ - -#include - -G_BEGIN_DECLS - -typedef struct _IgeMacMenuGroup IgeMacMenuGroup; - -void ige_mac_menu_set_menu_bar (GtkMenuShell *menu_shell); -void ige_mac_menu_set_quit_menu_item (GtkMenuItem *menu_item); - -IgeMacMenuGroup * ige_mac_menu_add_app_menu_group (void); -void ige_mac_menu_add_app_menu_item (IgeMacMenuGroup *group, - GtkMenuItem *menu_item, - const gchar *label); - -G_END_DECLS - -#endif /* __IGE_MAC_MENU_H__ */ diff --git a/app/gui/session.c b/app/gui/session.c index 721ede768e..e3f1655a39 100644 --- a/app/gui/session.c +++ b/app/gui/session.c @@ -312,6 +312,15 @@ session_restore (Gimp *gimp) g_return_if_fail (GIMP_IS_GIMP (gimp)); gimp_dialog_factory_restore (gimp_dialog_factory_get_singleton ()); + + /* make sure GimpImageWindow acts upon hide-docks at the right time, + * see bug #678043. + */ + if (GIMP_GUI_CONFIG (gimp->config)->single_window_mode && + GIMP_GUI_CONFIG (gimp->config)->hide_docks) + { + g_object_notify (G_OBJECT (gimp->config), "hide-docks"); + } } void diff --git a/app/language.c b/app/language.c index 6fc4a3c360..caa1412eec 100644 --- a/app/language.c +++ b/app/language.c @@ -37,7 +37,11 @@ void language_init (const gchar *language) { #ifdef G_OS_WIN32 - if (! language) + if (! language && + g_getenv ("LANG") == NULL && + g_getenv ("LC_MESSAGES") == NULL && + g_getenv ("LC_ALL") == NULL && + g_getenv ("LANGUAGE") == NULL) { /* FIXME: This is a hack. gettext doesn't pick the right language * by default on Windows, so we enforce the right one. The diff --git a/app/menus/Makefile.in b/app/menus/Makefile.in index 54120c8728..d0d36710b7 100644 --- a/app/menus/Makefile.in +++ b/app/menus/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -305,6 +305,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -331,6 +333,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -598,14 +604,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/paint-funcs/Makefile.in b/app/paint-funcs/Makefile.in index 6ea5ea9d04..8f29a20449 100644 --- a/app/paint-funcs/Makefile.in +++ b/app/paint-funcs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -304,6 +304,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -330,6 +332,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -592,14 +598,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/paint/Makefile.in b/app/paint/Makefile.in index f736996134..488d39e984 100644 --- a/app/paint/Makefile.in +++ b/app/paint/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -318,6 +318,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -344,6 +346,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -690,14 +696,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/paint/gimppaintcore-stroke.c b/app/paint/gimppaintcore-stroke.c index 7c1a8f3b71..af068bc774 100644 --- a/app/paint/gimppaintcore-stroke.c +++ b/app/paint/gimppaintcore-stroke.c @@ -68,8 +68,7 @@ gimp_paint_core_stroke (GimpPaintCore *core, { gint i; - core->start_coords = strokes[0]; - core->last_coords = strokes[0]; + core->last_coords = strokes[0]; gimp_paint_core_paint (core, drawable, paint_options, GIMP_PAINT_STATE_INIT, 0); @@ -179,9 +178,8 @@ gimp_paint_core_stroke_boundary (GimpPaintCore *core, initialized = TRUE; - core->cur_coords = coords[0]; - core->start_coords = coords[0]; - core->last_coords = coords[0]; + core->cur_coords = coords[0]; + core->last_coords = coords[0]; gimp_paint_core_paint (core, drawable, paint_options, GIMP_PAINT_STATE_INIT, 0); @@ -283,9 +281,8 @@ gimp_paint_core_stroke_vectors (GimpPaintCore *core, { initialized = TRUE; - core->cur_coords = g_array_index (coords, GimpCoords, 0); - core->start_coords = g_array_index (coords, GimpCoords, 0); - core->last_coords = g_array_index (coords, GimpCoords, 0); + core->cur_coords = g_array_index (coords, GimpCoords, 0); + core->last_coords = g_array_index (coords, GimpCoords, 0); gimp_paint_core_paint (core, drawable, paint_options, GIMP_PAINT_STATE_INIT, 0); diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c index c6d318349a..7c1c5c77da 100644 --- a/app/paint/gimppaintcore.c +++ b/app/paint/gimppaintcore.c @@ -370,6 +370,9 @@ gimp_paint_core_start (GimpPaintCore *core, sizeof (GimpCoords), STROKE_BUFFER_INIT_SIZE); + /* remember the last stroke's endpoint for later undo */ + core->start_coords = core->last_coords; + core->cur_coords = *coords; if (! GIMP_PAINT_CORE_GET_CLASS (core)->start (core, drawable, @@ -636,7 +639,6 @@ gimp_paint_core_get_current_coords (GimpPaintCore *core, g_return_if_fail (coords != NULL); *coords = core->cur_coords; - } void diff --git a/app/paint/gimppaintcore.h b/app/paint/gimppaintcore.h index 970edb86a4..a46fbe56a5 100644 --- a/app/paint/gimppaintcore.h +++ b/app/paint/gimppaintcore.h @@ -40,7 +40,7 @@ struct _GimpPaintCore gchar *undo_desc; /* undo description */ - GimpCoords start_coords; /* starting coords (for undo only) */ + GimpCoords start_coords; /* the last stroke's endpoint for undo */ GimpCoords cur_coords; /* current coords */ GimpCoords last_coords; /* last coords */ diff --git a/app/pdb/Makefile.in b/app/pdb/Makefile.in index ae421595d2..8f7078ad03 100644 --- a/app/pdb/Makefile.in +++ b/app/pdb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -334,6 +334,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -360,6 +362,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -736,14 +742,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c index 942e026fee..5c194a3835 100644 --- a/app/pdb/image-cmds.c +++ b/app/pdb/image-cmds.c @@ -1404,7 +1404,7 @@ image_flatten_invoker (GimpProcedure *procedure, if (success) { - layer = gimp_image_flatten (image, context); + layer = gimp_image_flatten (image, context, error); if (! layer) success = FALSE; diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c index 4cc255667a..502642b67b 100644 --- a/app/pdb/layer-cmds.c +++ b/app/pdb/layer-cmds.c @@ -159,10 +159,7 @@ layer_new_from_drawable_invoker (GimpProcedure *procedure, else new_type = GIMP_TYPE_LAYER; - if (dest_image == gimp_item_get_image (GIMP_ITEM (drawable))) - new_item = gimp_item_duplicate (GIMP_ITEM (drawable), new_type); - else - new_item = gimp_item_convert (GIMP_ITEM (drawable), dest_image, new_type); + new_item = gimp_item_convert (GIMP_ITEM (drawable), dest_image, new_type); if (new_item) layer_copy = GIMP_LAYER (new_item); diff --git a/app/plug-in/Makefile.in b/app/plug-in/Makefile.in index 60ad0d133b..bee26b9662 100644 --- a/app/plug-in/Makefile.in +++ b/app/plug-in/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -320,6 +320,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -346,6 +348,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -687,14 +693,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index a14451917d..d2c0f0d996 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -830,7 +830,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in, /* Sanity check menu path */ - if (proc_install->menu_path) + if (proc_install->menu_path && strlen (proc_install->menu_path)) { if (proc_install->menu_path[0] == '<') { diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index 1162fb28a2..78465f954f 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -476,7 +476,7 @@ gimp_plug_in_close (GimpPlugIn *plug_in, DWORD dwExitCode = STILL_ACTIVE; DWORD dwTries = 10; - while (dwExitCode == dwExitCode && + while (dwExitCode == STILL_ACTIVE && GetExitCodeProcess ((HANDLE) plug_in->pid, &dwExitCode) && (dwTries > 0)) { diff --git a/app/tests.h b/app/tests.h index 0f783fa483..c331064421 100644 --- a/app/tests.h +++ b/app/tests.h @@ -18,6 +18,16 @@ #ifndef __TESTS_H__ #define __TESTS_H__ +/* Automake doc says: + "When no test protocol is in use, an exit status of 0 from a test + script will denote a success, an exit status of 77 a skipped test, + an exit status of 99 an hard error, and any other exit status will + denote a failure." + + Unfortunately glib returns a SUCCESS when you skip tests, which is + not a reliable test feedback. So we hard-code the SKIPPED return + value. */ +#define GIMP_EXIT_TEST_SKIPPED 77 Gimp * gimp_init_for_testing (void); Gimp * gimp_init_for_gui_testing (gboolean show_gui); diff --git a/app/tests/Makefile.in b/app/tests/Makefile.in index 865f2bbca7..991d0387a7 100644 --- a/app/tests/Makefile.in +++ b/app/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -983,6 +983,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -1009,6 +1011,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1402,14 +1408,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/tests/files/Makefile.in b/app/tests/files/Makefile.in index e5639bb32b..0ced14c182 100644 --- a/app/tests/files/Makefile.in +++ b/app/tests/files/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir-empty/Makefile.in b/app/tests/gimpdir-empty/Makefile.in index 1e1ceb64ec..fb0f27801d 100644 --- a/app/tests/gimpdir-empty/Makefile.in +++ b/app/tests/gimpdir-empty/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir-empty/brushes/Makefile.in b/app/tests/gimpdir-empty/brushes/Makefile.in index 4709638acf..c986ae9fac 100644 --- a/app/tests/gimpdir-empty/brushes/Makefile.in +++ b/app/tests/gimpdir-empty/brushes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir-empty/gradients/Makefile.in b/app/tests/gimpdir-empty/gradients/Makefile.in index 62582f78a5..3dab7fd2b3 100644 --- a/app/tests/gimpdir-empty/gradients/Makefile.in +++ b/app/tests/gimpdir-empty/gradients/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir-empty/patterns/Makefile.in b/app/tests/gimpdir-empty/patterns/Makefile.in index 580d179710..081c7b4b27 100644 --- a/app/tests/gimpdir-empty/patterns/Makefile.in +++ b/app/tests/gimpdir-empty/patterns/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir/Makefile.in b/app/tests/gimpdir/Makefile.in index ff2ba898cc..0a252b14f4 100644 --- a/app/tests/gimpdir/Makefile.in +++ b/app/tests/gimpdir/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir/brushes/Makefile.in b/app/tests/gimpdir/brushes/Makefile.in index e3006a9fb9..428098a627 100644 --- a/app/tests/gimpdir/brushes/Makefile.in +++ b/app/tests/gimpdir/brushes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir/gradients/Makefile.in b/app/tests/gimpdir/gradients/Makefile.in index 1ef986bf74..6b25df98c4 100644 --- a/app/tests/gimpdir/gradients/Makefile.in +++ b/app/tests/gimpdir/gradients/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/gimpdir/patterns/Makefile.in b/app/tests/gimpdir/patterns/Makefile.in index 72fd362bee..9ced1dc03d 100644 --- a/app/tests/gimpdir/patterns/Makefile.in +++ b/app/tests/gimpdir/patterns/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/app/tests/test-session-2-6-compatibility.c b/app/tests/test-session-2-6-compatibility.c index 8d27a23ace..0333655f38 100644 --- a/app/tests/test-session-2-6-compatibility.c +++ b/app/tests/test-session-2-6-compatibility.c @@ -30,6 +30,9 @@ #define ADD_TEST(function) \ g_test_add_func ("/gimp-session-2-6-compatibility/" #function, function); +#define SKIP_TEST(function) \ + g_test_add_func ("/gimp-session-2-6-compatibility/subprocess/" #function, function); + /** * Tests that a sessionrc and dockrc from GIMP 2.6 is loaded and @@ -50,8 +53,16 @@ int main(int argc, char **argv) gimp_test_bail_if_no_display (); gtk_test_init (&argc, &argv, NULL); +#ifdef HAVE_XVFB_RUN ADD_TEST (read_and_write_session_files); +#else + SKIP_TEST (read_and_write_session_files); +#endif /* Don't bother freeing stuff, the process is short-lived */ +#ifdef HAVE_XVFB_RUN return g_test_run (); +#else + return GIMP_EXIT_TEST_SKIPPED; +#endif } diff --git a/app/tests/test-session-2-8-compatibility-multi-window.c b/app/tests/test-session-2-8-compatibility-multi-window.c index c72398e329..c46341f3cb 100644 --- a/app/tests/test-session-2-8-compatibility-multi-window.c +++ b/app/tests/test-session-2-8-compatibility-multi-window.c @@ -31,6 +31,10 @@ g_test_add_func ("/gimp-session-2-8-compatibility-multi-window/" #function, \ function); +#define SKIP_TEST(function) \ + g_test_add_func ("/gimp-session-2-8-compatibility-multi-window/subprocess/" #function, \ + function); + /** * Tests that a single-window sessionrc in GIMP 2.8 format is loaded @@ -51,8 +55,16 @@ int main(int argc, char **argv) gimp_test_bail_if_no_display (); gtk_test_init (&argc, &argv, NULL); +#ifdef HAVE_XVFB_RUN ADD_TEST (read_and_write_session_files); +#else + SKIP_TEST (read_and_write_session_files); +#endif /* Don't bother freeing stuff, the process is short-lived */ +#ifdef HAVE_XVFB_RUN return g_test_run (); +#else + return GIMP_EXIT_TEST_SKIPPED; +#endif } diff --git a/app/tests/test-session-2-8-compatibility-single-window.c b/app/tests/test-session-2-8-compatibility-single-window.c index a9811d52ce..3f566441e8 100644 --- a/app/tests/test-session-2-8-compatibility-single-window.c +++ b/app/tests/test-session-2-8-compatibility-single-window.c @@ -31,6 +31,9 @@ g_test_add_func ("/gimp-session-2-8-compatibility-single-window/" #function, \ function); +#define SKIP_TEST(function) \ + g_test_add_func ("/gimp-session-2-8-compatibility-single-window/subprocess/" #function, \ + function); /** * Tests that a multi-window sessionrc in GIMP 2.8 format is loaded @@ -51,8 +54,16 @@ int main(int argc, char **argv) gimp_test_bail_if_no_display (); gtk_test_init (&argc, &argv, NULL); +#ifdef HAVE_XVFB_RUN ADD_TEST (read_and_write_session_files); +#else + SKIP_TEST (read_and_write_session_files); +#endif /* Don't bother freeing stuff, the process is short-lived */ +#ifdef HAVE_XVFB_RUN return g_test_run (); +#else + return GIMP_EXIT_TEST_SKIPPED; +#endif } diff --git a/app/text/Makefile.in b/app/text/Makefile.in index de5b22d7c6..8885b0bec1 100644 --- a/app/text/Makefile.in +++ b/app/text/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -310,6 +310,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -336,6 +338,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -633,14 +639,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/text/gimptext-vectors.c b/app/text/gimptext-vectors.c index d47a703be8..fb84aaf246 100644 --- a/app/text/gimptext-vectors.c +++ b/app/text/gimptext-vectors.c @@ -26,6 +26,7 @@ #include "text-types.h" +#include "core/gimp.h" #include "core/gimpimage.h" #include "vectors/gimpbezierstroke.h" @@ -69,6 +70,7 @@ gimp_text_vectors_new (GimpImage *image, cairo_t *cr; gdouble xres; gdouble yres; + GError *error = NULL; if (text->text) gimp_object_set_name_safe (GIMP_OBJECT (vectors), text->text); @@ -80,7 +82,12 @@ gimp_text_vectors_new (GimpImage *image, gimp_image_get_resolution (image, &xres, &yres); - layout = gimp_text_layout_new (text, xres, yres); + layout = gimp_text_layout_new (text, xres, yres, &error); + if (error) + { + gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message); + g_error_free (error); + } gimp_text_layout_render (layout, cr, text->base_dir, TRUE); g_object_unref (layout); diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c index 8984c76e95..58ccab5578 100644 --- a/app/text/gimptextlayer.c +++ b/app/text/gimptextlayer.c @@ -567,6 +567,7 @@ gimp_text_layer_render (GimpTextLayer *layer) gdouble yres; gint width; gint height; + GError *error = NULL; if (! layer->text) return FALSE; @@ -585,7 +586,12 @@ gimp_text_layer_render (GimpTextLayer *layer) gimp_image_get_resolution (image, &xres, &yres); - layout = gimp_text_layout_new (layer->text, xres, yres); + layout = gimp_text_layout_new (layer->text, xres, yres, &error); + if (error) + { + gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message); + g_error_free (error); + } g_object_freeze_notify (G_OBJECT (drawable)); @@ -645,7 +651,8 @@ gimp_text_layer_render (GimpTextLayer *layer) } } - gimp_text_layer_render_layout (layer, layout); + if (width > 0 && height > 0) + gimp_text_layer_render_layout (layer, layout); g_object_unref (layout); @@ -671,6 +678,7 @@ gimp_text_layer_render_layout (GimpTextLayer *layer, gint width; gint height; gpointer pr; + cairo_status_t status; g_return_if_fail (gimp_drawable_has_alpha (drawable)); @@ -678,6 +686,18 @@ gimp_text_layer_render_layout (GimpTextLayer *layer, height = gimp_item_get_height (item); surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); + status = cairo_surface_status (surface); + + if (status != CAIRO_STATUS_SUCCESS) + { + GimpImage *image = gimp_item_get_image (item); + + gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, + _("Your text cannot be rendered. It is likely too big. " + "Please make it shorter or use a smaller font.")); + cairo_surface_destroy (surface); + return; + } cr = cairo_create (surface); gimp_text_layout_render (layout, cr, layer->text->base_dir, FALSE); diff --git a/app/text/gimptextlayout.c b/app/text/gimptextlayout.c index 06161e5c9a..5266bc8009 100644 --- a/app/text/gimptextlayout.c +++ b/app/text/gimptextlayout.c @@ -31,9 +31,12 @@ #include "text-types.h" +#include "core/gimperror.h" + #include "gimptext.h" #include "gimptextlayout.h" +#include "gimp-intl.h" struct _GimpTextLayout { @@ -50,7 +53,8 @@ struct _GimpTextLayout static void gimp_text_layout_finalize (GObject *object); static void gimp_text_layout_position (GimpTextLayout *layout); -static void gimp_text_layout_set_markup (GimpTextLayout *layout); +static void gimp_text_layout_set_markup (GimpTextLayout *layout, + GError **error); static PangoContext * gimp_text_get_pango_context (GimpText *text, gdouble xres, @@ -100,7 +104,8 @@ gimp_text_layout_finalize (GObject *object) GimpTextLayout * gimp_text_layout_new (GimpText *text, gdouble xres, - gdouble yres) + gdouble yres, + GError **error) { GimpTextLayout *layout; PangoContext *context; @@ -135,7 +140,7 @@ gimp_text_layout_new (GimpText *text, pango_layout_set_font_description (layout->layout, font_desc); pango_font_description_free (font_desc); - gimp_text_layout_set_markup (layout); + gimp_text_layout_set_markup (layout, error); switch (text->justify) { @@ -509,7 +514,8 @@ gimp_text_layout_apply_tags (GimpTextLayout *layout, } static void -gimp_text_layout_set_markup (GimpTextLayout *layout) +gimp_text_layout_set_markup (GimpTextLayout *layout, + GError **error) { GimpText *text = layout->text; gchar *open_tag = NULL; @@ -549,7 +555,32 @@ gimp_text_layout_set_markup (GimpTextLayout *layout) g_free (tagged); g_free (close_tag); - pango_layout_set_markup (layout->layout, markup, -1); + if (pango_parse_markup (markup, -1, 0, NULL, NULL, NULL, error) == FALSE) + { + if (error && *error && + (*error)->domain == G_MARKUP_ERROR && + (*error)->code == G_MARKUP_ERROR_INVALID_CONTENT) + { + /* Errors from pango lib are not accurate enough. + * Other possible error codes are: G_MARKUP_ERROR_UNKNOWN_ELEMENT + * and G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, which likely indicate a bug + * in GIMP code or a pango library version issue. + * G_MARKUP_ERROR_INVALID_CONTENT on the other hand likely indicates + * size/color/style/weight/variant/etc. value issue. Font size is the + * only free text in GIMP GUI so we assume that must be it. + * Also we output a custom message because pango's error->message is + * too technical (telling of tags, not using user's font size + * unit, and such). */ + g_error_free (*error); + *error = NULL; + g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, + _("The new text layout cannot be generated. " + "Most likely the font size is too big.")); + } + } + else + pango_layout_set_markup (layout->layout, markup, -1); + g_free (markup); } diff --git a/app/text/gimptextlayout.h b/app/text/gimptextlayout.h index fdb8a3d338..510b039ccc 100644 --- a/app/text/gimptextlayout.h +++ b/app/text/gimptextlayout.h @@ -39,7 +39,8 @@ GType gimp_text_layout_get_type (void) G_GNUC_CONST; GimpTextLayout * gimp_text_layout_new (GimpText *text, gdouble xres, - gdouble yres); + gdouble yres, + GError **error); gboolean gimp_text_layout_get_size (GimpTextLayout *layout, gint *width, gint *heigth); diff --git a/app/tools/Makefile.in b/app/tools/Makefile.in index 2912e85ebb..446b77e774 100644 --- a/app/tools/Makefile.in +++ b/app/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -352,6 +352,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -378,6 +380,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -900,14 +906,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c index bada159ff8..a85c19f222 100644 --- a/app/tools/gimpcagetool.c +++ b/app/tools/gimpcagetool.c @@ -58,6 +58,11 @@ #include "gimp-intl.h" +/* XXX: if this state list is updated, in particular if for some reason, + a new CAGE_STATE_* was to be inserted after CAGE_STATE_CLOSING, check + if the function gimp_cage_tool_is_complete() has to be updated. + Current algorithm is that all DEFORM_* states are complete states, + and all CAGE_* states are incomplete states. */ enum { CAGE_STATE_INIT, @@ -123,6 +128,7 @@ static gint gimp_cage_tool_is_on_edge (GimpCageTool *ct, gdouble y, gint handle_size); +static gboolean gimp_cage_tool_is_complete (GimpCageTool *ct); static void gimp_cage_tool_remove_last_handle (GimpCageTool *ct); static void gimp_cage_tool_compute_coef (GimpCageTool *ct); static void gimp_cage_tool_create_image_map (GimpCageTool *ct, @@ -193,7 +199,6 @@ gimp_cage_tool_init (GimpCageTool *self) self->config = g_object_new (GIMP_TYPE_CAGE_CONFIG, NULL); self->hovering_handle = -1; - self->cage_complete = FALSE; self->tool_state = CAGE_STATE_INIT; self->coef = NULL; @@ -306,7 +311,6 @@ gimp_cage_tool_start (GimpCageTool *ct, ct->config = g_object_new (GIMP_TYPE_CAGE_CONFIG, NULL); ct->hovering_handle = -1; ct->hovering_edge = -1; - ct->cage_complete = FALSE; ct->tool_state = CAGE_STATE_INIT; /* Setting up cage offset to convert the cage point coords to @@ -346,7 +350,6 @@ gimp_cage_tool_options_notify (GimpTool *tool, { /* switch to deform mode */ - ct->cage_complete = TRUE; gimp_cage_config_reset_displacement (ct->config); gimp_cage_config_reverse_cage_if_needed (ct->config); gimp_tool_push_status (tool, tool->display, @@ -403,24 +406,29 @@ gimp_cage_tool_key_press (GimpTool *tool, switch (kevent->keyval) { case GDK_KEY_BackSpace: - if (! ct->cage_complete && ct->tool_state == CAGE_STATE_WAIT) + if (ct->tool_state == CAGE_STATE_WAIT) { gimp_cage_tool_remove_last_handle (ct); } - else if (ct->cage_complete && ct->tool_state == CAGE_STATE_WAIT) + else if (ct->tool_state == DEFORM_STATE_WAIT) { gimp_cage_config_remove_selected_points(ct->config); /* if the cage have less than 3 handles, we reopen it */ if (gimp_cage_config_get_n_points(ct->config) <= 2) - ct->cage_complete = FALSE; + { + ct->tool_state = CAGE_STATE_WAIT; + } + + gimp_cage_tool_compute_coef (ct); + gimp_cage_tool_render_node_update (ct); } return TRUE; case GDK_KEY_Return: case GDK_KEY_KP_Enter: case GDK_KEY_ISO_Enter: - if (ct->cage_complete == FALSE && gimp_cage_config_get_n_points (ct->config) > 2) + if (! gimp_cage_tool_is_complete (ct) && gimp_cage_config_get_n_points (ct->config) > 2) { g_object_set (gimp_tool_get_options (tool), "cage-mode", GIMP_CAGE_MODE_DEFORM, @@ -440,7 +448,7 @@ gimp_cage_tool_key_press (GimpTool *tool, gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display); } - break; + return TRUE; case GDK_KEY_Escape: gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display); @@ -565,103 +573,56 @@ gimp_cage_tool_button_press (GimpTool *tool, break; case CAGE_STATE_WAIT: - if (ct->cage_complete == FALSE) + if (handle == -1 && edge <= 0) { - if (handle == -1 && edge <= 0) - { - /* User clicked on the background, we add a new handle - * and move it - */ - gimp_cage_config_add_cage_point (ct->config, - coords->x - ct->offset_x, - coords->y - ct->offset_y); - gimp_cage_config_select_point (ct->config, - gimp_cage_config_get_n_points (ct->config) - 1); - ct->tool_state = CAGE_STATE_MOVE_HANDLE; - } - else if (handle == 0 && gimp_cage_config_get_n_points (ct->config) > 2) - { - /* User clicked on the first handle, we wait for - * release for closing the cage and switching to - * deform if possible - */ - gimp_cage_config_select_point (ct->config, 0); - ct->tool_state = CAGE_STATE_CLOSING; - } - else if (handle >= 0) - { - /* User clicked on a handle, so we move it */ - - if (state & GDK_SHIFT_MASK) - { - /* Multiple selection */ - - gimp_cage_config_toggle_point_selection (ct->config, handle); - } - else - { - /* New selection */ - - if (! gimp_cage_config_point_is_selected (ct->config, handle)) - { - gimp_cage_config_select_point (ct->config, handle); - } - } - - ct->tool_state = CAGE_STATE_MOVE_HANDLE; - } - else if (edge > 0) - { - /* User clicked on an edge, we add a new handle here and select it */ - - gimp_cage_config_insert_cage_point (ct->config, edge, coords->x, coords->y); - gimp_cage_config_select_point (ct->config, edge); - ct->tool_state = CAGE_STATE_MOVE_HANDLE; - } + /* User clicked on the background, we add a new handle + * and move it + */ + gimp_cage_config_add_cage_point (ct->config, + coords->x - ct->offset_x, + coords->y - ct->offset_y); + gimp_cage_config_select_point (ct->config, + gimp_cage_config_get_n_points (ct->config) - 1); + ct->tool_state = CAGE_STATE_MOVE_HANDLE; } - else + else if (handle == 0 && gimp_cage_config_get_n_points (ct->config) > 2) { - /* Cage already closed */ + /* User clicked on the first handle, we wait for + * release for closing the cage and switching to + * deform if possible + */ + gimp_cage_config_select_point (ct->config, 0); + ct->tool_state = CAGE_STATE_CLOSING; + } + else if (handle >= 0) + { + /* User clicked on a handle, so we move it */ - if (handle == -1 && edge == -1) + if (state & GDK_SHIFT_MASK) { - /* User clicked on the background, we start a rubber - * band selection - */ - ct->selection_start_x = coords->x; - ct->selection_start_y = coords->y; - ct->tool_state = CAGE_STATE_SELECTING; + /* Multiple selection */ + + gimp_cage_config_toggle_point_selection (ct->config, handle); } - else if (handle >= 0) + else { - /* User clicked on a handle, so we move it */ + /* New selection */ - if (state & GDK_SHIFT_MASK) + if (! gimp_cage_config_point_is_selected (ct->config, handle)) { - /* Multiple selection */ - - gimp_cage_config_toggle_point_selection (ct->config, handle); + gimp_cage_config_select_point (ct->config, handle); } - else - { - /* New selection */ - - if (! gimp_cage_config_point_is_selected (ct->config, handle)) - { - gimp_cage_config_select_point (ct->config, handle); - } - } - - ct->tool_state = CAGE_STATE_MOVE_HANDLE; } - else if (edge >= 0) - { - /* User clicked on an edge, we add a new handle here and select it */ - gimp_cage_config_insert_cage_point (ct->config, edge, coords->x, coords->y); - gimp_cage_config_select_point (ct->config, edge); - ct->tool_state = CAGE_STATE_MOVE_HANDLE; - } + ct->tool_state = CAGE_STATE_MOVE_HANDLE; + } + else if (edge > 0) + { + /* User clicked on an edge, we add a new handle here and select it */ + + gimp_cage_config_insert_cage_point (ct->config, edge, coords->x, coords->y); + gimp_cage_config_select_point (ct->config, edge); + ct->tool_state = CAGE_STATE_MOVE_HANDLE; } break; @@ -847,7 +808,7 @@ gimp_cage_tool_cursor_update (GimpTool *tool, } else { - if (ct->cage_complete) + if (gimp_cage_tool_is_complete (ct)) modifier = GIMP_CURSOR_MODIFIER_BAD; } } @@ -881,7 +842,7 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool) gimp_draw_tool_push_group (draw_tool, stroke_group); /* If needed, draw line to the cursor. */ - if (! ct->cage_complete) + if (! gimp_cage_tool_is_complete (ct)) { GimpVector2 last_point; @@ -909,7 +870,7 @@ gimp_cage_tool_draw (GimpDrawTool *draw_tool) point1.x += ct->offset_x; point1.y += ct->offset_y; - if (i > 0 || ct->cage_complete) + if (i > 0 || gimp_cage_tool_is_complete (ct)) { gint index_point2; @@ -1068,6 +1029,12 @@ gimp_cage_tool_is_on_edge (GimpCageTool *ct, return -1; } +static gboolean +gimp_cage_tool_is_complete (GimpCageTool *ct) +{ + return (ct->tool_state > CAGE_STATE_CLOSING); +} + static void gimp_cage_tool_remove_last_handle (GimpCageTool *ct) { diff --git a/app/tools/gimpcagetool.h b/app/tools/gimpcagetool.h index bf15916705..1130d3b072 100644 --- a/app/tools/gimpcagetool.h +++ b/app/tools/gimpcagetool.h @@ -57,7 +57,6 @@ struct _GimpCageTool gint hovering_handle; /* Handle which the cursor is above */ gint hovering_edge; /* Edge which the cursor is above */ - gboolean cage_complete; /* Cage closed or not */ GeglBuffer *coef; /* Gegl buffer where the coefficient of the transformation are stored */ gboolean dirty_coef; /* Indicate if the coef are still valid */ diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index 39b9b5d4d7..7ace03621c 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -725,14 +725,13 @@ gimp_move_tool_cursor_update (GimpTool *tool, } else { - GimpGuide *guide; GimpLayer *layer; const gint snap_distance = display->config->snap_distance; if (gimp_display_shell_get_show_guides (shell) && - (guide = gimp_image_find_guide (image, coords->x, coords->y, - FUNSCALEX (shell, snap_distance), - FUNSCALEY (shell, snap_distance)))) + gimp_image_find_guide (image, coords->x, coords->y, + FUNSCALEX (shell, snap_distance), + FUNSCALEY (shell, snap_distance))) { tool_cursor = GIMP_TOOL_CURSOR_HAND; modifier = GIMP_CURSOR_MODIFIER_MOVE; diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index 7810835652..9c52335937 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -300,13 +300,16 @@ gimp_paint_tool_button_press (GimpTool *tool, if ((display != tool->display) || ! paint_tool->draw_line) { - /* if this is a new image, reinit the core vals */ + /* if this is a new display, resest the "last stroke's endpoint" + * because there is none + */ + if (display != tool->display) + core->start_coords = core->cur_coords; - core->start_coords = core->cur_coords; - core->last_coords = core->cur_coords; + core->last_coords = core->cur_coords; - core->distance = 0.0; - core->pixel_dist = 0.0; + core->distance = 0.0; + core->pixel_dist = 0.0; } else if (paint_tool->draw_line) { @@ -315,8 +318,6 @@ gimp_paint_tool_button_press (GimpTool *tool, /* If shift is down and this is not the first paint * stroke, then draw a line from the last coords to the pointer */ - core->start_coords = core->last_coords; - gimp_paint_core_round_line (core, paint_options, constrain); } diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 91603964d3..a6ca9ecdd8 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -1765,11 +1765,17 @@ gimp_text_tool_ensure_layout (GimpTextTool *text_tool) GimpImage *image = gimp_item_get_image (GIMP_ITEM (text_tool->layer)); gdouble xres; gdouble yres; + GError *error = NULL; gimp_image_get_resolution (image, &xres, &yres); text_tool->layout = gimp_text_layout_new (text_tool->layer->text, - xres, yres); + xres, yres, &error); + if (error) + { + gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR, error->message); + g_error_free (error); + } } return text_tool->layout != NULL; diff --git a/app/vectors/Makefile.in b/app/vectors/Makefile.in index ea28235a24..5df1266c8d 100644 --- a/app/vectors/Makefile.in +++ b/app/vectors/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -308,6 +308,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -334,6 +336,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -618,14 +624,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/widgets/Makefile.in b/app/widgets/Makefile.in index e3a1434172..0523d867e0 100644 --- a/app/widgets/Makefile.in +++ b/app/widgets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -410,6 +410,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -436,6 +438,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1276,14 +1282,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/widgets/gimpcontainergridview.c b/app/widgets/gimpcontainergridview.c index 88190cac7b..4dc7507422 100644 --- a/app/widgets/gimpcontainergridview.c +++ b/app/widgets/gimpcontainergridview.c @@ -194,6 +194,11 @@ gimp_container_grid_view_init (GimpContainerGridView *grid_view) gimp_editor_set_show_name (GIMP_EDITOR (grid_view), TRUE); grid_view->wrap_box = gtk_hwrap_box_new (FALSE); + + /* set a silly small and random size request so it doesn't initially + * request too much and breaks dock geometry deserialization + */ + gtk_widget_set_size_request (grid_view->wrap_box, 16, 16); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (box->scrolled_win), grid_view->wrap_box); viewport = gtk_widget_get_parent (grid_view->wrap_box); @@ -702,9 +707,8 @@ gimp_container_grid_view_viewport_resized (GtkWidget *widget, grid_view->columns = columns; gtk_widget_set_size_request (grid_view->wrap_box, - columns * view_requisition.width, - rows * view_requisition.height); - + view_requisition.width, + rows * view_requisition.height); } grid_view->visible_rows = (allocation->height / diff --git a/app/widgets/gimpcontainertreeview-dnd.c b/app/widgets/gimpcontainertreeview-dnd.c index 16aa3d499c..e93c103df6 100644 --- a/app/widgets/gimpcontainertreeview-dnd.c +++ b/app/widgets/gimpcontainertreeview-dnd.c @@ -254,6 +254,21 @@ gimp_container_tree_view_scroll_timeout (gpointer data) return FALSE; } +void +gimp_container_tree_view_drag_failed (GtkWidget *widget, + GdkDragContext *context, + GtkDragResult result, + GimpContainerTreeView *tree_view) +{ + if (tree_view->priv->scroll_timeout_id) + { + g_source_remove (tree_view->priv->scroll_timeout_id); + tree_view->priv->scroll_timeout_id = 0; + } + + gtk_tree_view_set_drag_dest_row (tree_view->view, NULL, 0); +} + void gimp_container_tree_view_drag_leave (GtkWidget *widget, GdkDragContext *context, diff --git a/app/widgets/gimpcontainertreeview-dnd.h b/app/widgets/gimpcontainertreeview-dnd.h index 1778e28109..3d696dace4 100644 --- a/app/widgets/gimpcontainertreeview-dnd.h +++ b/app/widgets/gimpcontainertreeview-dnd.h @@ -22,6 +22,10 @@ #define __GIMP_CONTAINER_TREE_VIEW_DND_H__ +void gimp_container_tree_view_drag_failed (GtkWidget *widget, + GdkDragContext *context, + GtkDragResult result, + GimpContainerTreeView *tree_view); void gimp_container_tree_view_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c index 67a81764cc..da4bcb1c11 100644 --- a/app/widgets/gimpcontainertreeview.c +++ b/app/widgets/gimpcontainertreeview.c @@ -294,6 +294,9 @@ gimp_container_tree_view_constructed (GObject *object) G_CALLBACK (gimp_container_tree_view_selection_changed), tree_view); + g_signal_connect (tree_view->view, "drag-failed", + G_CALLBACK (gimp_container_tree_view_drag_failed), + tree_view); g_signal_connect (tree_view->view, "drag-leave", G_CALLBACK (gimp_container_tree_view_drag_leave), tree_view); @@ -442,6 +445,14 @@ gimp_container_tree_view_new (GimpContainer *container, return GTK_WIDGET (tree_view); } +GtkCellRenderer * +gimp_container_tree_view_get_name_cell (GimpContainerTreeView *tree_view) +{ + g_return_val_if_fail (GIMP_IS_CONTAINER_TREE_VIEW (tree_view), NULL); + + return tree_view->priv->name_cell; +} + void gimp_container_tree_view_set_main_column_title (GimpContainerTreeView *tree_view, const gchar *title) diff --git a/app/widgets/gimpcontainertreeview.h b/app/widgets/gimpcontainertreeview.h index b9d0cc64bd..5ad9ec9525 100644 --- a/app/widgets/gimpcontainertreeview.h +++ b/app/widgets/gimpcontainertreeview.h @@ -108,6 +108,10 @@ GtkWidget * gimp_container_tree_view_new (GimpContainer *container, gint view_size, gint view_border_width); +GtkCellRenderer * + gimp_container_tree_view_get_name_cell + (GimpContainerTreeView *tree_view); + void gimp_container_tree_view_set_main_column_title (GimpContainerTreeView *tree_view, const gchar *title); diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c index 8b4f9ca6c4..528e007730 100644 --- a/app/widgets/gimpcontainerview.c +++ b/app/widgets/gimpcontainerview.c @@ -405,6 +405,9 @@ gimp_container_view_real_set_container (GimpContainerView *view, if (private->container) { + if (private->context) + gimp_container_view_disconnect_context (view); + gimp_container_view_select_item (view, NULL); /* freeze/thaw is only supported for the toplevel container */ @@ -417,9 +420,6 @@ gimp_container_view_real_set_container (GimpContainerView *view, if (! gimp_container_frozen (private->container)) gimp_container_view_remove_container (view, private->container); - - if (private->context) - gimp_container_view_disconnect_context (view); } private->container = container; @@ -1074,15 +1074,11 @@ gimp_container_view_remove_container (GimpContainerView *view, GimpContainerViewInterface *view_iface; GimpContainerViewPrivate *private; + g_object_ref (container); + view_iface = GIMP_CONTAINER_VIEW_GET_INTERFACE (view); private = GIMP_CONTAINER_VIEW_GET_PRIVATE (view); - if (container == private->container) - { - gimp_tree_handler_disconnect (private->name_changed_handler); - private->name_changed_handler = NULL; - } - g_signal_handlers_disconnect_by_func (container, gimp_container_view_add, view); @@ -1093,6 +1089,12 @@ gimp_container_view_remove_container (GimpContainerView *view, gimp_container_view_reorder, view); + if (container == private->container) + { + gimp_tree_handler_disconnect (private->name_changed_handler); + private->name_changed_handler = NULL; + } + if (! view_iface->model_is_tree && container == private->container) { gimp_container_view_clear_items (view); @@ -1103,6 +1105,8 @@ gimp_container_view_remove_container (GimpContainerView *view, (GFunc) gimp_container_view_remove_foreach, view); } + + g_object_unref (container); } static void diff --git a/app/widgets/gimpdeviceinfo-coords.c b/app/widgets/gimpdeviceinfo-coords.c index 0b72a2b950..f6b74cac6a 100644 --- a/app/widgets/gimpdeviceinfo-coords.c +++ b/app/widgets/gimpdeviceinfo-coords.c @@ -62,11 +62,13 @@ gimp_device_info_get_event_coords (GimpDeviceInfo *info, gint offset_x; gint offset_y; - gtk_widget_translate_coordinates (src_widget, dest_widget, - 0, 0, &offset_x, &offset_y); - - coords->x += offset_x; - coords->y += offset_y; + if (gtk_widget_translate_coordinates (src_widget, dest_widget, + 0, 0, + &offset_x, &offset_y)) + { + coords->x += offset_x; + coords->y += offset_y; + } } } diff --git a/app/widgets/gimpimagepropview.c b/app/widgets/gimpimagepropview.c index 0f6164a697..f87905c851 100644 --- a/app/widgets/gimpimagepropview.c +++ b/app/widgets/gimpimagepropview.c @@ -21,15 +21,8 @@ #include "config.h" -#include - -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include -#include #include "libgimpbase/gimpbase.h" #include "libgimpwidgets/gimpwidgets.h" @@ -330,29 +323,35 @@ static void gimp_image_prop_view_label_set_filesize (GtkWidget *label, GimpImage *image) { - const gchar *uri = gimp_image_get_any_uri (image); - gchar *filename = NULL; + const gchar *uri = gimp_image_get_any_uri (image); + GFile *file = NULL; if (uri) - filename = g_filename_from_uri (uri, NULL, NULL); + file = g_file_new_for_uri (uri); - if (filename) + if (file) { - struct stat buf; + GFileInfo *info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_SIZE, + G_FILE_QUERY_INFO_NONE, + NULL, NULL); - if (g_stat (filename, &buf) == 0) + if (info) { - gchar *str = g_format_size (buf.st_size); + goffset size = g_file_info_get_size (info); + gchar *str = g_format_size (size); gtk_label_set_text (GTK_LABEL (label), str); g_free (str); + + g_object_unref (info); } else { gtk_label_set_text (GTK_LABEL (label), NULL); } - g_free (filename); + g_object_unref (file); } else { diff --git a/app/widgets/gimppaletteview.c b/app/widgets/gimppaletteview.c index a34dd50a56..959b8671a5 100644 --- a/app/widgets/gimppaletteview.c +++ b/app/widgets/gimppaletteview.c @@ -433,7 +433,7 @@ gimp_palette_view_find_entry (GimpPaletteView *view, palette = GIMP_PALETTE (GIMP_VIEW (view)->renderer->viewable); renderer = GIMP_VIEW_RENDERER_PALETTE (GIMP_VIEW (view)->renderer); - if (! palette) + if (! palette || ! gimp_palette_get_n_colors (palette)) return NULL; col = x / renderer->cell_width; diff --git a/app/widgets/gimppanedbox.c b/app/widgets/gimppanedbox.c index d7c8890de6..a00a7355e6 100644 --- a/app/widgets/gimppanedbox.c +++ b/app/widgets/gimppanedbox.c @@ -146,7 +146,7 @@ gimp_paned_box_init (GimpPanedBox *paned_box) gtk_label_set_line_wrap (GTK_LABEL (paned_box->p->instructions), TRUE); gtk_label_set_justify (GTK_LABEL (paned_box->p->instructions), GTK_JUSTIFY_CENTER); - gtk_widget_set_size_request (paned_box->p->instructions, 16, DROP_AREA_SIZE); + gtk_widget_set_size_request (paned_box->p->instructions, 1, DROP_AREA_SIZE); gimp_label_set_attributes (GTK_LABEL (paned_box->p->instructions), PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC, -1); diff --git a/app/widgets/gimpprofilechooserdialog.c b/app/widgets/gimpprofilechooserdialog.c index 79e408dd8e..358dee5959 100644 --- a/app/widgets/gimpprofilechooserdialog.c +++ b/app/widgets/gimpprofilechooserdialog.c @@ -332,7 +332,7 @@ gimp_profile_view_query (GimpProfileChooserDialog *dialog) &name, &desc, &info, NULL)) { - gsize info_len = strlen (info); + gsize info_len = info ? strlen (info) : 0; gsize name_len = strlen (filename); /* lcms tends to adds the filename at the end of the info string. @@ -344,7 +344,7 @@ gimp_profile_view_query (GimpProfileChooserDialog *dialog) info_len -= name_len; } - gtk_text_buffer_set_text (dialog->buffer, info, info_len); + gtk_text_buffer_set_text (dialog->buffer, info ? info : "", info_len); if (desc) { diff --git a/app/widgets/gimpprogressdialog.c b/app/widgets/gimpprogressdialog.c index 49dd2e56b2..7b430c3052 100644 --- a/app/widgets/gimpprogressdialog.c +++ b/app/widgets/gimpprogressdialog.c @@ -223,5 +223,7 @@ gimp_progress_dialog_new (void) "skip-taskbar-hint", TRUE, "skip-pager-hint", TRUE, "resizable", FALSE, + "focus-on-map", FALSE, + "window-position", GTK_WIN_POS_CENTER, NULL); } diff --git a/app/xcf/Makefile.in b/app/xcf/Makefile.in index 0aacf346c4..b8de8cc6a7 100644 --- a/app/xcf/Makefile.in +++ b/app/xcf/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -304,6 +304,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -330,6 +332,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -592,14 +598,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c index 44e4785c22..50809df9e0 100644 --- a/app/xcf/xcf-save.c +++ b/app/xcf/xcf-save.c @@ -947,13 +947,14 @@ xcf_save_prop (XcfInfo *info, case PROP_PARASITES: { GimpParasiteList *list; - guint32 base, length; - long pos; list = va_arg (args, GimpParasiteList *); if (gimp_parasite_list_persistent_length (list) > 0) { + guint32 base, length = 0; + long pos; + xcf_write_prop_type_check_error (info, prop_type); /* because we don't know how much room the parasite list will take @@ -996,7 +997,7 @@ xcf_save_prop (XcfInfo *info, case PROP_PATHS: { - guint32 base, length; + guint32 base, length = 0; glong pos; xcf_write_prop_type_check_error (info, prop_type); @@ -1062,7 +1063,7 @@ xcf_save_prop (XcfInfo *info, case PROP_VECTORS: { - guint32 base, length; + guint32 base, length = 0; glong pos; xcf_write_prop_type_check_error (info, prop_type); diff --git a/authors.xml b/authors.xml index 3d2a06b602..ee5910dc0c 100644 --- a/authors.xml +++ b/authors.xml @@ -111,6 +111,7 @@ Tim Harder Marcus Heese Robert Helgesson + Michael Henning James Henstridge Eric Hernes Lukasz Hladowski @@ -130,6 +131,7 @@ Kristian Jantz Javier Jardón Tim Jedlicka + Jehan Róman Joost Alexander Jones Hans de Jonge @@ -185,6 +187,7 @@ Torsten Martinsen Takeshi Matsuyama Gordon Matzigkeit + Téo Mazars Gregory McLean Mike Melancon Federico Mena Quintero @@ -248,6 +251,7 @@ Marco Rossini Tim Rowley Karthikeyan S + Daniel Sabo Mike Schaeffer John Schlag Norbert Schmitz diff --git a/build/Makefile.in b/build/Makefile.in index c596ab04f9..40849cd142 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/build/windows/Makefile.in b/build/windows/Makefile.in index ad4964070e..8eafc3c59f 100644 --- a/build/windows/Makefile.in +++ b/build/windows/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -247,6 +247,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -273,6 +275,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/build/windows/gimp-plug-ins.rc b/build/windows/gimp-plug-ins.rc index 7d59fe950e..5bba51f0c2 100644 --- a/build/windows/gimp-plug-ins.rc +++ b/build/windows/gimp-plug-ins.rc @@ -6,12 +6,12 @@ #define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team" -#define VER_PRODUCTVERSION 2,8,6,0 -#define VER_PRODUCTVERSION_STR "2.8.6\0" +#define VER_PRODUCTVERSION 2,8,10,0 +#define VER_PRODUCTVERSION_STR "2.8.10\0" #define VER_PRODUCTNAME_STR "GNU Image Manipulation Program" -#define VER_FILEVERSION 2,8,6,0 -#define VER_FILEVERSION_STR "2.8.6.0\0" +#define VER_FILEVERSION 2,8,10,0 +#define VER_FILEVERSION_STR "2.8.10.0\0" #define VER_FILEDESCRIPTION_STR "GNU Image Manipulation Program Plug-In" #define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) diff --git a/build/windows/gimp.manifest b/build/windows/gimp.manifest index e12beae6f4..70bc30ab82 100644 --- a/build/windows/gimp.manifest +++ b/build/windows/gimp.manifest @@ -13,6 +13,7 @@ + diff --git a/build/windows/gimp.rc b/build/windows/gimp.rc index e6f0a1795c..22b0d9b3ab 100644 --- a/build/windows/gimp.rc +++ b/build/windows/gimp.rc @@ -7,12 +7,12 @@ #define VER_COMPANYNAME_STR "Spencer Kimball, Peter Mattis and the GIMP Development Team" -#define VER_PRODUCTVERSION 2,8,6,0 -#define VER_PRODUCTVERSION_STR "2.8.6\0" +#define VER_PRODUCTVERSION 2,8,10,0 +#define VER_PRODUCTVERSION_STR "2.8.10\0" #define VER_PRODUCTNAME_STR "GNU Image Manipulation Program" -#define VER_FILEVERSION 2,8,6,0 -#define VER_FILEVERSION_STR "2.8.6.0\0" +#define VER_FILEVERSION 2,8,10,0 +#define VER_FILEVERSION_STR "2.8.10.0\0" #define VER_FILEDESCRIPTION_STR "GNU Image Manipulation Program" #define VER_INTERNALNAME_STR QUOTE(INTERNALNAME_STR) diff --git a/config.guess b/config.guess index 120cc0d239..b79252d6b1 100755 --- a/config.guess +++ b/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-05-16' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -995,6 +995,12 @@ EOF ppc:Linux:*:*) echo powerpc-unknown-linux-${LIBC} exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; diff --git a/config.h.in b/config.h.in index 5d22dc8d20..bfccb457c2 100644 --- a/config.h.in +++ b/config.h.in @@ -54,6 +54,9 @@ /* Define to 1 if the altivec runtime test should use a sysctl. */ #undef HAVE_ALTIVEC_SYSCTL +/* Define to 1 if you have the `backtrace' function. */ +#undef HAVE_BACKTRACE + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ #undef HAVE_BIND_TEXTDOMAIN_CODESET @@ -75,6 +78,9 @@ /* Define to 1 if you have DirectX DirectInput headers and libraries */ #undef HAVE_DX_DINPUT +/* Define to 1 if you have the header file. */ +#undef HAVE_EXECINFO_H + /* Define to 1 if you have the `finite' function. */ #undef HAVE_FINITE @@ -108,12 +114,21 @@ /* Define to 1 if lcms is available */ #undef HAVE_LCMS +/* Define to 1 if lcms1 is available */ +#undef HAVE_LCMS1 + +/* Define to 1 if lcms2 is available */ +#undef HAVE_LCMS2 + /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES /* Define to 1 if you have the `asound' library (-lasound). */ #undef HAVE_LIBASOUND +/* Define to 1 if you have the `execinfo' library (-lexecinfo). */ +#undef HAVE_LIBEXECINFO + /* Define to 1 if libexif is available */ #undef HAVE_LIBEXIF @@ -201,6 +216,9 @@ /* Define to 1 to if the XFIXES X extension is available */ #undef HAVE_XFIXES +/* Define to 1 if xvfb-run is available */ +#undef HAVE_XVFB_RUN + /* Define to 1 if _NL_MEASUREMENT_MEASUREMENT is available */ #undef HAVE__NL_MEASUREMENT_MEASUREMENT @@ -214,9 +232,6 @@ /* Define to 1 if you don't have the fd_set typedef. */ #undef NO_FD_SET -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/config.sub b/config.sub index 8b612ab89d..9633db7046 100755 --- a/config.sub +++ b/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2013-08-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -257,7 +257,7 @@ case $basic_machine in | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -372,7 +372,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -794,7 +794,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1546,6 +1546,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff --git a/configure b/configure index 3b4ca420d0..2f7222735a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GIMP 2.8.6. +# Generated by GNU Autoconf 2.69 for GIMP 2.8.10. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GIMP' PACKAGE_TARNAME='gimp' -PACKAGE_VERSION='2.8.6' -PACKAGE_STRING='GIMP 2.8.6' +PACKAGE_VERSION='2.8.10' +PACKAGE_STRING='GIMP 2.8.10' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP' PACKAGE_URL='' @@ -684,6 +684,8 @@ DESKTOP_DATADIR_FALSE DESKTOP_DATADIR_TRUE HAVE_MAC_TWAIN_FALSE HAVE_MAC_TWAIN_TRUE +GTK_MAC_INTEGRATION_LIBS +GTK_MAC_INTEGRATION_CFLAGS PLATFORM_OSX_FALSE PLATFORM_OSX_TRUE SCREENSHOT @@ -732,6 +734,10 @@ HAVE_LCMS_TRUE LCMS LCMS_LIBS LCMS_CFLAGS +LCMS2_LIBS +LCMS2_CFLAGS +LCMS1_LIBS +LCMS1_CFLAGS JP2_LIBS FILE_JP2_LOAD BUILD_JP2_FALSE @@ -1185,8 +1191,10 @@ CAIRO_PDF_CFLAGS CAIRO_PDF_LIBS CURL_CFLAGS CURL_LIBS -LCMS_CFLAGS -LCMS_LIBS +LCMS1_CFLAGS +LCMS1_LIBS +LCMS2_CFLAGS +LCMS2_LIBS XMC_CFLAGS XMC_LIBS DBUS_GLIB_CFLAGS @@ -1196,6 +1204,8 @@ GUDEV_LIBS PYTHON PYGTK_CFLAGS PYGTK_LIBS +GTK_MAC_INTEGRATION_CFLAGS +GTK_MAC_INTEGRATION_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS' @@ -1738,7 +1748,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GIMP 2.8.6 to adapt to many kinds of systems. +\`configure' configures GIMP 2.8.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1812,7 +1822,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GIMP 2.8.6:";; + short | recursive ) echo "Configuration of GIMP 2.8.10:";; esac cat <<\_ACEOF @@ -1886,7 +1896,7 @@ Optional Packages: --without-libcurl build without curl support --without-wmf build without WMF support --without-libjasper build without JPEG-2000 support - --without-lcms build without lcms support + --with-lcms build with lcms support (check, lcms1, lcms2) --without-xmc build without Xcursor support --without-alsa disable alsa support in midi input controller --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) @@ -1971,8 +1981,12 @@ Some influential environment variables: linker flags for CAIRO_PDF, overriding pkg-config CURL_CFLAGS C compiler flags for CURL, overriding pkg-config CURL_LIBS linker flags for CURL, overriding pkg-config - LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config - LCMS_LIBS linker flags for LCMS, overriding pkg-config + LCMS1_CFLAGS + C compiler flags for LCMS1, overriding pkg-config + LCMS1_LIBS linker flags for LCMS1, overriding pkg-config + LCMS2_CFLAGS + C compiler flags for LCMS2, overriding pkg-config + LCMS2_LIBS linker flags for LCMS2, overriding pkg-config XMC_CFLAGS C compiler flags for XMC, overriding pkg-config XMC_LIBS linker flags for XMC, overriding pkg-config DBUS_GLIB_CFLAGS @@ -1986,6 +2000,10 @@ Some influential environment variables: PYGTK_CFLAGS C compiler flags for PYGTK, overriding pkg-config PYGTK_LIBS linker flags for PYGTK, overriding pkg-config + GTK_MAC_INTEGRATION_CFLAGS + C compiler flags for GTK_MAC_INTEGRATION, overriding pkg-config + GTK_MAC_INTEGRATION_LIBS + linker flags for GTK_MAC_INTEGRATION, overriding pkg-config GTKDOC_DEPS_CFLAGS C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS @@ -2057,7 +2075,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GIMP configure 2.8.6 +GIMP configure 2.8.10 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2480,7 +2498,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GIMP $as_me 2.8.6, which was +It was created by GIMP $as_me 2.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2834,7 +2852,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3349,7 +3367,7 @@ fi # Define the identity of the package. PACKAGE='gimp' - VERSION='2.8.6' + VERSION='2.8.10' # Some tools Automake needs. @@ -3391,6 +3409,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Enable silent build rules by default, requires at least # Automake-1.11. Disable by either passing --disable-silent-rules to @@ -3437,11 +3496,11 @@ AM_BACKSLASH='\' GIMP_MAJOR_VERSION=2 GIMP_MINOR_VERSION=8 -GIMP_MICRO_VERSION=6 -GIMP_INTERFACE_AGE=6 -GIMP_BINARY_AGE=806 -GIMP_VERSION=2.8.6 -GIMP_REAL_VERSION=2.8.6 +GIMP_MICRO_VERSION=10 +GIMP_INTERFACE_AGE=10 +GIMP_BINARY_AGE=810 +GIMP_VERSION=2.8.10 +GIMP_REAL_VERSION=2.8.10 GIMP_API_VERSION=2.0 GIMP_APP_VERSION=2.8 GIMP_PLUGIN_VERSION=2.0 @@ -3503,7 +3562,7 @@ fi -LT_VERSION_INFO="800:6:800" +LT_VERSION_INFO="800:10:800" LT_CURRENT_MINUS_AGE=0 @@ -4307,6 +4366,65 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4499,131 +4617,6 @@ else fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Initialize libtool @@ -13709,42 +13702,6 @@ $as_echo_n "checking whether $CC understands $flag... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - extra_warnings_works=yes -else - extra_warnings_works=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $extra_warnings_works" >&5 -$as_echo "$extra_warnings_works" >&6; } - CFLAGS="$extra_warnings_save_CFLAGS" - if test "x$extra_warnings_works" = "xyes"; then - extra_warnings="$flag" - fi - fi - done - -CFLAGS="$CFLAGS $extra_warnings" - - - extra_warnings= - for flag in '-Wformat-non-literal'; do - if test -z "$extra_warnings"; then - extra_warnings_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $flag" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands $flag" >&5 -$as_echo_n "checking whether $CC understands $flag... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - int main () { @@ -14146,7 +14103,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -for ac_header in sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h +for ac_header in execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -14159,6 +14116,63 @@ fi done +for ac_func in backtrace +do : + ac_fn_c_check_func "$LINENO" "backtrace" "ac_cv_func_backtrace" +if test "x$ac_cv_func_backtrace" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BACKTRACE 1 +_ACEOF + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace in -lexecinfo" >&5 +$as_echo_n "checking for backtrace in -lexecinfo... " >&6; } +if ${ac_cv_lib_execinfo_backtrace+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lexecinfo $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char backtrace (); +int +main () +{ +return backtrace (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_execinfo_backtrace=yes +else + ac_cv_lib_execinfo_backtrace=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_execinfo_backtrace" >&5 +$as_echo "$ac_cv_lib_execinfo_backtrace" >&6; } +if test "x$ac_cv_lib_execinfo_backtrace" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBEXECINFO 1 +_ACEOF + + LIBS="-lexecinfo $LIBS" + +fi + +fi +done + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" if test "x$ac_cv_type_pid_t" = xyes; then : @@ -16421,13 +16435,10 @@ int main () { unsigned int major, minor, micro; - char *tmp_version; fclose (fopen ("conf.glibtest", "w")); - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { printf("%s, bad version string\n", "$min_glib_version"); exit(1); } @@ -21181,19 +21192,23 @@ fi # Check whether --with-lcms was given. if test "${with_lcms+set}" = set; then : withval=$with_lcms; +else + with_lcms=check fi have_lcms="no (lcms support disabled)" if test "x$with_lcms" != xno; then - have_lcms=yes + if test "x$with_lcms" = x1 || \ + test "x$with_lcms" = xlcms1 || \ + test "x$with_lcms" = xcheck; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5 -$as_echo_n "checking for LCMS... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS1" >&5 +$as_echo_n "checking for LCMS1... " >&6; } -if test -n "$LCMS_CFLAGS"; then - pkg_cv_LCMS_CFLAGS="$LCMS_CFLAGS" +if test -n "$LCMS1_CFLAGS"; then + pkg_cv_LCMS1_CFLAGS="$LCMS1_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.16\""; } >&5 @@ -21201,7 +21216,7 @@ if test -n "$LCMS_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.16" 2>/dev/null` + pkg_cv_LCMS1_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.16" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21209,8 +21224,8 @@ fi else pkg_failed=untried fi -if test -n "$LCMS_LIBS"; then - pkg_cv_LCMS_LIBS="$LCMS_LIBS" +if test -n "$LCMS1_LIBS"; then + pkg_cv_LCMS1_LIBS="$LCMS1_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms >= 1.16\""; } >&5 @@ -21218,7 +21233,7 @@ if test -n "$LCMS_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.16" 2>/dev/null` + pkg_cv_LCMS1_LIBS=`$PKG_CONFIG --libs "lcms >= 1.16" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -21239,32 +21254,137 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms >= 1.16" 2>&1` + LCMS1_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms >= 1.16" 2>&1` else - LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms >= 1.16" 2>&1` + LCMS1_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms >= 1.16" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$LCMS_PKG_ERRORS" >&5 + echo "$LCMS1_PKG_ERRORS" >&5 - have_lcms="no (lcms not found or unusable)" + have_lcms="no (lcms1 not found)" elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_lcms="no (lcms not found or unusable)" + have_lcms="no (lcms1 not found)" else - LCMS_CFLAGS=$pkg_cv_LCMS_CFLAGS - LCMS_LIBS=$pkg_cv_LCMS_LIBS + LCMS1_CFLAGS=$pkg_cv_LCMS1_CFLAGS + LCMS1_LIBS=$pkg_cv_LCMS1_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + have_lcms="yes (lcms1)" $as_echo "#define HAVE_LCMS 1" >>confdefs.h - LCMS='lcms$(EXEEXT)' + +$as_echo "#define HAVE_LCMS1 1" >>confdefs.h + + LCMS_CFLAGS="$LCMS1_CFLAGS" + LCMS_LIBS="$LCMS1_LIBS" + LCMS='lcms$(EXEEXT)' fi + fi + + if test "x$have_lcms" != "xyes (lcms1)"; then + if test "x$with_lcms" = x2 || \ + test "x$with_lcms" = xlcms2 || \ + test "x$with_lcms" = xcheck; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5 +$as_echo_n "checking for LCMS2... " >&6; } + +if test -n "$LCMS2_CFLAGS"; then + pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2 >= 2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LCMS2_LIBS"; then + pkg_cv_LCMS2_LIBS="$LCMS2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.2\""; } >&5 + ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.2") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2 >= 2.2" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi - if test "x$have_lcms" = xyes; then + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2 >= 2.2" 2>&1` + else + LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2 >= 2.2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LCMS2_PKG_ERRORS" >&5 + + if test "x$with_lcms" = xcheck; then + have_lcms="no (lcms not found)" + else + have_lcms="no (lcms2 not found)" + fi +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "x$with_lcms" = xcheck; then + have_lcms="no (lcms not found)" + else + have_lcms="no (lcms2 not found)" + fi +else + LCMS2_CFLAGS=$pkg_cv_LCMS2_CFLAGS + LCMS2_LIBS=$pkg_cv_LCMS2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lcms="yes (lcms2)" + +$as_echo "#define HAVE_LCMS 1" >>confdefs.h + + +$as_echo "#define HAVE_LCMS2 1" >>confdefs.h + + LCMS_CFLAGS="$LCMS2_CFLAGS" + LCMS_LIBS="$LCMS2_LIBS" + LCMS='lcms$(EXEEXT)' +fi + fi + fi +fi + + + + + if test "x$have_lcms" = "xyes (lcms1)" || \ + test "x$have_lcms" = "xyes (lcms2)"; then HAVE_LCMS_TRUE= HAVE_LCMS_FALSE='#' else @@ -22764,6 +22884,106 @@ fi +############################### +# Check for GTK Mac Integration +############################### + +if test "x$platform_osx" != xno && + test "x`$PKG_CONFIG --variable=target gtk+-2.0`" == "xquartz"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK_MAC_INTEGRATION" >&5 +$as_echo_n "checking for GTK_MAC_INTEGRATION... " >&6; } + +if test -n "$GTK_MAC_INTEGRATION_CFLAGS"; then + pkg_cv_GTK_MAC_INTEGRATION_CFLAGS="$GTK_MAC_INTEGRATION_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 1.0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_MAC_INTEGRATION_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration >= 1.0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GTK_MAC_INTEGRATION_LIBS"; then + pkg_cv_GTK_MAC_INTEGRATION_LIBS="$GTK_MAC_INTEGRATION_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration >= 1.0.1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk-mac-integration >= 1.0.1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GTK_MAC_INTEGRATION_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration >= 1.0.1" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTK_MAC_INTEGRATION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-mac-integration >= 1.0.1" 2>&1` + else + GTK_MAC_INTEGRATION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-mac-integration >= 1.0.1" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTK_MAC_INTEGRATION_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (gtk-mac-integration >= 1.0.1) were not met: + +$GTK_MAC_INTEGRATION_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GTK_MAC_INTEGRATION_CFLAGS +and GTK_MAC_INTEGRATION_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GTK_MAC_INTEGRATION_CFLAGS +and GTK_MAC_INTEGRATION_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + GTK_MAC_INTEGRATION_CFLAGS=$pkg_cv_GTK_MAC_INTEGRATION_CFLAGS + GTK_MAC_INTEGRATION_LIBS=$pkg_cv_GTK_MAC_INTEGRATION_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi +fi + + #################################### # Check for Mac OS X TWAIN framework #################################### @@ -22995,11 +23215,14 @@ fi if test "x$XVFB_RUN" != "xno"; then have_xvfb_run="yes" + +$as_echo "#define HAVE_XVFB_RUN 1" >>confdefs.h + else have_xvfb_run="no (not found)" fi fi - if test "x$have_xvfb_run" == "xyes"; then + if test "x$have_xvfb_run" = "xyes"; then HAVE_XVFB_RUN_TRUE= HAVE_XVFB_RUN_FALSE='#' else @@ -23236,31 +23459,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -23295,6 +23498,10 @@ fi enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -24227,7 +24434,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GIMP $as_me 2.8.6, which was +This file was extended by GIMP $as_me 2.8.10, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24293,7 +24500,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GIMP config.status 2.8.6 +GIMP config.status 2.8.10 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -24696,8 +24903,8 @@ fi gimp_major_ver=2 gimp_minor_ver=8 - gimp_micro_ver=6 - gimp_ver=2.8.6 + gimp_micro_ver=10 + gimp_ver=2.8.10 gimp_api_ver=2.0 diff --git a/configure.ac b/configure.ac index 888a12096d..1225bbb49b 100644 --- a/configure.ac +++ b/configure.ac @@ -8,16 +8,16 @@ AC_PREREQ(2.54) m4_define([gimp_major_version], [2]) m4_define([gimp_minor_version], [8]) -m4_define([gimp_micro_version], [6]) +m4_define([gimp_micro_version], [10]) m4_define([gimp_real_version], [gimp_major_version.gimp_minor_version.gimp_micro_version]) m4_define([gimp_version], [gimp_real_version]) -m4_define([gimp_interface_age], [6]) +m4_define([gimp_interface_age], [10]) m4_define([gimp_binary_age], [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) # For overriding the version string. Comment out if not needed. -# m4_define([gimp_version], [2.8.1]) +# m4_define([gimp_version], [2.8.9]) # This is the X.Y used in -lgimp-X.Y m4_define([gimp_api_version], [2.0]) @@ -61,8 +61,10 @@ m4_define([libcurl_required_version], [7.15.1]) m4_define([dbus_glib_required_version], [0.70]) m4_define([libgudev_required_version], [167]) m4_define([exif_required_version], [0.6.15]) -m4_define([lcms_required_version], [1.16]) +m4_define([lcms1_required_version], [1.16]) +m4_define([lcms2_required_version], [2.2]) m4_define([libpng_required_version], [1.2.37]) +m4_define([gtk_mac_integration_required_version], [1.0.1]) AC_INIT([GIMP], [gimp_version], @@ -358,9 +360,6 @@ CFLAGS="$CFLAGS $extra_warnings" GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-security') CFLAGS="$CFLAGS $extra_warnings" -GIMP_DETECT_CFLAGS(extra_warnings, '-Wformat-non-literal') -CFLAGS="$CFLAGS $extra_warnings" - GIMP_DETECT_CFLAGS(extra_warnings, '-fno-common') CFLAGS="$CFLAGS $extra_warnings" @@ -416,7 +415,8 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_HEADER_TIME -AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h) +AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h) +AC_CHECK_FUNCS(backtrace, , AC_CHECK_LIB(execinfo, backtrace)) AC_TYPE_PID_T AC_FUNC_VPRINTF @@ -1539,19 +1539,51 @@ AC_SUBST(JP2_LIBS) # Check for lcms ################ -AC_ARG_WITH(lcms, [ --without-lcms build without lcms support]) +AC_ARG_WITH(lcms, [ --with-lcms build with lcms support (check, lcms1, lcms2)], + [], + [with_lcms=check]) have_lcms="no (lcms support disabled)" if test "x$with_lcms" != xno; then - have_lcms=yes - PKG_CHECK_MODULES(LCMS, lcms >= lcms_required_version, - AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available]) - LCMS='lcms$(EXEEXT)', - have_lcms="no (lcms not found or unusable)") + if test "x$with_lcms" = x1 || \ + test "x$with_lcms" = xlcms1 || \ + test "x$with_lcms" = xcheck; then + PKG_CHECK_MODULES(LCMS1, lcms >= lcms1_required_version, + [have_lcms="yes (lcms1)" + AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available]) + AC_DEFINE(HAVE_LCMS1, 1, [Define to 1 if lcms1 is available]) + LCMS_CFLAGS="$LCMS1_CFLAGS" + LCMS_LIBS="$LCMS1_LIBS" + LCMS='lcms$(EXEEXT)'], + [have_lcms="no (lcms1 not found)"]) + fi + + if test "x$have_lcms" != "xyes (lcms1)"; then + if test "x$with_lcms" = x2 || \ + test "x$with_lcms" = xlcms2 || \ + test "x$with_lcms" = xcheck; then + PKG_CHECK_MODULES(LCMS2, lcms2 >= lcms2_required_version, + [have_lcms="yes (lcms2)" + AC_DEFINE(HAVE_LCMS, 1, [Define to 1 if lcms is available]) + AC_DEFINE(HAVE_LCMS2, 1, [Define to 1 if lcms2 is available]) + LCMS_CFLAGS="$LCMS2_CFLAGS" + LCMS_LIBS="$LCMS2_LIBS" + LCMS='lcms$(EXEEXT)'], + [if test "x$with_lcms" = xcheck; then + have_lcms="no (lcms not found)" + else + have_lcms="no (lcms2 not found)" + fi]) + fi + fi fi +AC_SUBST(LCMS_CFLAGS) +AC_SUBST(LCMS_LIBS) AC_SUBST(LCMS) -AM_CONDITIONAL(HAVE_LCMS, test "x$have_lcms" = xyes) +AM_CONDITIONAL(HAVE_LCMS, + [test "x$have_lcms" = "xyes (lcms1)" || \ + test "x$have_lcms" = "xyes (lcms2)"]) ###################### @@ -1859,6 +1891,16 @@ esac AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" = xyes) +############################### +# Check for GTK Mac Integration +############################### + +if test "x$platform_osx" != xno && + test "x`$PKG_CONFIG --variable=target gtk+-2.0`" == "xquartz"; then + PKG_CHECK_MODULES(GTK_MAC_INTEGRATION, gtk-mac-integration >= gtk_mac_integration_required_version) +fi + + #################################### # Check for Mac OS X TWAIN framework #################################### @@ -1920,11 +1962,12 @@ if test "x$with_xvfb_run" != "xno"; then AC_PATH_PROG(XVFB_RUN, xvfb-run, no) if test "x$XVFB_RUN" != "xno"; then have_xvfb_run="yes" + AC_DEFINE(HAVE_XVFB_RUN, 1, [Define to 1 if xvfb-run is available]) else have_xvfb_run="no (not found)" fi fi -AM_CONDITIONAL(HAVE_XVFB_RUN, test "x$have_xvfb_run" == "xyes") +AM_CONDITIONAL(HAVE_XVFB_RUN, test "x$have_xvfb_run" = "xyes") ###################################### diff --git a/cursors/Makefile.in b/cursors/Makefile.in index ee9bca7d50..23811ab6fd 100644 --- a/cursors/Makefile.in +++ b/cursors/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -248,6 +248,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -274,6 +276,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/Makefile.in b/data/Makefile.in index 3306f4998f..d6dc5cb310 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Basic/Makefile.in b/data/brushes/Basic/Makefile.in index 304c1541f4..1744045c61 100644 --- a/data/brushes/Basic/Makefile.in +++ b/data/brushes/Basic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Legacy/Makefile.in b/data/brushes/Legacy/Makefile.in index 03a262e753..85b24c4969 100644 --- a/data/brushes/Legacy/Makefile.in +++ b/data/brushes/Legacy/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Makefile.in b/data/brushes/Makefile.in index 39a4167850..500082b015 100644 --- a/data/brushes/Makefile.in +++ b/data/brushes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Media/Makefile.in b/data/brushes/Media/Makefile.in index 4174e8bef0..90a0647586 100644 --- a/data/brushes/Media/Makefile.in +++ b/data/brushes/Media/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Sketch/Makefile.in b/data/brushes/Sketch/Makefile.in index ad5e355cd6..25efbfbaee 100644 --- a/data/brushes/Sketch/Makefile.in +++ b/data/brushes/Sketch/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Splatters/Makefile.in b/data/brushes/Splatters/Makefile.in index cf49c2ccb1..0c0e2ee4a6 100644 --- a/data/brushes/Splatters/Makefile.in +++ b/data/brushes/Splatters/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/Texture/Makefile.in b/data/brushes/Texture/Makefile.in index 321fb09a74..19d7f0d43b 100644 --- a/data/brushes/Texture/Makefile.in +++ b/data/brushes/Texture/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/brushes/gimp-obsolete-files/Makefile.in b/data/brushes/gimp-obsolete-files/Makefile.in index f5bd9e55c1..62418e5681 100644 --- a/data/brushes/gimp-obsolete-files/Makefile.in +++ b/data/brushes/gimp-obsolete-files/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/dynamics/Basic/Makefile.in b/data/dynamics/Basic/Makefile.in index 2d88d34080..2d4ce1c195 100644 --- a/data/dynamics/Basic/Makefile.in +++ b/data/dynamics/Basic/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/dynamics/FX/Makefile.in b/data/dynamics/FX/Makefile.in index 9e50eb3743..56e24b85da 100644 --- a/data/dynamics/FX/Makefile.in +++ b/data/dynamics/FX/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/dynamics/Makefile.in b/data/dynamics/Makefile.in index 54ca8d8ca5..7580fccfbc 100644 --- a/data/dynamics/Makefile.in +++ b/data/dynamics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -336,6 +336,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -362,6 +364,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/environ/Makefile.in b/data/environ/Makefile.in index 56e000e5f1..9bd44c063d 100644 --- a/data/environ/Makefile.in +++ b/data/environ/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/gradients/Makefile.in b/data/gradients/Makefile.in index 884fbeb258..272d3c6231 100644 --- a/data/gradients/Makefile.in +++ b/data/gradients/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -277,6 +277,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -303,6 +305,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/images/Makefile.in b/data/images/Makefile.in index e2e84b87d7..5ac4ced81f 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/interpreters/Makefile.in b/data/interpreters/Makefile.in index c801a6351d..d8a33ed0d8 100644 --- a/data/interpreters/Makefile.in +++ b/data/interpreters/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/palettes/Makefile.in b/data/palettes/Makefile.in index 584162b814..2ab79a88b1 100644 --- a/data/palettes/Makefile.in +++ b/data/palettes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/patterns/Makefile.in b/data/patterns/Makefile.in index aa672a5001..b50154181a 100644 --- a/data/patterns/Makefile.in +++ b/data/patterns/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tags/Makefile.in b/data/tags/Makefile.in index c4d49f9f0e..8e2e9fb624 100644 --- a/data/tags/Makefile.in +++ b/data/tags/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tips/Makefile.in b/data/tips/Makefile.in index 92ec9ac396..0d510dd1a9 100644 --- a/data/tips/Makefile.in +++ b/data/tips/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tips/gimp-tips.xml b/data/tips/gimp-tips.xml index c50ac6a36b..4f3e651dd1 100644 --- a/data/tips/gimp-tips.xml +++ b/data/tips/gimp-tips.xml @@ -192,6 +192,7 @@ When you save an image to work on it again later, try using XCF, GIMP's native file format (use the file extension .xcf). This preserves the layers and many aspects of your work-in-progress. Once a project is completed, you can export it as JPEG, PNG, GIF, etc. Kiam vi konservas bildon por labori super ĝi poste, provu uzi na XCF, GIMP-origina dosierformo (uzu la dosier-finaĵon .xcf). Tio konservas tavolojn kaj iun ajn proprecon de via evoluanta laboraĵo. Kiam la projekto estas finita, vi povas konservi ĝin kiel JPEG, PNG, GIF, ktp. Cuando guarde una imagen para trabajar con ella más tarde, pruebe a usar XCF, el formato de archivo nativo de GIMP (use la extensión de archivo .xcf). Este formato preserva las capas y cada aspecto del avance de su trabajo. Una vez que su proyecto esté terminado puede exportarla como JPEG, PNG, GIF, etc + Irudi bat gordetzen duzunean, beranduago harekin berriro lan egiteko, saiatu XCF erabiltzen, GIMPen fitxategi-formatua da (erabili fitxategi-luzapen hau: .xcf). Hala, irudiaren geruzak eta lantzen ari zaren arlo asko mantenduko dira. Proiektua bukatutakoan, ordea, formatu hauetan gorde behar duzu: JPEG, PNG, GIF, ... Kun tallennat kuvan myöhempää työstämistä varten, kokeile käyttää XCF:ää, GIMPin omaa tiedostomuotoa (lisää tiedoston perään .xcf-pääte). Tämä säilyttää tasot ja monet muut yksityiskohdat työstäsi. Kun projekti on valmis, voit viedä sen JPEG, PNG, GIF, ... -muotoon. Quand vous enregistrez une image pour la retravailler plus tard, essayez le format XCF qui est le format natif de GIMP (extension .xcf). Ceci conserve les calques et de nombreux aspects de votre travail en cours. Une fois qu'un projet est terminé, vous pouvez l'exporter en JPEG, PNG, GIF, etc. Ha egy elmentendő képen a későbbiekben is szeretne majd módosításokat végezni, akkor használja az XCF formátumot, amely a GIMP saját fájlformátuma (használja ehhez a .xcf végződést a fájlnévben). Ez a formátum megőrzi a folyamatban lévő munka sok tulajdonságát. Amikor a kép elkészült, elmentheti JPEG, PNG, GIF stb. formátumban. diff --git a/data/tool-presets/FX/Makefile.in b/data/tool-presets/FX/Makefile.in index c885c941c7..995c612022 100644 --- a/data/tool-presets/FX/Makefile.in +++ b/data/tool-presets/FX/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tool-presets/Makefile.in b/data/tool-presets/Makefile.in index 99a99ee859..32f337c237 100644 --- a/data/tool-presets/Makefile.in +++ b/data/tool-presets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tool-presets/Paint/Makefile.in b/data/tool-presets/Paint/Makefile.in index 2613b1ae35..f7991b5f32 100644 --- a/data/tool-presets/Paint/Makefile.in +++ b/data/tool-presets/Paint/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tool-presets/Selection/Makefile.in b/data/tool-presets/Selection/Makefile.in index 2ccc116cb8..71d06f3cb2 100644 --- a/data/tool-presets/Selection/Makefile.in +++ b/data/tool-presets/Selection/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/data/tool-presets/Sketch/Makefile.in b/data/tool-presets/Sketch/Makefile.in index 8cf212484e..c1851bc052 100644 --- a/data/tool-presets/Sketch/Makefile.in +++ b/data/tool-presets/Sketch/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/desktop/Makefile.am b/desktop/Makefile.am index fca05de546..bd6be11904 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -3,12 +3,16 @@ desktop_in_files = gimp.desktop.in.in desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) +appdata_in_files = gimp.appdata.xml.in +appdata_files = $(appdata_in_files:.appdata.xml.in=.appdata.xml) if DESKTOP_DATADIR applicationsdir = $(DESKTOP_DATADIR)/applications applications_DATA = $(desktop_files) +appdatadir = $(DESKTOP_DATADIR)/appdata +appdata_DATA = $(appdata_files) icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps icons16_DATA = 16x16/gimp.png @@ -35,8 +39,8 @@ install-data-hook: endif - EXTRA_DIST = \ + $(appdata_in_files) \ gimp.desktop.in.in \ 16x16/gimp.png \ 22x22/gimp.png \ @@ -47,8 +51,9 @@ EXTRA_DIST = \ 256x256/gimp.png -DISTCLEANFILES = $(desktop_files) +DISTCLEANFILES = $(desktop_files) $(appdata_files) +@INTLTOOL_XML_RULE@ gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po) $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cache diff --git a/desktop/Makefile.in b/desktop/Makefile.in index 5152eebdd7..f8086cf0a4 100644 --- a/desktop/Makefile.in +++ b/desktop/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -146,13 +146,14 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(applicationsdir)" \ - "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \ - "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" \ - "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)" -DATA = $(applications_DATA) $(icons16_DATA) $(icons22_DATA) \ - $(icons24_DATA) $(icons256_DATA) $(icons32_DATA) \ - $(icons48_DATA) +am__installdirs = "$(DESTDIR)$(appdatadir)" \ + "$(DESTDIR)$(applicationsdir)" "$(DESTDIR)$(icons16dir)" \ + "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" \ + "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" \ + "$(DESTDIR)$(icons48dir)" +DATA = $(appdata_DATA) $(applications_DATA) $(icons16_DATA) \ + $(icons22_DATA) $(icons24_DATA) $(icons256_DATA) \ + $(icons32_DATA) $(icons48_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -282,6 +283,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -308,6 +311,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -482,8 +489,12 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ desktop_in_files = gimp.desktop.in.in desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) +appdata_in_files = gimp.appdata.xml.in +appdata_files = $(appdata_in_files:.appdata.xml.in=.appdata.xml) @DESKTOP_DATADIR_TRUE@applicationsdir = $(DESKTOP_DATADIR)/applications @DESKTOP_DATADIR_TRUE@applications_DATA = $(desktop_files) +@DESKTOP_DATADIR_TRUE@appdatadir = $(DESKTOP_DATADIR)/appdata +@DESKTOP_DATADIR_TRUE@appdata_DATA = $(appdata_files) @DESKTOP_DATADIR_TRUE@icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps @DESKTOP_DATADIR_TRUE@icons16_DATA = 16x16/gimp.png @DESKTOP_DATADIR_TRUE@icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps @@ -497,6 +508,7 @@ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) @DESKTOP_DATADIR_TRUE@icons256dir = $(DESKTOP_DATADIR)/icons/hicolor/256x256/apps @DESKTOP_DATADIR_TRUE@icons256_DATA = 256x256/gimp.png EXTRA_DIST = \ + $(appdata_in_files) \ gimp.desktop.in.in \ 16x16/gimp.png \ 22x22/gimp.png \ @@ -506,7 +518,7 @@ EXTRA_DIST = \ 64x64/gimp.png \ 256x256/gimp.png -DISTCLEANFILES = $(desktop_files) +DISTCLEANFILES = $(desktop_files) $(appdata_files) all: all-am .SUFFIXES: @@ -548,6 +560,27 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs +install-appdataDATA: $(appdata_DATA) + @$(NORMAL_INSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ + done + +uninstall-appdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-applicationsDATA: $(applications_DATA) @$(NORMAL_INSTALL) @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \ @@ -739,7 +772,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(applicationsdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)"; do \ + for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(applicationsdir)" "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons256dir)" "$(DESTDIR)$(icons32dir)" "$(DESTDIR)$(icons48dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -794,9 +827,9 @@ info: info-am info-am: -install-data-am: install-applicationsDATA install-icons16DATA \ - install-icons22DATA install-icons24DATA install-icons256DATA \ - install-icons32DATA install-icons48DATA +install-data-am: install-appdataDATA install-applicationsDATA \ + install-icons16DATA install-icons22DATA install-icons24DATA \ + install-icons256DATA install-icons32DATA install-icons48DATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -841,19 +874,20 @@ ps: ps-am ps-am: -uninstall-am: uninstall-applicationsDATA uninstall-icons16DATA \ - uninstall-icons22DATA uninstall-icons24DATA \ - uninstall-icons256DATA uninstall-icons32DATA \ - uninstall-icons48DATA +uninstall-am: uninstall-appdataDATA uninstall-applicationsDATA \ + uninstall-icons16DATA uninstall-icons22DATA \ + uninstall-icons24DATA uninstall-icons256DATA \ + uninstall-icons32DATA uninstall-icons48DATA .MAKE: install-am install-data-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ cscopelist-am ctags-am dist-hook distclean distclean-generic \ distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-applicationsDATA install-data \ - install-data-am install-data-hook install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ + install install-am install-appdataDATA \ + install-applicationsDATA install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am \ install-icons16DATA install-icons22DATA install-icons24DATA \ install-icons256DATA install-icons32DATA install-icons48DATA \ install-info install-info-am install-man install-pdf \ @@ -861,16 +895,18 @@ uninstall-am: uninstall-applicationsDATA uninstall-icons16DATA \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ - uninstall-am uninstall-applicationsDATA uninstall-icons16DATA \ - uninstall-icons22DATA uninstall-icons24DATA \ - uninstall-icons256DATA uninstall-icons32DATA \ - uninstall-icons48DATA + uninstall-am uninstall-appdataDATA uninstall-applicationsDATA \ + uninstall-icons16DATA uninstall-icons22DATA \ + uninstall-icons24DATA uninstall-icons256DATA \ + uninstall-icons32DATA uninstall-icons48DATA # touch the toplevel icon directory as required by the icon theme spec @DESKTOP_DATADIR_TRUE@install-data-hook: @DESKTOP_DATADIR_TRUE@ touch $(DESTDIR)$(DESKTOP_DATADIR)/icons/hicolor +@INTLTOOL_XML_RULE@ + gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po) $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cache diff --git a/desktop/gimp.appdata.xml.in b/desktop/gimp.appdata.xml.in new file mode 100644 index 0000000000..78145ddd4e --- /dev/null +++ b/desktop/gimp.appdata.xml.in @@ -0,0 +1,38 @@ + + + gimp.desktop + + CC0 + + <_p> + GIMP is an acronym for GNU Image Manipulation Program. It is a + freely distributed program for such tasks as photo retouching, + image composition and image authoring. + + <_p> + It has many capabilities. It can be used as a simple paint + program, an expert quality photo retouching program, an online + batch processing system, a mass production image renderer, an + image format converter, etc. + + <_p> + GIMP is expandable and extensible. It is designed to be + augmented with plug-ins and extensions to do just about + anything. The advanced scripting interface allows everything + from the simplest task to the most complex image manipulation + procedures to be easily scripted. GIMP is also available for + Microsoft Windows and OS X. + + + http://www.gimp.org/ + + http://www.gimp.org/screenshots/linux_mixer.jpg + + gimp-developer-list_at_gnome.org + diff --git a/devel-docs/Makefile.in b/devel-docs/Makefile.in index 40750acd76..57fa024543 100644 --- a/devel-docs/Makefile.in +++ b/devel-docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -308,6 +308,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -334,6 +336,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/devel-docs/app/Makefile.in b/devel-docs/app/Makefile.in index 2eed3a97ca..7b20a4ccfa 100644 --- a/devel-docs/app/Makefile.in +++ b/devel-docs/app/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -614,6 +620,42 @@ GTKDOC_LIBS = \ @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +@ENABLE_GTK_DOC_APP_TRUE@GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -733,11 +775,11 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@ENABLE_GTK_DOC_APP_FALSE@uninstall-local: -@ENABLE_GTK_DOC_APP_FALSE@distclean-local: -@ENABLE_GTK_DOC_APP_FALSE@install-data-local: @ENABLE_GTK_DOC_APP_FALSE@maintainer-clean-local: +@ENABLE_GTK_DOC_APP_FALSE@distclean-local: @ENABLE_GTK_DOC_APP_FALSE@clean-local: +@ENABLE_GTK_DOC_APP_FALSE@install-data-local: +@ENABLE_GTK_DOC_APP_FALSE@uninstall-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am @@ -829,35 +871,28 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@$(REPORT_FILES): sgml-build.stamp -#### setup #### - @ENABLE_GTK_DOC_APP_TRUE@setup-build.stamp: -@ENABLE_GTK_DOC_APP_TRUE@ -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ -@ENABLE_GTK_DOC_APP_TRUE@ echo ' DOC Preparing build'; \ +@ENABLE_GTK_DOC_APP_TRUE@ -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ @ENABLE_GTK_DOC_APP_TRUE@ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ @ENABLE_GTK_DOC_APP_TRUE@ if test "x$$files" != "x" ; then \ @ENABLE_GTK_DOC_APP_TRUE@ for file in $$files ; do \ @ENABLE_GTK_DOC_APP_TRUE@ test -f $(abs_srcdir)/$$file && \ -@ENABLE_GTK_DOC_APP_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ +@ENABLE_GTK_DOC_APP_TRUE@ cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ @ENABLE_GTK_DOC_APP_TRUE@ done; \ @ENABLE_GTK_DOC_APP_TRUE@ fi; \ @ENABLE_GTK_DOC_APP_TRUE@ test -d $(abs_srcdir)/tmpl && \ @ENABLE_GTK_DOC_APP_TRUE@ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ @ENABLE_GTK_DOC_APP_TRUE@ chmod -R u+w $(abs_builddir)/tmpl; } \ @ENABLE_GTK_DOC_APP_TRUE@ fi -@ENABLE_GTK_DOC_APP_TRUE@ @touch setup-build.stamp - -#### scan #### +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch setup-build.stamp @ENABLE_GTK_DOC_APP_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Scanning header files' -@ENABLE_GTK_DOC_APP_TRUE@ @_source_dir='' ; \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_SCAN)_source_dir='' ; \ @ENABLE_GTK_DOC_APP_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @ENABLE_GTK_DOC_APP_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @ENABLE_GTK_DOC_APP_TRUE@ done ; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) -@ENABLE_GTK_DOC_APP_TRUE@ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ -@ENABLE_GTK_DOC_APP_TRUE@ echo " DOC Introspecting gobjects"; \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ @ENABLE_GTK_DOC_APP_TRUE@ scanobj_options=""; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ @ENABLE_GTK_DOC_APP_TRUE@ if test "$(?)" = "0"; then \ @@ -872,22 +907,19 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@ test -f $$i || touch $$i ; \ @ENABLE_GTK_DOC_APP_TRUE@ done \ @ENABLE_GTK_DOC_APP_TRUE@ fi -@ENABLE_GTK_DOC_APP_TRUE@ @touch scan-build.stamp +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch scan-build.stamp @ENABLE_GTK_DOC_APP_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @ENABLE_GTK_DOC_APP_TRUE@ @true -#### templates #### - @ENABLE_GTK_DOC_APP_TRUE@tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Rebuilding template files' -@ENABLE_GTK_DOC_APP_TRUE@ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) -@ENABLE_GTK_DOC_APP_TRUE@ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ @ENABLE_GTK_DOC_APP_TRUE@ if test -w $(abs_srcdir) ; then \ @ENABLE_GTK_DOC_APP_TRUE@ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ @ENABLE_GTK_DOC_APP_TRUE@ fi \ @ENABLE_GTK_DOC_APP_TRUE@ fi -@ENABLE_GTK_DOC_APP_TRUE@ @touch tmpl-build.stamp +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch tmpl-build.stamp @ENABLE_GTK_DOC_APP_TRUE@tmpl.stamp: tmpl-build.stamp @ENABLE_GTK_DOC_APP_TRUE@ @true @@ -895,28 +927,20 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@$(srcdir)/tmpl/*.sgml: @ENABLE_GTK_DOC_APP_TRUE@ @true -#### xml #### - @ENABLE_GTK_DOC_APP_TRUE@sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Building XML' -@ENABLE_GTK_DOC_APP_TRUE@ @-chmod -R u+w $(srcdir) -@ENABLE_GTK_DOC_APP_TRUE@ @_source_dir='' ; \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ @ENABLE_GTK_DOC_APP_TRUE@ for i in $(DOC_SOURCE_DIR) ; do \ @ENABLE_GTK_DOC_APP_TRUE@ _source_dir="$${_source_dir} --source-dir=$$i" ; \ @ENABLE_GTK_DOC_APP_TRUE@ done ; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) -@ENABLE_GTK_DOC_APP_TRUE@ @touch sgml-build.stamp +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch sgml-build.stamp @ENABLE_GTK_DOC_APP_TRUE@sgml.stamp: sgml-build.stamp @ENABLE_GTK_DOC_APP_TRUE@ @true -#### html #### - @ENABLE_GTK_DOC_APP_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Building HTML' -@ENABLE_GTK_DOC_APP_TRUE@ @rm -rf html -@ENABLE_GTK_DOC_APP_TRUE@ @mkdir html -@ENABLE_GTK_DOC_APP_TRUE@ @mkhtml_options=""; \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ +@ENABLE_GTK_DOC_APP_TRUE@ mkhtml_options=""; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ @ENABLE_GTK_DOC_APP_TRUE@ if test "$(?)" = "0"; then \ @ENABLE_GTK_DOC_APP_TRUE@ if test "x$(V)" = "x1"; then \ @@ -937,16 +961,12 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@ cp $(abs_builddir)/$$file $(abs_builddir)/html; \ @ENABLE_GTK_DOC_APP_TRUE@ fi; \ @ENABLE_GTK_DOC_APP_TRUE@ done; -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Fixing cross-references' -@ENABLE_GTK_DOC_APP_TRUE@ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) -@ENABLE_GTK_DOC_APP_TRUE@ @touch html-build.stamp - -#### pdf #### +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch html-build.stamp @ENABLE_GTK_DOC_APP_TRUE@pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) -@ENABLE_GTK_DOC_APP_TRUE@ @echo ' DOC Building PDF' -@ENABLE_GTK_DOC_APP_TRUE@ @rm -f $(DOC_MODULE).pdf -@ENABLE_GTK_DOC_APP_TRUE@ @mkpdf_options=""; \ +@ENABLE_GTK_DOC_APP_TRUE@ $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ +@ENABLE_GTK_DOC_APP_TRUE@ mkpdf_options=""; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ @ENABLE_GTK_DOC_APP_TRUE@ if test "$(?)" = "0"; then \ @ENABLE_GTK_DOC_APP_TRUE@ if test "x$(V)" = "x1"; then \ @@ -963,7 +983,7 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@ done; \ @ENABLE_GTK_DOC_APP_TRUE@ fi; \ @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) -@ENABLE_GTK_DOC_APP_TRUE@ @touch pdf-build.stamp +@ENABLE_GTK_DOC_APP_TRUE@ $(AM_V_at)touch pdf-build.stamp ############## @@ -979,7 +999,7 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@ rm -rf tmpl; \ @ENABLE_GTK_DOC_APP_TRUE@ fi -@ENABLE_GTK_DOC_APP_TRUE@maintainer-clean-local: clean +@ENABLE_GTK_DOC_APP_TRUE@maintainer-clean-local: @ENABLE_GTK_DOC_APP_TRUE@ @rm -rf xml html @ENABLE_GTK_DOC_APP_TRUE@install-data-local: @@ -1015,7 +1035,7 @@ uninstall-am: uninstall-local # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_APP_TRUE@@ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml index b201d765e9..cc404c11d3 100644 --- a/devel-docs/app/app-docs.sgml +++ b/devel-docs/app/app-docs.sgml @@ -233,7 +233,6 @@ - diff --git a/devel-docs/libgimp/Makefile.in b/devel-docs/libgimp/Makefile.in index fc4464347c..9f9ef19c47 100644 --- a/devel-docs/libgimp/Makefile.in +++ b/devel-docs/libgimp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -558,6 +564,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -766,35 +808,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -809,22 +844,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -832,28 +864,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -874,16 +898,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -900,7 +920,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -916,7 +936,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -952,7 +972,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimp/html/GimpAspectPreview.html b/devel-docs/libgimp/html/GimpAspectPreview.html index 60aee5537c..b18d12510e 100644 --- a/devel-docs/libgimp/html/GimpAspectPreview.html +++ b/devel-docs/libgimp/html/GimpAspectPreview.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@ the scroll offset.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpBrushSelectButton.html b/devel-docs/libgimp/html/GimpBrushSelectButton.html index 7ef8d61f85..2b01ac58b3 100644 --- a/devel-docs/libgimp/html/GimpBrushSelectButton.html +++ b/devel-docs/libgimp/html/GimpBrushSelectButton.html @@ -8,7 +8,7 @@ - + @@ -361,6 +361,6 @@ The ::brush-set signal is emitted when the user selects a brush.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpDrawablePreview.html b/devel-docs/libgimp/html/GimpDrawablePreview.html index 95d0799caa..3d837c50d7 100644 --- a/devel-docs/libgimp/html/GimpDrawablePreview.html +++ b/devel-docs/libgimp/html/GimpDrawablePreview.html @@ -8,7 +8,7 @@ - + @@ -188,6 +188,6 @@ the scroll offset.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpFontSelectButton.html b/devel-docs/libgimp/html/GimpFontSelectButton.html index 4122799e61..485c9fa279 100644 --- a/devel-docs/libgimp/html/GimpFontSelectButton.html +++ b/devel-docs/libgimp/html/GimpFontSelectButton.html @@ -8,7 +8,7 @@ - + @@ -248,6 +248,6 @@ The ::font-set signal is emitted when the user selects a font.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpGradientSelectButton.html b/devel-docs/libgimp/html/GimpGradientSelectButton.html index a2201c269a..91b6fc1a11 100644 --- a/devel-docs/libgimp/html/GimpGradientSelectButton.html +++ b/devel-docs/libgimp/html/GimpGradientSelectButton.html @@ -8,7 +8,7 @@ - + @@ -262,6 +262,6 @@ The ::gradient-set signal is emitted when the user selects a gradient.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpImageComboBox.html b/devel-docs/libgimp/html/GimpImageComboBox.html index e37e303426..9e4844a090 100644 --- a/devel-docs/libgimp/html/GimpImageComboBox.html +++ b/devel-docs/libgimp/html/GimpImageComboBox.html @@ -8,7 +8,7 @@ - + @@ -135,6 +135,6 @@ ID of the selected image.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpPaletteSelectButton.html b/devel-docs/libgimp/html/GimpPaletteSelectButton.html index ae1382c48d..9f92e4e6ee 100644 --- a/devel-docs/libgimp/html/GimpPaletteSelectButton.html +++ b/devel-docs/libgimp/html/GimpPaletteSelectButton.html @@ -8,7 +8,7 @@ - + @@ -252,6 +252,6 @@ The ::palette-set signal is emitted when the user selects a palette.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpPatternSelectButton.html b/devel-docs/libgimp/html/GimpPatternSelectButton.html index 87adea74a8..e7d4203efa 100644 --- a/devel-docs/libgimp/html/GimpPatternSelectButton.html +++ b/devel-docs/libgimp/html/GimpPatternSelectButton.html @@ -8,7 +8,7 @@ - + @@ -272,6 +272,6 @@ The ::pattern-set signal is emitted when the user selects a pattern.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpProcBrowserDialog.html b/devel-docs/libgimp/html/GimpProcBrowserDialog.html index 4b4c843798..41b1687325 100644 --- a/devel-docs/libgimp/html/GimpProcBrowserDialog.html +++ b/devel-docs/libgimp/html/GimpProcBrowserDialog.html @@ -8,7 +8,7 @@ - + @@ -224,6 +224,6 @@ Emitted when the selection in the contained GtkTreeView
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpProgressBar.html b/devel-docs/libgimp/html/GimpProgressBar.html index d945703f10..84f0071ad7 100644 --- a/devel-docs/libgimp/html/GimpProgressBar.html +++ b/devel-docs/libgimp/html/GimpProgressBar.html @@ -8,7 +8,7 @@ - + @@ -101,6 +101,6 @@ Creates a new
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpSelectButton.html b/devel-docs/libgimp/html/GimpSelectButton.html index 35c9804f69..b258315c98 100644 --- a/devel-docs/libgimp/html/GimpSelectButton.html +++ b/devel-docs/libgimp/html/GimpSelectButton.html @@ -8,7 +8,7 @@ - + @@ -107,6 +107,6 @@ Closes the popup window associated with button
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/GimpZoomPreview.html b/devel-docs/libgimp/html/GimpZoomPreview.html index 9c12101a22..82a3af8301 100644 --- a/devel-docs/libgimp/html/GimpZoomPreview.html +++ b/devel-docs/libgimp/html/GimpZoomPreview.html @@ -8,7 +8,7 @@ - + @@ -308,6 +308,6 @@ The <
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/index.html b/devel-docs/libgimp/html/index.html index d1708cff40..4771f110aa 100644 --- a/devel-docs/libgimp/html/index.html +++ b/devel-docs/libgimp/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -285,6 +285,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/index.sgml b/devel-docs/libgimp/html/index.sgml index 4812cf263b..fac32aaf24 100644 --- a/devel-docs/libgimp/html/index.sgml +++ b/devel-docs/libgimp/html/index.sgml @@ -62,26 +62,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91,6 +164,13 @@ + + + + + + + @@ -671,6 +751,9 @@ + + + @@ -679,6 +762,11 @@ + + + + + @@ -1205,7 +1293,19 @@ + + + + + + + + + + + + diff --git a/devel-docs/libgimp/html/libgimp-Gimp.html b/devel-docs/libgimp/html/libgimp-Gimp.html index 7aeab8f804..55ebe7d377 100644 --- a/devel-docs/libgimp/html/libgimp-Gimp.html +++ b/devel-docs/libgimp/html/libgimp-Gimp.html @@ -8,7 +8,7 @@ - + @@ -440,25 +440,25 @@ possible here, so you could say "RGB*" instead of "RGB, RGBA" or run, use the empty string.

-type must be one of GIMP_PLUGIN or GIMP_EXTENSION. Note that +type must be one of GIMP_PLUGIN or GIMP_EXTENSION. Note that temporary procedures must be installed using gimp_install_temp_proc().

-NOTE: Unlike the GIMP 1.2 API, GIMP_EXTENSION no longer means +NOTE: Unlike the GIMP 1.2 API, GIMP_EXTENSION no longer means that the procedure's menu prefix is <Toolbox>, but that it will install temporary procedures. Therefore, the GIMP core -will wait until the GIMP_EXTENSION procedure has called +will wait until the GIMP_EXTENSION procedure has called gimp_extension_ack(), which means that the procedure has done its initialization, installed its temporary procedures and is ready to run.

-Not calling gimp_extension_ack() from a GIMP_EXTENSION +Not calling gimp_extension_ack() from a GIMP_EXTENSION procedure will cause the GIMP core to lock up.

-Additionally, a GIMP_EXTENSION procedure with no parameters +Additionally, a GIMP_EXTENSION procedure with no parameters (n_params == 0 and params == NULL) is an "automatic" extension that will be automatically started on each GIMP startup.

@@ -553,7 +553,7 @@ one of your plug-in's "real" procedures is running. See gimp_install_procedure() for most details.

-type must be GIMP_TEMPORARY or the function +type must be GIMP_TEMPORARY or the function will fail.

@@ -665,7 +665,7 @@ This function calls a GIMP procedure and returns its return values.

The procedure's parameters are given by a va_list in the format -(type, value, type, value) and must be terminated by GIMP_PDB_END. +(type, value, type, value) and must be terminated by GIMP_PDB_END.

This function converts the va_list of parameters into an array and @@ -1240,7 +1240,7 @@ a GUI and is hanging around in a GMainLoop, it must ca gimp_extension_enable().

-Note that the plug-in does not need to be a GIMP_EXTENSION to +Note that the plug-in does not need to be a GIMP_EXTENSION to register temporary procedures.

@@ -1257,7 +1257,7 @@ initialized and is ready to run.

This function must be called from every -procedure that was registered as GIMP_EXTENSION. +procedure that was registered as GIMP_EXTENSION.

Subsequently, extensions can process temporary procedure run @@ -1567,6 +1567,6 @@ See Also:

- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html b/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html index 5deb698184..28fb56e7fe 100644 --- a/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html +++ b/devel-docs/libgimp/html/libgimp-GimpItemComboBox.html @@ -8,7 +8,7 @@ - + @@ -335,6 +335,6 @@ of the selected vectors object.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-GimpProcView.html b/devel-docs/libgimp/html/libgimp-GimpProcView.html index 1bbc260bcf..2f59180648 100644 --- a/devel-docs/libgimp/html/libgimp-GimpProcView.html +++ b/devel-docs/libgimp/html/libgimp-GimpProcView.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@ procedure and plug-in browsers.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-data.html b/devel-docs/libgimp/html/libgimp-data.html index eaee129ed9..0677dfe5e4 100644 --- a/devel-docs/libgimp/html/libgimp-data.html +++ b/devel-docs/libgimp/html/libgimp-data.html @@ -8,7 +8,7 @@ - + @@ -57,6 +57,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-general.html b/devel-docs/libgimp/html/libgimp-general.html index 10fc9c1284..06a0634f7e 100644 --- a/devel-docs/libgimp/html/libgimp-general.html +++ b/devel-docs/libgimp/html/libgimp-general.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrush.html b/devel-docs/libgimp/html/libgimp-gimpbrush.html index 1efb1a4c9c..de407fc190 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrush.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrush.html @@ -8,7 +8,7 @@ - + @@ -840,6 +840,6 @@ Returns TRUE if you have permission to change the brush
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushes.html b/devel-docs/libgimp/html/libgimp-gimpbrushes.html index 5c8cb10943..9b007e2698 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushes.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushes.html @@ -8,7 +8,7 @@ - + @@ -394,6 +394,6 @@ This procedure is deprecated! Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html b/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html index 806f1d9e07..94bf1523c5 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushmenu.html @@ -8,7 +8,7 @@ - + @@ -191,6 +191,6 @@ call to
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbrushselect.html b/devel-docs/libgimp/html/libgimp-gimpbrushselect.html index 2b73421af9..c2e98edc62 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbrushselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpbrushselect.html @@ -8,7 +8,7 @@ - + @@ -240,6 +240,6 @@ Sets the current brush in a brush selection dialog.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpbuffer.html b/devel-docs/libgimp/html/libgimp-gimpbuffer.html index 72249e0b2a..1a30d18172 100644 --- a/devel-docs/libgimp/html/libgimp-gimpbuffer.html +++ b/devel-docs/libgimp/html/libgimp-gimpbuffer.html @@ -8,7 +8,7 @@ - + @@ -266,6 +266,6 @@ This procedure retrieves the specified named buffer's image type.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpchannel.html b/devel-docs/libgimp/html/libgimp-gimpchannel.html index 73d71385f2..993491a98d 100644 --- a/devel-docs/libgimp/html/libgimp-gimpchannel.html +++ b/devel-docs/libgimp/html/libgimp-gimpchannel.html @@ -8,7 +8,7 @@ - + @@ -432,6 +432,6 @@ the first channel.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpcolor.html b/devel-docs/libgimp/html/libgimp-gimpcolor.html index 5ae837e1f6..267897873b 100644 --- a/devel-docs/libgimp/html/libgimp-gimpcolor.html +++ b/devel-docs/libgimp/html/libgimp-gimpcolor.html @@ -8,7 +8,7 @@ - + @@ -810,6 +810,6 @@ black.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpcontext.html b/devel-docs/libgimp/html/libgimp-gimpcontext.html index 238767da35..782033d0c6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpcontext.html +++ b/devel-docs/libgimp/html/libgimp-gimpcontext.html @@ -8,7 +8,7 @@ - + @@ -2195,6 +2195,6 @@ Set the ink tilt sensitivity for ink tool.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpconvert.html b/devel-docs/libgimp/html/libgimp-gimpconvert.html index 98d04848a6..a79954f376 100644 --- a/devel-docs/libgimp/html/libgimp-gimpconvert.html +++ b/devel-docs/libgimp/html/libgimp-gimpconvert.html @@ -8,7 +8,7 @@ - + @@ -237,6 +237,6 @@ INDEXED mode with positional dithering.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdisplay.html b/devel-docs/libgimp/html/libgimp-gimpdisplay.html index 786cdbde8a..72ff5d1af6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdisplay.html +++ b/devel-docs/libgimp/html/libgimp-gimpdisplay.html @@ -8,7 +8,7 @@ - + @@ -239,6 +239,6 @@ without success. You should rarely need to use this function.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawable.html b/devel-docs/libgimp/html/libgimp-gimpdrawable.html index 594ae01619..d63e019d22 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdrawable.html +++ b/devel-docs/libgimp/html/libgimp-gimpdrawable.html @@ -8,7 +8,7 @@ - + @@ -1668,6 +1668,6 @@ See Also:
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html b/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html index 401d8aed37..2c50997d93 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html +++ b/devel-docs/libgimp/html/libgimp-gimpdrawabletransform.html @@ -8,7 +8,7 @@ - + @@ -1300,6 +1300,6 @@ Functions to perform transformatrions on drawables.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpdynamics.html b/devel-docs/libgimp/html/libgimp-gimpdynamics.html index 68a1153401..1f13cc84cc 100644 --- a/devel-docs/libgimp/html/libgimp-gimpdynamics.html +++ b/devel-docs/libgimp/html/libgimp-gimpdynamics.html @@ -8,7 +8,7 @@ - + @@ -111,6 +111,6 @@ accordingly.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpedit.html b/devel-docs/libgimp/html/libgimp-gimpedit.html index d31f19a45f..adf91ddf12 100644 --- a/devel-docs/libgimp/html/libgimp-gimpedit.html +++ b/devel-docs/libgimp/html/libgimp-gimpedit.html @@ -8,7 +8,7 @@ - + @@ -757,6 +757,6 @@ the path with the active brush and foreground color.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpenums.html b/devel-docs/libgimp/html/libgimp-gimpenums.html index 59f8661593..41b507ab79 100644 --- a/devel-docs/libgimp/html/libgimp-gimpenums.html +++ b/devel-docs/libgimp/html/libgimp-gimpenums.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,24 @@ the normal plug-in initialization code will handle it implicitly.

+
++++ + + + + + + + + + + +

GIMP_BRUSH_HARD

 +

GIMP_BRUSH_SOFT

 +
@@ -139,6 +157,34 @@ The possible shapes generated brushes can take.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_NO_DITHER

 +

GIMP_FS_DITHER

 +

GIMP_FSLOWBLEED_DITHER

 +

GIMP_FIXED_DITHER

 +
@@ -153,6 +199,39 @@ The possible shapes generated brushes can take.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_MAKE_PALETTE

 +

GIMP_REUSE_PALETTE

 +

GIMP_WEB_PALETTE

 +

GIMP_MONO_PALETTE

 +

GIMP_CUSTOM_PALETTE

 +
@@ -165,6 +244,29 @@ The possible shapes generated brushes can take.

+
++++ + + + + + + + + + + + + + + +

GIMP_NORMAL_CONVOL

 +

GIMP_ABSOLUTE_CONVOL

 +

GIMP_NEGATIVE_CONVOL

 +
@@ -209,6 +311,39 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_FOREGROUND_FILL

 +

GIMP_BACKGROUND_FILL

 +

GIMP_WHITE_FILL

 +

GIMP_TRANSPARENT_FILL

 +

GIMP_PATTERN_FILL

 +
@@ -221,6 +356,29 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + +

GIMP_GRADIENT_SEGMENT_RGB

 +

GIMP_GRADIENT_SEGMENT_HSV_CCW

 +

GIMP_GRADIENT_SEGMENT_HSV_CW

 +
@@ -235,6 +393,39 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_GRADIENT_SEGMENT_LINEAR

 +

GIMP_GRADIENT_SEGMENT_CURVED

 +

GIMP_GRADIENT_SEGMENT_SINE

 +

GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING

 +

GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING

 +
@@ -249,6 +440,39 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_HISTOGRAM_VALUE

 +

GIMP_HISTOGRAM_RED

 +

GIMP_HISTOGRAM_GREEN

 +

GIMP_HISTOGRAM_BLUE

 +

GIMP_HISTOGRAM_ALPHA

 +
@@ -265,6 +489,49 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_ALL_HUES

 +

GIMP_RED_HUES

 +

GIMP_YELLOW_HUES

 +

GIMP_GREEN_HUES

 +

GIMP_CYAN_HUES

 +

GIMP_BLUE_HUES

 +

GIMP_MAGENTA_HUES

 +
@@ -277,6 +544,29 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + +

GIMP_INK_BLOB_TYPE_CIRCLE

 +

GIMP_INK_BLOB_TYPE_SQUARE

 +

GIMP_INK_BLOB_TYPE_DIAMOND

 +
@@ -309,6 +599,129 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_NORMAL_MODE

 +

GIMP_DISSOLVE_MODE

 +

GIMP_BEHIND_MODE

 +

GIMP_MULTIPLY_MODE

 +

GIMP_SCREEN_MODE

 +

GIMP_OVERLAY_MODE

 +

GIMP_DIFFERENCE_MODE

 +

GIMP_ADDITION_MODE

 +

GIMP_SUBTRACT_MODE

 +

GIMP_DARKEN_ONLY_MODE

 +

GIMP_LIGHTEN_ONLY_MODE

 +

GIMP_HUE_MODE

 +

GIMP_SATURATION_MODE

 +

GIMP_COLOR_MODE

 +

GIMP_VALUE_MODE

 +

GIMP_DIVIDE_MODE

 +

GIMP_DODGE_MODE

 +

GIMP_BURN_MODE

 +

GIMP_HARDLIGHT_MODE

 +

GIMP_SOFTLIGHT_MODE

 +

GIMP_GRAIN_EXTRACT_MODE

 +

GIMP_GRAIN_MERGE_MODE

 +

GIMP_COLOR_ERASE_MODE

 +
@@ -320,6 +733,24 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + +

GIMP_MASK_APPLY

 +

GIMP_MASK_DISCARD

 +
@@ -333,6 +764,34 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_EXPAND_AS_NECESSARY

 +

GIMP_CLIP_TO_IMAGE

 +

GIMP_CLIP_TO_BOTTOM_LAYER

 +

GIMP_FLATTEN_IMAGE

 +
@@ -344,6 +803,24 @@ Operation modes of the convolve tool.

+
++++ + + + + + + + + + + +

GIMP_OFFSET_BACKGROUND

 +

GIMP_OFFSET_TRANSPARENT

 +
@@ -432,6 +909,49 @@ Steps for simple rotation based on multpiles of 90 degrees.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_SELECT_CRITERION_COMPOSITE

 +

GIMP_SELECT_CRITERION_R

 +

GIMP_SELECT_CRITERION_G

 +

GIMP_SELECT_CRITERION_B

 +

GIMP_SELECT_CRITERION_H

 +

GIMP_SELECT_CRITERION_S

 +

GIMP_SELECT_CRITERION_V

 +
@@ -463,6 +983,6 @@ The returned array is static and must not be modified.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpexport.html b/devel-docs/libgimp/html/libgimp-gimpexport.html index afecdcc506..d918e17a1e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpexport.html +++ b/devel-docs/libgimp/html/libgimp-gimpexport.html @@ -8,7 +8,7 @@ - + @@ -86,6 +86,59 @@ as it will most probably have to open a dialog.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_EXPORT_CAN_HANDLE_RGB

 +

GIMP_EXPORT_CAN_HANDLE_GRAY

 +

GIMP_EXPORT_CAN_HANDLE_INDEXED

 +

GIMP_EXPORT_CAN_HANDLE_BITMAP

 +

GIMP_EXPORT_CAN_HANDLE_ALPHA

 +

GIMP_EXPORT_CAN_HANDLE_LAYERS

 +

GIMP_EXPORT_CAN_HANDLE_LAYERS_AS_ANIMATION

 +

GIMP_EXPORT_CAN_HANDLE_LAYER_MASKS

 +

GIMP_EXPORT_NEEDS_ALPHA

 +
@@ -98,6 +151,29 @@ as it will most probably have to open a dialog.

+
++++ + + + + + + + + + + + + + + +

GIMP_EXPORT_CANCEL

 +

GIMP_EXPORT_IGNORE

 +

GIMP_EXPORT_EXPORT

 +
@@ -125,7 +201,7 @@ If the user chooses to Ignore the export problem, the image_ID and drawable_ID is not altered, GIMP_EXPORT_IGNORE is returned and the save_plugin should try to save the original image. If the user chooses Cancel, GIMP_EXPORT_CANCEL is returned and the -save_plugin should quit itself with status GIMP_PDB_CANCEL. +save_plugin should quit itself with status GIMP_PDB_CANCEL.

If format_name is NULL, no dialogs will be shown and this function @@ -237,6 +313,6 @@ export options.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfileops.html b/devel-docs/libgimp/html/libgimp-gimpfileops.html index eb533ca6ab..848fe03834 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfileops.html +++ b/devel-docs/libgimp/html/libgimp-gimpfileops.html @@ -8,7 +8,7 @@ - + @@ -521,6 +521,6 @@ using this function.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html b/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html index 0ebd760f07..0ca3359d06 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html +++ b/devel-docs/libgimp/html/libgimp-gimpfloatingsel.html @@ -8,7 +8,7 @@ - + @@ -245,6 +245,6 @@ drawable.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfontmenu.html b/devel-docs/libgimp/html/libgimp-gimpfontmenu.html index 70d4804676..7445c05af7 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfontmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpfontmenu.html @@ -8,7 +8,7 @@ - + @@ -155,6 +155,6 @@ callback function if one was supplied in the call to
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfonts.html b/devel-docs/libgimp/html/libgimp-gimpfonts.html index 0e329a6084..554de80906 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfonts.html +++ b/devel-docs/libgimp/html/libgimp-gimpfonts.html @@ -8,7 +8,7 @@ - + @@ -108,6 +108,6 @@ available.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpfontselect.html b/devel-docs/libgimp/html/libgimp-gimpfontselect.html index 631dadb513..6a76c27dc6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpfontselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpfontselect.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ Sets the current font in a font selection dialog.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgimprc.html b/devel-docs/libgimp/html/libgimp-gimpgimprc.html index 18ed3f5058..3cdc8b0dd6 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgimprc.html +++ b/devel-docs/libgimp/html/libgimp-gimpgimprc.html @@ -8,7 +8,7 @@ - + @@ -271,6 +271,6 @@ Returns a copy of the current GUI theme dir.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradient.html b/devel-docs/libgimp/html/libgimp-gimpgradient.html index b37bdb77b7..9c688232c9 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradient.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradient.html @@ -8,7 +8,7 @@ - + @@ -1442,6 +1442,6 @@ control points of the neighboring segments.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html b/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html index 5c3e56be17..c792ffc0f9 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradientmenu.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@ callback function if one was supplied in the call to
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradients.html b/devel-docs/libgimp/html/libgimp-gimpgradients.html index d5cf0d9af6..1379c70458 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradients.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradients.html @@ -8,7 +8,7 @@ - + @@ -281,6 +281,6 @@ This procedure is deprecated! Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgradientselect.html b/devel-docs/libgimp/html/libgimp-gimpgradientselect.html index 137ef7830e..7edfc028ab 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgradientselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpgradientselect.html @@ -8,7 +8,7 @@ - + @@ -198,6 +198,6 @@ Sets the current gradient in a gradient selection dialog.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpgrid.html b/devel-docs/libgimp/html/libgimp-gimpgrid.html index 825d9dab9d..f1efd54441 100644 --- a/devel-docs/libgimp/html/libgimp-gimpgrid.html +++ b/devel-docs/libgimp/html/libgimp-gimpgrid.html @@ -8,7 +8,7 @@ - + @@ -431,6 +431,6 @@ and the new style as parameters.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpguides.html b/devel-docs/libgimp/html/libgimp-gimpguides.html index b22d2e61a9..5bda771ebd 100644 --- a/devel-docs/libgimp/html/libgimp-gimpguides.html +++ b/devel-docs/libgimp/html/libgimp-gimpguides.html @@ -8,7 +8,7 @@ - + @@ -265,6 +265,6 @@ the position of the guide relative to the top or left of the image.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimphelp.html b/devel-docs/libgimp/html/libgimp-gimphelp.html index db30416c99..ef0761cd6a 100644 --- a/devel-docs/libgimp/html/libgimp-gimphelp.html +++ b/devel-docs/libgimp/html/libgimp-gimphelp.html @@ -8,7 +8,7 @@ - + @@ -89,6 +89,6 @@ the help domain of the main GIMP installation is used.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimage.html b/devel-docs/libgimp/html/libgimp-gimpimage.html index f300ad0ba5..9e68da33b8 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimage.html +++ b/devel-docs/libgimp/html/libgimp-gimpimage.html @@ -8,7 +8,7 @@ - + @@ -338,12 +338,6 @@ as an argument will fail. Layers can be created using the

gimp_image_get_uri ()

gchar *             gimp_image_get_uri                  (gint32 image_ID);

-Returns the URI for the specified image. -

-

-This procedure returns the URI associated with the specified image. -The image has an URI only if it was loaded or imported from a file -or has since been saved or exported. Otherwise, this function returns NULL. See also gimp-image-get-imported-uri to get the URI of the current file if it was imported from a non-GIMP file format and not yet saved, or gimp-image-get-exported-uri if the image has @@ -3755,6 +3749,6 @@ If the path exists, it is set as the active path in the image.

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpimageselect.html b/devel-docs/libgimp/html/libgimp-gimpimageselect.html index d3069a7c00..3c336f4a2c 100644 --- a/devel-docs/libgimp/html/libgimp-gimpimageselect.html +++ b/devel-docs/libgimp/html/libgimp-gimpimageselect.html @@ -8,7 +8,7 @@ - + @@ -491,6 +491,6 @@ by the following context setters:
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpitem.html b/devel-docs/libgimp/html/libgimp-gimpitem.html index 3fedddf40d..49891bdd4f 100644 --- a/devel-docs/libgimp/html/libgimp-gimpitem.html +++ b/devel-docs/libgimp/html/libgimp-gimpitem.html @@ -8,7 +8,7 @@ - + @@ -906,6 +906,6 @@ Returns a list of all parasites currently attached the an item.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpitemtransform.html b/devel-docs/libgimp/html/libgimp-gimpitemtransform.html index f2fe21378e..bcf756a8be 100644 --- a/devel-docs/libgimp/html/libgimp-gimpitemtransform.html +++ b/devel-docs/libgimp/html/libgimp-gimpitemtransform.html @@ -8,7 +8,7 @@ - + @@ -695,6 +695,6 @@ following context setters:
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimplayer.html b/devel-docs/libgimp/html/libgimp-gimplayer.html index ac13de67c5..e6bf964f2b 100644 --- a/devel-docs/libgimp/html/libgimp-gimplayer.html +++ b/devel-docs/libgimp/html/libgimp-gimplayer.html @@ -8,7 +8,7 @@ - + @@ -1394,6 +1394,6 @@ to a specific drawable.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpmenu.html b/devel-docs/libgimp/html/libgimp-gimpmenu.html index 2f710dfaa6..401116b87e 100644 --- a/devel-docs/libgimp/html/libgimp-gimpmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimpmenu.html @@ -8,7 +8,7 @@ - + @@ -257,6 +257,6 @@ Menus for selecting images, layers, channels and drawables.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpmessage.html b/devel-docs/libgimp/html/libgimp-gimpmessage.html index 743d6ec982..31d8b80587 100644 --- a/devel-docs/libgimp/html/libgimp-gimpmessage.html +++ b/devel-docs/libgimp/html/libgimp-gimpmessage.html @@ -8,7 +8,7 @@ - + @@ -133,6 +133,6 @@ was started.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppainttools.html b/devel-docs/libgimp/html/libgimp-gimppainttools.html index ff93d82aa3..b0b698e13f 100644 --- a/devel-docs/libgimp/html/libgimp-gimppainttools.html +++ b/devel-docs/libgimp/html/libgimp-gimppainttools.html @@ -8,7 +8,7 @@ - + @@ -1025,6 +1025,6 @@ tools option dialog has not been activated.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalette.html b/devel-docs/libgimp/html/libgimp-gimppalette.html index 74536156fe..8b8eba062b 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalette.html +++ b/devel-docs/libgimp/html/libgimp-gimppalette.html @@ -8,7 +8,7 @@ - + @@ -788,6 +788,6 @@ Returns TRUE if you have permission to change the palette
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalettemenu.html b/devel-docs/libgimp/html/libgimp-gimppalettemenu.html index 73daa3acdb..1d4cb897df 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalettemenu.html +++ b/devel-docs/libgimp/html/libgimp-gimppalettemenu.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@ callback function if one was supplied in the call to
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppalettes.html b/devel-docs/libgimp/html/libgimp-gimppalettes.html index 27ee689bcd..2b9c66b393 100644 --- a/devel-docs/libgimp/html/libgimp-gimppalettes.html +++ b/devel-docs/libgimp/html/libgimp-gimppalettes.html @@ -8,7 +8,7 @@ - + @@ -208,6 +208,6 @@ This procedure is deprecated! Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppaletteselect.html b/devel-docs/libgimp/html/libgimp-gimppaletteselect.html index 78aacc62df..db0ea0f3f2 100644 --- a/devel-docs/libgimp/html/libgimp-gimppaletteselect.html +++ b/devel-docs/libgimp/html/libgimp-gimppaletteselect.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ Sets the current palette in a palette selection dialog.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppaths.html b/devel-docs/libgimp/html/libgimp-gimppaths.html index b8231a73d0..ba8f01befd 100644 --- a/devel-docs/libgimp/html/libgimp-gimppaths.html +++ b/devel-docs/libgimp/html/libgimp-gimppaths.html @@ -8,7 +8,7 @@ - + @@ -620,6 +620,6 @@ Deprecated operations related to paths.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppattern.html b/devel-docs/libgimp/html/libgimp-gimppattern.html index 0450aa210c..000378362d 100644 --- a/devel-docs/libgimp/html/libgimp-gimppattern.html +++ b/devel-docs/libgimp/html/libgimp-gimppattern.html @@ -8,7 +8,7 @@ - + @@ -159,6 +159,6 @@ pixel data.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatternmenu.html b/devel-docs/libgimp/html/libgimp-gimppatternmenu.html index 1c757046d3..c238ddf131 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatternmenu.html +++ b/devel-docs/libgimp/html/libgimp-gimppatternmenu.html @@ -8,7 +8,7 @@ - + @@ -155,6 +155,6 @@ callback function if one was supplied in the call to
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatterns.html b/devel-docs/libgimp/html/libgimp-gimppatterns.html index 33b8d0b447..ddf58422b3 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatterns.html +++ b/devel-docs/libgimp/html/libgimp-gimppatterns.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ This procedure is deprecated! Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppatternselect.html b/devel-docs/libgimp/html/libgimp-gimppatternselect.html index c4cf651420..b1a972e4a5 100644 --- a/devel-docs/libgimp/html/libgimp-gimppatternselect.html +++ b/devel-docs/libgimp/html/libgimp-gimppatternselect.html @@ -8,7 +8,7 @@ - + @@ -194,6 +194,6 @@ Sets the current pattern in a pattern selection dialog.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixbuf.html b/devel-docs/libgimp/html/libgimp-gimppixbuf.html index 5fbfd961fc..9a1528e42d 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixbuf.html +++ b/devel-docs/libgimp/html/libgimp-gimppixbuf.html @@ -8,7 +8,7 @@ - + @@ -74,6 +74,29 @@ Get a thumbnail pixbuf for a drawable or image.

+
++++ + + + + + + + + + + + + + + +

GIMP_PIXBUF_KEEP_ALPHA

 +

GIMP_PIXBUF_SMALL_CHECKS

 +

GIMP_PIXBUF_LARGE_CHECKS

 +
@@ -227,6 +250,6 @@ size.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html b/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html index 405b1ee82d..ac0fa5c3a5 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html +++ b/devel-docs/libgimp/html/libgimp-gimppixelfetcher.html @@ -8,7 +8,7 @@ - + @@ -80,6 +80,39 @@ making plug-in code more readable and shorter.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_PIXEL_FETCHER_EDGE_NONE

 +

GIMP_PIXEL_FETCHER_EDGE_WRAP

 +

GIMP_PIXEL_FETCHER_EDGE_SMEAR

 +

GIMP_PIXEL_FETCHER_EDGE_BLACK

 +

GIMP_PIXEL_FETCHER_EDGE_BACKGROUND

 +
@@ -260,6 +293,6 @@ Close a previously initializd pixel region.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimppixelrgn.html b/devel-docs/libgimp/html/libgimp-gimppixelrgn.html index 2ddc7c51f8..a8f7a636b1 100644 --- a/devel-docs/libgimp/html/libgimp-gimppixelrgn.html +++ b/devel-docs/libgimp/html/libgimp-gimppixelrgn.html @@ -8,7 +8,7 @@ - + @@ -716,6 +716,6 @@ any tiles left.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpplugin.html b/devel-docs/libgimp/html/libgimp-gimpplugin.html index b1c6314465..f68e11b4f3 100644 --- a/devel-docs/libgimp/html/libgimp-gimpplugin.html +++ b/devel-docs/libgimp/html/libgimp-gimpplugin.html @@ -8,7 +8,7 @@ - + @@ -226,7 +226,7 @@ This procedure changes the way that errors in procedure calls are handled. By default GIMP will raise an error dialog if a procedure call made by a plug-in fails. Using this procedure the plug-in can change this behavior. If the error handler is set to -GIMP_PDB_ERROR_HANDLER_PLUGIN, then the plug-in is responsible for +GIMP_PDB_ERROR_HANDLER_PLUGIN, then the plug-in is responsible for calling gimp_get_pdb_error() and handling the error whenever one if its procedure calls fails. It can do this by displaying the error message or by forwarding it in its own return values. @@ -277,6 +277,6 @@ procedure calls made by the calling plug-in. See
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html b/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html index ca4594ab48..cf09f2c07a 100644 --- a/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html +++ b/devel-docs/libgimp/html/libgimp-gimpproceduraldb.html @@ -8,7 +8,7 @@ - + @@ -533,6 +533,6 @@ associated with the identifier, an error is returned.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpprogress.html b/devel-docs/libgimp/html/libgimp-gimpprogress.html index b92c57655f..8d6016828a 100644 --- a/devel-docs/libgimp/html/libgimp-gimpprogress.html +++ b/devel-docs/libgimp/html/libgimp-gimpprogress.html @@ -8,7 +8,7 @@ - + @@ -518,6 +518,6 @@ This function cancels the currently running progress.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpregioniterator.html b/devel-docs/libgimp/html/libgimp-gimpregioniterator.html index 8e17ae8048..c6f331a914 100644 --- a/devel-docs/libgimp/html/libgimp-gimpregioniterator.html +++ b/devel-docs/libgimp/html/libgimp-gimpregioniterator.html @@ -8,7 +8,7 @@ - + @@ -254,6 +254,6 @@ Frees the resources allocated for iter.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpselection.html b/devel-docs/libgimp/html/libgimp-gimpselection.html index dfdc6d4e52..d497fdbd4f 100644 --- a/devel-docs/libgimp/html/libgimp-gimpselection.html +++ b/devel-docs/libgimp/html/libgimp-gimpselection.html @@ -8,7 +8,7 @@ - + @@ -683,6 +683,6 @@ because of this call are lost.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpselectiontools.html b/devel-docs/libgimp/html/libgimp-gimpselectiontools.html index 127b0c3441..799044e6de 100644 --- a/devel-docs/libgimp/html/libgimp-gimpselectiontools.html +++ b/devel-docs/libgimp/html/libgimp-gimpselectiontools.html @@ -8,7 +8,7 @@ - + @@ -669,6 +669,6 @@ Functions giving access to toolbox selection tools.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptextlayer.html b/devel-docs/libgimp/html/libgimp-gimptextlayer.html index 71230d197f..23787af458 100644 --- a/devel-docs/libgimp/html/libgimp-gimptextlayer.html +++ b/devel-docs/libgimp/html/libgimp-gimptextlayer.html @@ -8,7 +8,7 @@ - + @@ -1127,6 +1127,6 @@ keeping it as a text layer and not converting it to a bitmap like
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptexttool.html b/devel-docs/libgimp/html/libgimp-gimptexttool.html index 5236d92fb3..6410651cdc 100644 --- a/devel-docs/libgimp/html/libgimp-gimptexttool.html +++ b/devel-docs/libgimp/html/libgimp-gimptexttool.html @@ -8,7 +8,7 @@ - + @@ -453,6 +453,6 @@ into account.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptile.html b/devel-docs/libgimp/html/libgimp-gimptile.html index 0adfb5ec92..3aa37f7187 100644 --- a/devel-docs/libgimp/html/libgimp-gimptile.html +++ b/devel-docs/libgimp/html/libgimp-gimptile.html @@ -8,7 +8,7 @@ - + @@ -152,6 +152,6 @@ shadow tiles.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimptransformtools.html b/devel-docs/libgimp/html/libgimp-gimptransformtools.html index 753c2effad..4b9f14faca 100644 --- a/devel-docs/libgimp/html/libgimp-gimptransformtools.html +++ b/devel-docs/libgimp/html/libgimp-gimptransformtools.html @@ -8,7 +8,7 @@ - + @@ -374,6 +374,6 @@ Functions giving access to toolbox transform tools.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpui.html b/devel-docs/libgimp/html/libgimp-gimpui.html index a78d6571fb..416a154c01 100644 --- a/devel-docs/libgimp/html/libgimp-gimpui.html +++ b/devel-docs/libgimp/html/libgimp-gimpui.html @@ -8,7 +8,7 @@ - + @@ -217,6 +217,6 @@ gtk_init(), gdk_set_use_xshm(),
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpundo.html b/devel-docs/libgimp/html/libgimp-gimpundo.html index d70c3a8590..4d80b9d8f0 100644 --- a/devel-docs/libgimp/html/libgimp-gimpundo.html +++ b/devel-docs/libgimp/html/libgimp-gimpundo.html @@ -8,7 +8,7 @@ - + @@ -279,6 +279,6 @@ responsibility of the caller.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-gimpvectors.html b/devel-docs/libgimp/html/libgimp-gimpvectors.html index ed8b4a2189..57cd3a6433 100644 --- a/devel-docs/libgimp/html/libgimp-gimpvectors.html +++ b/devel-docs/libgimp/html/libgimp-gimpvectors.html @@ -8,7 +8,7 @@ - + @@ -1133,9 +1133,6 @@ Measure the length of the given stroke. gdouble **controlpoints, gboolean *closed);

-returns the control points of a stroke. -

-

returns the control points of a stroke. The interpretation of the coordinates returned depends on the type of the stroke. For Gimp 2.4 this is always a bezier stroke, where the coordinates are the @@ -1255,9 +1252,6 @@ enough, a \"valid\" flag will be FALSE.

returns polygonal approximation of the stroke.

-

-returns polygonal approximation of the stroke. -

@@ -1782,6 +1776,6 @@ Adds a bezier stroke with a single moveto to the vectors object.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-image.html b/devel-docs/libgimp/html/libgimp-image.html index 657d1ed4b2..8b7336a6b7 100644 --- a/devel-docs/libgimp/html/libgimp-image.html +++ b/devel-docs/libgimp/html/libgimp-image.html @@ -8,7 +8,7 @@ - + @@ -117,6 +117,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index-deprecated.html b/devel-docs/libgimp/html/libgimp-index-deprecated.html index debc5e10c5..dbee61bf27 100644 --- a/devel-docs/libgimp/html/libgimp-index-deprecated.html +++ b/devel-docs/libgimp/html/libgimp-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -455,6 +455,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html b/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html index d6430fa732..be235d017c 100644 --- a/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html +++ b/devel-docs/libgimp/html/libgimp-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -318,6 +318,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html b/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html index aec376c4cd..956002fa26 100644 --- a/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html +++ b/devel-docs/libgimp/html/libgimp-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -444,6 +444,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html b/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html index 97cc143feb..71789c5b2b 100644 --- a/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html +++ b/devel-docs/libgimp/html/libgimp-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -151,6 +151,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html b/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html index 5467e605b0..6f4c06b27d 100644 --- a/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html +++ b/devel-docs/libgimp/html/libgimp-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -311,6 +311,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-index.html b/devel-docs/libgimp/html/libgimp-index.html index c87720ee70..d95fc786fb 100644 --- a/devel-docs/libgimp/html/libgimp-index.html +++ b/devel-docs/libgimp/html/libgimp-index.html @@ -8,7 +8,7 @@ - + @@ -2082,6 +2082,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp-selectors.html b/devel-docs/libgimp/html/libgimp-selectors.html index 65d607b790..a0733e9002 100644 --- a/devel-docs/libgimp/html/libgimp-selectors.html +++ b/devel-docs/libgimp/html/libgimp-selectors.html @@ -8,7 +8,7 @@ - + @@ -60,6 +60,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimp.devhelp2 b/devel-docs/libgimp/html/libgimp.devhelp2 index e6a0e6eb34..6700233270 100644 --- a/devel-docs/libgimp/html/libgimp.devhelp2 +++ b/devel-docs/libgimp/html/libgimp.devhelp2 @@ -1075,16 +1075,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/devel-docs/libgimp/html/libgimp.html b/devel-docs/libgimp/html/libgimp.html index 078d289d4a..663696d863 100644 --- a/devel-docs/libgimp/html/libgimp.html +++ b/devel-docs/libgimp/html/libgimp.html @@ -8,7 +8,7 @@ - + @@ -234,6 +234,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimpui-hierarchy.html b/devel-docs/libgimp/html/libgimpui-hierarchy.html index bca70e59ec..b3ae8fd88d 100644 --- a/devel-docs/libgimp/html/libgimpui-hierarchy.html +++ b/devel-docs/libgimp/html/libgimpui-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimp/html/libgimpui.html b/devel-docs/libgimp/html/libgimpui.html index c38103ae94..80f3f33430 100644 --- a/devel-docs/libgimp/html/libgimpui.html +++ b/devel-docs/libgimp/html/libgimpui.html @@ -8,7 +8,7 @@ - + @@ -81,6 +81,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/Makefile.in b/devel-docs/libgimpbase/Makefile.in index 1ff8803118..89827ec10b 100644 --- a/devel-docs/libgimpbase/Makefile.in +++ b/devel-docs/libgimpbase/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -544,6 +550,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -752,35 +794,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -795,22 +830,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -818,28 +850,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -860,16 +884,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -886,7 +906,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -902,7 +922,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -938,7 +958,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpbase/html/index.html b/devel-docs/libgimpbase/html/index.html index 77150fed8a..df8c675fd2 100644 --- a/devel-docs/libgimpbase/html/index.html +++ b/devel-docs/libgimpbase/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -90,6 +90,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/index.sgml b/devel-docs/libgimpbase/html/index.sgml index 538de97295..7624918768 100644 --- a/devel-docs/libgimpbase/html/index.sgml +++ b/devel-docs/libgimpbase/html/index.sgml @@ -3,41 +3,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -97,6 +257,14 @@ + + + + + + + + @@ -195,6 +363,13 @@ + + + + + + + diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpbaseenums.html b/devel-docs/libgimpbase/html/libgimpbase-gimpbaseenums.html index e32449cc7f..e0d12c1d0e 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpbaseenums.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpbaseenums.html @@ -8,7 +8,7 @@ - + @@ -97,6 +97,49 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_ADD_WHITE_MASK

 +

GIMP_ADD_BLACK_MASK

 +

GIMP_ADD_ALPHA_MASK

 +

GIMP_ADD_ALPHA_TRANSFER_MASK

 +

GIMP_ADD_SELECTION_MASK

 +

GIMP_ADD_COPY_MASK

 +

GIMP_ADD_CHANNEL_MASK

 +
@@ -110,6 +153,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_FG_BG_RGB_MODE

 +

GIMP_FG_BG_HSV_MODE

 +

GIMP_FG_TRANSPARENT_MODE

 +

GIMP_CUSTOM_MODE

 +
@@ -122,6 +193,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_FG_BUCKET_FILL

 +

GIMP_BG_BUCKET_FILL

 +

GIMP_PATTERN_BUCKET_FILL

 +
@@ -135,6 +229,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_CHANNEL_OP_ADD

 +

GIMP_CHANNEL_OP_SUBTRACT

 +

GIMP_CHANNEL_OP_REPLACE

 +

GIMP_CHANNEL_OP_INTERSECT

 +
@@ -150,6 +272,44 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_RED_CHANNEL

 +

GIMP_GREEN_CHANNEL

 +

GIMP_BLUE_CHANNEL

 +

GIMP_GRAY_CHANNEL

 +

GIMP_INDEXED_CHANNEL

 +

GIMP_ALPHA_CHANNEL

 +
@@ -162,6 +322,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_CHECK_SIZE_SMALL_CHECKS

 +

GIMP_CHECK_SIZE_MEDIUM_CHECKS

 +

GIMP_CHECK_SIZE_LARGE_CHECKS

 +
@@ -177,6 +360,44 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_CHECK_TYPE_LIGHT_CHECKS

 +

GIMP_CHECK_TYPE_GRAY_CHECKS

 +

GIMP_CHECK_TYPE_DARK_CHECKS

 +

GIMP_CHECK_TYPE_WHITE_ONLY

 +

GIMP_CHECK_TYPE_GRAY_ONLY

 +

GIMP_CHECK_TYPE_BLACK_ONLY

 +
@@ -188,6 +409,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_IMAGE_CLONE

 +

GIMP_PATTERN_CLONE

 +
@@ -200,6 +439,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_DESATURATE_LIGHTNESS

 +

GIMP_DESATURATE_LUMINOSITY

 +

GIMP_DESATURATE_AVERAGE

 +
@@ -211,6 +473,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_DODGE

 +

GIMP_BURN

 +
@@ -221,6 +501,17 @@ Basic GIMP enumeration data types.

+
++++ + + + + +

GIMP_FOREGROUND_EXTRACT_SIOX

 +
@@ -241,6 +532,69 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_GRADIENT_LINEAR

 +

GIMP_GRADIENT_BILINEAR

 +

GIMP_GRADIENT_RADIAL

 +

GIMP_GRADIENT_SQUARE

 +

GIMP_GRADIENT_CONICAL_SYMMETRIC

 +

GIMP_GRADIENT_CONICAL_ASYMMETRIC

 +

GIMP_GRADIENT_SHAPEBURST_ANGULAR

 +

GIMP_GRADIENT_SHAPEBURST_SPHERICAL

 +

GIMP_GRADIENT_SHAPEBURST_DIMPLED

 +

GIMP_GRADIENT_SPIRAL_CLOCKWISE

 +

GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE

 +
@@ -255,6 +609,39 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_GRID_DOTS

 +

GIMP_GRID_INTERSECTIONS

 +

GIMP_GRID_ON_OFF_DASH

 +

GIMP_GRID_DOUBLE_DASH

 +

GIMP_GRID_SOLID

 +
@@ -267,6 +654,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_ICON_TYPE_STOCK_ID

 +

GIMP_ICON_TYPE_INLINE_PIXBUF

 +

GIMP_ICON_TYPE_IMAGE_FILE

 +
@@ -279,6 +689,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_RGB

 +

GIMP_GRAY

 +

GIMP_INDEXED

 +
@@ -294,6 +727,44 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_RGB_IMAGE

 +

GIMP_RGBA_IMAGE

 +

GIMP_GRAY_IMAGE

 +

GIMP_GRAYA_IMAGE

 +

GIMP_INDEXED_IMAGE

 +

GIMP_INDEXEDA_IMAGE

 +
@@ -307,6 +778,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_INTERPOLATION_NONE

 +

GIMP_INTERPOLATION_LINEAR

 +

GIMP_INTERPOLATION_CUBIC

 +

GIMP_INTERPOLATION_LANCZOS

 +
@@ -319,6 +818,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_MESSAGE_BOX

 +

GIMP_CONSOLE

 +

GIMP_ERROR_CONSOLE

 +
@@ -330,6 +852,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_PAINT_CONSTANT

 +

GIMP_PAINT_INCREMENTAL

 +
@@ -367,6 +907,144 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_PDB_INT32

 +

GIMP_PDB_INT16

 +

GIMP_PDB_INT8

 +

GIMP_PDB_FLOAT

 +

GIMP_PDB_STRING

 +

GIMP_PDB_INT32ARRAY

 +

GIMP_PDB_INT16ARRAY

 +

GIMP_PDB_INT8ARRAY

 +

GIMP_PDB_FLOATARRAY

 +

GIMP_PDB_STRINGARRAY

 +

GIMP_PDB_COLOR

 +

GIMP_PDB_ITEM

 +

GIMP_PDB_DISPLAY

 +

GIMP_PDB_IMAGE

 +

GIMP_PDB_LAYER

 +

GIMP_PDB_CHANNEL

 +

GIMP_PDB_DRAWABLE

 +

GIMP_PDB_SELECTION

 +

GIMP_PDB_COLORARRAY

 +

GIMP_PDB_VECTORS

 +

GIMP_PDB_PARASITE

 +

GIMP_PDB_STATUS

 +

GIMP_PDB_END

 +

GIMP_PDB_PATH

 +

GIMP_PDB_BOUNDARY

 +

GIMP_PDB_REGION

 +
@@ -378,6 +1056,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_PDB_ERROR_HANDLER_INTERNAL

 +

GIMP_PDB_ERROR_HANDLER_PLUGIN

 +
@@ -391,6 +1087,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_INTERNAL

 +

GIMP_PLUGIN

 +

GIMP_EXTENSION

 +

GIMP_TEMPORARY

 +
@@ -405,6 +1129,39 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + +

GIMP_PDB_EXECUTION_ERROR

 +

GIMP_PDB_CALLING_ERROR

 +

GIMP_PDB_PASS_THROUGH

 +

GIMP_PDB_SUCCESS

 +

GIMP_PDB_CANCEL

 +
@@ -420,6 +1177,44 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_PROGRESS_COMMAND_START

 +

GIMP_PROGRESS_COMMAND_END

 +

GIMP_PROGRESS_COMMAND_SET_TEXT

 +

GIMP_PROGRESS_COMMAND_SET_VALUE

 +

GIMP_PROGRESS_COMMAND_PULSE

 +

GIMP_PROGRESS_COMMAND_GET_WINDOW

 +
@@ -432,6 +1227,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_REPEAT_NONE

 +

GIMP_REPEAT_SAWTOOTH

 +

GIMP_REPEAT_TRIANGULAR

 +
@@ -444,6 +1262,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_RUN_INTERACTIVE

 +

GIMP_RUN_NONINTERACTIVE

 +

GIMP_RUN_WITH_LAST_VALS

 +
@@ -455,6 +1296,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_PIXELS

 +

GIMP_POINTS

 +
@@ -467,6 +1326,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_STACK_TRACE_NEVER

 +

GIMP_STACK_TRACE_QUERY

 +

GIMP_STACK_TRACE_ALWAYS

 +
@@ -478,6 +1360,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_TEXT_DIRECTION_LTR

 +

GIMP_TEXT_DIRECTION_RTL

 +
@@ -491,6 +1391,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_TEXT_HINT_STYLE_NONE

 +

GIMP_TEXT_HINT_STYLE_SLIGHT

 +

GIMP_TEXT_HINT_STYLE_MEDIUM

 +

GIMP_TEXT_HINT_STYLE_FULL

 +
@@ -504,6 +1432,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_TEXT_JUSTIFY_LEFT

 +

GIMP_TEXT_JUSTIFY_RIGHT

 +

GIMP_TEXT_JUSTIFY_CENTER

 +

GIMP_TEXT_JUSTIFY_FILL

 +
@@ -516,6 +1472,29 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + +

GIMP_SHADOWS

 +

GIMP_MIDTONES

 +

GIMP_HIGHLIGHTS

 +
@@ -527,6 +1506,24 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + +

GIMP_TRANSFORM_FORWARD

 +

GIMP_TRANSFORM_BACKWARD

 +
@@ -540,6 +1537,34 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_TRANSFORM_RESIZE_ADJUST

 +

GIMP_TRANSFORM_RESIZE_CLIP

 +

GIMP_TRANSFORM_RESIZE_CROP

 +

GIMP_TRANSFORM_RESIZE_CROP_WITH_ASPECT

 +
@@ -561,6 +1586,54 @@ Basic GIMP enumeration data types.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_USER_DIRECTORY_DESKTOP

 +

GIMP_USER_DIRECTORY_DOCUMENTS

 +

GIMP_USER_DIRECTORY_DOWNLOAD

 +

GIMP_USER_DIRECTORY_MUSIC

 +

GIMP_USER_DIRECTORY_PICTURES

 +

GIMP_USER_DIRECTORY_PUBLIC_SHARE

 +

GIMP_USER_DIRECTORY_TEMPLATES

 +

GIMP_USER_DIRECTORY_VIDEOS

 +
@@ -571,11 +1644,22 @@ Basic GIMP enumeration data types.

+
++++ + + + + +

GIMP_VECTORS_STROKE_TYPE_BEZIER

 +
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html index 0bd66d8b67..b626313558 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html @@ -8,7 +8,7 @@ - + @@ -369,6 +369,6 @@ and help texts for flags values.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html b/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html index 8a7a2b9cec..f6c529cb41 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpchecks.html @@ -8,7 +8,7 @@ - + @@ -128,6 +128,6 @@ checkerboard for a certain
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html b/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html index ace095a3b7..94c4c8cafe 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpcpuaccel.html @@ -8,7 +8,7 @@ - + @@ -69,6 +69,54 @@ Functions to query and configure CPU acceleration.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_CPU_ACCEL_NONE

 +

GIMP_CPU_ACCEL_X86_MMX

 +

GIMP_CPU_ACCEL_X86_3DNOW

 +

GIMP_CPU_ACCEL_X86_MMXEXT

 +

GIMP_CPU_ACCEL_X86_SSE

 +

GIMP_CPU_ACCEL_X86_SSE2

 +

GIMP_CPU_ACCEL_X86_SSE3

 +

GIMP_CPU_ACCEL_PPC_ALTIVEC

 +
@@ -113,6 +161,6 @@ This function is for internal use only.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html b/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html index d3981b1917..ace74b55e5 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpdatafiles.html @@ -8,7 +8,7 @@ - + @@ -136,6 +136,6 @@ data path.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html index cdce3b079b..618da306e2 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html @@ -8,7 +8,7 @@ - + @@ -426,6 +426,6 @@ Note that you have to g_free() the returned string
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html index f51c50a841..d4c7e0da68 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ values.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html index c6a563376d..22a1a0b16e 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html @@ -8,7 +8,7 @@ - + @@ -245,6 +245,6 @@ See g_param_spec_internal() for more information.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html index 10f3026c47..4658c31e93 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparam.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@ Definitions of useful GParamFlags.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html index 5f98084b9b..9c965e6200 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparasite.html @@ -8,7 +8,7 @@ - + @@ -302,6 +302,6 @@ gimp_image_parasite_attach(),
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html b/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html index 3e9bc8fd79..ebbb918c28 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpparasiteio.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ Utility functions to (de)serialize certain C structures to/from*
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html index 6670fc666b..2adc848c94 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html @@ -8,7 +8,7 @@ - + @@ -231,6 +231,6 @@ Calculates the union of two rectangles.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html b/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html index 2ca13e891b..db23fcfbfd 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpsignal.html @@ -8,7 +8,7 @@ - + @@ -130,6 +130,6 @@ signal(2), signal(5 or 7), sigaction(2).
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html index 2d24a6f167..9c1ca82774 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html @@ -8,7 +8,7 @@ - + @@ -109,6 +109,49 @@ creating user-defined units.

+
++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

GIMP_UNIT_PIXEL

 +

GIMP_UNIT_INCH

 +

GIMP_UNIT_MM

 +

GIMP_UNIT_POINT

 +

GIMP_UNIT_PICA

 +

GIMP_UNIT_END

 +

GIMP_UNIT_PERCENT

 +
@@ -295,10 +338,6 @@ Returns 0 for unit == GIMP_UNIT_PIXEL.

gimp_unit_get_digits ()

gint                gimp_unit_get_digits                (GimpUnit unit);

-Returns the number of digits an entry field should provide to get -approximately the same accuracy as an inch input field with two digits. -

-

Returns 0 for unit == GIMP_UNIT_PIXEL.

@@ -729,6 +768,6 @@ See g_param_spec_internal() for more information.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html index a65bcaaabf..2ec7bcc160 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html @@ -8,7 +8,7 @@ - + @@ -601,6 +601,6 @@ Retrieves the translated help for a given flags_valu
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html index fa4a6b1157..11c24e3eb5 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html @@ -8,7 +8,7 @@ - + @@ -81,7 +81,7 @@ The minor GIMP version number.

GIMP_MICRO_VERSION

-
#define GIMP_MICRO_VERSION                              (6)
+
#define GIMP_MICRO_VERSION                              (10)
 

 

 The micro GIMP version number.
@@ -90,7 +90,7 @@ The micro GIMP version number.
 

 

 
GIMP_VERSION

-
#define GIMP_VERSION                                    "2.8.6"
+
#define GIMP_VERSION                                    "2.8.10"
 

 

 The GIMP version as a string.
@@ -146,6 +146,6 @@ The GIMP version as a string.
 

 

 

-          Generated by GTK-Doc V1.18

+          Generated by GTK-Doc V1.19
\ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index-deprecated.html b/devel-docs/libgimpbase/html/libgimpbase-index-deprecated.html index 6ff9f14d9e..9d75668ed9 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index-deprecated.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -40,6 +40,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-2.html b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-2.html index 4b29eb9be4..0a0b01c704 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-2.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -91,6 +91,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-4.html b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-4.html index 2686d634e6..9d9d00d356 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-4.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -70,6 +70,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-6.html b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-6.html index af02ce339e..3340f623a8 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-6.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-8.html b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-8.html index 513ae205e6..d9d1bb82e3 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-8.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -57,6 +57,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase-index.html b/devel-docs/libgimpbase/html/libgimpbase-index.html index 0a946e9f88..a5c838e743 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-index.html +++ b/devel-docs/libgimpbase/html/libgimpbase-index.html @@ -8,7 +8,7 @@ - + @@ -443,6 +443,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpbase/html/libgimpbase.devhelp2 b/devel-docs/libgimpbase/html/libgimpbase.devhelp2 index 9910adab80..f6f20b960f 100644 --- a/devel-docs/libgimpbase/html/libgimpbase.devhelp2 +++ b/devel-docs/libgimpbase/html/libgimpbase.devhelp2 @@ -197,5 +197,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/devel-docs/libgimpbase/html/libgimpbase.html b/devel-docs/libgimpbase/html/libgimpbase.html index 3f382a17c9..81d1eec0b0 100644 --- a/devel-docs/libgimpbase/html/libgimpbase.html +++ b/devel-docs/libgimpbase/html/libgimpbase.html @@ -8,7 +8,7 @@ - + @@ -85,6 +85,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/Makefile.in b/devel-docs/libgimpcolor/Makefile.in index 2293dc14a3..8b59e3fe1f 100644 --- a/devel-docs/libgimpcolor/Makefile.in +++ b/devel-docs/libgimpcolor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -537,6 +543,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -745,35 +787,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -788,22 +823,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -811,28 +843,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -853,16 +877,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -879,7 +899,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -895,7 +915,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -931,7 +951,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpcolor/html/index.html b/devel-docs/libgimpcolor/html/index.html index 76e47ec6e6..1d70fba6a8 100644 --- a/devel-docs/libgimpcolor/html/index.html +++ b/devel-docs/libgimpcolor/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -61,6 +61,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/index.sgml b/devel-docs/libgimpcolor/html/index.sgml index 619c85a22e..a76f69385a 100644 --- a/devel-docs/libgimpcolor/html/index.sgml +++ b/devel-docs/libgimpcolor/html/index.sgml @@ -4,6 +4,9 @@ + + + diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html index 646047c1dd..84d763378e 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpAdaptiveSupersample.html @@ -8,7 +8,7 @@ - + @@ -123,6 +123,6 @@ Functions to perform adaptive supersampling on an area.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html index 8cdcc54ba6..f9d4af648a 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpBilinear.html @@ -8,7 +8,7 @@ - + @@ -184,6 +184,6 @@ following order: [0,0], [1,0], [0,1], [1,1].
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html index a22c662414..b3fcf4604e 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCMYK.html @@ -8,7 +8,7 @@ - + @@ -396,6 +396,6 @@ Channel values are pointers to unsigned chars in the range 0 to 255.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairoColor.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairoColor.html index 80340d3597..8f56ae442a 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairoColor.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpCairoColor.html @@ -8,7 +8,7 @@ - + @@ -317,6 +317,6 @@ Gets a single pixel from a Cairo image surface in CAIRO_FO
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html index ab8f90ce3c..bc1078d0e3 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorManaged.html @@ -8,7 +8,7 @@ - + @@ -126,6 +126,6 @@ Emits the "profile-changed" signal.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html index 08d8d1feb9..b0e5f1df99 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpColorSpace.html @@ -8,7 +8,7 @@ - + @@ -667,6 +667,6 @@ rgb[2] is blue (0..255)
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html index 9dc5194f3f..727af40b44 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpHSV.html @@ -8,7 +8,7 @@ - + @@ -193,6 +193,6 @@ Used to keep HSL and HSLA colors. All components are in a range of
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html b/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html index 32bcdfe3d7..e23dc4120c 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-GimpRGB.html @@ -8,7 +8,7 @@ - + @@ -192,6 +192,29 @@ Used to keep RGB and RGBA colors. All components are in a range of

+
++++ + + + + + + + + + + + + + + +

GIMP_RGB_COMPOSITE_NONE

 +

GIMP_RGB_COMPOSITE_NORMAL

 +

GIMP_RGB_COMPOSITE_BEHIND

 +
@@ -1003,6 +1026,6 @@ See g_param_spec_internal() for more information.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index-deprecated.html b/devel-docs/libgimpcolor/html/libgimpcolor-index-deprecated.html index a3658505c1..70032048a9 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index-deprecated.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -41,6 +41,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-2.html b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-2.html index fa806b2ba1..ca677c84be 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-2.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-4.html b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-4.html index e48d808dbb..416b61aa6b 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-4.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -42,6 +42,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-6.html b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-6.html index 377dde3065..1992edc8c0 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-6.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-8.html b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-8.html index cc567235bc..39559bec25 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-8.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor-index.html b/devel-docs/libgimpcolor/html/libgimpcolor-index.html index 7992701442..f187cac05d 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor-index.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor-index.html @@ -8,7 +8,7 @@ - + @@ -232,6 +232,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpcolor/html/libgimpcolor.devhelp2 b/devel-docs/libgimpcolor/html/libgimpcolor.devhelp2 index ec118dbef4..d77f404e0c 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor.devhelp2 +++ b/devel-docs/libgimpcolor/html/libgimpcolor.devhelp2 @@ -121,5 +121,8 @@ + + + diff --git a/devel-docs/libgimpcolor/html/libgimpcolor.html b/devel-docs/libgimpcolor/html/libgimpcolor.html index 3e063c8a25..7fb144ff63 100644 --- a/devel-docs/libgimpcolor/html/libgimpcolor.html +++ b/devel-docs/libgimpcolor/html/libgimpcolor.html @@ -8,7 +8,7 @@ - + @@ -56,6 +56,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/Makefile.in b/devel-docs/libgimpconfig/Makefile.in index c7db826a07..771dfa11c4 100644 --- a/devel-docs/libgimpconfig/Makefile.in +++ b/devel-docs/libgimpconfig/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -550,6 +556,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -758,35 +800,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -801,22 +836,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -824,28 +856,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -866,16 +890,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -892,7 +912,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -908,7 +928,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -944,7 +964,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpconfig/html/GimpColorConfig.html b/devel-docs/libgimpconfig/html/GimpColorConfig.html index cf4d139668..14b6cdf133 100644 --- a/devel-docs/libgimpconfig/html/GimpColorConfig.html +++ b/devel-docs/libgimpconfig/html/GimpColorConfig.html @@ -8,7 +8,7 @@ - + @@ -117,6 +117,29 @@ Color management settings.

+
++++ + + + + + + + + + + + + + + +

GIMP_COLOR_MANAGEMENT_OFF

 +

GIMP_COLOR_MANAGEMENT_DISPLAY

 +

GIMP_COLOR_MANAGEMENT_SOFTPROOF

 +
@@ -130,6 +153,34 @@ Color management settings.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL

 +

GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC

 +

GIMP_COLOR_RENDERING_INTENT_SATURATION

 +

GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC

 +
@@ -213,6 +264,6 @@ Color management settings.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/index.html b/devel-docs/libgimpconfig/html/index.html index e50af76d9d..68589c8ab3 100644 --- a/devel-docs/libgimpconfig/html/index.html +++ b/devel-docs/libgimpconfig/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -66,6 +66,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/index.sgml b/devel-docs/libgimpconfig/html/index.sgml index a82d52d2e1..a16a378c16 100644 --- a/devel-docs/libgimpconfig/html/index.sgml +++ b/devel-docs/libgimpconfig/html/index.sgml @@ -79,6 +79,10 @@ + + + + @@ -141,7 +145,14 @@ + + + + + + + diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html index d19f94f7ff..8da3d9247c 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-deserialize.html @@ -8,7 +8,7 @@ - + @@ -132,6 +132,6 @@ found but couldn't be parsed.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html index 260d6bfbc0..7ce2f38d28 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-params.html @@ -8,7 +8,7 @@ - + @@ -319,6 +319,6 @@ Macros and defines to install config properties.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html index 552cbca211..c1a6a72006 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-path.html @@ -8,7 +8,7 @@ - + @@ -82,6 +82,34 @@ File path utilities for libgimpconfig.

+
++++ + + + + + + + + + + + + + + + + + + +

GIMP_CONFIG_PATH_FILE

 +

GIMP_CONFIG_PATH_FILE_LIST

 +

GIMP_CONFIG_PATH_DIR

 +

GIMP_CONFIG_PATH_DIR_LIST

 +
@@ -313,6 +341,6 @@ recode it using
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html index 47f7ac9b86..5e94b09d73 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-serialize.html @@ -8,7 +8,7 @@ - + @@ -238,6 +238,6 @@ This utility function appends a string representation of GVal
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html index 3d4c2f1674..cf89f16a5d 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig-utils.html @@ -8,7 +8,7 @@ - + @@ -235,6 +235,6 @@ strings. Only control characters and quotes are being escaped.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html index 4d84d7908d..23835dc5c3 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfig.html @@ -8,7 +8,7 @@ - + @@ -571,6 +571,6 @@ Properties marked as "construct-only" are not touched.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html index ce5ea18631..591647dc32 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigError.html @@ -8,7 +8,7 @@ - + @@ -128,6 +128,6 @@ This function is never called directly. Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html index 7c7513924a..a457cdc2db 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpConfigWriter.html @@ -8,7 +8,7 @@ - + @@ -488,6 +488,6 @@ the writer afterwards.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html b/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html index 433ab322a5..031f472cb9 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-GimpScanner.html @@ -8,7 +8,7 @@ - + @@ -417,6 +417,6 @@ A wrapper around GScanner with some convenience API.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html b/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html index c53e84fede..5b1bcd49ac 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -31,6 +31,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-index-deprecated.html b/devel-docs/libgimpconfig/html/libgimpconfig-index-deprecated.html index 127ae54a29..02ce144297 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-index-deprecated.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -25,6 +25,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-4.html b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-4.html index fdaeb85057..7608e9c2d9 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-4.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -150,6 +150,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-6.html b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-6.html index da7c4a2a4a..608b98e56f 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-6.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -34,6 +34,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-8.html b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-8.html index e351633cab..420f64559b 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-8.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -34,6 +34,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig-index.html b/devel-docs/libgimpconfig/html/libgimpconfig-index.html index a17124ba08..28c06828b9 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig-index.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig-index.html @@ -8,7 +8,7 @@ - + @@ -251,6 +251,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpconfig/html/libgimpconfig.devhelp2 b/devel-docs/libgimpconfig/html/libgimpconfig.devhelp2 index 82cd843edc..3b8287b4c4 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig.devhelp2 +++ b/devel-docs/libgimpconfig/html/libgimpconfig.devhelp2 @@ -130,5 +130,16 @@ + + + + + + + + + + + diff --git a/devel-docs/libgimpconfig/html/libgimpconfig.html b/devel-docs/libgimpconfig/html/libgimpconfig.html index a3d96b7d48..6a31bfe9ff 100644 --- a/devel-docs/libgimpconfig/html/libgimpconfig.html +++ b/devel-docs/libgimpconfig/html/libgimpconfig.html @@ -8,7 +8,7 @@ - + @@ -62,6 +62,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/Makefile.in b/devel-docs/libgimpmath/Makefile.in index dbadb468de..30fe4231ac 100644 --- a/devel-docs/libgimpmath/Makefile.in +++ b/devel-docs/libgimpmath/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -537,6 +543,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -745,35 +787,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -788,22 +823,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -811,28 +843,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -853,16 +877,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -879,7 +899,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -895,7 +915,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -931,7 +951,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpmath/html/index.html b/devel-docs/libgimpmath/html/index.html index 2fec7b204a..51d96e2812 100644 --- a/devel-docs/libgimpmath/html/index.html +++ b/devel-docs/libgimpmath/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -47,6 +47,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html index b8330f4c99..613fcf41bf 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMD5.html @@ -8,7 +8,7 @@ - + @@ -87,6 +87,6 @@ buffer digest. For more information see
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html index e0122432d8..838bc2fff9 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMath.html @@ -8,7 +8,7 @@ - + @@ -194,6 +194,6 @@ This macro converts its argument angle f
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html b/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html index 215bc89e62..4c8891a817 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpMatrix.html @@ -8,7 +8,7 @@ - + @@ -816,6 +816,6 @@ See g_param_spec_internal() for more information.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html b/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html index c6b488d36f..b3767d3274 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html +++ b/devel-docs/libgimpmath/html/libgimpmath-GimpVector.html @@ -8,7 +8,7 @@ - + @@ -1639,6 +1639,6 @@ This is basically the opposite of
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-index-deprecated.html b/devel-docs/libgimpmath/html/libgimpmath-index-deprecated.html index e4d8cf95c6..4fbfb8fc5b 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-index-deprecated.html +++ b/devel-docs/libgimpmath/html/libgimpmath-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -25,6 +25,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-2.html b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-2.html index 2f65e3bc48..bf2c790dd7 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-2.html +++ b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-4.html b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-4.html index dd14c82575..b19c9fd9a2 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-4.html +++ b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -37,6 +37,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-6.html b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-6.html index 06a5920fd8..8349ab38fd 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-6.html +++ b/devel-docs/libgimpmath/html/libgimpmath-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath-index.html b/devel-docs/libgimpmath/html/libgimpmath-index.html index 81d6d0210c..35369c76d6 100644 --- a/devel-docs/libgimpmath/html/libgimpmath-index.html +++ b/devel-docs/libgimpmath/html/libgimpmath-index.html @@ -8,7 +8,7 @@ - + @@ -240,6 +240,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmath/html/libgimpmath.html b/devel-docs/libgimpmath/html/libgimpmath.html index 35cb7cb3b8..65c24d9e01 100644 --- a/devel-docs/libgimpmath/html/libgimpmath.html +++ b/devel-docs/libgimpmath/html/libgimpmath.html @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/Makefile.in b/devel-docs/libgimpmodule/Makefile.in index 4915e7cb51..777bc2ef82 100644 --- a/devel-docs/libgimpmodule/Makefile.in +++ b/devel-docs/libgimpmodule/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -547,6 +553,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -755,35 +797,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -798,22 +833,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -821,28 +853,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -863,16 +887,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -889,7 +909,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -905,7 +925,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -941,7 +961,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpmodule/html/GimpModule.html b/devel-docs/libgimpmodule/html/GimpModule.html index 332ccb9a4b..578ccb0396 100644 --- a/devel-docs/libgimpmodule/html/GimpModule.html +++ b/devel-docs/libgimpmodule/html/GimpModule.html @@ -8,7 +8,7 @@ - + @@ -298,6 +298,17 @@ it implements with the passed module.

+
++++ + + + + +

GIMP_MODULE_FAILED

 +
@@ -647,6 +658,6 @@ This function is never called directly. Use
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/GimpModuleDB.html b/devel-docs/libgimpmodule/html/GimpModuleDB.html index d72b2acac0..a3c06ae26f 100644 --- a/devel-docs/libgimpmodule/html/GimpModuleDB.html +++ b/devel-docs/libgimpmodule/html/GimpModuleDB.html @@ -8,7 +8,7 @@ - + @@ -300,6 +300,6 @@ to load modules from.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/index.html b/devel-docs/libgimpmodule/html/index.html index 3a934af88e..470f750789 100644 --- a/devel-docs/libgimpmodule/html/index.html +++ b/devel-docs/libgimpmodule/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -43,6 +43,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/index.sgml b/devel-docs/libgimpmodule/html/index.sgml index 6af8b458a0..bb73df15a4 100644 --- a/devel-docs/libgimpmodule/html/index.sgml +++ b/devel-docs/libgimpmodule/html/index.sgml @@ -16,6 +16,7 @@ + diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index-deprecated.html b/devel-docs/libgimpmodule/html/libgimpmodule-index-deprecated.html index 7334e1f174..4e4209bb6b 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index-deprecated.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -33,6 +33,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-2.html b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-2.html index 376eedae29..5fbf941cea 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-2.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-4.html b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-4.html index 9673083761..0929d0247b 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-4.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-6.html b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-6.html index a2993765cc..44e60eee37 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-6.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-8.html b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-8.html index be525d2d33..a0aa03a5cc 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-8.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -30,6 +30,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule-index.html b/devel-docs/libgimpmodule/html/libgimpmodule-index.html index 46d0631755..9bc54eeb3d 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule-index.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule-index.html @@ -8,7 +8,7 @@ - + @@ -88,6 +88,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpmodule/html/libgimpmodule.devhelp2 b/devel-docs/libgimpmodule/html/libgimpmodule.devhelp2 index 971cb661de..23de5a8011 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule.devhelp2 +++ b/devel-docs/libgimpmodule/html/libgimpmodule.devhelp2 @@ -47,5 +47,6 @@ + diff --git a/devel-docs/libgimpmodule/html/libgimpmodule.html b/devel-docs/libgimpmodule/html/libgimpmodule.html index 0ecd27e586..5c07457bf8 100644 --- a/devel-docs/libgimpmodule/html/libgimpmodule.html +++ b/devel-docs/libgimpmodule/html/libgimpmodule.html @@ -8,7 +8,7 @@ - + @@ -38,6 +38,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/Makefile.in b/devel-docs/libgimpthumb/Makefile.in index 9f737b7482..fe90465237 100644 --- a/devel-docs/libgimpthumb/Makefile.in +++ b/devel-docs/libgimpthumb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -546,6 +552,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -754,35 +796,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -797,22 +832,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -820,28 +852,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -862,16 +886,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -888,7 +908,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -904,7 +924,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -940,7 +960,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpthumb/html/GimpThumbnail.html b/devel-docs/libgimpthumb/html/GimpThumbnail.html index 291097d853..4d0962822b 100644 --- a/devel-docs/libgimpthumb/html/GimpThumbnail.html +++ b/devel-docs/libgimpthumb/html/GimpThumbnail.html @@ -8,7 +8,7 @@ - + @@ -683,6 +683,6 @@ valid failure thumbnail exists.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/index.html b/devel-docs/libgimpthumb/html/index.html index eab2d4bc22..354cf261c6 100644 --- a/devel-docs/libgimpthumb/html/index.html +++ b/devel-docs/libgimpthumb/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -46,6 +46,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html index 4d0ad87d0f..7d099a6daa 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-enums.html @@ -8,7 +8,7 @@ - + @@ -205,6 +205,6 @@ Possible image and thumbnail file states used by libgimpthumb.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html index 810fc03f71..5331b4abb2 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-error.html @@ -8,7 +8,7 @@ - + @@ -117,6 +117,6 @@ This function is never called directly. Use
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html index 02a74965ff..9a1d722960 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-GimpThumb-utils.html @@ -8,7 +8,7 @@ - + @@ -452,6 +452,6 @@ the local thumbnail repository.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-index-deprecated.html b/devel-docs/libgimpthumb/html/libgimpthumb-index-deprecated.html index c6fc4b289b..793b1cfb8b 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-index-deprecated.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -25,6 +25,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-2.html b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-2.html index 921a53f22f..067f0760d0 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-2.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -50,6 +50,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-4.html b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-4.html index 996a510f48..58816aecb3 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-4.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-6.html b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-6.html index a540d9c423..aff8e4b2f8 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-6.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -26,6 +26,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb-index.html b/devel-docs/libgimpthumb/html/libgimpthumb-index.html index 6f341b704e..fc1c8deb52 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb-index.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb-index.html @@ -8,7 +8,7 @@ - + @@ -114,6 +114,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpthumb/html/libgimpthumb.html b/devel-docs/libgimpthumb/html/libgimpthumb.html index a8cd3ffe3a..125cb13686 100644 --- a/devel-docs/libgimpthumb/html/libgimpthumb.html +++ b/devel-docs/libgimpthumb/html/libgimpthumb.html @@ -8,7 +8,7 @@ - + @@ -42,6 +42,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/Makefile.in b/devel-docs/libgimpwidgets/Makefile.in index b0858bf708..75a5a0080b 100644 --- a/devel-docs/libgimpwidgets/Makefile.in +++ b/devel-docs/libgimpwidgets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -253,6 +253,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -279,6 +281,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -561,6 +567,42 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = @ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### templates #### +GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; all: all-am .SUFFIXES: @@ -769,35 +811,28 @@ docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -812,22 +847,19 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -835,28 +867,20 @@ tmpl.stamp: tmpl-build.stamp $(srcdir)/tmpl/*.sgml: @true -#### xml #### - sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -877,16 +901,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -903,7 +923,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -919,7 +939,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -955,7 +975,7 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: +@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: docs @ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: @ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" @ENABLE_GTK_DOC_FALSE@ @false diff --git a/devel-docs/libgimpwidgets/html/GimpBrowser.html b/devel-docs/libgimpwidgets/html/GimpBrowser.html index 936819c91a..914208a24f 100644 --- a/devel-docs/libgimpwidgets/html/GimpBrowser.html +++ b/devel-docs/libgimpwidgets/html/GimpBrowser.html @@ -8,7 +8,7 @@ - + @@ -236,6 +236,6 @@ side already contains a GtkLabel, the widget previousl
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpButton.html b/devel-docs/libgimpwidgets/html/GimpButton.html index 18b66d07be..1654f053cb 100644 --- a/devel-docs/libgimpwidgets/html/GimpButton.html +++ b/devel-docs/libgimpwidgets/html/GimpButton.html @@ -8,7 +8,7 @@ - + @@ -171,6 +171,6 @@ key pressed.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html index a64366e9d4..5f91abc934 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererColor.html @@ -8,7 +8,7 @@ - + @@ -124,6 +124,6 @@ Creates a GtkCellRenderer that displays a color.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html index 960bb446b7..f254ce869a 100644 --- a/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html +++ b/devel-docs/libgimpwidgets/html/GimpCellRendererToggle.html @@ -8,7 +8,7 @@ - + @@ -200,6 +200,6 @@ Emits the "clicked" signal from a
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpChainButton.html b/devel-docs/libgimpwidgets/html/GimpChainButton.html index 3ad56c3e20..7fa3f73dac 100644 --- a/devel-docs/libgimpwidgets/html/GimpChainButton.html +++ b/devel-docs/libgimpwidgets/html/GimpChainButton.html @@ -8,7 +8,7 @@ - + @@ -284,6 +284,6 @@ You may want to use the convenience function
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorArea.html b/devel-docs/libgimpwidgets/html/GimpColorArea.html index 1f92738b63..855c2fa68e 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorArea.html +++ b/devel-docs/libgimpwidgets/html/GimpColorArea.html @@ -8,7 +8,7 @@ - + @@ -379,6 +379,6 @@ The type of the color area.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorButton.html b/devel-docs/libgimpwidgets/html/GimpColorButton.html index 377f9312f8..63ed0d435e 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorButton.html +++ b/devel-docs/libgimpwidgets/html/GimpColorButton.html @@ -8,7 +8,7 @@ - + @@ -422,6 +422,6 @@ The type of the button's color area.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html index 3b07a07371..5aa1c02bdb 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorDisplay.html +++ b/devel-docs/libgimpwidgets/html/GimpColorDisplay.html @@ -8,7 +8,7 @@ - + @@ -361,6 +361,6 @@ Converts all pixels in surface.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html index 0d089692bd..9734439e9c 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html +++ b/devel-docs/libgimpwidgets/html/GimpColorDisplayStack.html @@ -8,7 +8,7 @@ - + @@ -338,6 +338,6 @@ Runs all the stack's filters on all pixels in surfac
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html index eadb28163c..fc4af53018 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpColorHexEntry.html @@ -8,7 +8,7 @@ - + @@ -190,6 +190,6 @@ Retrieves the color value displayed by a
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html index 6ed197d54b..2595a905d2 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorNotebook.html +++ b/devel-docs/libgimpwidgets/html/GimpColorNotebook.html @@ -8,7 +8,7 @@ - + @@ -148,6 +148,6 @@ if has_page was FALSE
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html b/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html index a98380f3e7..1d475d446d 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileComboBox.html @@ -8,7 +8,7 @@ - + @@ -307,6 +307,6 @@ Overrides the "model" property of the GtkComboBox clas
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html b/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html index c59d72600f..28e167c948 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html +++ b/devel-docs/libgimpwidgets/html/GimpColorProfileStore.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ Filename of the color history used to populate the profile store.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorScale.html b/devel-docs/libgimpwidgets/html/GimpColorScale.html index 735ad64cf6..f84943bad1 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorScale.html +++ b/devel-docs/libgimpwidgets/html/GimpColorScale.html @@ -8,7 +8,7 @@ - + @@ -193,6 +193,6 @@ The channel which is edited by the color scale.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorScales.html b/devel-docs/libgimpwidgets/html/GimpColorScales.html index 82ab5fa65f..1861fb9125 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorScales.html +++ b/devel-docs/libgimpwidgets/html/GimpColorScales.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ that allow to adjust the HSV and RGB color channels.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelect.html b/devel-docs/libgimpwidgets/html/GimpColorSelect.html index d0b405bb5d..64ac72891f 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelect.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelect.html @@ -8,7 +8,7 @@ - + @@ -86,6 +86,6 @@ will then change the other two channels accordingly.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelection.html b/devel-docs/libgimpwidgets/html/GimpColorSelection.html index 8a8a8ef650..1d34dfa4bd 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelection.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelection.html @@ -8,7 +8,7 @@ - + @@ -376,6 +376,6 @@ Sets the color management configuration to use with this color selection.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpColorSelector.html b/devel-docs/libgimpwidgets/html/GimpColorSelector.html index 4f1725eadd..46dd195a0e 100644 --- a/devel-docs/libgimpwidgets/html/GimpColorSelector.html +++ b/devel-docs/libgimpwidgets/html/GimpColorSelector.html @@ -8,7 +8,7 @@ - + @@ -348,6 +348,6 @@ Sets the color management configuration to use with this color selector.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpController.html b/devel-docs/libgimpwidgets/html/GimpController.html index 32447df284..5ef7d04f63 100644 --- a/devel-docs/libgimpwidgets/html/GimpController.html +++ b/devel-docs/libgimpwidgets/html/GimpController.html @@ -8,7 +8,7 @@ - + @@ -267,6 +267,6 @@ Event types for
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpDialog.html b/devel-docs/libgimpwidgets/html/GimpDialog.html index 1a117ebe8b..1218524964 100644 --- a/devel-docs/libgimpwidgets/html/GimpDialog.html +++ b/devel-docs/libgimpwidgets/html/GimpDialog.html @@ -8,7 +8,7 @@ - + @@ -400,6 +400,6 @@ This function is for internal use only.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html b/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html index a3ddaeb4ae..402ac413b6 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumComboBox.html @@ -8,7 +8,7 @@ - + @@ -192,6 +192,6 @@ Attempts to create stock icons for all items in the
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumLabel.html b/devel-docs/libgimpwidgets/html/GimpEnumLabel.html index 14d9333468..f5f80b71be 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumLabel.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumLabel.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@ The value to display.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpEnumStore.html b/devel-docs/libgimpwidgets/html/GimpEnumStore.html index 39566c7694..f345cafa3e 100644 --- a/devel-docs/libgimpwidgets/html/GimpEnumStore.html +++ b/devel-docs/libgimpwidgets/html/GimpEnumStore.html @@ -8,7 +8,7 @@ - + @@ -278,6 +278,6 @@ Sets the GType of the enum to be used in the store.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpFileEntry.html b/devel-docs/libgimpwidgets/html/GimpFileEntry.html index 1cc175673a..a8232fdb6e 100644 --- a/devel-docs/libgimpwidgets/html/GimpFileEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpFileEntry.html @@ -8,7 +8,7 @@ - + @@ -247,6 +247,6 @@ This signal is emitted whenever the user changes the filename.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpFrame.html b/devel-docs/libgimpwidgets/html/GimpFrame.html index e57bdf1173..d31c7a0566 100644 --- a/devel-docs/libgimpwidgets/html/GimpFrame.html +++ b/devel-docs/libgimpwidgets/html/GimpFrame.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@ the GNOME HIG (see http://developer.gnome.org/projects/gup/hig/).
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html index d8ef8ec70d..a4fac71a4a 100644 --- a/devel-docs/libgimpwidgets/html/GimpIntComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpIntComboBox.html @@ -8,7 +8,7 @@ - + @@ -475,6 +475,6 @@ entire string.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpIntStore.html b/devel-docs/libgimpwidgets/html/GimpIntStore.html index 7bcb76e263..cc527e410f 100644 --- a/devel-docs/libgimpwidgets/html/GimpIntStore.html +++ b/devel-docs/libgimpwidgets/html/GimpIntStore.html @@ -8,7 +8,7 @@ - + @@ -223,6 +223,6 @@ handle ref-counting of your user data.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html index b1b6f6426e..a02a2432bf 100644 --- a/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpMemsizeEntry.html @@ -8,7 +8,7 @@ - + @@ -210,6 +210,6 @@ Retrieves the current value from a
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html b/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html index ccd0fe993e..80e616d50a 100644 --- a/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpNumberPairEntry.html @@ -8,7 +8,7 @@ - + @@ -725,6 +725,6 @@ normal.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html index 71912b0636..df7f88edc4 100644 --- a/devel-docs/libgimpwidgets/html/GimpOffsetArea.html +++ b/devel-docs/libgimpwidgets/html/GimpOffsetArea.html @@ -8,7 +8,7 @@ - + @@ -246,6 +246,6 @@ is being offset.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPageSelector.html b/devel-docs/libgimpwidgets/html/GimpPageSelector.html index 4e9e9898d4..d95c0ce348 100644 --- a/devel-docs/libgimpwidgets/html/GimpPageSelector.html +++ b/devel-docs/libgimpwidgets/html/GimpPageSelector.html @@ -8,7 +8,7 @@ - + @@ -682,6 +682,6 @@ This signal is emitted whenever the set of selected pages changes.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPathEditor.html b/devel-docs/libgimpwidgets/html/GimpPathEditor.html index fbbe0f3106..8cbcd38115 100644 --- a/devel-docs/libgimpwidgets/html/GimpPathEditor.html +++ b/devel-docs/libgimpwidgets/html/GimpPathEditor.html @@ -8,7 +8,7 @@ - + @@ -282,6 +282,6 @@ is changed, either by the user clicking on it or by calling
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPickButton.html b/devel-docs/libgimpwidgets/html/GimpPickButton.html index ab1de06502..29c18de3bb 100644 --- a/devel-docs/libgimpwidgets/html/GimpPickButton.html +++ b/devel-docs/libgimpwidgets/html/GimpPickButton.html @@ -8,7 +8,7 @@ - + @@ -142,6 +142,6 @@ This signal is emitted when the user has picked a color.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPixmap.html b/devel-docs/libgimpwidgets/html/GimpPixmap.html index a2d3a2ade8..c64ef7be3a 100644 --- a/devel-docs/libgimpwidgets/html/GimpPixmap.html +++ b/devel-docs/libgimpwidgets/html/GimpPixmap.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@ gimp_pixmap_button_new(), GtkPixmap
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPreview.html b/devel-docs/libgimpwidgets/html/GimpPreview.html index 741faf2d2d..6e6fba4e75 100644 --- a/devel-docs/libgimpwidgets/html/GimpPreview.html +++ b/devel-docs/libgimpwidgets/html/GimpPreview.html @@ -8,7 +8,7 @@ - + @@ -587,6 +587,6 @@ if they need to add controls to this area.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html index bd6daa6ab7..bdd5ee2a5b 100644 --- a/devel-docs/libgimpwidgets/html/GimpPreviewArea.html +++ b/devel-docs/libgimpwidgets/html/GimpPreviewArea.html @@ -8,7 +8,7 @@ - + @@ -480,7 +480,7 @@ when drawing the checkerboard and to determine the dither offsets.

Sets the colormap for the GimpPreviewArea widget. You need to call this function before you use gimp_preview_area_draw() with -an image type of GIMP_INDEXED_IMAGE or GIMP_INDEXEDA_IMAGE. +an image type of GIMP_INDEXED_IMAGE or GIMP_INDEXEDA_IMAGE.

Since GIMP 2.2 @@ -590,6 +590,6 @@ the checkerboard pattern that the area u

- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpRuler.html b/devel-docs/libgimpwidgets/html/GimpRuler.html index 245ac554aa..d21b7604d5 100644 --- a/devel-docs/libgimpwidgets/html/GimpRuler.html +++ b/devel-docs/libgimpwidgets/html/GimpRuler.html @@ -8,7 +8,7 @@ - + @@ -436,6 +436,6 @@ Removes a previously added track widget from the ruler. See
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html b/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html index 256f0a661b..f19d63f20c 100644 --- a/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html +++ b/devel-docs/libgimpwidgets/html/GimpScrolledPreview.html @@ -8,7 +8,7 @@ - + @@ -198,6 +198,6 @@ This function should only be used to implement widgets derived from
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html index f647f2b6d3..def2c57e9e 100644 --- a/devel-docs/libgimpwidgets/html/GimpSizeEntry.html +++ b/devel-docs/libgimpwidgets/html/GimpSizeEntry.html @@ -8,7 +8,7 @@ - + @@ -1033,6 +1033,6 @@ can use this function to get a pointer to the spinbuttons.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpStringComboBox.html b/devel-docs/libgimpwidgets/html/GimpStringComboBox.html index 039cb99b5d..930f19c861 100644 --- a/devel-docs/libgimpwidgets/html/GimpStringComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpStringComboBox.html @@ -8,7 +8,7 @@ - + @@ -209,6 +209,6 @@ be used as labels in the combo-box.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html b/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html index ae02828bf2..56e1cf1323 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitComboBox.html @@ -8,7 +8,7 @@ - + @@ -177,6 +177,6 @@ It replaces the deprecated
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html index 606345609b..6c8ad3c4e9 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitMenu.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitMenu.html @@ -8,7 +8,7 @@ - + @@ -329,6 +329,6 @@ the
- Generated by GTK-Doc V1.18 + Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpUnitStore.html b/devel-docs/libgimpwidgets/html/GimpUnitStore.html index 4c11560538..ff9503a91c 100644 --- a/devel-docs/libgimpwidgets/html/GimpUnitStore.html +++ b/devel-docs/libgimpwidgets/html/GimpUnitStore.html @@ -8,7 +8,7 @@ - + @@ -259,6 +259,6 @@ GimpUnitStore implements
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/GimpZoomModel.html b/devel-docs/libgimpwidgets/html/GimpZoomModel.html index 8e8984b51d..9eb8a18d4f 100644 --- a/devel-docs/libgimpwidgets/html/GimpZoomModel.html +++ b/devel-docs/libgimpwidgets/html/GimpZoomModel.html @@ -8,7 +8,7 @@ - + @@ -447,6 +447,6 @@ Emitted when the zoom factor of the zoom model changes.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/index.html b/devel-docs/libgimpwidgets/html/index.html index 53ed312eae..2046b951c8 100644 --- a/devel-docs/libgimpwidgets/html/index.html +++ b/devel-docs/libgimpwidgets/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for GIMP 2.8.6 + for GIMP 2.8.10

@@ -227,6 +227,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/index.sgml b/devel-docs/libgimpwidgets/html/index.sgml index d439de42f7..5f33beae71 100644 --- a/devel-docs/libgimpwidgets/html/index.sgml +++ b/devel-docs/libgimpwidgets/html/index.sgml @@ -1110,6 +1110,7 @@ + diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html index 0e7f0614b2..9bba3e2208 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpCairoUtils.html @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@ efficient ways of achieving the result you are looking for.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html index 87c0d74dda..bbd45d8c27 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpEnumWidgets.html @@ -8,7 +8,7 @@ - + @@ -444,6 +444,6 @@ Sets the padding of all buttons in a box created by
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html index 03b91bdef0..1653a512bf 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHelpUI.html @@ -8,7 +8,7 @@ - + @@ -312,6 +312,6 @@ case at least for every window/dialog).
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html index 41570fdf2a..08721c4af7 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpHintBox.html @@ -8,7 +8,7 @@ - + @@ -77,6 +77,6 @@ Since GIMP 2.4
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html index 47139300c7..d5fb993a57 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpOldWidgets.html @@ -8,7 +8,7 @@ - + @@ -532,6 +532,6 @@ value.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html index cd78381710..1998e54e70 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpPropWidgets.html @@ -8,7 +8,7 @@ - + @@ -1468,6 +1468,6 @@ Since GIMP 2.4
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html index ceee3d02fe..a6decaed04 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpQueryBox.html @@ -8,7 +8,7 @@ - + @@ -739,6 +739,6 @@ Useful if you want to add more widgets.
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html index 660a73da65..a4bf8d5c32 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpStock.html @@ -8,7 +8,7 @@ - + @@ -2276,6 +2276,6 @@ RTL variant
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html index e6c9279274..55ff0972cf 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-GimpWidgets.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,17 @@ and helper functions.

+
++++ + + + + +

GIMP_WIDGETS_PARSE_ERROR

 +
@@ -1394,6 +1405,6 @@ This function is never called directly. Use
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html index 205c26a8d2..e0e00fe3bb 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-cell-renderers.html @@ -8,7 +8,7 @@ - + @@ -34,6 +34,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html index 0e34ca8925..d0b2b5491c 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colordisplay.html @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html index 8f523d5ec2..79dbbda4ef 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-colorselector.html @@ -8,7 +8,7 @@ - + @@ -42,6 +42,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html index 8ecb21c010..01b910c316 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-controller.html @@ -8,7 +8,7 @@ - + @@ -34,6 +34,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html index 625fcddd1b..2e551e7bc2 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-deprecated.html @@ -8,7 +8,7 @@ - + @@ -40,6 +40,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html index 7ee3750fd0..ec109e71b8 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-gallery.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html index 9d1ed9116e..de935d2a06 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-hierarchy.html @@ -8,7 +8,7 @@ - + @@ -97,6 +97,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-deprecated.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-deprecated.html index 717e71b20a..11ec651599 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-deprecated.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-deprecated.html @@ -7,7 +7,7 @@ - + @@ -133,6 +133,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-2.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-2.html index cd611ca6cc..7666162527 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-2.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-2.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-4.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-4.html index 425b703705..c3bd785dc9 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-4.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-4.html @@ -8,7 +8,7 @@ - + @@ -254,6 +254,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-6.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-6.html index 98e11d9c6c..c6266ea8a3 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-6.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-6.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-8.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-8.html index f7f06d8856..312dde3a49 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-8.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index-new-in-2-8.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-index.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-index.html index e2a37c8090..c42b3accd7 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-index.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-index.html @@ -8,7 +8,7 @@ - + @@ -1595,6 +1595,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html index b4e2e2cf9d..af1194e57f 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-utils.html @@ -8,7 +8,7 @@ - + @@ -56,6 +56,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html index f8d222f2c4..fc30f5ff37 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets-widgets.html @@ -8,7 +8,7 @@ - + @@ -142,6 +142,6 @@
- Generated by GTK-Doc V1.18
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff --git a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 index 559dd46aba..a3f5e81e68 100644 --- a/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 +++ b/devel-docs/libgimpwidgets/html/libgimpwidgets.devhelp2 @@ -852,5 +852,6 @@ + diff --git a/devel-docs/libgimpwidgets/html/stock-tool-align-16.png b/devel-docs/libgimpwidgets/html/stock-tool-align-16.png index b3e55d19886b0f219b5ead6aca6a6de973e849e2..7d055a5180e7bbac879e5243e0b2e6db2e8d1771 100644 GIT binary patch delta 277 zcmV+w0qXvP1F!;+B!BlwL_t(I%bk<4O2kkQMNeMR_z9L`HHCsd;3o)vhHUSjQn?B$8Hp*-0r!1Lu1A4@ zFYo=$r~(mp&beh@LblQM7T5zGH}dvld@-}5ZDs+`G)*@INq<+rxrLdXuEym!&+`;> z3rS^N*SltRNOXGcyG7opZ}9%aZmh>7uHtYhe20fuu5o&r}6S znyo#UtSfh2l7I&QGdtL}#&h7LhdeX0v(!0D;A7|)hAwd@gi!qZi(=R3xT?2N9~nuD bA@Vo!W8*FQ#SWIl00000NkvXXu0mjftqg=x delta 360 zcmV-u0hj);0)qpPB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^RR1rZet4tW;ohyVZpHFQN-bVF}#ZDnqB04QTAATls8G$2Z0Yjt8EQ*>o% zZe?-`3PW;bVRU6=Aa`kWXdqN*WgtgMO;C{8i*En`0MAK8L4Q;@%cYVb4#F@Pg}<&# zfD>?lsaXE;tM|cCWiEifT!UUxN00006}f{;E)dQ@irj&{0Ces{ zlXSUPC_LUoK^rVWC>UwA@~r**$Nu(;jwq$P0!v`XIY0M|aW6FI46uy$^-)SW0OJ$w z>lFh-DWy#UFz{Q^RQIa=3A{Tr0eJz|os6fP^ZR-7Zld#gc7H$PKouz&3$U?-BoGL( z-|ydmui#0KiVDHV0)#CjBT?ZO{O&W4j_a6`u@g$hHYusTZJZKz{eHFwBTM1W(+&X4 zALgMH9Ev4}YQ++X-EId!0FORC^=K)DoU;I&j9k@PiDcI*BHt6=|by%+st`~O_@y4BD06Ewb!zub931^@s607*qoM6N<$f=D2y AQ2+n{ delta 410 zcmV;L0cHOD0bY*F7WpWA%Lvm$dbY)~9cWHEJ zAXI2&AV*0}P>|V+ZvX%R5lKWrR5;7kl`(RIKnz9S|KdvVDSx1(%u(XPSBX1HT)O05 zq*!4y4m(2;j~zAI(P;l@pCo`6TMNwT|6Fu_hBzs@+suD6Z3Ty6_ySHlH9q^kKR*VW zO7iLOabQlYlCc0AOGpBN5Yse$1Lqp!cIz#+2nP{H4#LI`Y!m4#Q$&-8@exaeOGwHp zm&y%RCU24)fq$;a!+M+qU@~07*qoM6N<$ Ef<_moZ~y=R diff --git a/devel-docs/tools/Makefile.in b/devel-docs/tools/Makefile.in index df2da261f6..3b916e5d8f 100644 --- a/devel-docs/tools/Makefile.in +++ b/devel-docs/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -303,6 +303,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -329,6 +331,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -597,14 +603,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/devel-docs/vbr.txt b/devel-docs/vbr.txt index 63ab6b03e1..01ac4a6965 100644 --- a/devel-docs/vbr.txt +++ b/devel-docs/vbr.txt @@ -11,10 +11,11 @@ has been tweaked several times. The most recent tweak, in August version number used was always 1.0. The version number used for shaped brushes is 1.5. -VBR files are ASCII, consisting of a set of fields separated by line -breaks. The number of lines is variable, 10 if the brush is "shaped", -8 otherwise. All numerical fields are in float format, except the -number of spikes (for shaped brushes), which is an integer. +VBR files are plain text tiles, consisting of a set of fields +separated by line breaks. The number of lines is variable, 10 if the +brush is "shaped", 8 otherwise. All numerical fields are in float +format, with a dot as decimal separator, except the number of spikes +(for shaped brushes), which is an integer. Non-shaped brushes: @@ -45,16 +46,16 @@ Line 2: Version number, always "1.5". Line 3: The name of the brush. This is a UTF-8 string, with a maximum length of 255 bytes. -Line 4: A string giving the shape of the brush. Currently "Circle", - "Square", and "Diamond" are supported. The possible shapes +Line 4: A string giving the shape of the brush. Currently "circle", + "square", and "diamond" are supported. The possible shapes are defined by the GimpBrushGeneratedShape enum in core-enums.h. Line 5: The brush spacing. -Line 6: The number of spikes for the shape. +Line 6: The brush radius, in pixels. -Line 7: The brush radius, in pixels. +Line 7: The number of spikes for the shape. Line 8: The brush hardness. diff --git a/docs/Makefile.in b/docs/Makefile.in index a649f6d08d..53cae7df42 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -281,6 +281,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -307,6 +309,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 4b754e4f2f..44b9345e7b 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -60,7 +60,7 @@ Sets how many processors GIMP should try to use simultaneously. This is an integer value. .TP -(tile-cache-size 2038820k) +(tile-cache-size 2147483647) When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on diff --git a/etc/Makefile.in b/etc/Makefile.in index e41de9732f..48b0a901b0 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/etc/gimprc b/etc/gimprc index aa22bc4001..1efcc43486 100644 --- a/etc/gimprc +++ b/etc/gimprc @@ -42,7 +42,7 @@ # specified in bytes, kilobytes, megabytes or gigabytes. If no suffix is # specified the size defaults to being specified in kilobytes. # -# (tile-cache-size 2038820k) +# (tile-cache-size 2147483647) # Specifies the language to use for the user interface. This is a string # value. diff --git a/gtk-doc.make b/gtk-doc.make index 1f75dfdc72..3b5bed0e09 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -74,33 +74,42 @@ $(REPORT_FILES): sgml-build.stamp #### setup #### +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pu $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ test -d $(abs_srcdir)/tmpl && \ { cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \ chmod -R u+w $(abs_builddir)/tmpl; } \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp #### scan #### +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -115,22 +124,25 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### templates #### +GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) +GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; + tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo ' DOC Rebuilding template files' - @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ + $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ if test -w $(abs_srcdir) ; then \ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \ fi \ fi - @touch tmpl-build.stamp + $(AM_V_at)touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true @@ -140,26 +152,34 @@ $(srcdir)/tmpl/*.sgml: #### xml #### +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo ' DOC Building XML' - @-chmod -R u+w $(srcdir) - @_source_dir='' ; \ + $(GTK_DOC_V_XML)-chmod -R u+w $(srcdir) && _source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -180,16 +200,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp #### pdf #### +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -206,7 +228,7 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## @@ -222,7 +244,7 @@ distclean-local: rm -rf tmpl; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -259,7 +281,7 @@ uninstall-local: # Require gtk-doc when making dist # if ENABLE_GTK_DOC -dist-check-gtkdoc: +dist-check-gtkdoc: docs else dist-check-gtkdoc: @echo "*** gtk-doc must be installed and enabled in order to make dist" diff --git a/libgimp/Makefile.in b/libgimp/Makefile.in index bb37c16081..03960fdec2 100644 --- a/libgimp/Makefile.in +++ b/libgimp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -380,6 +380,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -406,6 +408,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1136,14 +1142,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimp/gimpexport.c b/libgimp/gimpexport.c index 979fd2ce37..3433c4afd0 100644 --- a/libgimp/gimpexport.c +++ b/libgimp/gimpexport.c @@ -694,6 +694,7 @@ gimp_export_image (gint32 *image_ID, gint32 i; gint32 n_layers; gint32 *layers; + gboolean interactive = FALSE; gboolean added_flatten = FALSE; gboolean has_layer_masks = FALSE; gboolean background_has_alpha = TRUE; @@ -714,8 +715,11 @@ gimp_export_image (gint32 *image_ID, if (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS) capabilities |= GIMP_EXPORT_CAN_HANDLE_ALPHA; + if (format_name && g_getenv ("GIMP_INTERACTIVE_EXPORT")) + interactive = TRUE; + /* ask for confirmation if the user is not saving a layer (see bug #51114) */ - if (format_name && + if (interactive && ! gimp_item_is_layer (*drawable_ID) && ! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS)) { @@ -782,12 +786,16 @@ gimp_export_image (gint32 *image_ID, } } - g_free (layers); - if (! added_flatten) { + gint32 n_children; + gint32 *children; + + children = gimp_item_get_children (layers[0], &n_children); + /* check if layer size != canvas size, opacity != 100%, or offsets != 0 */ if (n_layers == 1 && + ! children && gimp_item_is_layer (*drawable_ID) && ! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS)) { @@ -838,6 +846,21 @@ gimp_export_image (gint32 *image_ID, &export_action_merge_or_flatten); } } + /* check for a single toplevel layer group */ + else if (children) + { + if (! (capabilities & GIMP_EXPORT_CAN_HANDLE_LAYERS)) + { + if (capabilities & GIMP_EXPORT_NEEDS_ALPHA) + actions = g_slist_prepend (actions, + &export_action_merge); + else + actions = g_slist_prepend (actions, + &export_action_merge_or_flatten); + } + } + + g_free (children); /* check layer masks */ if (has_layer_masks && @@ -845,6 +868,8 @@ gimp_export_image (gint32 *image_ID, actions = g_slist_prepend (actions, &export_action_apply_masks); } + g_free (layers); + /* check the image type */ type = gimp_image_base_type (*image_ID); switch (type) @@ -918,7 +943,7 @@ gimp_export_image (gint32 *image_ID, { actions = g_slist_reverse (actions); - if (format_name) + if (interactive) retval = export_dialog (actions, format_name); else retval = GIMP_EXPORT_EXPORT; diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am index 57f683cb46..1a83280a39 100644 --- a/libgimpbase/Makefile.am +++ b/libgimpbase/Makefile.am @@ -66,7 +66,7 @@ AM_CCASFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ - $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ $(BINRELOC_CFLAGS) \ -I$(includedir) \ $(xobjective_c) @@ -158,7 +158,7 @@ libgimpbase_2_0_la_LDFLAGS = \ libgimpbase_2_0_la_DEPENDENCIES = $(gimpbase_def) -libgimpbase_2_0_la_LIBADD = $(GLIB_LIBS) $(ole32_lib) +libgimpbase_2_0_la_LIBADD = $(GIO_LIBS) $(ole32_lib) install-data-local: install-ms-lib install-libtool-import-lib diff --git a/libgimpbase/Makefile.in b/libgimpbase/Makefile.in index c5f4c22688..efda298ab4 100644 --- a/libgimpbase/Makefile.in +++ b/libgimpbase/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -521,6 +521,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -547,6 +549,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -748,7 +754,7 @@ AM_CCASFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ - $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ $(BINRELOC_CFLAGS) \ -I$(includedir) \ $(xobjective_c) @@ -829,7 +835,7 @@ libgimpbase_2_0_la_LDFLAGS = \ $(framework_cocoa) libgimpbase_2_0_la_DEPENDENCIES = $(gimpbase_def) -libgimpbase_2_0_la_LIBADD = $(GLIB_LIBS) $(ole32_lib) +libgimpbase_2_0_la_LIBADD = $(GIO_LIBS) $(ole32_lib) test_cpu_accel_SOURCES = test-cpu-accel.c test_cpu_accel_DEPENDENCIES = \ $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la @@ -952,14 +958,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpbase/gimpdatafiles.c b/libgimpbase/gimpdatafiles.c index ac7987cc93..0bf2520e6f 100644 --- a/libgimpbase/gimpdatafiles.c +++ b/libgimpbase/gimpdatafiles.c @@ -21,20 +21,9 @@ #include "config.h" -#include #include -#include -#ifdef HAVE_UNISTD_H -#include -#endif - -#include -#include - -#ifdef G_OS_WIN32 -#include "gimpwin32-io.h" -#endif /* G_OS_WIN32 */ +#include #include "gimpbasetypes.h" @@ -106,56 +95,80 @@ gimp_datafiles_read_directories (const gchar *path_str, while ((dir_ent = g_dir_read_name (dir))) { - struct stat filestat; - gchar *filename; + gchar *filename; + GFile *file; + GFileInfo *info; if (is_hidden (dir_ent)) continue; filename = g_build_filename (dirname, dir_ent, NULL); + file = g_file_new_for_path (filename); - if (! g_stat (filename, &filestat)) + info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_TYPE "," + G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "," + "time::*", + G_FILE_QUERY_INFO_NONE, + NULL, NULL); + + if (info) { GimpDatafileData file_data; + GFileType file_type; file_data.filename = filename; file_data.dirname = dirname; file_data.basename = dir_ent; - file_data.atime = filestat.st_atime; - file_data.mtime = filestat.st_mtime; - file_data.ctime = filestat.st_ctime; + + file_data.atime = + g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_ACCESS); + + file_data.mtime = + g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_MODIFIED); + + file_data.ctime = + g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_CREATED); + + file_type = + g_file_info_get_attribute_uint32 (info, + G_FILE_ATTRIBUTE_STANDARD_TYPE); if (flags & G_FILE_TEST_EXISTS) { (* loader_func) (&file_data, user_data); } else if ((flags & G_FILE_TEST_IS_REGULAR) && - S_ISREG (filestat.st_mode)) + (file_type == G_FILE_TYPE_REGULAR)) { (* loader_func) (&file_data, user_data); } else if ((flags & G_FILE_TEST_IS_DIR) && - S_ISDIR (filestat.st_mode)) + (file_type == G_FILE_TYPE_DIRECTORY)) { (* loader_func) (&file_data, user_data); } -#ifndef G_OS_WIN32 else if ((flags & G_FILE_TEST_IS_SYMLINK) && - S_ISLNK (filestat.st_mode)) + (file_type == G_FILE_TYPE_SYMBOLIC_LINK)) { (* loader_func) (&file_data, user_data); } -#endif else if ((flags & G_FILE_TEST_IS_EXECUTABLE) && - (((filestat.st_mode & S_IXUSR) && - !S_ISDIR (filestat.st_mode)) || - (S_ISREG (filestat.st_mode) && + (g_file_info_get_attribute_boolean (info, + G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE) || + ((file_type == G_FILE_TYPE_REGULAR) && is_script (filename)))) { (* loader_func) (&file_data, user_data); } + + g_object_unref (info); } + g_object_unref (file); g_free (filename); } diff --git a/libgimpbase/gimpversion.h b/libgimpbase/gimpversion.h index 9bffb4d473..d5cd611181 100644 --- a/libgimpbase/gimpversion.h +++ b/libgimpbase/gimpversion.h @@ -42,14 +42,14 @@ G_BEGIN_DECLS * * The micro GIMP version number. **/ -#define GIMP_MICRO_VERSION (6) +#define GIMP_MICRO_VERSION (10) /** * GIMP_VERSION: * * The GIMP version as a string. **/ -#define GIMP_VERSION "2.8.6" +#define GIMP_VERSION "2.8.10" /** * GIMP_API_VERSION: diff --git a/libgimpcolor/Makefile.in b/libgimpcolor/Makefile.in index bd1b793b3e..68c75d4a27 100644 --- a/libgimpcolor/Makefile.in +++ b/libgimpcolor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -517,6 +517,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -543,6 +545,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -900,14 +906,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpconfig/Makefile.in b/libgimpconfig/Makefile.in index 00393c7639..b862e7648f 100644 --- a/libgimpconfig/Makefile.in +++ b/libgimpconfig/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -338,6 +338,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -364,6 +366,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -717,14 +723,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpmath/Makefile.in b/libgimpmath/Makefile.in index 60315e9475..5cb9265bb1 100644 --- a/libgimpmath/Makefile.in +++ b/libgimpmath/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -333,6 +333,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -359,6 +361,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -663,14 +669,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpmodule/Makefile.in b/libgimpmodule/Makefile.in index 3d44aa9176..cd1e6cd524 100644 --- a/libgimpmodule/Makefile.in +++ b/libgimpmodule/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -333,6 +333,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -359,6 +361,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -661,14 +667,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am index 761c4b9b04..d792120c1c 100644 --- a/libgimpthumb/Makefile.am +++ b/libgimpthumb/Makefile.am @@ -51,7 +51,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ $(GDK_PIXBUF_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ -I$(includedir) \ $(xobjective_c) @@ -86,7 +86,9 @@ libgimpthumb_2_0_la_LDFLAGS = \ $(libgimpthumb_export_symbols) \ $(framework_cocoa) -libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) +libgimpthumb_2_0_la_LIBADD = \ + $(GDK_PIXBUF_LIBS) \ + $(GIO_LIBS) noinst_PROGRAMS = gimp-thumbnail-list @@ -96,7 +98,7 @@ gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c gimp_thumbnail_list_LDADD = \ libgimpthumb-$(GIMP_API_VERSION).la \ $(GDK_PIXBUF_LIBS) \ - $(GLIB_LIBS) + $(GIO_LIBS) install-data-local: install-ms-lib install-libtool-import-lib diff --git a/libgimpthumb/Makefile.in b/libgimpthumb/Makefile.in index 4437ea9912..09a392dd7a 100644 --- a/libgimpthumb/Makefile.in +++ b/libgimpthumb/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -346,6 +346,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -372,6 +374,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -558,7 +564,7 @@ AM_CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir) \ $(GDK_PIXBUF_CFLAGS) \ - $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ -I$(includedir) \ $(xobjective_c) @@ -592,12 +598,15 @@ libgimpthumb_2_0_la_LDFLAGS = \ $(libgimpthumb_export_symbols) \ $(framework_cocoa) -libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) +libgimpthumb_2_0_la_LIBADD = \ + $(GDK_PIXBUF_LIBS) \ + $(GIO_LIBS) + gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c gimp_thumbnail_list_LDADD = \ libgimpthumb-$(GIMP_API_VERSION).la \ $(GDK_PIXBUF_LIBS) \ - $(GLIB_LIBS) + $(GIO_LIBS) # @@ -709,14 +718,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpthumb/gimpthumb-utils.c b/libgimpthumb/gimpthumb-utils.c index ea5e41e483..5b96315e75 100644 --- a/libgimpthumb/gimpthumb-utils.c +++ b/libgimpthumb/gimpthumb-utils.c @@ -28,15 +28,11 @@ #include #include -#ifdef HAVE_UNISTD_H -#include -#endif - #ifdef PLATFORM_OSX #include #endif -#include +#include #include #ifdef G_OS_WIN32 @@ -515,33 +511,62 @@ gimp_thumb_file_test (const gchar *filename, gint64 *size, gint *err_no) { - struct stat s; + GimpThumbFileType type = GIMP_THUMB_FILE_TYPE_NONE; + GFile *file; + GFileInfo *info; g_return_val_if_fail (filename != NULL, FALSE); - if (g_stat (filename, &s) == 0) + file = g_file_new_for_path (filename); + + info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_TYPE "," + G_FILE_ATTRIBUTE_STANDARD_SIZE "," + G_FILE_ATTRIBUTE_TIME_MODIFIED, + G_FILE_QUERY_INFO_NONE, + NULL, NULL); + + if (info) { - if (mtime) *mtime = s.st_mtime; - if (size) *size = s.st_size; - if (err_no) *err_no = 0; + if (mtime) + *mtime = + g_file_info_get_attribute_uint64 (info, + G_FILE_ATTRIBUTE_TIME_MODIFIED); - if (S_ISREG (s.st_mode)) + if (size) + *size = g_file_info_get_size (info); + + if (err_no) + *err_no = 0; + + switch (g_file_info_get_attribute_uint32 (info, + G_FILE_ATTRIBUTE_STANDARD_TYPE)) { - return GIMP_THUMB_FILE_TYPE_REGULAR; - } - else if (S_ISDIR (s.st_mode)) - { - return GIMP_THUMB_FILE_TYPE_FOLDER; + case G_FILE_TYPE_REGULAR: + type = GIMP_THUMB_FILE_TYPE_REGULAR; + break; + + case G_FILE_TYPE_DIRECTORY: + type = GIMP_THUMB_FILE_TYPE_FOLDER; + break; + + default: + type = GIMP_THUMB_FILE_TYPE_SPECIAL; + break; } - return GIMP_THUMB_FILE_TYPE_SPECIAL; + g_object_unref (info); + } + else + { + if (mtime) *mtime = 0; + if (size) *size = 0; + if (err_no) *err_no = ENOENT; } - if (mtime) *mtime = 0; - if (size) *size = 0; - if (err_no) *err_no = errno; + g_object_unref (file); - return GIMP_THUMB_FILE_TYPE_NONE; + return type; } /** diff --git a/libgimpwidgets/Makefile.in b/libgimpwidgets/Makefile.in index db8fa847e1..f879c8e093 100644 --- a/libgimpwidgets/Makefile.in +++ b/libgimpwidgets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -539,6 +539,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -565,6 +567,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -1164,14 +1170,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c index 05482a7e45..51546eba45 100644 --- a/libgimpwidgets/gimppickbutton.c +++ b/libgimpwidgets/gimppickbutton.c @@ -34,6 +34,9 @@ #include "libgimp/libgimp-intl.h" +#ifdef GDK_WINDOWING_QUARTZ +#include +#endif /** * SECTION: gimppickbutton @@ -364,6 +367,8 @@ gimp_pick_button_pick (GdkScreen *screen, gint y_root, GimpPickButton *button) { +#ifndef GDK_WINDOWING_QUARTZ + GdkWindow *root_window = gdk_screen_get_root_window (screen); cairo_surface_t *image; cairo_t *cr; @@ -385,7 +390,29 @@ gimp_pick_button_pick (GdkScreen *screen, cairo_surface_destroy (image); - gimp_rgba_set_uchar (&rgb, color[0], color[1], color[2], 1.0); + gimp_rgba_set_uchar (&rgb, color[0], color[1], color[2], 255); + +#else /* GDK_WINDOWING_QUARTZ */ + + CGImageRef root_image_ref; + CFDataRef pixel_data; + const guchar *data; + GimpRGB rgb; + + CGRect rect = CGRectMake (x_root, y_root, 1, 1); + root_image_ref = CGWindowListCreateImage (rect, + kCGWindowListOptionOnScreenOnly, + kCGNullWindowID, + kCGWindowImageDefault); + pixel_data = CGDataProviderCopyData(CGImageGetDataProvider(root_image_ref)); + data = CFDataGetBytePtr(pixel_data); + + gimp_rgba_set_uchar (&rgb, data[2], data[1], data[0], 255); + + CGImageRelease (root_image_ref); + CFRelease (pixel_data); + +#endif /* GDK_WINDOWING_QUARTZ */ g_signal_emit (button, pick_button_signals[COLOR_PICKED], 0, &rgb); } diff --git a/ltmain.sh b/ltmain.sh index 499e473fb9..68c6d96ca5 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.2" +VERSION="2.4.2 Debian-2.4.2-1.3" TIMESTAMP="" package_revision=1.3337 diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in index a56edcfa19..cbb54de0a1 100644 --- a/m4macros/Makefile.in +++ b/m4macros/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -278,6 +278,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -304,6 +306,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/m4macros/gtk-doc.m4 b/m4macros/gtk-doc.m4 index 0ada151935..ac2eccb4ad 100644 --- a/m4macros/gtk-doc.m4 +++ b/m4macros/gtk-doc.m4 @@ -37,7 +37,7 @@ AC_DEFUN([GTK_DOC_CHECK], dnl don't check for glib if we build glib if test "x$PACKAGE_NAME" != "xglib"; then dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) fi fi @@ -58,6 +58,10 @@ AC_DEFUN([GTK_DOC_CHECK], enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) diff --git a/menus/Makefile.in b/menus/Makefile.in index a9983033bc..0b78c5dcb2 100644 --- a/menus/Makefile.in +++ b/menus/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/modules/Makefile.am b/modules/Makefile.am index 746a618c7e..fe83957e52 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -70,7 +70,7 @@ libcolor_selector_water_la_SOURCES = color-selector-water.c libcolor_selector_water_la_LDFLAGS = -avoid-version -module $(no_undefined) libcolor_selector_water_la_LIBADD = $(color_selector_libadd) -libcolor_selector_wheel_la_SOURCES = color-selector-wheel.c +libcolor_selector_wheel_la_SOURCES = color-selector-wheel.c gimpcolorwheel.c gimpcolorwheel.h libcolor_selector_wheel_la_LDFLAGS = -avoid-version -module $(no_undefined) libcolor_selector_wheel_la_LIBADD = $(color_selector_libadd) diff --git a/modules/Makefile.in b/modules/Makefile.in index 91a9d8bdb1..03bfbce1f4 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -162,7 +162,8 @@ libcolor_selector_water_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(libcolor_selector_water_la_LDFLAGS) \ $(LDFLAGS) -o $@ libcolor_selector_wheel_la_DEPENDENCIES = $(am__DEPENDENCIES_3) -am_libcolor_selector_wheel_la_OBJECTS = color-selector-wheel.lo +am_libcolor_selector_wheel_la_OBJECTS = color-selector-wheel.lo \ + gimpcolorwheel.lo libcolor_selector_wheel_la_OBJECTS = \ $(am_libcolor_selector_wheel_la_OBJECTS) libcolor_selector_wheel_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -464,6 +465,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -490,6 +493,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -704,7 +711,7 @@ libcolor_selector_cmyk_la_LDFLAGS = -avoid-version -module $(no_undefined) libcolor_selector_water_la_SOURCES = color-selector-water.c libcolor_selector_water_la_LDFLAGS = -avoid-version -module $(no_undefined) libcolor_selector_water_la_LIBADD = $(color_selector_libadd) -libcolor_selector_wheel_la_SOURCES = color-selector-wheel.c +libcolor_selector_wheel_la_SOURCES = color-selector-wheel.c gimpcolorwheel.c gimpcolorwheel.h libcolor_selector_wheel_la_LDFLAGS = -avoid-version -module $(no_undefined) libcolor_selector_wheel_la_LIBADD = $(color_selector_libadd) libdisplay_filter_color_blind_la_SOURCES = display-filter-color-blind.c @@ -864,6 +871,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-filter-color-blind.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-filter-gamma.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-filter-high-contrast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpcolorwheel.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpinputdevicestore-dx.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Plo@am__quote@ @@ -878,14 +886,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/modules/color-selector-cmyk-lcms.c b/modules/color-selector-cmyk-lcms.c index 0d5d20f6d0..89c7d30c0e 100644 --- a/modules/color-selector-cmyk-lcms.c +++ b/modules/color-selector-cmyk-lcms.c @@ -19,7 +19,12 @@ #include /* lcms.h uses the "inline" keyword */ +#ifdef HAVE_LCMS1 #include +typedef DWORD cmsUInt32Number; +#else +#include +#endif #include @@ -152,7 +157,9 @@ colorsel_cmyk_class_init (ColorselCmykClass *klass) selector_class->set_color = colorsel_cmyk_set_color; selector_class->set_config = colorsel_cmyk_set_config; +#ifdef HAVE_LCMS1 cmsErrorAction (LCMS_ERROR_IGNORE); +#endif } static void @@ -391,10 +398,16 @@ colorsel_cmyk_config_changed (ColorselCmyk *module) { GimpColorSelector *selector = GIMP_COLOR_SELECTOR (module); GimpColorConfig *config = module->config; - DWORD flags = 0; + cmsUInt32Number flags = 0; +#ifdef HAVE_LCMS2 + cmsUInt32Number descSize = 0; +#endif cmsHPROFILE rgb_profile; cmsHPROFILE cmyk_profile; - const gchar *name; +#ifdef HAVE_LCMS2 + gchar *descData = NULL; +#endif + const gchar *name = NULL; gchar *text; if (module->rgb2cmyk) @@ -419,13 +432,55 @@ colorsel_cmyk_config_changed (ColorselCmyk *module) ! (cmyk_profile = cmsOpenProfileFromFile (config->cmyk_profile, "r"))) goto out; +#ifdef HAVE_LCMS1 name = cmsTakeProductDesc (cmyk_profile); +#else + descSize = cmsGetProfileInfoASCII (cmyk_profile, cmsInfoDescription, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (cmyk_profile, cmsInfoDescription, + "en", "US", descData, descSize); + if (descSize > 0) + { + name = descData; + } + else + { + g_free (descData); + descData = NULL; + } + } +#endif + if (name && ! g_utf8_validate (name, -1, NULL)) name = _("(invalid UTF-8 string)"); if (! name) { +#ifdef HAVE_LCMS1 name = cmsTakeProductName (cmyk_profile); +#else + descSize = cmsGetProfileInfoASCII (cmyk_profile, cmsInfoModel, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (cmyk_profile, cmsInfoModel, + "en", "US", descData, descSize); + if (descSize > 0) + { + name = descData; + } + else + { + g_free (descData); + descData = NULL; + } + } +#endif + if (name && ! g_utf8_validate (name, -1, NULL)) name = _("(invalid UTF-8 string)"); } @@ -435,6 +490,11 @@ colorsel_cmyk_config_changed (ColorselCmyk *module) gimp_help_set_help_data (module->name_label, text, NULL); g_free (text); +#ifdef HAVE_LCMS2 + if (descData) + g_free (descData); +#endif + rgb_profile = color_config_get_rgb_profile (config); if (config->display_intent == diff --git a/modules/color-selector-wheel.c b/modules/color-selector-wheel.c index 465b0959b4..cfea1a5a36 100644 --- a/modules/color-selector-wheel.c +++ b/modules/color-selector-wheel.c @@ -27,6 +27,8 @@ #include "libgimpmodule/gimpmodule.h" #include "libgimpwidgets/gimpwidgets.h" +#include "gimpcolorwheel.h" + #include "libgimp/libgimp-intl.h" @@ -53,16 +55,12 @@ struct _ColorselWheelClass }; -GType colorsel_wheel_get_type (void); +static GType colorsel_wheel_get_type (void); static void colorsel_wheel_set_color (GimpColorSelector *selector, const GimpRGB *rgb, const GimpHSV *hsv); - -static void colorsel_wheel_size_allocate (GtkWidget *frame, - GtkAllocation *allocation, - ColorselWheel *wheel); -static void colorsel_wheel_changed (GtkHSV *hsv, +static void colorsel_wheel_changed (GimpColorWheel *hsv, GimpColorSelector *selector); static const GimpModuleInfo colorsel_wheel_info = @@ -89,6 +87,7 @@ gimp_module_query (GTypeModule *module) G_MODULE_EXPORT gboolean gimp_module_register (GTypeModule *module) { + color_wheel_register_type (module); colorsel_wheel_register_type (module); return TRUE; @@ -120,11 +119,7 @@ colorsel_wheel_init (ColorselWheel *wheel) gtk_box_pack_start (GTK_BOX (wheel), frame, TRUE, TRUE, 0); gtk_widget_show (frame); - g_signal_connect (frame, "size-allocate", - G_CALLBACK (colorsel_wheel_size_allocate), - wheel); - - wheel->hsv = gtk_hsv_new (); + wheel->hsv = gimp_color_wheel_new (); gtk_container_add (GTK_CONTAINER (frame), wheel->hsv); gtk_widget_show (wheel->hsv); @@ -140,39 +135,18 @@ colorsel_wheel_set_color (GimpColorSelector *selector, { ColorselWheel *wheel = COLORSEL_WHEEL (selector); - gtk_hsv_set_color (GTK_HSV (wheel->hsv), hsv->h, hsv->s, hsv->v); + gimp_color_wheel_set_color (GIMP_COLOR_WHEEL (wheel->hsv), + hsv->h, hsv->s, hsv->v); } static void -colorsel_wheel_size_allocate (GtkWidget *frame, - GtkAllocation *allocation, - ColorselWheel *wheel) -{ - GtkStyle *style = gtk_widget_get_style (frame); - gint focus_width; - gint focus_padding; - gint size; - - gtk_widget_style_get (frame, - "focus-line-width", &focus_width, - "focus-padding", &focus_padding, - NULL); - - size = (MIN (allocation->width, allocation->height) - - 2 * MAX (style->xthickness, style->ythickness) - - 2 * (focus_width + focus_padding)); - - gtk_hsv_set_metrics (GTK_HSV (wheel->hsv), size, size / 10); -} - -static void -colorsel_wheel_changed (GtkHSV *hsv, +colorsel_wheel_changed (GimpColorWheel *hsv, GimpColorSelector *selector) { - gtk_hsv_get_color (hsv, - &selector->hsv.h, - &selector->hsv.s, - &selector->hsv.v); + gimp_color_wheel_get_color (hsv, + &selector->hsv.h, + &selector->hsv.s, + &selector->hsv.v); gimp_hsv_to_rgb (&selector->hsv, &selector->rgb); gimp_color_selector_color_changed (selector); diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c index 30c5857555..e3052d7efd 100644 --- a/modules/display-filter-lcms.c +++ b/modules/display-filter-lcms.c @@ -19,13 +19,20 @@ #include /* lcms.h uses the "inline" keyword */ +#include + #ifdef G_OS_WIN32 #define STRICT #include #define LCMS_WIN_TYPES_ALREADY_DEFINED #endif +#ifdef HAVE_LCMS1 #include +typedef DWORD cmsUInt32Number; +#else +#include +#endif #include @@ -134,7 +141,9 @@ cdisplay_lcms_class_init (CdisplayLcmsClass *klass) display_class->convert_surface = cdisplay_lcms_convert_surface; display_class->changed = cdisplay_lcms_changed; +#ifdef HAVE_LCMS1 cmsErrorAction (LCMS_ERROR_IGNORE); +#endif } static void @@ -162,28 +171,101 @@ cdisplay_lcms_finalize (GObject *object) G_OBJECT_CLASS (cdisplay_lcms_parent_class)->finalize (object); } +#ifdef HAVE_LCMS1 static void cdisplay_lcms_profile_get_info (cmsHPROFILE profile, const gchar **name, const gchar **info) +#else +static void +cdisplay_lcms_profile_get_info (cmsHPROFILE profile, + gchar **name, + gchar **info) +#endif { if (profile) { +#ifdef HAVE_LCMS1 *name = cmsTakeProductDesc (profile); +#else + cmsUInt32Number descSize; + gchar *descData; + + descSize = cmsGetProfileInfoASCII (profile, cmsInfoDescription, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoDescription, + "en", "US", descData, descSize); + if (descSize > 0) + *name = descData; + else + g_free (descData); + } +#endif if (! *name) +#ifdef HAVE_LCMS1 *name = cmsTakeProductName (profile); +#else + { + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII(profile, cmsInfoModel, + "en", "US", descData, descSize); + if (descSize > 0) + *name = descData; + else + g_free (descData); + } + } +#endif +#ifdef HAVE_LCMS1 if (*name && ! g_utf8_validate (*name, -1, NULL)) *name = _("(invalid UTF-8 string)"); *info = cmsTakeProductInfo (profile); if (*name && ! g_utf8_validate (*info, -1, NULL)) *info = NULL; +#else + if (*name && ! g_utf8_validate (*name, -1, NULL)) + { + g_free (*name); + *name = g_strdup (_("(invalid UTF-8 string)")); + } + + descSize = cmsGetProfileInfoASCII (profile, cmsInfoManufacturer, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoManufacturer, + "en", "US", descData, descSize); + if (descSize > 0) + *info = descData; + else + g_free (descData); + } + + if (*info && ! g_utf8_validate (*info, -1, NULL)) + { + g_free (*info); + *info = NULL; + } +#endif } else { +#ifdef HAVE_LCMS1 *name = _("None"); +#else + *name = g_strdup (_("None")); +#endif *info = NULL; } } @@ -313,7 +395,10 @@ cdisplay_lcms_changed (GimpColorDisplay *display) cmsHPROFILE src_profile = NULL; cmsHPROFILE dest_profile = NULL; cmsHPROFILE proof_profile = NULL; - DWORD flags = 0; + cmsUInt32Number flags = 0; +#ifdef HAVE_LCMS2 + cmsUInt16Number alarmCodes[cmsMAXCHANNELS] = { 0 }; +#endif if (lcms->transform) { @@ -363,7 +448,15 @@ cdisplay_lcms_changed (GimpColorDisplay *display) gimp_rgb_get_uchar (&config->out_of_gamut_color, &r, &g, &b); +#ifdef HAVE_LCMS1 cmsSetAlarmCodes (r, g, b); +#else + alarmCodes[0] = (cmsUInt16Number) r; + alarmCodes[1] = (cmsUInt16Number) g; + alarmCodes[2] = (cmsUInt16Number) b; + + cmsSetAlarmCodes (alarmCodes); +#endif } lcms->transform = cmsCreateProofingTransform (src_profile, TYPE_ARGB_8, @@ -398,7 +491,11 @@ cdisplay_lcms_changed (GimpColorDisplay *display) static gboolean cdisplay_lcms_profile_is_rgb (cmsHPROFILE profile) { +#ifdef HAVE_LCMS1 return (cmsGetColorSpace (profile) == icSigRgbData); +#else + return (cmsGetColorSpace (profile) == cmsSigRgbData); +#endif } static cmsHPROFILE @@ -619,8 +716,13 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms, { GtkWidget *label; cmsHPROFILE profile = NULL; +#ifdef HAVE_LCMS1 const gchar *text; const gchar *tooltip; +#else + gchar *text = NULL; + gchar *tooltip = NULL; +#endif label = g_object_get_data (G_OBJECT (lcms), name); @@ -649,6 +751,11 @@ cdisplay_lcms_update_profile_label (CdisplayLcms *lcms, gtk_label_set_text (GTK_LABEL (label), text); gimp_help_set_help_data (label, tooltip, NULL); +#ifdef HAVE_LCMS2 + g_free (text); + g_free (tooltip); +#endif + if (profile) cmsCloseProfile (profile); } diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c index 41967f519a..51783955be 100644 --- a/modules/display-filter-proof.c +++ b/modules/display-filter-proof.c @@ -19,7 +19,12 @@ #include /* lcms.h uses the "inline" keyword */ +#ifdef HAVE_LCMS1 #include +typedef DWORD cmsUInt32Number; +#else +#include +#endif #include @@ -146,7 +151,9 @@ cdisplay_proof_class_init (CdisplayProofClass *klass) display_class->configure = cdisplay_proof_configure; display_class->changed = cdisplay_proof_changed; +#ifdef HAVE_LCMS1 cmsErrorAction (LCMS_ERROR_IGNORE); +#endif } static void @@ -298,9 +305,45 @@ cdisplay_proof_combo_box_set_active (GimpColorProfileComboBox *combo, if (profile) { +#ifdef HAVE_LCMS1 label = gimp_any_to_utf8 (cmsTakeProductDesc (profile), -1, NULL); +#else + cmsUInt32Number descSize; + gchar *descData; + + descSize = cmsGetProfileInfoASCII(profile, cmsInfoDescription, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoDescription, + "en", "US", descData, descSize); + if (descSize > 0) + label = gimp_any_to_utf8 (descData, -1, NULL); + + g_free (descData); + } +#endif + if (! label) +#ifdef HAVE_LCMS1 label = gimp_any_to_utf8 (cmsTakeProductName (profile), -1, NULL); +#else + { + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", descData, descSize); + if (descSize > 0) + label = gimp_any_to_utf8 (descData, -1, NULL); + + g_free (descData); + } + } +#endif cmsCloseProfile (profile); } @@ -465,7 +508,7 @@ cdisplay_proof_changed (GimpColorDisplay *display) if (proofProfile) { - DWORD flags = cmsFLAGS_SOFTPROOFING; + cmsUInt32Number flags = cmsFLAGS_SOFTPROOFING; if (proof->bpc) flags |= cmsFLAGS_BLACKPOINTCOMPENSATION; diff --git a/modules/gimpcolorwheel.c b/modules/gimpcolorwheel.c new file mode 100644 index 0000000000..56642fdb2e --- /dev/null +++ b/modules/gimpcolorwheel.c @@ -0,0 +1,1484 @@ +/* HSV color selector for GTK+ + * + * Copyright (C) 1999 The Free Software Foundation + * + * Authors: Simon Budig (original code) + * Federico Mena-Quintero (cleanup for GTK+) + * Jonathan Blandford (cleanup for GTK+) + * Michael Natterer (ported back to GIMP) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#include "config.h" + +#include +#include + +#include + +#include "gimpcolorwheel.h" + + +/* Default ring fraction */ +#define DEFAULT_FRACTION 0.1 + +/* Default width/height */ +#define DEFAULT_SIZE 100 + +/* Default ring width */ +#define DEFAULT_RING_WIDTH 10 + + +/* Dragging modes */ +typedef enum +{ + DRAG_NONE, + DRAG_H, + DRAG_SV +} DragMode; + +/* Private part of the GimpColorWheel structure */ +typedef struct +{ + /* Color value */ + gdouble h; + gdouble s; + gdouble v; + + /* ring_width is this fraction of size */ + gdouble ring_fraction; + + /* Size and ring width */ + gint size; + gint ring_width; + + /* Window for capturing events */ + GdkWindow *window; + + /* Dragging mode */ + DragMode mode; + + guint focus_on_ring : 1; +} GimpColorWheelPrivate; + +enum +{ + CHANGED, + MOVE, + LAST_SIGNAL +}; + +static void gimp_color_wheel_map (GtkWidget *widget); +static void gimp_color_wheel_unmap (GtkWidget *widget); +static void gimp_color_wheel_realize (GtkWidget *widget); +static void gimp_color_wheel_unrealize (GtkWidget *widget); +static void gimp_color_wheel_size_request (GtkWidget *widget, + GtkRequisition *requisition); +static void gimp_color_wheel_size_allocate (GtkWidget *widget, + GtkAllocation *allocation); +static gboolean gimp_color_wheel_button_press (GtkWidget *widget, + GdkEventButton *event); +static gboolean gimp_color_wheel_button_release (GtkWidget *widget, + GdkEventButton *event); +static gboolean gimp_color_wheel_motion (GtkWidget *widget, + GdkEventMotion *event); +static gboolean gimp_color_wheel_expose (GtkWidget *widget, + GdkEventExpose *event); +static gboolean gimp_color_wheel_grab_broken (GtkWidget *widget, + GdkEventGrabBroken *event); +static gboolean gimp_color_wheel_focus (GtkWidget *widget, + GtkDirectionType direction); +static void gimp_color_wheel_move (GimpColorWheel *wheel, + GtkDirectionType dir); + + +static guint wheel_signals[LAST_SIGNAL]; + +G_DEFINE_DYNAMIC_TYPE (GimpColorWheel, gimp_color_wheel, GTK_TYPE_WIDGET) + +#define parent_class gimp_color_wheel_parent_class + + +void +color_wheel_register_type (GTypeModule *module) +{ + gimp_color_wheel_register_type (module); +} + +static void +gimp_color_wheel_class_init (GimpColorWheelClass *class) +{ + GObjectClass *object_class = G_OBJECT_CLASS (class); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); + GimpColorWheelClass *wheel_class = GIMP_COLOR_WHEEL_CLASS (class); + GtkBindingSet *binding_set; + + widget_class->map = gimp_color_wheel_map; + widget_class->unmap = gimp_color_wheel_unmap; + widget_class->realize = gimp_color_wheel_realize; + widget_class->unrealize = gimp_color_wheel_unrealize; + widget_class->size_request = gimp_color_wheel_size_request; + widget_class->size_allocate = gimp_color_wheel_size_allocate; + widget_class->button_press_event = gimp_color_wheel_button_press; + widget_class->button_release_event = gimp_color_wheel_button_release; + widget_class->motion_notify_event = gimp_color_wheel_motion; + widget_class->expose_event = gimp_color_wheel_expose; + widget_class->focus = gimp_color_wheel_focus; + widget_class->grab_broken_event = gimp_color_wheel_grab_broken; + + wheel_class->move = gimp_color_wheel_move; + + wheel_signals[CHANGED] = + g_signal_new ("changed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GimpColorWheelClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + wheel_signals[MOVE] = + g_signal_new ("move", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GimpColorWheelClass, move), + NULL, NULL, + g_cclosure_marshal_VOID__ENUM, + G_TYPE_NONE, 1, + GTK_TYPE_DIRECTION_TYPE); + + binding_set = gtk_binding_set_by_class (class); + + gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_UP); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Up, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_UP); + + gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_DOWN); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Down, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_DOWN); + + + gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_RIGHT); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Right, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_RIGHT); + + gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_LEFT); + gtk_binding_entry_add_signal (binding_set, GDK_KP_Left, 0, + "move", 1, + G_TYPE_ENUM, GTK_DIR_LEFT); + + g_type_class_add_private (object_class, sizeof (GimpColorWheelPrivate)); +} + +static void +gimp_color_wheel_class_finalize (GimpColorWheelClass *klass) +{ +} + +static void +gimp_color_wheel_init (GimpColorWheel *wheel) +{ + GimpColorWheelPrivate *priv; + + priv = G_TYPE_INSTANCE_GET_PRIVATE (wheel, GIMP_TYPE_COLOR_WHEEL, + GimpColorWheelPrivate); + + wheel->priv = priv; + + gtk_widget_set_has_window (GTK_WIDGET (wheel), FALSE); + gtk_widget_set_can_focus (GTK_WIDGET (wheel), TRUE); + + priv->ring_fraction = DEFAULT_FRACTION; + priv->size = DEFAULT_SIZE; + priv->ring_width = DEFAULT_RING_WIDTH; +} + +static void +gimp_color_wheel_map (GtkWidget *widget) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + + GTK_WIDGET_CLASS (parent_class)->map (widget); + + gdk_window_show (priv->window); +} + +static void +gimp_color_wheel_unmap (GtkWidget *widget) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + + gdk_window_hide (priv->window); + + GTK_WIDGET_CLASS (parent_class)->unmap (widget); +} + +static void +gimp_color_wheel_realize (GtkWidget *widget) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + GtkAllocation allocation; + GdkWindowAttr attr; + gint attr_mask; + GdkWindow *parent_window; + + gtk_widget_get_allocation (widget, &allocation); + + gtk_widget_set_realized (widget, TRUE); + + attr.window_type = GDK_WINDOW_CHILD; + attr.x = allocation.x; + attr.y = allocation.y; + attr.width = allocation.width; + attr.height = allocation.height; + attr.wclass = GDK_INPUT_ONLY; + attr.event_mask = (gtk_widget_get_events (widget) | + GDK_KEY_PRESS_MASK | + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_ENTER_NOTIFY_MASK | + GDK_LEAVE_NOTIFY_MASK); + + attr_mask = GDK_WA_X | GDK_WA_Y; + + parent_window = gtk_widget_get_parent_window (widget); + + gtk_widget_set_window (widget, parent_window); + g_object_ref (parent_window); + + priv->window = gdk_window_new (parent_window, &attr, attr_mask); + gdk_window_set_user_data (priv->window, wheel); + + gtk_widget_style_attach (widget); +} + +static void +gimp_color_wheel_unrealize (GtkWidget *widget) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + + gdk_window_set_user_data (priv->window, NULL); + gdk_window_destroy (priv->window); + priv->window = NULL; + + GTK_WIDGET_CLASS (parent_class)->unrealize (widget); +} + +static void +gimp_color_wheel_size_request (GtkWidget *widget, + GtkRequisition *requisition) +{ + gint focus_width; + gint focus_pad; + + gtk_widget_style_get (widget, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + + requisition->width = DEFAULT_SIZE + 2 * (focus_width + focus_pad); + requisition->height = DEFAULT_SIZE + 2 * (focus_width + focus_pad); +} + +static void +gimp_color_wheel_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + gint focus_width; + gint focus_pad; + + gtk_widget_set_allocation (widget, allocation); + + gtk_widget_style_get (widget, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + + priv->size = MIN (allocation->width - 2 * (focus_width + focus_pad), + allocation->height - 2 * (focus_width + focus_pad)); + + priv->ring_width = priv->size * priv->ring_fraction; + + if (gtk_widget_get_realized (widget)) + gdk_window_move_resize (priv->window, + allocation->x, + allocation->y, + allocation->width, + allocation->height); +} + + +/* Utility functions */ + +#define INTENSITY(r, g, b) ((r) * 0.30 + (g) * 0.59 + (b) * 0.11) + +/* Converts from HSV to RGB */ +static void +hsv_to_rgb (gdouble *h, + gdouble *s, + gdouble *v) +{ + gdouble hue, saturation, value; + gdouble f, p, q, t; + + if (*s == 0.0) + { + *h = *v; + *s = *v; + /* *v = *v; -- heh */ + } + else + { + hue = *h * 6.0; + saturation = *s; + value = *v; + + if (hue == 6.0) + hue = 0.0; + + f = hue - (int) hue; + p = value * (1.0 - saturation); + q = value * (1.0 - saturation * f); + t = value * (1.0 - saturation * (1.0 - f)); + + switch ((int) hue) + { + case 0: + *h = value; + *s = t; + *v = p; + break; + + case 1: + *h = q; + *s = value; + *v = p; + break; + + case 2: + *h = p; + *s = value; + *v = t; + break; + + case 3: + *h = p; + *s = q; + *v = value; + break; + + case 4: + *h = t; + *s = p; + *v = value; + break; + + case 5: + *h = value; + *s = p; + *v = q; + break; + + default: + g_assert_not_reached (); + } + } +} + +/* Computes the vertices of the saturation/value triangle */ +static void +compute_triangle (GimpColorWheel *wheel, + gint *hx, + gint *hy, + gint *sx, + gint *sy, + gint *vx, + gint *vy) +{ + GimpColorWheelPrivate *priv = wheel->priv; + GtkAllocation allocation; + gdouble center_x; + gdouble center_y; + gdouble inner, outer; + gdouble angle; + + gtk_widget_get_allocation (GTK_WIDGET (wheel), &allocation); + + center_x = allocation.width / 2.0; + center_y = allocation.height / 2.0; + + outer = priv->size / 2.0; + inner = outer - priv->ring_width; + angle = priv->h * 2.0 * G_PI; + + *hx = floor (center_x + cos (angle) * inner + 0.5); + *hy = floor (center_y - sin (angle) * inner + 0.5); + *sx = floor (center_x + cos (angle + 2.0 * G_PI / 3.0) * inner + 0.5); + *sy = floor (center_y - sin (angle + 2.0 * G_PI / 3.0) * inner + 0.5); + *vx = floor (center_x + cos (angle + 4.0 * G_PI / 3.0) * inner + 0.5); + *vy = floor (center_y - sin (angle + 4.0 * G_PI / 3.0) * inner + 0.5); +} + +/* Computes whether a point is inside the hue ring */ +static gboolean +is_in_ring (GimpColorWheel *wheel, + gdouble x, + gdouble y) +{ + GimpColorWheelPrivate *priv = wheel->priv; + GtkAllocation allocation; + gdouble dx, dy, dist; + gdouble center_x; + gdouble center_y; + gdouble inner, outer; + + gtk_widget_get_allocation (GTK_WIDGET (wheel), &allocation); + + center_x = allocation.width / 2.0; + center_y = allocation.height / 2.0; + + outer = priv->size / 2.0; + inner = outer - priv->ring_width; + + dx = x - center_x; + dy = center_y - y; + dist = dx * dx + dy * dy; + + return (dist >= inner * inner && dist <= outer * outer); +} + +/* Computes a saturation/value pair based on the mouse coordinates */ +static void +compute_sv (GimpColorWheel *wheel, + gdouble x, + gdouble y, + gdouble *s, + gdouble *v) +{ + GtkAllocation allocation; + gint ihx, ihy, isx, isy, ivx, ivy; + gdouble hx, hy, sx, sy, vx, vy; + gdouble center_x; + gdouble center_y; + + gtk_widget_get_allocation (GTK_WIDGET (wheel), &allocation); + + compute_triangle (wheel, &ihx, &ihy, &isx, &isy, &ivx, &ivy); + + center_x = allocation.width / 2.0; + center_y = allocation.height / 2.0; + + hx = ihx - center_x; + hy = center_y - ihy; + sx = isx - center_x; + sy = center_y - isy; + vx = ivx - center_x; + vy = center_y - ivy; + x -= center_x; + y = center_y - y; + + if (vx * (x - sx) + vy * (y - sy) < 0.0) + { + *s = 1.0; + *v = (((x - sx) * (hx - sx) + (y - sy) * (hy-sy)) + / ((hx - sx) * (hx - sx) + (hy - sy) * (hy - sy))); + + if (*v < 0.0) + *v = 0.0; + else if (*v > 1.0) + *v = 1.0; + } + else if (hx * (x - sx) + hy * (y - sy) < 0.0) + { + *s = 0.0; + *v = (((x - sx) * (vx - sx) + (y - sy) * (vy - sy)) + / ((vx - sx) * (vx - sx) + (vy - sy) * (vy - sy))); + + if (*v < 0.0) + *v = 0.0; + else if (*v > 1.0) + *v = 1.0; + } + else if (sx * (x - hx) + sy * (y - hy) < 0.0) + { + *v = 1.0; + *s = (((x - vx) * (hx - vx) + (y - vy) * (hy - vy)) / + ((hx - vx) * (hx - vx) + (hy - vy) * (hy - vy))); + + if (*s < 0.0) + *s = 0.0; + else if (*s > 1.0) + *s = 1.0; + } + else + { + *v = (((x - sx) * (hy - vy) - (y - sy) * (hx - vx)) + / ((vx - sx) * (hy - vy) - (vy - sy) * (hx - vx))); + + if (*v<= 0.0) + { + *v = 0.0; + *s = 0.0; + } + else + { + if (*v > 1.0) + *v = 1.0; + + if (fabs (hy - vy) < fabs (hx - vx)) + *s = (x - sx - *v * (vx - sx)) / (*v * (hx - vx)); + else + *s = (y - sy - *v * (vy - sy)) / (*v * (hy - vy)); + + if (*s < 0.0) + *s = 0.0; + else if (*s > 1.0) + *s = 1.0; + } + } +} + +/* Computes whether a point is inside the saturation/value triangle */ +static gboolean +is_in_triangle (GimpColorWheel *wheel, + gdouble x, + gdouble y) +{ + gint hx, hy, sx, sy, vx, vy; + gdouble det, s, v; + + compute_triangle (wheel, &hx, &hy, &sx, &sy, &vx, &vy); + + det = (vx - sx) * (hy - sy) - (vy - sy) * (hx - sx); + + s = ((x - sx) * (hy - sy) - (y - sy) * (hx - sx)) / det; + v = ((vx - sx) * (y - sy) - (vy - sy) * (x - sx)) / det; + + return (s >= 0.0 && v >= 0.0 && s + v <= 1.0); +} + +/* Computes a value based on the mouse coordinates */ +static double +compute_v (GimpColorWheel *wheel, + gdouble x, + gdouble y) +{ + GtkAllocation allocation; + gdouble center_x; + gdouble center_y; + gdouble dx, dy; + gdouble angle; + + gtk_widget_get_allocation (GTK_WIDGET (wheel), &allocation); + + center_x = allocation.width / 2.0; + center_y = allocation.height / 2.0; + + dx = x - center_x; + dy = center_y - y; + + angle = atan2 (dy, dx); + if (angle < 0.0) + angle += 2.0 * G_PI; + + return angle / (2.0 * G_PI); +} + +static void +set_cross_grab (GimpColorWheel *wheel, + guint32 time) +{ + GimpColorWheelPrivate *priv = wheel->priv; + GdkCursor *cursor; + + cursor = + gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (wheel)), + GDK_CROSSHAIR); + + gdk_pointer_grab (priv->window, FALSE, + GDK_POINTER_MOTION_MASK | + GDK_POINTER_MOTION_HINT_MASK | + GDK_BUTTON_RELEASE_MASK, + NULL, cursor, time); + gdk_cursor_unref (cursor); +} + +static gboolean +gimp_color_wheel_grab_broken (GtkWidget *widget, + GdkEventGrabBroken *event) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + + priv->mode = DRAG_NONE; + + return TRUE; +} + +static gboolean +gimp_color_wheel_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + gdouble x, y; + + if (priv->mode != DRAG_NONE || event->button != 1) + return FALSE; + + x = event->x; + y = event->y; + + if (is_in_ring (wheel, x, y)) + { + priv->mode = DRAG_H; + set_cross_grab (wheel, event->time); + + gimp_color_wheel_set_color (wheel, + compute_v (wheel, x, y), + priv->s, + priv->v); + + gtk_widget_grab_focus (widget); + priv->focus_on_ring = TRUE; + + return TRUE; + } + + if (is_in_triangle (wheel, x, y)) + { + gdouble s, v; + + priv->mode = DRAG_SV; + set_cross_grab (wheel, event->time); + + compute_sv (wheel, x, y, &s, &v); + gimp_color_wheel_set_color (wheel, priv->h, s, v); + + gtk_widget_grab_focus (widget); + priv->focus_on_ring = FALSE; + + return TRUE; + } + + return FALSE; +} + +static gboolean +gimp_color_wheel_button_release (GtkWidget *widget, + GdkEventButton *event) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + DragMode mode; + gdouble x, y; + + if (priv->mode == DRAG_NONE || event->button != 1) + return FALSE; + + /* Set the drag mode to DRAG_NONE so that signal handlers for "catched" + * can see that this is the final color state. + */ + + mode = priv->mode; + priv->mode = DRAG_NONE; + + x = event->x; + y = event->y; + + if (mode == DRAG_H) + { + gimp_color_wheel_set_color (wheel, + compute_v (wheel, x, y), priv->s, priv->v); + } + else if (mode == DRAG_SV) + { + gdouble s, v; + + compute_sv (wheel, x, y, &s, &v); + gimp_color_wheel_set_color (wheel, priv->h, s, v); + } + else + g_assert_not_reached (); + + gdk_display_pointer_ungrab (gdk_window_get_display (event->window), + event->time); + + return TRUE; +} + +static gboolean +gimp_color_wheel_motion (GtkWidget *widget, + GdkEventMotion *event) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + gdouble x, y; + + if (priv->mode == DRAG_NONE) + return FALSE; + + gdk_event_request_motions (event); + x = event->x; + y = event->y; + + if (priv->mode == DRAG_H) + { + gimp_color_wheel_set_color (wheel, + compute_v (wheel, x, y), priv->s, priv->v); + return TRUE; + } + else if (priv->mode == DRAG_SV) + { + gdouble s, v; + + compute_sv (wheel, x, y, &s, &v); + gimp_color_wheel_set_color (wheel, priv->h, s, v); + return TRUE; + } + + g_assert_not_reached (); + + return FALSE; +} + + +/* Redrawing */ + +/* Paints the hue ring */ +static void +paint_ring (GimpColorWheel *wheel, + cairo_t *cr, + gint x, + gint y, + gint width, + gint height) +{ + GtkWidget *widget = GTK_WIDGET (wheel); + GimpColorWheelPrivate *priv = wheel->priv; + GtkAllocation allocation; + gint xx, yy; + gdouble dx, dy, dist; + gdouble center_x; + gdouble center_y; + gdouble inner, outer; + guint32 *buf, *p; + gdouble angle; + gdouble hue; + gdouble r, g, b; + cairo_surface_t *source; + cairo_t *source_cr; + gint stride; + gint focus_width; + gint focus_pad; + + gtk_widget_get_allocation (GTK_WIDGET (wheel), &allocation); + + gtk_widget_style_get (widget, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + + center_x = allocation.width / 2.0; + center_y = allocation.height / 2.0; + + outer = priv->size / 2.0; + inner = outer - priv->ring_width; + + /* Create an image initialized with the ring colors */ + + stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width); + buf = g_new (guint32, height * stride / 4); + + for (yy = 0; yy < height; yy++) + { + p = buf + yy * width; + + dy = -(yy + y - center_y); + + for (xx = 0; xx < width; xx++) + { + dx = xx + x - center_x; + + dist = dx * dx + dy * dy; + if (dist < ((inner-1) * (inner-1)) || dist > ((outer+1) * (outer+1))) + { + *p++ = 0; + continue; + } + + angle = atan2 (dy, dx); + if (angle < 0.0) + angle += 2.0 * G_PI; + + hue = angle / (2.0 * G_PI); + + r = hue; + g = 1.0; + b = 1.0; + hsv_to_rgb (&r, &g, &b); + + *p++ = (((int)floor (r * 255 + 0.5) << 16) | + ((int)floor (g * 255 + 0.5) << 8) | + (int)floor (b * 255 + 0.5)); + } + } + + source = cairo_image_surface_create_for_data ((unsigned char *)buf, + CAIRO_FORMAT_RGB24, + width, height, stride); + + /* Now draw the value marker onto the source image, so that it + * will get properly clipped at the edges of the ring + */ + source_cr = cairo_create (source); + + r = priv->h; + g = 1.0; + b = 1.0; + hsv_to_rgb (&r, &g, &b); + + if (INTENSITY (r, g, b) > 0.5) + cairo_set_source_rgb (source_cr, 0., 0., 0.); + else + cairo_set_source_rgb (source_cr, 1., 1., 1.); + + cairo_move_to (source_cr, -x + center_x, - y + center_y); + cairo_line_to (source_cr, + -x + center_x + cos (priv->h * 2.0 * G_PI) * priv->size / 2, + -y + center_y - sin (priv->h * 2.0 * G_PI) * priv->size / 2); + cairo_stroke (source_cr); + cairo_destroy (source_cr); + + /* Draw the ring using the source image */ + + cairo_save (cr); + + cairo_set_source_surface (cr, source, x, y); + cairo_surface_destroy (source); + + cairo_set_line_width (cr, priv->ring_width); + cairo_new_path (cr); + cairo_arc (cr, + center_x, center_y, + priv->size / 2. - priv->ring_width / 2., + 0, 2 * G_PI); + cairo_stroke (cr); + + cairo_restore (cr); + + g_free (buf); +} + +/* Converts an HSV triplet to an integer RGB triplet */ +static void +get_color (gdouble h, + gdouble s, + gdouble v, + gint *r, + gint *g, + gint *b) +{ + hsv_to_rgb (&h, &s, &v); + + *r = floor (h * 255 + 0.5); + *g = floor (s * 255 + 0.5); + *b = floor (v * 255 + 0.5); +} + +#define SWAP(a, b, t) ((t) = (a), (a) = (b), (b) = (t)) + +#define LERP(a, b, v1, v2, i) (((v2) - (v1) != 0) \ + ? ((a) + ((b) - (a)) * ((i) - (v1)) / ((v2) - (v1))) \ + : (a)) + +/* Number of pixels we extend out from the edges when creating + * color source to avoid artifacts + */ +#define PAD 3 + +/* Paints the HSV triangle */ +static void +paint_triangle (GimpColorWheel *wheel, + cairo_t *cr, + gint x, + gint y, + gint width, + gint height) +{ + GtkWidget *widget = GTK_WIDGET (wheel); + GimpColorWheelPrivate *priv = wheel->priv; + gint hx, hy, sx, sy, vx, vy; /* HSV vertices */ + gint x1, y1, r1, g1, b1; /* First vertex in scanline order */ + gint x2, y2, r2, g2, b2; /* Second vertex */ + gint x3, y3, r3, g3, b3; /* Third vertex */ + gint t; + guint32 *buf, *p, c; + gint xl, xr, rl, rr, gl, gr, bl, br; /* Scanline data */ + gint xx, yy; + gint x_interp, y_interp; + gint x_start, x_end; + cairo_surface_t *source; + gdouble r, g, b; + gchar *detail; + gint stride; + + /* Compute triangle's vertices */ + + compute_triangle (wheel, &hx, &hy, &sx, &sy, &vx, &vy); + + x1 = hx; + y1 = hy; + get_color (priv->h, 1.0, 1.0, &r1, &g1, &b1); + + x2 = sx; + y2 = sy; + get_color (priv->h, 1.0, 0.0, &r2, &g2, &b2); + + x3 = vx; + y3 = vy; + get_color (priv->h, 0.0, 1.0, &r3, &g3, &b3); + + if (y2 > y3) + { + SWAP (x2, x3, t); + SWAP (y2, y3, t); + SWAP (r2, r3, t); + SWAP (g2, g3, t); + SWAP (b2, b3, t); + } + + if (y1 > y3) + { + SWAP (x1, x3, t); + SWAP (y1, y3, t); + SWAP (r1, r3, t); + SWAP (g1, g3, t); + SWAP (b1, b3, t); + } + + if (y1 > y2) + { + SWAP (x1, x2, t); + SWAP (y1, y2, t); + SWAP (r1, r2, t); + SWAP (g1, g2, t); + SWAP (b1, b2, t); + } + + /* Shade the triangle */ + + stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width); + buf = g_new (guint32, height * stride / 4); + + for (yy = 0; yy < height; yy++) + { + p = buf + yy * width; + + if (yy + y >= y1 - PAD && yy + y < y3 + PAD) + { + y_interp = CLAMP (yy + y, y1, y3); + + if (y_interp < y2) + { + xl = LERP (x1, x2, y1, y2, y_interp); + + rl = LERP (r1, r2, y1, y2, y_interp); + gl = LERP (g1, g2, y1, y2, y_interp); + bl = LERP (b1, b2, y1, y2, y_interp); + } + else + { + xl = LERP (x2, x3, y2, y3, y_interp); + + rl = LERP (r2, r3, y2, y3, y_interp); + gl = LERP (g2, g3, y2, y3, y_interp); + bl = LERP (b2, b3, y2, y3, y_interp); + } + + xr = LERP (x1, x3, y1, y3, y_interp); + + rr = LERP (r1, r3, y1, y3, y_interp); + gr = LERP (g1, g3, y1, y3, y_interp); + br = LERP (b1, b3, y1, y3, y_interp); + + if (xl > xr) + { + SWAP (xl, xr, t); + SWAP (rl, rr, t); + SWAP (gl, gr, t); + SWAP (bl, br, t); + } + + x_start = MAX (xl - PAD, x); + x_end = MIN (xr + PAD, x + width); + x_start = MIN (x_start, x_end); + + c = (rl << 16) | (gl << 8) | bl; + + for (xx = x; xx < x_start; xx++) + *p++ = c; + + for (; xx < x_end; xx++) + { + x_interp = CLAMP (xx, xl, xr); + + *p++ = ((LERP (rl, rr, xl, xr, x_interp) << 16) | + (LERP (gl, gr, xl, xr, x_interp) << 8) | + LERP (bl, br, xl, xr, x_interp)); + } + + c = (rr << 16) | (gr << 8) | br; + + for (; xx < x + width; xx++) + *p++ = c; + } + } + + source = cairo_image_surface_create_for_data ((unsigned char *)buf, + CAIRO_FORMAT_RGB24, + width, height, stride); + + /* Draw a triangle with the image as a source */ + + cairo_set_source_surface (cr, source, x, y); + cairo_surface_destroy (source); + + cairo_move_to (cr, x1, y1); + cairo_line_to (cr, x2, y2); + cairo_line_to (cr, x3, y3); + cairo_close_path (cr); + cairo_fill (cr); + + g_free (buf); + + /* Draw value marker */ + + xx = floor (sx + (vx - sx) * priv->v + (hx - vx) * priv->s * priv->v + 0.5); + yy = floor (sy + (vy - sy) * priv->v + (hy - vy) * priv->s * priv->v + 0.5); + + r = priv->h; + g = priv->s; + b = priv->v; + hsv_to_rgb (&r, &g, &b); + + if (INTENSITY (r, g, b) > 0.5) + { + detail = "colorwheel_light"; + cairo_set_source_rgb (cr, 0., 0., 0.); + } + else + { + detail = "colorwheel_dark"; + cairo_set_source_rgb (cr, 1., 1., 1.); + } + +#define RADIUS 4 +#define FOCUS_RADIUS 6 + + cairo_new_path (cr); + cairo_arc (cr, xx, yy, RADIUS, 0, 2 * G_PI); + cairo_stroke (cr); + + /* Draw focus outline */ + + if (gtk_widget_has_focus (widget) && + ! priv->focus_on_ring) + { + GtkAllocation allocation; + gint focus_width; + gint focus_pad; + + gtk_widget_get_allocation (widget, &allocation); + + gtk_widget_style_get (widget, + "focus-line-width", &focus_width, + "focus-padding", &focus_pad, + NULL); + + gtk_paint_focus (gtk_widget_get_style (widget), + gtk_widget_get_window (widget), + gtk_widget_get_state (widget), + NULL, widget, detail, + allocation.x + xx - FOCUS_RADIUS - focus_width - focus_pad, + allocation.y + yy - FOCUS_RADIUS - focus_width - focus_pad, + 2 * (FOCUS_RADIUS + focus_width + focus_pad), + 2 * (FOCUS_RADIUS + focus_width + focus_pad)); + } +} + +/* Paints the contents of the HSV color selector */ +static void +paint (GimpColorWheel *hsv, + cairo_t *cr, + gint x, + gint y, + gint width, + gint height) +{ + paint_ring (hsv, cr, x, y, width, height); + paint_triangle (hsv, cr, x, y, width, height); +} + +static gint +gimp_color_wheel_expose (GtkWidget *widget, + GdkEventExpose *event) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + GtkAllocation allocation; + GdkRectangle dest; + cairo_t *cr; + + if (! (event->window == gtk_widget_get_window (widget) && + gtk_widget_is_drawable (widget))) + return FALSE; + + gtk_widget_get_allocation (widget, &allocation); + + if (!gdk_rectangle_intersect (&event->area, &allocation, &dest)) + return FALSE; + + cr = gdk_cairo_create (gtk_widget_get_window (widget)); + + cairo_translate (cr, allocation.x, allocation.y); + paint (wheel, cr, + dest.x - allocation.x, + dest.y - allocation.y, + dest.width, dest.height); + cairo_destroy (cr); + + if (gtk_widget_has_focus (widget) && priv->focus_on_ring) + gtk_paint_focus (gtk_widget_get_style (widget), + gtk_widget_get_window (widget), + gtk_widget_get_state (widget), + &event->area, widget, NULL, + allocation.x, + allocation.y, + allocation.width, + allocation.height); + + return FALSE; +} + +static gboolean +gimp_color_wheel_focus (GtkWidget *widget, + GtkDirectionType dir) +{ + GimpColorWheel *wheel = GIMP_COLOR_WHEEL (widget); + GimpColorWheelPrivate *priv = wheel->priv; + + if (!gtk_widget_has_focus (widget)) + { + if (dir == GTK_DIR_TAB_BACKWARD) + priv->focus_on_ring = FALSE; + else + priv->focus_on_ring = TRUE; + + gtk_widget_grab_focus (widget); + return TRUE; + } + + switch (dir) + { + case GTK_DIR_UP: + if (priv->focus_on_ring) + return FALSE; + else + priv->focus_on_ring = TRUE; + break; + + case GTK_DIR_DOWN: + if (priv->focus_on_ring) + priv->focus_on_ring = FALSE; + else + return FALSE; + break; + + case GTK_DIR_LEFT: + case GTK_DIR_TAB_BACKWARD: + if (priv->focus_on_ring) + return FALSE; + else + priv->focus_on_ring = TRUE; + break; + + case GTK_DIR_RIGHT: + case GTK_DIR_TAB_FORWARD: + if (priv->focus_on_ring) + priv->focus_on_ring = FALSE; + else + return FALSE; + break; + } + + gtk_widget_queue_draw (widget); + + return TRUE; +} + +/** + * gimp_color_wheel_new: + * + * Creates a new HSV color selector. + * + * Return value: A newly-created HSV color selector. + * + * Since: 2.14 + */ +GtkWidget* +gimp_color_wheel_new (void) +{ + return g_object_new (GIMP_TYPE_COLOR_WHEEL, NULL); +} + +/** + * gimp_color_wheel_set_color: + * @hsv: An HSV color selector + * @h: Hue + * @s: Saturation + * @v: Value + * + * Sets the current color in an HSV color selector. + * Color component values must be in the [0.0, 1.0] range. + * + * Since: 2.14 + */ +void +gimp_color_wheel_set_color (GimpColorWheel *wheel, + gdouble h, + gdouble s, + gdouble v) +{ + GimpColorWheelPrivate *priv; + + g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel)); + g_return_if_fail (h >= 0.0 && h <= 1.0); + g_return_if_fail (s >= 0.0 && s <= 1.0); + g_return_if_fail (v >= 0.0 && v <= 1.0); + + priv = wheel->priv; + + priv->h = h; + priv->s = s; + priv->v = v; + + g_signal_emit (wheel, wheel_signals[CHANGED], 0); + + gtk_widget_queue_draw (GTK_WIDGET (wheel)); +} + +/** + * gimp_color_wheel_get_color: + * @hsv: An HSV color selector + * @h: (out): Return value for the hue + * @s: (out): Return value for the saturation + * @v: (out): Return value for the value + * + * Queries the current color in an HSV color selector. + * Returned values will be in the [0.0, 1.0] range. + * + * Since: 2.14 + */ +void +gimp_color_wheel_get_color (GimpColorWheel *wheel, + gdouble *h, + gdouble *s, + gdouble *v) +{ + GimpColorWheelPrivate *priv; + + g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel)); + + priv = wheel->priv; + + if (h) *h = priv->h; + if (s) *s = priv->s; + if (v) *v = priv->v; +} + +/** + * gimp_color_wheel_set_ring_fraction: + * @ring: A wheel color selector + * @fraction: Ring fraction + * + * Sets the ring fraction of a wheel color selector. + * + * Since: GIMP 2.10 + */ +void +gimp_color_wheel_set_ring_fraction (GimpColorWheel *hsv, + gdouble fraction) +{ + GimpColorWheelPrivate *priv; + + g_return_if_fail (GIMP_IS_COLOR_WHEEL (hsv)); + + priv = hsv->priv; + + priv->ring_fraction = CLAMP (fraction, 0.01, 0.99); + + gtk_widget_queue_draw (GTK_WIDGET (hsv)); +} + +/** + * gimp_color_wheel_get_ring_fraction: + * @ring: A wheel color selector + * + * Returns value: The ring fraction of the wheel color selector. + * + * Since: GIMP 2.10 + */ +gdouble +gimp_color_wheel_get_ring_fraction (GimpColorWheel *wheel) +{ + GimpColorWheelPrivate *priv; + + g_return_val_if_fail (GIMP_IS_COLOR_WHEEL (wheel), DEFAULT_FRACTION); + + priv = wheel->priv; + + return priv->ring_fraction; +} + +/** + * gimp_color_wheel_is_adjusting: + * @hsv: A #GimpColorWheel + * + * An HSV color selector can be said to be adjusting if multiple rapid + * changes are being made to its value, for example, when the user is + * adjusting the value with the mouse. This function queries whether + * the HSV color selector is being adjusted or not. + * + * Return value: %TRUE if clients can ignore changes to the color value, + * since they may be transitory, or %FALSE if they should consider + * the color value status to be final. + * + * Since: 2.14 + */ +gboolean +gimp_color_wheel_is_adjusting (GimpColorWheel *wheel) +{ + GimpColorWheelPrivate *priv; + + g_return_val_if_fail (GIMP_IS_COLOR_WHEEL (wheel), FALSE); + + priv = wheel->priv; + + return priv->mode != DRAG_NONE; +} + +static void +gimp_color_wheel_move (GimpColorWheel *wheel, + GtkDirectionType dir) +{ + GimpColorWheelPrivate *priv = wheel->priv; + gdouble hue, sat, val; + gint hx, hy, sx, sy, vx, vy; /* HSV vertices */ + gint x, y; /* position in triangle */ + + hue = priv->h; + sat = priv->s; + val = priv->v; + + compute_triangle (wheel, &hx, &hy, &sx, &sy, &vx, &vy); + + x = floor (sx + (vx - sx) * priv->v + (hx - vx) * priv->s * priv->v + 0.5); + y = floor (sy + (vy - sy) * priv->v + (hy - vy) * priv->s * priv->v + 0.5); + +#define HUE_DELTA 0.002 + switch (dir) + { + case GTK_DIR_UP: + if (priv->focus_on_ring) + hue += HUE_DELTA; + else + { + y -= 1; + compute_sv (wheel, x, y, &sat, &val); + } + break; + + case GTK_DIR_DOWN: + if (priv->focus_on_ring) + hue -= HUE_DELTA; + else + { + y += 1; + compute_sv (wheel, x, y, &sat, &val); + } + break; + + case GTK_DIR_LEFT: + if (priv->focus_on_ring) + hue += HUE_DELTA; + else + { + x -= 1; + compute_sv (wheel, x, y, &sat, &val); + } + break; + + case GTK_DIR_RIGHT: + if (priv->focus_on_ring) + hue -= HUE_DELTA + ; + else + { + x += 1; + compute_sv (wheel, x, y, &sat, &val); + } + break; + + default: + /* we don't care about the tab directions */ + break; + } + + /* Wrap */ + if (hue < 0.0) + hue = 1.0; + else if (hue > 1.0) + hue = 0.0; + + gimp_color_wheel_set_color (wheel, hue, sat, val); +} diff --git a/modules/gimpcolorwheel.h b/modules/gimpcolorwheel.h new file mode 100644 index 0000000000..72093575f2 --- /dev/null +++ b/modules/gimpcolorwheel.h @@ -0,0 +1,97 @@ +/* HSV color selector for GTK+ + * + * Copyright (C) 1999 The Free Software Foundation + * + * Authors: Simon Budig (original code) + * Federico Mena-Quintero (cleanup for GTK+) + * Jonathan Blandford (cleanup for GTK+) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#ifndef __GIMP_COLOR_WHEEL_H__ +#define __GIMP_COLOR_WHEEL_H__ + +G_BEGIN_DECLS + +#define GIMP_TYPE_COLOR_WHEEL (gimp_color_wheel_get_type ()) +#define GIMP_COLOR_WHEEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_WHEEL, GimpColorWheel)) +#define GIMP_COLOR_WHEEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_WHEEL, GimpColorWheelClass)) +#define GIMP_IS_COLOR_WHEEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_WHEEL)) +#define GIMP_IS_COLOR_WHEEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLOR_WHEEL)) +#define GIMP_COLOR_WHEEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLOR_WHEEL, GimpColorWheelClass)) + + +typedef struct _GimpColorWheel GimpColorWheel; +typedef struct _GimpColorWheelClass GimpColorWheelClass; + +struct _GimpColorWheel +{ + GtkWidget parent_instance; + + /* Private data */ + gpointer priv; +}; + +struct _GimpColorWheelClass +{ + GtkWidgetClass parent_class; + + /* Notification signals */ + void (* changed) (GimpColorWheel *wheel); + + /* Keybindings */ + void (* move) (GimpColorWheel *wheel, + GtkDirectionType type); + + /* Padding for future expansion */ + void (*_gimp_reserved1) (void); + void (*_gimp_reserved2) (void); + void (*_gimp_reserved3) (void); + void (*_gimp_reserved4) (void); +}; + + +void color_wheel_register_type (GTypeModule *module); + +GType gimp_color_wheel_get_type (void) G_GNUC_CONST; +GtkWidget * gimp_color_wheel_new (void); + +void gimp_color_wheel_set_color (GimpColorWheel *wheel, + double h, + double s, + double v); +void gimp_color_wheel_get_color (GimpColorWheel *wheel, + gdouble *h, + gdouble *s, + gdouble *v); + +void gimp_color_wheel_set_ring_fraction (GimpColorWheel *wheel, + gdouble fraction); +gdouble gimp_color_wheel_get_ring_fraction (GimpColorWheel *wheel); + +gboolean gimp_color_wheel_is_adjusting (GimpColorWheel *wheel); + +G_END_DECLS + +#endif /* __GIMP_COLOR_WHEEL_H__ */ diff --git a/plug-ins/Makefile.in b/plug-ins/Makefile.in index 3e36608334..47f58f5e59 100644 --- a/plug-ins/Makefile.in +++ b/plug-ins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -311,6 +311,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -337,6 +339,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/color-rotate/Makefile.in b/plug-ins/color-rotate/Makefile.in index bb5739afe8..bf705318e8 100644 --- a/plug-ins/color-rotate/Makefile.in +++ b/plug-ins/color-rotate/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -351,6 +351,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -377,6 +379,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -702,14 +708,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/color-rotate/images/Makefile.in b/plug-ins/color-rotate/images/Makefile.in index db2971557a..ba4e893482 100644 --- a/plug-ins/color-rotate/images/Makefile.in +++ b/plug-ins/color-rotate/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -248,6 +248,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -274,6 +276,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in index 8e802258ba..af5486d039 100644 --- a/plug-ins/common/Makefile.in +++ b/plug-ins/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1496,6 +1496,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -1522,6 +1524,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -5139,14 +5145,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c index 2be7fe0fc6..288755fdd8 100644 --- a/plug-ins/common/bump-map.c +++ b/plug-ins/common/bump-map.c @@ -935,7 +935,7 @@ bumpmap_dialog (void) gimp_scale_entry_new (GTK_TABLE (table), 0, row++, _("_X offset:"), SCALE_WIDTH, 6, bmvals.xofs, -1000.0, 1001.0, 1.0, 10.0, 0, - TRUE, 0, 0, + FALSE, -10000.0, 10001.0, _("The offset can be adjusted by dragging the " "preview using the middle mouse button."), NULL); g_signal_connect (adj, "value-changed", @@ -949,7 +949,7 @@ bumpmap_dialog (void) gimp_scale_entry_new (GTK_TABLE (table), 0, row, _("_Y offset:"), SCALE_WIDTH, 6, bmvals.yofs, -1000.0, 1001.0, 1.0, 10.0, 0, - TRUE, 0, 0, + FALSE, -10000.0, 10001.0, _("The offset can be adjusted by dragging the " "preview using the middle mouse button."), NULL); g_signal_connect (adj, "value-changed", @@ -1065,7 +1065,7 @@ dialog_preview_events (GtkWidget *area, switch (bmint.drag_mode) { case DRAG_BUMPMAP: - bmvals.xofs = CLAMP (bmvals.xofs - dx, -1000, 1000); + bmvals.xofs = CLAMP (bmvals.xofs - dx, -10000, 10000); g_signal_handlers_block_by_func (bmint.offset_adj_x, gimp_int_adjustment_update, &bmvals.xofs); @@ -1075,7 +1075,7 @@ dialog_preview_events (GtkWidget *area, gimp_int_adjustment_update, &bmvals.xofs); - bmvals.yofs = CLAMP (bmvals.yofs - dy, -1000, 1000); + bmvals.yofs = CLAMP (bmvals.yofs - dy, -10000, 10000); g_signal_handlers_block_by_func (bmint.offset_adj_y, gimp_int_adjustment_update, &bmvals.yofs); diff --git a/plug-ins/common/crop-auto.c b/plug-ins/common/crop-auto.c index 01ac47f06c..23ac5f4789 100644 --- a/plug-ins/common/crop-auto.c +++ b/plug-ins/common/crop-auto.c @@ -82,7 +82,12 @@ query (void) gimp_install_procedure (AUTOCROP_PROC, N_("Remove empty borders from the image"), - "", + "Crop the active layer of the input \"image\" " + "based on empty borders of the input \"drawable\". " + "The input drawable serves as a base for detecting " + "cropping extents (transparency or background " + "color), and is not necessarily the cropped layer " + "(the current active layer).", "Tim Newsome", "Tim Newsome", "1997", diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c index 1a08cf16f5..a42077f05a 100644 --- a/plug-ins/common/file-aa.c +++ b/plug-ins/common/file-aa.c @@ -160,10 +160,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + + export = gimp_export_image (&image_ID, &drawable_ID, "AA", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c index f1aed6f67a..d74b6363fb 100644 --- a/plug-ins/common/file-cel.c +++ b/plug-ins/common/file-cel.c @@ -237,11 +237,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_ALPHA | - GIMP_EXPORT_CAN_HANDLE_INDEXED - )); + + export = gimp_export_image (&image_ID, &drawable_ID, "CEL", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_ALPHA | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c index 3d505d8e5e..aa6dd048ba 100644 --- a/plug-ins/common/file-csource.c +++ b/plug-ins/common/file-csource.c @@ -172,9 +172,9 @@ run (const gchar *name, gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + export = gimp_export_image (&image_ID, &drawable_ID, "C Source", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_ALPHA); if (export == GIMP_EXPORT_CANCEL) { diff --git a/plug-ins/common/file-dicom.c b/plug-ins/common/file-dicom.c index ea9abb5f0b..a03c952037 100644 --- a/plug-ins/common/file-dicom.c +++ b/plug-ins/common/file-dicom.c @@ -229,10 +229,10 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "DICOM", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index 18768a05e6..4b7e7c3d06 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -239,10 +239,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_RGB | + + export = gimp_export_image (&image_ID, &drawable_ID, "GBR", + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c index 37b2ce0f12..ac967e962e 100644 --- a/plug-ins/common/file-gif-save.c +++ b/plug-ins/common/file-gif-save.c @@ -281,7 +281,7 @@ run (const gchar *name, if (gsvals.as_animation) capabilities |= GIMP_EXPORT_CAN_HANDLE_LAYERS; - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "GIF", capabilities); if (export == GIMP_EXPORT_CANCEL) diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index 283de93eae..df1db893ab 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -295,11 +295,13 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "GIH", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_ALPHA | GIMP_EXPORT_CAN_HANDLE_LAYERS); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-header.c b/plug-ins/common/file-header.c index e8e2269b1c..827065c87b 100644 --- a/plug-ins/common/file-header.c +++ b/plug-ins/common/file-header.c @@ -119,9 +119,11 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + + export = gimp_export_image (&image_ID, &drawable_ID, "Header", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c index 7e78692555..093690e45c 100644 --- a/plug-ins/common/file-jp2-load.c +++ b/plug-ins/common/file-jp2-load.c @@ -106,8 +106,10 @@ query (void) "4,string,jP,0,string,\xff\x4f\xff\x51\x00"); gimp_register_file_handler_mime (LOAD_PROC, "image/jp2"); +#if 0 gimp_register_file_handler_mime (LOAD_PROC, "image/jpeg2000"); gimp_register_file_handler_mime (LOAD_PROC, "image/jpx"); +#endif } static void diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c index 6a9a4a7dc9..c05bc52e37 100644 --- a/plug-ins/common/file-mng.c +++ b/plug-ins/common/file-mng.c @@ -1639,18 +1639,19 @@ run (const gchar *name, gint32 drawable_id = param[2].data.d_int32; GimpExportReturn export = GIMP_EXPORT_IGNORE; - if ((run_mode == GIMP_RUN_INTERACTIVE) - || (run_mode == GIMP_RUN_WITH_LAST_VALS)) + if (run_mode == GIMP_RUN_INTERACTIVE || + run_mode == GIMP_RUN_WITH_LAST_VALS) { gimp_procedural_db_get_data (SAVE_PROC, &mng_data); gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_id, &drawable_id, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA | - GIMP_EXPORT_CAN_HANDLE_LAYERS)); + + export = gimp_export_image (&image_id, &drawable_id, "MNG", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED | + GIMP_EXPORT_CAN_HANDLE_ALPHA | + GIMP_EXPORT_CAN_HANDLE_LAYERS); } if (export == GIMP_EXPORT_CANCEL) diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c index 7c12dc0acb..26d7e0578c 100644 --- a/plug-ins/common/file-pat.c +++ b/plug-ins/common/file-pat.c @@ -209,10 +209,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "PAT", GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c index 2666979f49..09f737eb79 100644 --- a/plug-ins/common/file-pcx.c +++ b/plug-ins/common/file-pcx.c @@ -211,10 +211,11 @@ run (const gchar *name, case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + export = gimp_export_image (&image_ID, &drawable_ID, "PCX", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-pix.c b/plug-ins/common/file-pix.c index 6b258e115e..5e267a028a 100644 --- a/plug-ins/common/file-pix.c +++ b/plug-ins/common/file-pix.c @@ -230,9 +230,11 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY)); + + export = gimp_export_image (&image_ID, &drawable_ID, "PIX", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 4e590a926c..885c77ae78 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -450,11 +450,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA)); + + export = gimp_export_image (&image_ID, &drawable_ID, "PNG", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED | + GIMP_EXPORT_CAN_HANDLE_ALPHA); if (export == GIMP_EXPORT_CANCEL) { diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index f47054d087..52a6e981b0 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -374,25 +374,25 @@ run (const gchar *name, if (strcmp (name, PNM_SAVE_PROC) == 0) { - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "PNM", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_INDEXED); } else if (strcmp (name, PBM_SAVE_PROC) == 0) { - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "PBM", GIMP_EXPORT_CAN_HANDLE_BITMAP); pbm = TRUE; /* gimp has no mono image type so hack it */ } else if (strcmp (name, PGM_SAVE_PROC) == 0) { - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "PGM", GIMP_EXPORT_CAN_HANDLE_GRAY); } else { - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + export = gimp_export_image (&image_ID, &drawable_ID, "PPM", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_INDEXED); } diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 399f984e61..6bd59c9a49 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -862,10 +862,13 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + + export = gimp_export_image (&image_ID, &drawable_ID, + psvals.eps ? "EPS" : "PostScript", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 5c8982a75a..ac0fff78f0 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -1948,12 +1948,14 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "PSP", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_INDEXED | GIMP_EXPORT_CAN_HANDLE_ALPHA | GIMP_EXPORT_CAN_HANDLE_LAYERS); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index 8dfc6a5cef..f072a22fa2 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -296,10 +296,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + + export = gimp_export_image (&image_ID, &drawable_ID, "SUNRAS", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index 82ced38d78..9fdd351095 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -331,11 +331,12 @@ run (const gchar *name, { case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + export = gimp_export_image (&image_ID, &drawable_ID, "TGA", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED | + GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c index 3cdd806327..012d71ed4d 100644 --- a/plug-ins/common/file-tiff-save.c +++ b/plug-ins/common/file-tiff-save.c @@ -252,11 +252,13 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image, &drawable, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + + export = gimp_export_image (&image, &drawable, "TIFF", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED | + GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; @@ -303,13 +305,13 @@ run (const gchar *name, { switch (param[5].data.d_int32) { - case 0: tsvals.compression = COMPRESSION_NONE; break; - case 1: tsvals.compression = COMPRESSION_LZW; break; - case 2: tsvals.compression = COMPRESSION_PACKBITS; break; - case 3: tsvals.compression = COMPRESSION_DEFLATE; break; - case 4: tsvals.compression = COMPRESSION_JPEG; break; - case 5: tsvals.compression = COMPRESSION_CCITTFAX3; break; - case 6: tsvals.compression = COMPRESSION_CCITTFAX4; break; + case 0: tsvals.compression = COMPRESSION_NONE; break; + case 1: tsvals.compression = COMPRESSION_LZW; break; + case 2: tsvals.compression = COMPRESSION_PACKBITS; break; + case 3: tsvals.compression = COMPRESSION_ADOBE_DEFLATE; break; + case 4: tsvals.compression = COMPRESSION_JPEG; break; + case 5: tsvals.compression = COMPRESSION_CCITTFAX3; break; + case 6: tsvals.compression = COMPRESSION_CCITTFAX4; break; default: status = GIMP_PDB_CALLING_ERROR; break; } @@ -829,7 +831,7 @@ save_image (const gchar *filename, TIFFSetField (tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); TIFFSetField (tif, TIFFTAG_COMPRESSION, compression); - if ((compression == COMPRESSION_LZW || compression == COMPRESSION_DEFLATE) + if ((compression == COMPRESSION_LZW || compression == COMPRESSION_ADOBE_DEFLATE) && (predictor != 0)) { TIFFSetField (tif, TIFFTAG_PREDICTOR, predictor); @@ -1092,11 +1094,11 @@ save_dialog (gboolean has_alpha, G_CALLBACK (gimp_radio_button_update), &tsvals.compression, tsvals.compression, - _("_None"), COMPRESSION_NONE, NULL, - _("_LZW"), COMPRESSION_LZW, NULL, - _("_Pack Bits"), COMPRESSION_PACKBITS, NULL, - _("_Deflate"), COMPRESSION_DEFLATE, NULL, - _("_JPEG"), COMPRESSION_JPEG, NULL, + _("_None"), COMPRESSION_NONE, NULL, + _("_LZW"), COMPRESSION_LZW, NULL, + _("_Pack Bits"), COMPRESSION_PACKBITS, NULL, + _("_Deflate"), COMPRESSION_ADOBE_DEFLATE, NULL, + _("_JPEG"), COMPRESSION_JPEG, NULL, _("CCITT Group _3 fax"), COMPRESSION_CCITTFAX3, &g3, _("CCITT Group _4 fax"), COMPRESSION_CCITTFAX4, &g4, diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index bd6111957f..cdf30eaf90 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -287,7 +287,8 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "XBM", GIMP_EXPORT_CAN_HANDLE_BITMAP | GIMP_EXPORT_CAN_HANDLE_ALPHA); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 7a8c9b4889..a75c8fbde3 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -486,11 +486,13 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_ALPHA | - GIMP_EXPORT_CAN_HANDLE_LAYERS | - GIMP_EXPORT_NEEDS_ALPHA)); + + export = gimp_export_image (&image_ID, &drawable_ID, "XMC", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_ALPHA | + GIMP_EXPORT_CAN_HANDLE_LAYERS | + GIMP_EXPORT_NEEDS_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { *nreturn_vals = 1; diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index 2a8ed674ee..df75e54325 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -258,11 +258,12 @@ run (const gchar *name, { case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED | - GIMP_EXPORT_CAN_HANDLE_ALPHA )); + export = gimp_export_image (&image_ID, &drawable_ID, "XPM", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED | + GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c index f91d75773a..3240f7e053 100644 --- a/plug-ins/common/file-xwd.c +++ b/plug-ins/common/file-xwd.c @@ -359,10 +359,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + + export = gimp_export_image (&image_ID, &drawable_ID, "XWD", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c index cb9ff578bb..5974aaa8b8 100644 --- a/plug-ins/common/lcms.c +++ b/plug-ins/common/lcms.c @@ -24,7 +24,12 @@ #include /* lcms.h uses the "inline" keyword */ +#ifdef HAVE_LCMS1 #include +typedef DWORD cmsUInt32Number; +#else +#include +#endif #include #include @@ -123,6 +128,12 @@ static void lcms_image_transform_rgb (gint32 image, cmsHPROFILE dest_profile, GimpColorRenderingIntent intent, gboolean bpc); +static void lcms_layers_transform_rgb (gint *layers, + gint num_layers, + cmsHPROFILE src_profile, + cmsHPROFILE dest_profile, + GimpColorRenderingIntent intent, + gboolean bpc); static void lcms_image_transform_indexed (gint32 image, cmsHPROFILE src_profile, cmsHPROFILE dest_profile, @@ -352,10 +363,12 @@ run (const gchar *name, goto done; if (proc != PROC_FILE_INFO) - config = gimp_get_color_configuration (); - - if (config) - intent = config->display_intent; + { + config = gimp_get_color_configuration (); + /* Later code relies on config != NULL if proc != PROC_FILE_INFO */ + g_return_if_fail (config != NULL); + intent = config->display_intent; + } else intent = GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL; @@ -428,7 +441,9 @@ run (const gchar *name, } } +#ifdef HAVE_LCMS1 cmsErrorAction (LCMS_ERROR_SHOW); +#endif switch (proc) { @@ -459,7 +474,9 @@ run (const gchar *name, gchar *desc = NULL; gchar *info = NULL; +#ifdef HAVE_LCMS1 cmsErrorAction (LCMS_ERROR_IGNORE); +#endif if (proc == PROC_INFO) status = lcms_icc_info (config, image, &name, &desc, &info); @@ -496,25 +513,92 @@ run (const gchar *name, static gchar * lcms_icc_profile_get_name (cmsHPROFILE profile) { +#ifdef HAVE_LCMS1 return gimp_any_to_utf8 (cmsTakeProductName (profile), -1, NULL); +#else + cmsUInt32Number descSize; + gchar *descData; + gchar *name = NULL; + + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", descData, descSize); + if (descSize > 0) + name = gimp_any_to_utf8 (descData, -1, NULL); + + g_free (descData); + } + + return name; +#endif } static gchar * lcms_icc_profile_get_desc (cmsHPROFILE profile) { +#ifdef HAVE_LCMS1 return gimp_any_to_utf8 (cmsTakeProductDesc (profile), -1, NULL); +#else + cmsUInt32Number descSize; + gchar *descData; + gchar *desc = NULL; + + descSize = cmsGetProfileInfoASCII (profile, cmsInfoDescription, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoDescription, + "en", "US", descData, descSize); + if (descSize > 0) + desc = gimp_any_to_utf8 (descData, -1, NULL); + + g_free (descData); + } + + return desc; +#endif } static gchar * lcms_icc_profile_get_info (cmsHPROFILE profile) { +#ifdef HAVE_LCMS1 return gimp_any_to_utf8 (cmsTakeProductInfo (profile), -1, NULL); +#else + cmsUInt32Number descSize; + gchar *descData; + gchar *info = NULL; + + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", NULL, 0); + if (descSize > 0) + { + descData = g_new (gchar, descSize + 1); + descSize = cmsGetProfileInfoASCII (profile, cmsInfoModel, + "en", "US", descData, descSize); + if (descSize > 0) + info = gimp_any_to_utf8 (descData, -1, NULL); + + g_free (descData); + } + + return info; +#endif } static gboolean lcms_icc_profile_is_rgb (cmsHPROFILE profile) { +#ifdef HAVE_LCMS1 return (cmsGetColorSpace (profile) == icSigRgbData); +#else + return (cmsGetColorSpace (profile) == cmsSigRgbData); +#endif } static GimpPDBStatusType @@ -737,9 +821,15 @@ lcms_calculate_checksum (const gchar *data, { GChecksum *md5 = g_checksum_new (G_CHECKSUM_MD5); +#ifdef HAVE_LCMS1 g_checksum_update (md5, (const guchar *) data + sizeof (icHeader), len - sizeof (icHeader)); +#else + g_checksum_update (md5, + (const guchar *) data + sizeof (cmsICCHeader), + len - sizeof (cmsICCHeader)); +#endif len = 16; g_checksum_get_digest (md5, digest, &len); @@ -934,18 +1024,49 @@ lcms_image_transform_rgb (gint32 image, GimpColorRenderingIntent intent, gboolean bpc) { - cmsHTRANSFORM transform = NULL; - DWORD last_format = 0; - gint *layers; - gint num_layers; - gint i; + gint *layers; + gint num_layers; layers = gimp_image_get_layers (image, &num_layers); + lcms_layers_transform_rgb (layers, num_layers, + src_profile, dest_profile, + intent, bpc); + + g_free (layers); +} + +static void +lcms_layers_transform_rgb (gint *layers, + gint num_layers, + cmsHPROFILE src_profile, + cmsHPROFILE dest_profile, + GimpColorRenderingIntent intent, + gboolean bpc) +{ + cmsHTRANSFORM transform = NULL; + cmsUInt32Number last_format = 0; + gint i; + for (i = 0; i < num_layers; i++) { - GimpDrawable *drawable = gimp_drawable_get (layers[i]); - DWORD format; + GimpDrawable *drawable = gimp_drawable_get (layers[i]); + cmsUInt32Number format; + gint *children; + gint num_children; + + children = gimp_item_get_children (layers[i], &num_children); + + if (children) + { + lcms_layers_transform_rgb (children, num_children, + src_profile, dest_profile, + intent, bpc); + + g_free (children); + + continue; + } switch (drawable->bpp) { @@ -991,8 +1112,6 @@ lcms_image_transform_rgb (gint32 image, if (transform) cmsDeleteTransform(transform); - - g_free (layers); } static void @@ -1269,7 +1388,10 @@ lcms_icc_apply_dialog (gint32 image, run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - *dont_ask = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)); + if (dont_ask) + { + *dont_ask = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle)); + } gtk_widget_destroy (dialog); @@ -1376,7 +1498,7 @@ lcms_icc_combo_box_new (GimpColorConfig *config, gchar *history; gchar *label; gchar *name; - cmsHPROFILE profile; + cmsHPROFILE profile = NULL; dialog = lcms_icc_file_chooser_dialog_new (); history = gimp_personal_rc_file ("profilerc"); @@ -1391,7 +1513,8 @@ lcms_icc_combo_box_new (GimpColorConfig *config, if (config->rgb_profile) profile = lcms_load_profile (config->rgb_profile, NULL); - else + + if (! profile) profile = cmsCreate_sRGBProfile (); name = lcms_icc_profile_get_desc (profile); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index e8fc8b7236..19b5f165e8 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -74,6 +74,7 @@ typedef struct typedef struct { gdouble base_x, base_y; + gdouble base_x2, base_y2; gdouble norm_x, norm_y; gdouble light; } SpecVec; @@ -250,6 +251,9 @@ static void fill_poly_image (Polygon *poly, gint y2, guchar *dest); +static gfloat distance (SpecVec *vec, + gfloat x, + gfloat y); static void calc_spec_vec (SpecVec *vec, gint xs, gint ys, @@ -2605,6 +2609,8 @@ calc_spec_vec (SpecVec *vec, vec->base_x = x1; vec->base_y = y1; + vec->base_x2 = x2; + vec->base_y2 = y2; r = sqrt (SQR (x2 - x1) + SQR (y2 - y1)); @@ -2622,6 +2628,44 @@ calc_spec_vec (SpecVec *vec, vec->light = vec->norm_x * light_x + vec->norm_y * light_y; } +static gfloat +distance (SpecVec *vec, + gfloat x, + gfloat y) +{ + gfloat l2, t; + gfloat pv_x, pv_y; + gfloat pw_x, pw_y; + gfloat wv_x, wv_y; + gfloat proj_x, proj_y; + + l2 = SQR (vec->base_x - vec->base_x2) + SQR (vec->base_y - vec->base_y2); + + if (l2 < 1e-5) + return sqrt (SQR (vec->base_x - x) + SQR (vec->base_y - y)); + + pv_x = x - vec->base_x; + pv_y = y - vec->base_y; + + pw_x = x - vec->base_x2; + pw_y = y - vec->base_y2; + + wv_x = vec->base_x2 - vec->base_x; + wv_y = vec->base_y2 - vec->base_y; + + t = (pv_x * wv_x + pv_y * wv_y) / l2; + + if (t < 0.0) + return sqrt (SQR (pv_x) + SQR (pv_y)); + + else if (t > 1.0) + return sqrt (SQR (pw_x) + SQR (pw_y)); + + proj_x = vec->base_x + t * wv_x; + proj_y = vec->base_y + t * wv_y; + + return sqrt (SQR (x - proj_x) + SQR (y - proj_y)); +} static double calc_spec_contrib (SpecVec *vecs, @@ -2634,13 +2678,9 @@ calc_spec_contrib (SpecVec *vecs, for (i = 0; i < n; i++) { - gdouble x_p, y_p; gdouble dist; - x_p = x - vecs[i].base_x; - y_p = y - vecs[i].base_y; - - dist = fabs (x_p * vecs[i].norm_x + y_p * vecs[i].norm_y); + dist = distance (vecs + i, x, y); if (mvals.tile_surface == ROUGH) { diff --git a/plug-ins/file-bmp/Makefile.in b/plug-ins/file-bmp/Makefile.in index 2bc0c15c1b..e972a9da34 100644 --- a/plug-ins/file-bmp/Makefile.in +++ b/plug-ins/file-bmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -644,14 +650,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-bmp/bmp-read.c b/plug-ins/file-bmp/bmp-read.c index 30251c10f3..e59dfb8ae6 100644 --- a/plug-ins/file-bmp/bmp-read.c +++ b/plug-ins/file-bmp/bmp-read.c @@ -55,6 +55,58 @@ static gint32 ReadImage (FILE *fd, GError **error); +static void +setMasksDefault (gushort biBitCnt, Bitmap_Channel *masks) +{ + switch (biBitCnt) + { + case 32: + masks[0].mask = 0x00ff0000; + masks[0].shiftin = 16; + masks[0].max_value= (gfloat)255.0; + masks[1].mask = 0x0000ff00; + masks[1].shiftin = 8; + masks[1].max_value= (gfloat)255.0; + masks[2].mask = 0x000000ff; + masks[2].shiftin = 0; + masks[2].max_value= (gfloat)255.0; + masks[3].mask = 0x00000000; + masks[3].shiftin = 0; + masks[3].max_value= (gfloat)0.0; + break; + case 24: + masks[0].mask = 0xff0000; + masks[0].shiftin = 16; + masks[0].max_value= (gfloat)255.0; + masks[1].mask = 0x00ff00; + masks[1].shiftin = 8; + masks[1].max_value= (gfloat)255.0; + masks[2].mask = 0x0000ff; + masks[2].shiftin = 0; + masks[2].max_value= (gfloat)255.0; + masks[3].mask = 0x0; + masks[3].shiftin = 0; + masks[3].max_value= (gfloat)0.0; + break; + case 16: + masks[0].mask = 0x7c00; + masks[0].shiftin = 10; + masks[0].max_value= (gfloat)31.0; + masks[1].mask = 0x03e0; + masks[1].shiftin = 5; + masks[1].max_value= (gfloat)31.0; + masks[2].mask = 0x001f; + masks[2].shiftin = 0; + masks[2].max_value= (gfloat)31.0; + masks[3].mask = 0x0; + masks[3].shiftin = 0; + masks[3].max_value= (gfloat)0.0; + break; + default: + break; + } +} + static gint32 ToL (const guchar *puffer) { @@ -137,11 +189,11 @@ ReadBMP (const gchar *name, GError **error) { FILE *fd; - guchar buffer[64]; + guchar buffer[124]; gint ColormapSize, rowbytes, Maps; gboolean Grey = FALSE; guchar ColorMap[256][3]; - gint32 image_ID; + gint32 image_ID = -1; gchar magick[2]; Bitmap_Channel masks[4]; @@ -153,7 +205,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), _("Could not open '%s' for reading: %s"), gimp_filename_to_utf8 (filename), g_strerror (errno)); - return -1; + goto out; } gimp_progress_init_printf (_("Opening '%s'"), @@ -169,8 +221,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - fclose (fd); - return -1; + goto out; } while (!strncmp (magick, "BA", 2)) @@ -180,14 +231,14 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } if (!ReadOK (fd, magick, 2)) { g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } } @@ -196,7 +247,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } /* bring them to the right byteorder. Not too nice, but it should work */ @@ -211,7 +262,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } Bitmap_File_Head.biSize = ToL (&buffer[0x00]); @@ -225,7 +276,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error reading BMP file header from '%s'"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } Bitmap_Head.biWidth = ToS (&buffer[0x00]); /* 12 */ @@ -252,12 +303,12 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error reading BMP file header from '%s'"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } Bitmap_Head.biWidth = ToL (&buffer[0x00]); /* 12 */ Bitmap_Head.biHeight = ToL (&buffer[0x04]); /* 16 */ - Bitmap_Head.biPlanes = ToS (&buffer[0x08]); /* 1A */ + Bitmap_Head.biPlanes = ToS (&buffer[0x08]); /* 1A */ Bitmap_Head.biBitCnt = ToS (&buffer[0x0A]); /* 1C */ Bitmap_Head.biCompr = ToL (&buffer[0x0C]); /* 1E */ Bitmap_Head.biSizeIm = ToL (&buffer[0x10]); /* 22 */ @@ -280,7 +331,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error reading BMP file header from '%s'"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } Bitmap_Head.masks[0] = ToL(&buffer[0x00]); @@ -290,55 +341,9 @@ ReadBMP (const gchar *name, } else if (Bitmap_Head.biCompr == BI_RGB) { - switch (Bitmap_Head.biBitCnt) - { - case 32: - masks[0].mask = 0x00ff0000; - masks[0].shiftin = 16; - masks[0].max_value= (gfloat)255.0; - masks[1].mask = 0x0000ff00; - masks[1].shiftin = 8; - masks[1].max_value= (gfloat)255.0; - masks[2].mask = 0x000000ff; - masks[2].shiftin = 0; - masks[2].max_value= (gfloat)255.0; - masks[3].mask = 0x00000000; - masks[3].shiftin = 0; - masks[3].max_value= (gfloat)0.0; - break; - case 24: - masks[0].mask = 0xff0000; - masks[0].shiftin = 16; - masks[0].max_value= (gfloat)255.0; - masks[1].mask = 0x00ff00; - masks[1].shiftin = 8; - masks[1].max_value= (gfloat)255.0; - masks[2].mask = 0x0000ff; - masks[2].shiftin = 0; - masks[2].max_value= (gfloat)255.0; - masks[3].mask = 0x0; - masks[3].shiftin = 0; - masks[3].max_value= (gfloat)0.0; - break; - case 16: - masks[0].mask = 0x7c00; - masks[0].shiftin = 10; - masks[0].max_value= (gfloat)31.0; - masks[1].mask = 0x03e0; - masks[1].shiftin = 5; - masks[1].max_value= (gfloat)31.0; - masks[2].mask = 0x001f; - masks[2].shiftin = 0; - masks[2].max_value= (gfloat)31.0; - masks[3].mask = 0x0; - masks[3].shiftin = 0; - masks[3].max_value= (gfloat)0.0; - break; - default: - break; - } + setMasksDefault (Bitmap_Head.biBitCnt, masks); } - else + else if ((Bitmap_Head.biCompr != BI_RLE4) && (Bitmap_Head.biCompr != BI_RLE8)) { /* BI_ALPHABITFIELDS, etc. */ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, @@ -355,7 +360,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error reading BMP file header from '%s'"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } Bitmap_Head.biWidth =ToL (&buffer[0x00]); /* 12 */ @@ -376,37 +381,50 @@ ReadBMP (const gchar *name, Maps = 4; ReadChannelMasks (&Bitmap_Head.masks[0], masks, 4); } - else + else if (Bitmap_File_Head.biSize == 108 || Bitmap_File_Head.biSize == 124) + /* BMP Version 4 or 5 */ { - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_file(filename, NULL); - - if (pixbuf) - { - gint32 layer_ID; - - image_ID = gimp_image_new (gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf), - GIMP_RGB); - - layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"), - pixbuf, - 100., - GIMP_NORMAL_MODE, 0, 0); - g_object_unref (pixbuf); - - gimp_image_set_filename (image_ID, filename); - gimp_image_insert_layer (image_ID, layer_ID, -1, -1); - - return image_ID; - } - else + if (!ReadOK (fd, buffer, Bitmap_File_Head.biSize - 4)) { g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Error reading BMP file header from '%s'"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } + + Bitmap_Head.biWidth = ToL (&buffer[0x00]); + Bitmap_Head.biHeight = ToL (&buffer[0x04]); + Bitmap_Head.biPlanes = ToS (&buffer[0x08]); + Bitmap_Head.biBitCnt = ToS (&buffer[0x0A]); + Bitmap_Head.biCompr = ToL (&buffer[0x0C]); + Bitmap_Head.biSizeIm = ToL (&buffer[0x10]); + Bitmap_Head.biXPels = ToL (&buffer[0x14]); + Bitmap_Head.biYPels = ToL (&buffer[0x18]); + Bitmap_Head.biClrUsed = ToL (&buffer[0x1C]); + Bitmap_Head.biClrImp = ToL (&buffer[0x20]); + Bitmap_Head.masks[0] = ToL (&buffer[0x24]); + Bitmap_Head.masks[1] = ToL (&buffer[0x28]); + Bitmap_Head.masks[2] = ToL (&buffer[0x2C]); + Bitmap_Head.masks[3] = ToL (&buffer[0x30]); + + Maps = 4; + + if (Bitmap_Head.biCompr == BI_BITFIELDS) + { + ReadChannelMasks (&Bitmap_Head.masks[0], masks, 4); + } + else if (Bitmap_Head.biCompr == BI_RGB) + { + setMasksDefault (Bitmap_Head.biBitCnt, masks); + } + } + else + { + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("Error reading BMP file header from '%s'"), + gimp_filename_to_utf8 (filename)); + goto out; } /* Valid bit depth is 1, 4, 8, 16, 24, 32 */ @@ -426,7 +444,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } /* There should be some colors used! */ @@ -447,7 +465,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } /* biHeight may be negative, but G_MININT32 is dangerous because: @@ -458,7 +476,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } if (Bitmap_Head.biPlanes != 1) @@ -466,7 +484,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } if (Bitmap_Head.biClrUsed > 256) @@ -474,7 +492,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } /* protect against integer overflows caused by malicious BMPs */ @@ -486,7 +504,7 @@ ReadBMP (const gchar *name, g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("'%s' is not a valid BMP file"), gimp_filename_to_utf8 (filename)); - return -1; + goto out; } /* Windows and OS/2 declare filler so that rows are a multiple of @@ -514,7 +532,7 @@ ReadBMP (const gchar *name, #endif /* Get the Colormap */ if (!ReadColorMap (fd, ColorMap, ColormapSize, Maps, &Grey)) - return -1; + goto out; } fseek (fd, Bitmap_File_Head.bfOffs, SEEK_SET); @@ -533,7 +551,7 @@ ReadBMP (const gchar *name, error); if (image_ID < 0) - return -1; + goto out; if (Bitmap_Head.biXPels > 0 && Bitmap_Head.biYPels > 0) { @@ -555,6 +573,10 @@ ReadBMP (const gchar *name, if (Bitmap_Head.biHeight < 0) gimp_image_flip (image_ID, GIMP_ORIENTATION_VERTICAL); +out: + if (fd) + fclose (fd); + return image_ID; } @@ -699,42 +721,6 @@ ReadImage (FILE *fd, gimp_progress_update ((gdouble) cur_progress / (gdouble) max_progress); } - - if (channels == 4) - { - gboolean has_alpha = FALSE; - - /* at least one pixel should have nonzero alpha */ - for (ypos = 0; ypos < height; ypos++) - { - temp = dest + (ypos * rowstride); - for (xpos = 0; xpos < width; xpos++) - { - if (temp[3]) - { - has_alpha = TRUE; - break; - } - temp += 4; - } - if (has_alpha) - break; - } - - /* workaround unwanted behaviour when all alpha pixels are zero */ - if (!has_alpha) - { - for (ypos = 0; ypos < height; ypos++) - { - temp = dest + (ypos * rowstride); - for (xpos = 0; xpos < width; xpos++) - { - temp[3] = 255; - temp += 4; - } - } - } - } } break; @@ -934,7 +920,6 @@ ReadImage (FILE *fd, break; } - fclose (fd); if (bpp <= 8) for (i = 0, j = 0; i < ncols; i++) { diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c index 3b1a2842a6..6c1d328343 100644 --- a/plug-ins/file-bmp/bmp.c +++ b/plug-ins/file-bmp/bmp.c @@ -220,13 +220,17 @@ run (const gchar *name, /* fallthrough */ case GIMP_RUN_WITH_LAST_VALS: - if (run_mode == GIMP_RUN_WITH_LAST_VALS) lastvals = TRUE; + if (run_mode == GIMP_RUN_WITH_LAST_VALS) + lastvals = TRUE; + gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_ALPHA | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); + + export = gimp_export_image (&image_ID, &drawable_ID, "BMP", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_ALPHA | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/file-compressor/Makefile.in b/plug-ins/file-compressor/Makefile.in index 72d4c6b58f..177b4785b1 100644 --- a/plug-ins/file-compressor/Makefile.in +++ b/plug-ins/file-compressor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -304,6 +304,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -330,6 +332,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -630,14 +636,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-faxg3/Makefile.in b/plug-ins/file-faxg3/Makefile.in index 124a86ee2c..9c69eaf111 100644 --- a/plug-ins/file-faxg3/Makefile.in +++ b/plug-ins/file-faxg3/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -641,14 +647,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-fits/Makefile.in b/plug-ins/file-fits/Makefile.in index da1bf3fa42..c815666068 100644 --- a/plug-ins/file-fits/Makefile.in +++ b/plug-ins/file-fits/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -642,14 +648,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 90a38d82c3..48a212388a 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -277,20 +277,22 @@ run (const gchar *name, /* eventually export the image */ switch (run_mode) - { - case GIMP_RUN_INTERACTIVE: - case GIMP_RUN_WITH_LAST_VALS: - gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_INDEXED)); - if (export == GIMP_EXPORT_CANCEL) - { - values[0].data.d_status = GIMP_PDB_CANCEL; - return; - } - break; + { + case GIMP_RUN_INTERACTIVE: + case GIMP_RUN_WITH_LAST_VALS: + gimp_ui_init (PLUG_IN_BINARY, FALSE); + + export = gimp_export_image (&image_ID, &drawable_ID, "FITS", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_INDEXED); + + if (export == GIMP_EXPORT_CANCEL) + { + values[0].data.d_status = GIMP_PDB_CANCEL; + return; + } + break; default: break; } diff --git a/plug-ins/file-fli/Makefile.in b/plug-ins/file-fli/Makefile.in index 8f8503acaf..6a5dce2cc1 100644 --- a/plug-ins/file-fli/Makefile.in +++ b/plug-ins/file-fli/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -641,14 +647,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index b324250c1c..e3843eb5db 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -351,11 +351,13 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "FLI", GIMP_EXPORT_CAN_HANDLE_INDEXED | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_ALPHA | GIMP_EXPORT_CAN_HANDLE_LAYERS); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/file-ico/Makefile.in b/plug-ins/file-ico/Makefile.in index 9fa12deb31..bf49da9638 100644 --- a/plug-ins/file-ico/Makefile.in +++ b/plug-ins/file-ico/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -311,6 +311,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -337,6 +339,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -655,14 +661,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-jpeg/Makefile.in b/plug-ins/file-jpeg/Makefile.in index 8dc44ddc80..bf97af2f4c 100644 --- a/plug-ins/file-jpeg/Makefile.in +++ b/plug-ins/file-jpeg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -329,6 +329,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -355,6 +357,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -686,14 +692,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c index 87267fd9d8..4ae7eb2f98 100644 --- a/plug-ins/file-jpeg/jpeg-load.c +++ b/plug-ins/file-jpeg/jpeg-load.c @@ -31,7 +31,12 @@ #endif /* HAVE_LIBEXIF */ #ifdef HAVE_LCMS +#ifdef HAVE_LCMS1 #include +typedef DWORD cmsUInt32Number; +#else +#include +#endif #endif #include @@ -966,7 +971,7 @@ jpeg_load_cmyk_transform (guint8 *profile_data, GimpColorConfig *config = gimp_get_color_configuration (); cmsHPROFILE cmyk_profile = NULL; cmsHPROFILE rgb_profile = NULL; - DWORD flags = 0; + cmsUInt32Number flags = 0; cmsHTRANSFORM transform; /* try to load the embedded CMYK profile */ @@ -976,7 +981,11 @@ jpeg_load_cmyk_transform (guint8 *profile_data, if (cmyk_profile) { - if (! cmsGetColorSpace (cmyk_profile) == icSigCmykData) +#ifdef HAVE_LCMS1 + if (cmsGetColorSpace (cmyk_profile) != icSigCmykData) +#else + if (cmsGetColorSpace (cmyk_profile) != cmsSigCmykData) +#endif { cmsCloseProfile (cmyk_profile); cmyk_profile = NULL; @@ -989,7 +998,11 @@ jpeg_load_cmyk_transform (guint8 *profile_data, { cmyk_profile = cmsOpenProfileFromFile (config->cmyk_profile, "r"); - if (cmyk_profile && ! cmsGetColorSpace (cmyk_profile) == icSigCmykData) +#ifdef HAVE_LCMS1 + if (cmyk_profile && cmsGetColorSpace (cmyk_profile) != icSigCmykData) +#else + if (cmyk_profile && cmsGetColorSpace (cmyk_profile) != cmsSigCmykData) +#endif { cmsCloseProfile (cmyk_profile); cmyk_profile = NULL; @@ -1008,7 +1021,11 @@ jpeg_load_cmyk_transform (guint8 *profile_data, { rgb_profile = cmsOpenProfileFromFile (config->rgb_profile, "r"); - if (rgb_profile && ! cmsGetColorSpace (rgb_profile) == icSigRgbData) +#ifdef HAVE_LCMS1 + if (rgb_profile && cmsGetColorSpace (rgb_profile) != icSigRgbData) +#else + if (rgb_profile && cmsGetColorSpace (rgb_profile) != cmsSigRgbData) +#endif { cmsCloseProfile (rgb_profile); rgb_profile = NULL; diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index 1c38561968..880823a834 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -196,19 +196,42 @@ background_jpeg_save (PreviewPersistent *pp) /* display the preview stuff */ if (!pp->abort_me) { - struct stat buf; - gchar *text; - gchar *size_text; + GFile *file = g_file_new_for_path (pp->file_name); - g_stat (pp->file_name, &buf); + if (file) + { + GFileInfo *info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_SIZE, + G_FILE_QUERY_INFO_NONE, + NULL, NULL); - size_text = g_format_size (buf.st_size); - text = g_strdup_printf (_("File size: %s"), size_text); + if (info) + { + goffset size = g_file_info_get_size (info); + gchar *size_text; + gchar *text; - gtk_label_set_text (GTK_LABEL (preview_size), text); + size_text = g_format_size (size); + text = g_strdup_printf (_("File size: %s"), size_text); + gtk_label_set_text (GTK_LABEL (preview_size), text); + g_free (text); + g_free (size_text); - g_free (text); - g_free (size_text); + g_object_unref (info); + } + else + { + gtk_label_set_text (GTK_LABEL (preview_size), + _("File size: unknown")); + } + + g_object_unref (file); + } + else + { + gtk_label_set_text (GTK_LABEL (preview_size), + _("File size: unknown")); + } /* and load the preview */ load_image (pp->file_name, GIMP_RUN_NONINTERACTIVE, TRUE, NULL); diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c index 9f0d06908e..466fa3a784 100644 --- a/plug-ins/file-jpeg/jpeg.c +++ b/plug-ins/file-jpeg/jpeg.c @@ -293,9 +293,11 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY)); + + export = gimp_export_image (&image_ID, &drawable_ID, "JPEG", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY); + switch (export) { case GIMP_EXPORT_EXPORT: diff --git a/plug-ins/file-psd/Makefile.in b/plug-ins/file-psd/Makefile.in index 7f815d8c1b..2b278119ec 100644 --- a/plug-ins/file-psd/Makefile.in +++ b/plug-ins/file-psd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -312,6 +312,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -338,6 +340,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -684,14 +690,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index 2103feefc7..35cfaf27b8 100644 --- a/plug-ins/file-psd/psd-save.c +++ b/plug-ins/file-psd/psd-save.c @@ -272,7 +272,8 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_id, &drawable_id, NULL, + + export = gimp_export_image (&image_id, &drawable_id, "PSD", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_INDEXED | diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c index 97668e121c..50b6355dbe 100644 --- a/plug-ins/file-psd/psd.c +++ b/plug-ins/file-psd/psd.c @@ -248,13 +248,15 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, + + export = gimp_export_image (&image_ID, &drawable_ID, "PSD", GIMP_EXPORT_CAN_HANDLE_RGB | GIMP_EXPORT_CAN_HANDLE_GRAY | GIMP_EXPORT_CAN_HANDLE_INDEXED | GIMP_EXPORT_CAN_HANDLE_ALPHA | GIMP_EXPORT_CAN_HANDLE_LAYERS | GIMP_EXPORT_CAN_HANDLE_LAYER_MASKS); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/file-sgi/Makefile.in b/plug-ins/file-sgi/Makefile.in index 2ef686cd6a..5cf5d3b60f 100644 --- a/plug-ins/file-sgi/Makefile.in +++ b/plug-ins/file-sgi/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -641,14 +647,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index 1f7ca44c10..007084b21b 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -200,10 +200,12 @@ run (const gchar *name, case GIMP_RUN_INTERACTIVE: case GIMP_RUN_WITH_LAST_VALS: gimp_ui_init (PLUG_IN_BINARY, FALSE); - export = gimp_export_image (&image_ID, &drawable_ID, NULL, - (GIMP_EXPORT_CAN_HANDLE_RGB | - GIMP_EXPORT_CAN_HANDLE_GRAY | - GIMP_EXPORT_CAN_HANDLE_ALPHA)); + + export = gimp_export_image (&image_ID, &drawable_ID, "SGI", + GIMP_EXPORT_CAN_HANDLE_RGB | + GIMP_EXPORT_CAN_HANDLE_GRAY | + GIMP_EXPORT_CAN_HANDLE_ALPHA); + if (export == GIMP_EXPORT_CANCEL) { values[0].data.d_status = GIMP_PDB_CANCEL; diff --git a/plug-ins/file-uri/Makefile.in b/plug-ins/file-uri/Makefile.in index b14f7de48f..39fdcb0084 100644 --- a/plug-ins/file-uri/Makefile.in +++ b/plug-ins/file-uri/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -314,6 +314,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -340,6 +342,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -662,14 +668,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/file-xjt/Makefile.in b/plug-ins/file-xjt/Makefile.in index 4d3075bf6a..d8ec7c5cbd 100644 --- a/plug-ins/file-xjt/Makefile.in +++ b/plug-ins/file-xjt/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -644,14 +650,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/flame/Makefile.in b/plug-ins/flame/Makefile.in index 5cacd3dd49..aad419f1cc 100644 --- a/plug-ins/flame/Makefile.in +++ b/plug-ins/flame/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -652,14 +658,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/fractal-explorer/Makefile.in b/plug-ins/fractal-explorer/Makefile.in index 7a34e9f3b5..bebe375579 100644 --- a/plug-ins/fractal-explorer/Makefile.in +++ b/plug-ins/fractal-explorer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -350,6 +350,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -376,6 +378,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -689,14 +695,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/fractal-explorer/examples/Makefile.in b/plug-ins/fractal-explorer/examples/Makefile.in index d1c9f84a7e..0a60dec656 100644 --- a/plug-ins/fractal-explorer/examples/Makefile.in +++ b/plug-ins/fractal-explorer/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gfig/Makefile.in b/plug-ins/gfig/Makefile.in index 4343ce32b4..298cc5fa3a 100644 --- a/plug-ins/gfig/Makefile.in +++ b/plug-ins/gfig/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -354,6 +354,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -380,6 +382,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -737,14 +743,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/gfig/gfig-examples/Makefile.in b/plug-ins/gfig/gfig-examples/Makefile.in index b890d9fce0..97b346eee3 100644 --- a/plug-ins/gfig/gfig-examples/Makefile.in +++ b/plug-ins/gfig/gfig-examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gfig/images/Makefile.in b/plug-ins/gfig/images/Makefile.in index 998b299dc6..d10561539a 100644 --- a/plug-ins/gfig/images/Makefile.in +++ b/plug-ins/gfig/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -248,6 +248,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -274,6 +276,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gimpressionist/Brushes/Makefile.in b/plug-ins/gimpressionist/Brushes/Makefile.in index 405656c305..8184ba6d0f 100644 --- a/plug-ins/gimpressionist/Brushes/Makefile.in +++ b/plug-ins/gimpressionist/Brushes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gimpressionist/Makefile.in b/plug-ins/gimpressionist/Makefile.in index 1332d2c94c..8aefc051c9 100644 --- a/plug-ins/gimpressionist/Makefile.in +++ b/plug-ins/gimpressionist/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -355,6 +355,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -381,6 +383,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -742,14 +748,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/gimpressionist/Paper/Makefile.in b/plug-ins/gimpressionist/Paper/Makefile.in index 9656e227bd..4dcc30cfc1 100644 --- a/plug-ins/gimpressionist/Paper/Makefile.in +++ b/plug-ins/gimpressionist/Paper/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gimpressionist/Presets/Makefile.in b/plug-ins/gimpressionist/Presets/Makefile.in index 1be1b2e33e..5aa6e8d393 100644 --- a/plug-ins/gimpressionist/Presets/Makefile.in +++ b/plug-ins/gimpressionist/Presets/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/gradient-flare/Makefile.in b/plug-ins/gradient-flare/Makefile.in index 9fb2c58b49..12a2565cb7 100644 --- a/plug-ins/gradient-flare/Makefile.in +++ b/plug-ins/gradient-flare/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -349,6 +349,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -375,6 +377,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -682,14 +688,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/gradient-flare/flares/Makefile.in b/plug-ins/gradient-flare/flares/Makefile.in index 7a67a5bc9e..69b5825533 100644 --- a/plug-ins/gradient-flare/flares/Makefile.in +++ b/plug-ins/gradient-flare/flares/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/help-browser/Makefile.in b/plug-ins/help-browser/Makefile.in index c0c333fd15..4eb20c3806 100644 --- a/plug-ins/help-browser/Makefile.in +++ b/plug-ins/help-browser/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -309,6 +309,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -335,6 +337,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -657,14 +663,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/help/Makefile.in b/plug-ins/help/Makefile.in index 105f4100b3..d95ba107bd 100644 --- a/plug-ins/help/Makefile.in +++ b/plug-ins/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -327,6 +327,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -353,6 +355,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -708,14 +714,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/ifs-compose/Makefile.in b/plug-ins/ifs-compose/Makefile.in index c2c79c139d..bf6871aed5 100644 --- a/plug-ins/ifs-compose/Makefile.in +++ b/plug-ins/ifs-compose/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -647,14 +653,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/imagemap/Makefile.in b/plug-ins/imagemap/Makefile.in index 79668f2cfe..0117158154 100644 --- a/plug-ins/imagemap/Makefile.in +++ b/plug-ins/imagemap/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -379,6 +379,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -405,6 +407,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -891,14 +897,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/imagemap/images/Makefile.in b/plug-ins/imagemap/images/Makefile.in index 451b1b989b..87d3cf807e 100644 --- a/plug-ins/imagemap/images/Makefile.in +++ b/plug-ins/imagemap/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -248,6 +248,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -274,6 +276,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/lighting/Makefile.in b/plug-ins/lighting/Makefile.in index 206b34c5cd..d7085c8db6 100644 --- a/plug-ins/lighting/Makefile.in +++ b/plug-ins/lighting/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -351,6 +351,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -377,6 +379,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -705,14 +711,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/lighting/images/Makefile.in b/plug-ins/lighting/images/Makefile.in index c6665e0463..ba6bd5dd3e 100644 --- a/plug-ins/lighting/images/Makefile.in +++ b/plug-ins/lighting/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -248,6 +248,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -274,6 +276,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/map-object/Makefile.in b/plug-ins/map-object/Makefile.in index eff5349a0b..74c636a9eb 100644 --- a/plug-ins/map-object/Makefile.in +++ b/plug-ins/map-object/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -309,6 +309,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -335,6 +337,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -665,14 +671,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/maze/Makefile.in b/plug-ins/maze/Makefile.in index 03830e19a8..a675761185 100644 --- a/plug-ins/maze/Makefile.in +++ b/plug-ins/maze/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -649,14 +655,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/metadata/Makefile.in b/plug-ins/metadata/Makefile.in index bb268f8b49..d541303e77 100644 --- a/plug-ins/metadata/Makefile.in +++ b/plug-ins/metadata/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -319,6 +319,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -345,6 +347,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -706,14 +712,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/pagecurl/Makefile.in b/plug-ins/pagecurl/Makefile.in index 551a0deeec..ebccca9452 100644 --- a/plug-ins/pagecurl/Makefile.in +++ b/plug-ins/pagecurl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -307,6 +307,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -333,6 +335,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -654,14 +660,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/print/Makefile.in b/plug-ins/print/Makefile.in index 70c37ddfda..a3aa31de74 100644 --- a/plug-ins/print/Makefile.in +++ b/plug-ins/print/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -310,6 +310,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -336,6 +338,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -661,14 +667,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/pygimp/Makefile.in b/plug-ins/pygimp/Makefile.in index 8e53253937..bba03b5f95 100644 --- a/plug-ins/pygimp/Makefile.in +++ b/plug-ins/pygimp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -417,6 +417,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -443,6 +445,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -859,14 +865,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/pygimp/plug-ins/Makefile.in b/plug-ins/pygimp/plug-ins/Makefile.in index f44f3021f9..e2b3f73f6f 100644 --- a/plug-ins/pygimp/plug-ins/Makefile.in +++ b/plug-ins/pygimp/plug-ins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -279,6 +279,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -305,6 +307,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/script-fu/Makefile.in b/plug-ins/script-fu/Makefile.in index b45f4d4cfe..a728223af6 100644 --- a/plug-ins/script-fu/Makefile.in +++ b/plug-ins/script-fu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -358,6 +358,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -384,6 +386,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -744,14 +750,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/script-fu/ftx/Makefile.in b/plug-ins/script-fu/ftx/Makefile.in index ed4cb434fc..7b17acd5d4 100644 --- a/plug-ins/script-fu/ftx/Makefile.in +++ b/plug-ins/script-fu/ftx/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -302,6 +302,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -328,6 +330,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -569,14 +575,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/script-fu/scripts/Makefile.in b/plug-ins/script-fu/scripts/Makefile.in index 64065e8de7..1d3b72d5b7 100644 --- a/plug-ins/script-fu/scripts/Makefile.in +++ b/plug-ins/script-fu/scripts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -336,6 +336,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -362,6 +364,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/script-fu/scripts/images/Makefile.in b/plug-ins/script-fu/scripts/images/Makefile.in index 44fc30384a..6ef42bde99 100644 --- a/plug-ins/script-fu/scripts/images/Makefile.in +++ b/plug-ins/script-fu/scripts/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/script-fu/tinyscheme/Makefile.in b/plug-ins/script-fu/tinyscheme/Makefile.in index c8433e85a5..330fdc622f 100644 --- a/plug-ins/script-fu/tinyscheme/Makefile.in +++ b/plug-ins/script-fu/tinyscheme/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -302,6 +302,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -328,6 +330,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -580,14 +586,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/selection-to-path/Makefile.in b/plug-ins/selection-to-path/Makefile.in index a98af28779..b5aa2b3370 100644 --- a/plug-ins/selection-to-path/Makefile.in +++ b/plug-ins/selection-to-path/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -310,6 +310,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -336,6 +338,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -675,14 +681,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/twain/Makefile.in b/plug-ins/twain/Makefile.in index 7227cfffae..4330242a35 100644 --- a/plug-ins/twain/Makefile.in +++ b/plug-ins/twain/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -343,6 +343,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -369,6 +371,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -696,14 +702,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/plug-ins/ui/Makefile.in b/plug-ins/ui/Makefile.in index 6d64111644..2d4a54435c 100644 --- a/plug-ins/ui/Makefile.in +++ b/plug-ins/ui/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/plug-ins/win-snap/Makefile.in b/plug-ins/win-snap/Makefile.in index 9bdba88a67..691a5b2634 100644 --- a/plug-ins/win-snap/Makefile.in +++ b/plug-ins/win-snap/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -642,14 +648,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/po-libgimp/eu.po b/po-libgimp/eu.po index 6261234f68..62b8f64d0e 100644 --- a/po-libgimp/eu.po +++ b/po-libgimp/eu.po @@ -4,39 +4,40 @@ # # Hizkuntza Politikarako Sailburuordetza , 2004. # Iñaki Larrañaga Murgoitio , 2004, 2006, 2008. -# Iñaki Larrañaga Murgoitio , 2007, 2011. +# Iñaki Larrañaga Murgoitio , 2007, 2011, 2013. msgid "" msgstr "" "Project-Id-Version: gimp-libgimp.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-15 17:35+0200\n" -"PO-Revision-Date: 2011-09-15 17:34+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"POT-Creation-Date: 2013-08-28 21:13+0200\n" +"PO-Revision-Date: 2013-08-27 22:13+0200\n" +"Last-Translator: \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1077 +#: ../libgimp/gimp.c:1097 msgid "success" msgstr "ongi burutu da" #. procedure execution failed -#: ../libgimp/gimp.c:1081 +#: ../libgimp/gimp.c:1101 msgid "execution error" msgstr "exekuzioko errorea" #. procedure called incorrectly -#: ../libgimp/gimp.c:1085 +#: ../libgimp/gimp.c:1105 msgid "calling error" msgstr "deiaren errorea" #. procedure execution cancelled -#: ../libgimp/gimp.c:1089 +#: ../libgimp/gimp.c:1109 msgid "cancelled" msgstr "bertan behera utzita" @@ -183,7 +184,7 @@ msgstr "Esportatu fitxategia" msgid "_Ignore" msgstr "_Ez ikusi egin" -#: ../libgimp/gimpexport.c:518 ../libgimp/gimpexport.c:989 +#: ../libgimp/gimpexport.c:518 ../libgimp/gimpexport.c:988 msgid "_Export" msgstr "_Esportatu" @@ -220,7 +221,7 @@ msgstr "" "Kanal bat (gordetako hautaketa) %s gisa gordetzera zoaz.\n" "Horrek ez ditu ikusgai dauden geruzak gordeko." -#: ../libgimp/gimpexport.c:980 +#: ../libgimp/gimpexport.c:979 msgid "Export Image as " msgstr "Esportatu irudia honela " @@ -236,7 +237,10 @@ msgstr "Sans" msgid "Gradient Selection" msgstr "Gradientearen hautapena" -#: ../libgimp/gimpmenu.c:459 ../libgimpwidgets/gimpintstore.c:238 +#. This string appears in an empty menu as in +#. * "nothing selected and nothing to select" +#. +#: ../libgimp/gimpmenu.c:461 ../libgimpwidgets/gimpintstore.c:259 msgid "(Empty)" msgstr "(Hutsa)" @@ -993,41 +997,41 @@ msgctxt "color-rendering-intent" msgid "Absolute colorimetric" msgstr "Kolore absolutuaren metrika" -#: ../libgimpconfig/gimpconfig-deserialize.c:106 +#: ../libgimpconfig/gimpconfig-deserialize.c:109 #, c-format msgid "value for token %s is not a valid UTF-8 string" msgstr "%s tokenarentzako balioa ez da baliozko UTF-8 katea" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpconfig-deserialize.c:445 +#: ../libgimpconfig/gimpconfig-deserialize.c:451 #, c-format msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" msgstr "" "'yes' edo 'no' espero zen %s token boolearrarentzat, baina '%s' jaso da" -#: ../libgimpconfig/gimpconfig-deserialize.c:519 +#: ../libgimpconfig/gimpconfig-deserialize.c:525 #, c-format msgid "invalid value '%s' for token %s" msgstr "baliogabeko '%s' balioa %s tokenarentzat" -#: ../libgimpconfig/gimpconfig-deserialize.c:534 +#: ../libgimpconfig/gimpconfig-deserialize.c:540 #, c-format msgid "invalid value '%ld' for token %s" msgstr "Baliogabeko '%ld' balioa %s tokenarentzat" -#: ../libgimpconfig/gimpconfig-deserialize.c:603 +#: ../libgimpconfig/gimpconfig-deserialize.c:609 #, c-format msgid "while parsing token '%s': %s" msgstr "'%s' tokena analizatzen zen bitartean: %s" #: ../libgimpconfig/gimpconfig-iface.c:482 -#: ../libgimpconfig/gimpconfig-iface.c:495 ../libgimpconfig/gimpscanner.c:507 -#: ../libgimpconfig/gimpscanner.c:588 +#: ../libgimpconfig/gimpconfig-iface.c:495 ../libgimpconfig/gimpscanner.c:559 +#: ../libgimpconfig/gimpscanner.c:641 #: ../libgimpwidgets/gimpcolorprofilestore.c:656 msgid "fatal parse error" msgstr "analisi-errore larria" -#: ../libgimpconfig/gimpconfig-path.c:387 +#: ../libgimpconfig/gimpconfig-path.c:389 #, c-format msgid "Cannot expand ${%s}" msgstr "Ezin da ${%s} zabaldu" @@ -1072,12 +1076,18 @@ msgstr "" msgid "Could not create '%s': %s" msgstr "Ezin izan da %s' sortu: %s" -#: ../libgimpconfig/gimpscanner.c:264 +#: ../libgimpconfig/gimpscanner.c:268 #, c-format msgid "invalid UTF-8 string" msgstr "UTF-8 kate baliogabea" -#: ../libgimpconfig/gimpscanner.c:615 +#. please don't translate 'yes' and 'no' +#: ../libgimpconfig/gimpscanner.c:431 +#, c-format +msgid "expected 'yes' or 'no' for boolean token, got '%s'" +msgstr "'yes' edo 'no' espero zen token boolearrarentzat, baina '%s' jaso da" + +#: ../libgimpconfig/gimpscanner.c:668 #, c-format msgid "Error while parsing '%s' in line %d: %s" msgstr "Errorea %2$d lerroan '%1$s' analizatzean : %3$s" @@ -1105,7 +1115,7 @@ msgstr "Ezin izan da kargatu" msgid "Not loaded" msgstr "Ez da kargatu" -#: ../libgimpthumb/gimpthumb-utils.c:131 +#: ../libgimpthumb/gimpthumb-utils.c:153 #, c-format msgid "" "Cannot determine a valid home directory.\n" @@ -1114,7 +1124,7 @@ msgstr "" "Ezin da baliozko etxeko direktorioa zehaztu.\n" "Koadro txikiak aldi baterako fitxategian (%s) gordeko dira." -#: ../libgimpthumb/gimpthumb-utils.c:255 ../libgimpthumb/gimpthumb-utils.c:323 +#: ../libgimpthumb/gimpthumb-utils.c:277 ../libgimpthumb/gimpthumb-utils.c:345 #, c-format msgid "Failed to create thumbnail folder '%s'." msgstr "Huts egin du koadro txikien '%s' karpeta sortzean." @@ -1133,19 +1143,19 @@ msgstr "Ezin izan da '%s'(r)en koadro txikia sortu: %s" msgid "_Search:" msgstr "_Bilatu:" -#: ../libgimpwidgets/gimpcolorbutton.c:134 +#: ../libgimpwidgets/gimpcolorbutton.c:135 msgid "_Foreground Color" msgstr "_Aurreko planoaren kolorea" -#: ../libgimpwidgets/gimpcolorbutton.c:138 +#: ../libgimpwidgets/gimpcolorbutton.c:139 msgid "_Background Color" msgstr "_Atzeko planoaren kolorea" -#: ../libgimpwidgets/gimpcolorbutton.c:142 +#: ../libgimpwidgets/gimpcolorbutton.c:143 msgid "Blac_k" msgstr "_Beltza" -#: ../libgimpwidgets/gimpcolorbutton.c:146 +#: ../libgimpwidgets/gimpcolorbutton.c:147 msgid "_White" msgstr "_Zuria" @@ -1215,50 +1225,46 @@ msgid "Gigabytes" msgstr "GigaByte" #. Count label -#: ../libgimpwidgets/gimppageselector.c:281 -#: ../libgimpwidgets/gimppageselector.c:1177 +#: ../libgimpwidgets/gimppageselector.c:269 +#: ../libgimpwidgets/gimppageselector.c:1067 msgid "Nothing selected" msgstr "Ez dago ezer hautatuta" -#: ../libgimpwidgets/gimppageselector.c:299 +#: ../libgimpwidgets/gimppageselector.c:287 msgid "Select _All" msgstr "Hautatu _denak" -#: ../libgimpwidgets/gimppageselector.c:319 +#: ../libgimpwidgets/gimppageselector.c:307 msgid "Select _range:" msgstr "Hautatu _barrutia:" -#: ../libgimpwidgets/gimppageselector.c:331 +#: ../libgimpwidgets/gimppageselector.c:319 msgid "Open _pages as" msgstr "Ireki _orrialdeak honela" -#: ../libgimpwidgets/gimppageselector.c:432 -msgid "Page 000" -msgstr "000 orrialdea" - -#: ../libgimpwidgets/gimppageselector.c:520 -#: ../libgimpwidgets/gimppageselector.c:757 +#: ../libgimpwidgets/gimppageselector.c:449 +#: ../libgimpwidgets/gimppageselector.c:647 #, c-format msgid "Page %d" msgstr "%d. orrialdea" -#: ../libgimpwidgets/gimppageselector.c:1182 +#: ../libgimpwidgets/gimppageselector.c:1072 msgid "One page selected" msgstr "Orrialde bat hautatuta" -#: ../libgimpwidgets/gimppageselector.c:1189 -#: ../libgimpwidgets/gimppageselector.c:1193 +#: ../libgimpwidgets/gimppageselector.c:1079 +#: ../libgimpwidgets/gimppageselector.c:1083 #, c-format msgid "%d page selected" msgid_plural "All %d pages selected" msgstr[0] "Orrialde %d hautatuta" msgstr[1] "%d orrialde hautatuta" -#: ../libgimpwidgets/gimppatheditor.c:237 +#: ../libgimpwidgets/gimppatheditor.c:239 msgid "Writable" msgstr "Idazkorra" -#: ../libgimpwidgets/gimppatheditor.c:246 +#: ../libgimpwidgets/gimppatheditor.c:248 msgid "Folder" msgstr "Karpeta" @@ -1597,11 +1603,11 @@ msgstr "Akuarela" msgid "Pressure" msgstr "Presioa" -#: ../modules/color-selector-wheel.c:71 +#: ../modules/color-selector-wheel.c:69 msgid "HSV color wheel" msgstr "ÑSB kolore-gurpila" -#: ../modules/color-selector-wheel.c:102 +#: ../modules/color-selector-wheel.c:101 msgid "Wheel" msgstr "Gurpila" @@ -2064,3 +2070,6 @@ msgstr "_Helburua:" #: ../modules/display-filter-proof.c:439 msgid "_Black Point Compensation" msgstr "Puntu -beltzaren konpentsazioa" + +#~ msgid "Page 000" +#~ msgstr "000 orrialdea" diff --git a/po-libgimp/fi.po b/po-libgimp/fi.po index ea075da9e8..de92b9eda4 100644 --- a/po-libgimp/fi.po +++ b/po-libgimp/fi.po @@ -5,39 +5,41 @@ # Tor Lillqvist , 2000 # Mikko Paananen , 2004 # Ilkka Tuohela , 2008. +# Juhani Numminen , 2013 # msgid "" msgstr "" "Project-Id-Version: libgimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-05-04 13:53+0000\n" -"PO-Revision-Date: 2013-01-27 18:33+0200\n" -"Last-Translator: Ville Skyttä \n" +"POT-Creation-Date: 2013-09-18 14:38+0000\n" +"PO-Revision-Date: 2013-09-20 21:35+0300\n" +"Last-Translator: Juhani Numminen \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Gtranslator 2.91.6\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1077 +#: ../libgimp/gimp.c:1097 msgid "success" msgstr "onnistui" #. procedure execution failed -#: ../libgimp/gimp.c:1081 +#: ../libgimp/gimp.c:1101 msgid "execution error" msgstr "suoritusvirhe" #. procedure called incorrectly -#: ../libgimp/gimp.c:1085 +#: ../libgimp/gimp.c:1105 msgid "calling error" msgstr "kutsuvirhe" #. procedure execution cancelled -#: ../libgimp/gimp.c:1089 +#: ../libgimp/gimp.c:1109 msgid "cancelled" msgstr "peruttu" @@ -237,7 +239,7 @@ msgstr "Liukuvärin valinta" #. This string appears in an empty menu as in #. * "nothing selected and nothing to select" #. -#: ../libgimp/gimpmenu.c:461 ../libgimpwidgets/gimpintstore.c:241 +#: ../libgimp/gimpmenu.c:461 ../libgimpwidgets/gimpintstore.c:259 msgid "(Empty)" msgstr "(tyhjä)" @@ -366,641 +368,534 @@ msgid "percent" msgstr "prosenttia" #: ../libgimpbase/gimpbaseenums.c:28 -#| msgid "_White (full opacity)" msgctxt "add-mask-type" msgid "_White (full opacity)" msgstr "_Valkoinen (täysin peittävä)" #: ../libgimpbase/gimpbaseenums.c:29 -#| msgid "_Black (full transparency)" msgctxt "add-mask-type" msgid "_Black (full transparency)" msgstr "_Musta (täysin läpinäkyvä)" #: ../libgimpbase/gimpbaseenums.c:30 -#| msgid "Layer's _alpha channel" msgctxt "add-mask-type" msgid "Layer's _alpha channel" msgstr "Tason _alfakanava" #: ../libgimpbase/gimpbaseenums.c:31 -#| msgid "_Transfer layer's alpha channel" msgctxt "add-mask-type" msgid "_Transfer layer's alpha channel" msgstr "_Siirrä tason alfakanava" #: ../libgimpbase/gimpbaseenums.c:32 -#| msgid "_Selection" msgctxt "add-mask-type" msgid "_Selection" msgstr "_Valinta" #: ../libgimpbase/gimpbaseenums.c:33 -#| msgid "_Grayscale copy of layer" msgctxt "add-mask-type" msgid "_Grayscale copy of layer" msgstr "_Harmaasävykopio tasosta" #: ../libgimpbase/gimpbaseenums.c:34 -#| msgid "C_hannel" msgctxt "add-mask-type" msgid "C_hannel" msgstr "_Kanava" #: ../libgimpbase/gimpbaseenums.c:65 -#| msgid "FG to BG (RGB)" msgctxt "blend-mode" msgid "FG to BG (RGB)" msgstr "Edustaväristä taustaväriin (RGB)" #: ../libgimpbase/gimpbaseenums.c:66 -#| msgid "FG to BG (HSV)" msgctxt "blend-mode" msgid "FG to BG (HSV)" msgstr "Edustaväristä taustaväriin (HSV)" #: ../libgimpbase/gimpbaseenums.c:67 -#| msgid "FG to transparent" msgctxt "blend-mode" msgid "FG to transparent" msgstr "Edustaväristä läpinäkyvään" #: ../libgimpbase/gimpbaseenums.c:68 -#| msgid "Custom gradient" msgctxt "blend-mode" msgid "Custom gradient" msgstr "Oma väriliuku" #: ../libgimpbase/gimpbaseenums.c:98 -#| msgid "FG color fill" msgctxt "bucket-fill-mode" msgid "FG color fill" msgstr "Täyttö edustavärillä" #: ../libgimpbase/gimpbaseenums.c:99 -#| msgid "BG color fill" msgctxt "bucket-fill-mode" msgid "BG color fill" msgstr "Täyttö taustavärillä" #: ../libgimpbase/gimpbaseenums.c:100 -#| msgid "Pattern fill" msgctxt "bucket-fill-mode" msgid "Pattern fill" msgstr "Täyttö kuviolla" #: ../libgimpbase/gimpbaseenums.c:131 -#| msgid "Add to the current selection" msgctxt "channel-ops" msgid "Add to the current selection" msgstr "Lisää valintaan" #: ../libgimpbase/gimpbaseenums.c:132 -#| msgid "Subtract from the current selection" msgctxt "channel-ops" msgid "Subtract from the current selection" msgstr "Vähennä valinnasta" #: ../libgimpbase/gimpbaseenums.c:133 -#| msgid "Replace the current selection" msgctxt "channel-ops" msgid "Replace the current selection" msgstr "Korvaa valittu alue" #: ../libgimpbase/gimpbaseenums.c:134 -#| msgid "Intersect with the current selection" msgctxt "channel-ops" msgid "Intersect with the current selection" msgstr "Leikkaa valinnan kanssa" #: ../libgimpbase/gimpbaseenums.c:167 -#| msgid "Red" msgctxt "channel-type" msgid "Red" msgstr "Punainen" #: ../libgimpbase/gimpbaseenums.c:168 -#| msgid "Green" msgctxt "channel-type" msgid "Green" msgstr "Vihreä" #: ../libgimpbase/gimpbaseenums.c:169 -#| msgid "Blue" msgctxt "channel-type" msgid "Blue" msgstr "Sininen" #: ../libgimpbase/gimpbaseenums.c:170 -#| msgid "Gray" msgctxt "channel-type" msgid "Gray" msgstr "Harmaa" #: ../libgimpbase/gimpbaseenums.c:171 -#| msgid "Indexed" msgctxt "channel-type" msgid "Indexed" msgstr "Indeksoitu" #: ../libgimpbase/gimpbaseenums.c:172 -#| msgid "Alpha" msgctxt "channel-type" msgid "Alpha" msgstr "Alfa" #: ../libgimpbase/gimpbaseenums.c:202 -#| msgid "Small" msgctxt "check-size" msgid "Small" msgstr "Pieni" #: ../libgimpbase/gimpbaseenums.c:203 -#| msgid "Medium" msgctxt "check-size" msgid "Medium" msgstr "Keskikokoinen" #: ../libgimpbase/gimpbaseenums.c:204 -#| msgid "Large" msgctxt "check-size" msgid "Large" msgstr "Suuri" #: ../libgimpbase/gimpbaseenums.c:237 -#| msgid "Light checks" msgctxt "check-type" msgid "Light checks" msgstr "Vaaleat ruudut" #: ../libgimpbase/gimpbaseenums.c:238 -#| msgid "Mid-tone checks" msgctxt "check-type" msgid "Mid-tone checks" msgstr "Keskisävyiset ruudut" #: ../libgimpbase/gimpbaseenums.c:239 -#| msgid "Dark checks" msgctxt "check-type" msgid "Dark checks" msgstr "Tummat ruudut" #: ../libgimpbase/gimpbaseenums.c:240 -#| msgid "White only" msgctxt "check-type" msgid "White only" msgstr "Vain valkoinen" #: ../libgimpbase/gimpbaseenums.c:241 -#| msgid "Gray only" msgctxt "check-type" msgid "Gray only" msgstr "Vain harmaa" #: ../libgimpbase/gimpbaseenums.c:242 -#| msgid "Black only" msgctxt "check-type" msgid "Black only" msgstr "Vain musta" #: ../libgimpbase/gimpbaseenums.c:271 -#| msgid "Image" msgctxt "clone-type" msgid "Image" msgstr "Kuva" #: ../libgimpbase/gimpbaseenums.c:272 -#| msgid "Pattern" msgctxt "clone-type" msgid "Pattern" msgstr "Kuvio" #: ../libgimpbase/gimpbaseenums.c:302 -#| msgid "Lightness" msgctxt "desaturate-mode" msgid "Lightness" msgstr "Vaaleus" #: ../libgimpbase/gimpbaseenums.c:303 -#| msgid "Luminosity" msgctxt "desaturate-mode" msgid "Luminosity" msgstr "Kirkkaus" #: ../libgimpbase/gimpbaseenums.c:304 -#| msgid "Average" msgctxt "desaturate-mode" msgid "Average" msgstr "Keskiarvo" #: ../libgimpbase/gimpbaseenums.c:333 -#| msgid "Dodge" msgctxt "dodge-burn-type" msgid "Dodge" msgstr "Värivalotus" #: ../libgimpbase/gimpbaseenums.c:334 -#| msgid "Burn" msgctxt "dodge-burn-type" msgid "Burn" msgstr "Värivarjostus" #: ../libgimpbase/gimpbaseenums.c:400 -#| msgid "Bi-linear" msgctxt "gradient-type" msgid "Linear" msgstr "Lineaarinen" #: ../libgimpbase/gimpbaseenums.c:401 -#| msgid "Bi-linear" msgctxt "gradient-type" msgid "Bi-linear" msgstr "Bilineaarinen" #: ../libgimpbase/gimpbaseenums.c:402 -#| msgid "Radial" msgctxt "gradient-type" msgid "Radial" msgstr "Säteittäinen" #: ../libgimpbase/gimpbaseenums.c:403 -#| msgid "Square" msgctxt "gradient-type" msgid "Square" msgstr "Neliömäinen" #: ../libgimpbase/gimpbaseenums.c:404 -#| msgid "Conical (sym)" msgctxt "gradient-type" msgid "Conical (sym)" msgstr "Kartiomainen (symmetrinen)" #: ../libgimpbase/gimpbaseenums.c:405 -#| msgid "Conical (asym)" msgctxt "gradient-type" msgid "Conical (asym)" msgstr "Kartiomainen (epäsymmetrinen)" #: ../libgimpbase/gimpbaseenums.c:406 -#| msgid "Shaped (angular)" msgctxt "gradient-type" msgid "Shaped (angular)" msgstr "Muotopurske (kulma)" #: ../libgimpbase/gimpbaseenums.c:407 -#| msgid "Shaped (spherical)" msgctxt "gradient-type" msgid "Shaped (spherical)" msgstr "Muotopurske (pallo)" #: ../libgimpbase/gimpbaseenums.c:408 -#| msgid "Shaped (dimpled)" msgctxt "gradient-type" msgid "Shaped (dimpled)" msgstr "Muotopurske (näppyläinen)" #: ../libgimpbase/gimpbaseenums.c:409 -#| msgid "Spiral (cw)" msgctxt "gradient-type" msgid "Spiral (cw)" msgstr "Spiraali (myötäpäivään)" #: ../libgimpbase/gimpbaseenums.c:410 -#| msgid "Spiral (ccw)" msgctxt "gradient-type" msgid "Spiral (ccw)" msgstr "Spiraali (vastapäivään)" #: ../libgimpbase/gimpbaseenums.c:442 -#| msgid "Intersections (dots)" msgctxt "grid-style" msgid "Intersections (dots)" msgstr "Leikkaukset (pisteet)" #: ../libgimpbase/gimpbaseenums.c:443 -#| msgid "Intersections (crosshairs)" msgctxt "grid-style" msgid "Intersections (crosshairs)" msgstr "Leikkaukset (ristikot)" #: ../libgimpbase/gimpbaseenums.c:444 -#| msgid "Dashed" msgctxt "grid-style" msgid "Dashed" msgstr "Katkoviiva" #: ../libgimpbase/gimpbaseenums.c:445 -#| msgid "Double dashed" msgctxt "grid-style" msgid "Double dashed" msgstr "Kaksoiskatkoviiva" #: ../libgimpbase/gimpbaseenums.c:446 -#| msgid "Solid" msgctxt "grid-style" msgid "Solid" msgstr "Yhtenäinen" #: ../libgimpbase/gimpbaseenums.c:476 -#, fuzzy -#| msgid "Stock ID" msgctxt "icon-type" msgid "Stock ID" msgstr "Yleistunniste" #: ../libgimpbase/gimpbaseenums.c:477 -#, fuzzy -#| msgid "Inline pixbuf" msgctxt "icon-type" msgid "Inline pixbuf" msgstr "Sisäkkäinen pixbuf" #: ../libgimpbase/gimpbaseenums.c:478 -#| msgid "Image file" msgctxt "icon-type" msgid "Image file" msgstr "Kuvatiedosto" #: ../libgimpbase/gimpbaseenums.c:508 -#| msgid "RGB color" msgctxt "image-base-type" msgid "RGB color" msgstr "RGB-väri" #: ../libgimpbase/gimpbaseenums.c:509 -#| msgid "Grayscale" msgctxt "image-base-type" msgid "Grayscale" msgstr "Harmaasävy" #: ../libgimpbase/gimpbaseenums.c:510 -#| msgid "Indexed color" msgctxt "image-base-type" msgid "Indexed color" msgstr "Indeksoitu paletti" #: ../libgimpbase/gimpbaseenums.c:543 -#| msgid "RGB" msgctxt "image-type" msgid "RGB" msgstr "RGB" #: ../libgimpbase/gimpbaseenums.c:544 -#| msgid "RGB-alpha" msgctxt "image-type" msgid "RGB-alpha" msgstr "RGB+alfa" #: ../libgimpbase/gimpbaseenums.c:545 -#| msgid "Grayscale" msgctxt "image-type" msgid "Grayscale" msgstr "Harmaasävy" #: ../libgimpbase/gimpbaseenums.c:546 -#| msgid "Grayscale-alpha" msgctxt "image-type" msgid "Grayscale-alpha" msgstr "Harmaasävy+alfa" #: ../libgimpbase/gimpbaseenums.c:547 -#| msgid "Indexed" msgctxt "image-type" msgid "Indexed" msgstr "Indeksoitu" #: ../libgimpbase/gimpbaseenums.c:548 -#| msgid "Indexed-alpha" msgctxt "image-type" msgid "Indexed-alpha" msgstr "Indeksoitu+alfa" #: ../libgimpbase/gimpbaseenums.c:579 -#| msgid "None" msgctxt "interpolation-type" msgid "None" msgstr "Ei mitään" #: ../libgimpbase/gimpbaseenums.c:580 -#| msgid "Bi-linear" msgctxt "interpolation-type" msgid "Linear" msgstr "Lineaarinen" #: ../libgimpbase/gimpbaseenums.c:581 -#| msgid "Cubic" msgctxt "interpolation-type" msgid "Cubic" msgstr "Parabolaarinen" #: ../libgimpbase/gimpbaseenums.c:582 -#| msgid "Sinc (Lanczos3)" msgctxt "interpolation-type" msgid "Sinc (Lanczos3)" msgstr "Sinc (Lanczos3)" #: ../libgimpbase/gimpbaseenums.c:611 -#| msgid "Constant" msgctxt "paint-application-mode" msgid "Constant" msgstr "Vakio" #: ../libgimpbase/gimpbaseenums.c:612 -#| msgid "Incremental" msgctxt "paint-application-mode" msgid "Incremental" msgstr "Inkrementaalinen" #: ../libgimpbase/gimpbaseenums.c:642 -#| msgid "None" msgctxt "repeat-mode" msgid "None" msgstr "Ei mitään" #: ../libgimpbase/gimpbaseenums.c:643 -#| msgid "Sawtooth wave" msgctxt "repeat-mode" msgid "Sawtooth wave" msgstr "Sahalaita-aalto" #: ../libgimpbase/gimpbaseenums.c:644 -#| msgid "Triangular wave" msgctxt "repeat-mode" msgid "Triangular wave" msgstr "Kolmioaalto" #: ../libgimpbase/gimpbaseenums.c:674 -#| msgid "Run interactively" msgctxt "run-mode" msgid "Run interactively" msgstr "Suorita interaktiivisesti" #: ../libgimpbase/gimpbaseenums.c:675 -#| msgid "Run non-interactively" msgctxt "run-mode" msgid "Run non-interactively" msgstr "Suorita taustalla" #: ../libgimpbase/gimpbaseenums.c:676 -#| msgid "Run with last used values" msgctxt "run-mode" msgid "Run with last used values" msgstr "Suorita viimeksi käytetyillä arvoilla" #: ../libgimpbase/gimpbaseenums.c:705 -#| msgid "Pixels" msgctxt "size-type" msgid "Pixels" msgstr "Pikseleitä" #: ../libgimpbase/gimpbaseenums.c:706 -#| msgid "Points" msgctxt "size-type" msgid "Points" msgstr "Pisteitä" #: ../libgimpbase/gimpbaseenums.c:736 -#| msgid "Shadows" msgctxt "transfer-mode" msgid "Shadows" msgstr "Varjot" #: ../libgimpbase/gimpbaseenums.c:737 -#| msgid "Midtones" msgctxt "transfer-mode" msgid "Midtones" msgstr "Keskisävyt" #: ../libgimpbase/gimpbaseenums.c:738 -#| msgid "Highlights" msgctxt "transfer-mode" msgid "Highlights" msgstr "Kirkkaat kohdat" #: ../libgimpbase/gimpbaseenums.c:767 -#| msgid "Normal (Forward)" msgctxt "transform-direction" msgid "Normal (Forward)" msgstr "Tavallinen (eteenpäin)" #: ../libgimpbase/gimpbaseenums.c:768 -#| msgid "Corrective (Backward)" msgctxt "transform-direction" msgid "Corrective (Backward)" msgstr "Korjaava (taaksepäin)" #: ../libgimpbase/gimpbaseenums.c:799 -#| msgid "Adjust" msgctxt "transform-resize" msgid "Adjust" msgstr "Säädä" #: ../libgimpbase/gimpbaseenums.c:800 -#| msgid "Clip" msgctxt "transform-resize" msgid "Clip" msgstr "Rajaa" #: ../libgimpbase/gimpbaseenums.c:801 -#| msgid "Crop to result" msgctxt "transform-resize" msgid "Crop to result" msgstr "Rajaa tulokseen" #: ../libgimpbase/gimpbaseenums.c:802 -#| msgid "Crop with aspect" msgctxt "transform-resize" msgid "Crop with aspect" msgstr "Rajaa kuvasuhteessa" #: ../libgimpbase/gimpbaseenums.c:935 -#| msgid "Internal GIMP procedure" msgctxt "pdb-proc-type" msgid "Internal GIMP procedure" msgstr "Sisäinen GIMP-proseduuri" #: ../libgimpbase/gimpbaseenums.c:936 -#| msgid "GIMP Plug-In" msgctxt "pdb-proc-type" msgid "GIMP Plug-In" msgstr "GIMP-liitännäinen" #: ../libgimpbase/gimpbaseenums.c:937 -#| msgid "GIMP Extension" msgctxt "pdb-proc-type" msgid "GIMP Extension" msgstr "GIMP-laajennos" #: ../libgimpbase/gimpbaseenums.c:938 -#| msgid "Temporary Procedure" msgctxt "pdb-proc-type" msgid "Temporary Procedure" msgstr "Väliaikainen proseduuri" #: ../libgimpbase/gimpbaseenums.c:1105 -#| msgid "From left to right" msgctxt "text-direction" msgid "From left to right" msgstr "Vasemmalta oikealle" #: ../libgimpbase/gimpbaseenums.c:1106 -#| msgid "From right to left" msgctxt "text-direction" msgid "From right to left" msgstr "Oikealta vasemmalle" #: ../libgimpbase/gimpbaseenums.c:1137 -#| msgid "None" msgctxt "text-hint-style" msgid "None" msgstr "Ei mitään" #: ../libgimpbase/gimpbaseenums.c:1138 -#| msgid "Highlights" msgctxt "text-hint-style" msgid "Slight" msgstr "Vähäinen" #: ../libgimpbase/gimpbaseenums.c:1139 -#| msgid "Medium" msgctxt "text-hint-style" msgid "Medium" msgstr "Keskitaso" #: ../libgimpbase/gimpbaseenums.c:1140 -#| msgid "Filled" msgctxt "text-hint-style" msgid "Full" msgstr "Täysi" #: ../libgimpbase/gimpbaseenums.c:1171 -#| msgid "Left justified" msgctxt "text-justification" msgid "Left justified" msgstr "Tasattu vasemmalle" #: ../libgimpbase/gimpbaseenums.c:1172 -#| msgid "Right justified" msgctxt "text-justification" msgid "Right justified" msgstr "Tasattu oikealle" #: ../libgimpbase/gimpbaseenums.c:1173 -#| msgid "Centered" msgctxt "text-justification" msgid "Centered" msgstr "Keskitetty" #: ../libgimpbase/gimpbaseenums.c:1174 -#| msgid "Filled" msgctxt "text-justification" msgid "Filled" msgstr "Tasaa molemmat" #: ../libgimpbase/gimputils.c:178 ../libgimpbase/gimputils.c:183 -#: ../modules/color-selector-cmyk-lcms.c:424 -#: ../modules/color-selector-cmyk-lcms.c:430 -#: ../modules/display-filter-lcms.c:178 +#: ../modules/color-selector-cmyk-lcms.c:458 +#: ../modules/color-selector-cmyk-lcms.c:485 +#: ../modules/display-filter-lcms.c:230 ../modules/display-filter-lcms.c:239 msgid "(invalid UTF-8 string)" msgstr "(kelpaamaton UTF-8 -merkkijono)" @@ -1066,70 +961,62 @@ msgid "The color to use for marking colors which are out of gamut." msgstr "Väri, jota käytetään kirjon ulkopuolisten värien merkitsemiseen." #: ../libgimpconfig/gimpcolorconfig-enums.c:24 -#| msgid "No color management" msgctxt "color-management-mode" msgid "No color management" msgstr "Ei värihallintaa" #: ../libgimpconfig/gimpcolorconfig-enums.c:25 -#| msgid "Color managed display" msgctxt "color-management-mode" msgid "Color managed display" msgstr "Värihallittu näyttö" #: ../libgimpconfig/gimpcolorconfig-enums.c:26 -#| msgid "Print simulation" msgctxt "color-management-mode" msgid "Print simulation" msgstr "Tulostuksen simulointi" #: ../libgimpconfig/gimpcolorconfig-enums.c:57 -#, fuzzy -#| msgid "Perceptual" msgctxt "color-rendering-intent" msgid "Perceptual" msgstr "Havaittu" #: ../libgimpconfig/gimpcolorconfig-enums.c:58 -#| msgid "Relative colorimetric" msgctxt "color-rendering-intent" msgid "Relative colorimetric" msgstr "Suhteellinen värimetriikka" #: ../libgimpconfig/gimpcolorconfig-enums.c:59 -#| msgid "Saturation" msgctxt "color-rendering-intent" msgid "Saturation" msgstr "Kylläisyys" #: ../libgimpconfig/gimpcolorconfig-enums.c:60 -#| msgid "Absolute colorimetric" msgctxt "color-rendering-intent" msgid "Absolute colorimetric" msgstr "Absoluuttinen värimetriikka" -#: ../libgimpconfig/gimpconfig-deserialize.c:106 +#: ../libgimpconfig/gimpconfig-deserialize.c:109 #, c-format msgid "value for token %s is not a valid UTF-8 string" msgstr "symbolin %s arvo ei ole kelvollinen UTF-8 -merkkijono" #. please don't translate 'yes' and 'no' -#: ../libgimpconfig/gimpconfig-deserialize.c:444 +#: ../libgimpconfig/gimpconfig-deserialize.c:451 #, c-format msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" msgstr "sallitut arvot: \"yes\" tai \"no\" asetukselle %s, tuli '%s'" -#: ../libgimpconfig/gimpconfig-deserialize.c:518 +#: ../libgimpconfig/gimpconfig-deserialize.c:525 #, c-format msgid "invalid value '%s' for token %s" msgstr "väärä arvo \"%s\" symbolille %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:533 +#: ../libgimpconfig/gimpconfig-deserialize.c:540 #, c-format msgid "invalid value '%ld' for token %s" msgstr "kelvoton arvo \"%ld\" symbolille %s" -#: ../libgimpconfig/gimpconfig-deserialize.c:602 +#: ../libgimpconfig/gimpconfig-deserialize.c:609 #, c-format msgid "while parsing token '%s': %s" msgstr "jäsennettäessä symbolia \"%s\": %s" @@ -1141,7 +1028,7 @@ msgstr "jäsennettäessä symbolia \"%s\": %s" msgid "fatal parse error" msgstr "jäsennysvirhe" -#: ../libgimpconfig/gimpconfig-path.c:387 +#: ../libgimpconfig/gimpconfig-path.c:389 #, c-format msgid "Cannot expand ${%s}" msgstr "Ei voi laajentaa ${%s}" @@ -1194,7 +1081,6 @@ msgstr "epäkelpo UTF-8 -merkkijono" #. please don't translate 'yes' and 'no' #: ../libgimpconfig/gimpscanner.c:431 #, c-format -#| msgid "expected 'yes' or 'no' for boolean token %s, got '%s'" msgid "expected 'yes' or 'no' for boolean token, got '%s'" msgstr "sallitut arvot: \"yes\" tai \"no\" asetukselle, tuli '%s'" @@ -1226,16 +1112,16 @@ msgstr "Lataus epäonnistui" msgid "Not loaded" msgstr "Ei ladattu" -#: ../libgimpthumb/gimpthumb-utils.c:131 +#: ../libgimpthumb/gimpthumb-utils.c:153 #, c-format msgid "" "Cannot determine a valid home directory.\n" "Thumbnails will be stored in the folder for temporary files (%s) instead." msgstr "" -"Kelvollista kotihakemiston ei voi määrittää.\n" +"Kelvollista kotihakemistoa ei voi määrittää.\n" "Pienoiskuvat tallennetaan väliaikaistiedostojen kansioon (%s) sen sijasta." -#: ../libgimpthumb/gimpthumb-utils.c:255 ../libgimpthumb/gimpthumb-utils.c:323 +#: ../libgimpthumb/gimpthumb-utils.c:277 ../libgimpthumb/gimpthumb-utils.c:345 #, c-format msgid "Failed to create thumbnail folder '%s'." msgstr "Pienoiskuvakansiota '%s' ei voitu luoda." @@ -1296,8 +1182,8 @@ msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." msgstr "" -"HTML- ja CSS-tiedostoissa käytetty heksadesimaalimerkintä värimäärittely. " -"Kohta hyväksyy myös CSS-värinimet." +"HTML- ja CSS-tiedostoissa käytetty heksadesimaalinen värimäärittely. Kohta " +"hyväksyy myös CSS-värinimet." #: ../libgimpwidgets/gimpcolorselection.c:320 msgid "HTML _notation:" @@ -1321,7 +1207,7 @@ msgstr "Valitse tiedosto" #: ../libgimpwidgets/gimphelpui.c:432 msgid "Press F1 for more help" -msgstr "Paina F1 sadaksesi lisäohjeita" +msgstr "Paina F1 saadaksesi lisäohjeita" #: ../libgimpwidgets/gimpmemsizeentry.c:220 msgid "Kilobytes" @@ -1336,39 +1222,35 @@ msgid "Gigabytes" msgstr "gigatavua" #. Count label -#: ../libgimpwidgets/gimppageselector.c:282 -#: ../libgimpwidgets/gimppageselector.c:1178 +#: ../libgimpwidgets/gimppageselector.c:269 +#: ../libgimpwidgets/gimppageselector.c:1067 msgid "Nothing selected" msgstr "Mitään ei ole valittu" -#: ../libgimpwidgets/gimppageselector.c:300 +#: ../libgimpwidgets/gimppageselector.c:287 msgid "Select _All" msgstr "Valitse k_aikki" -#: ../libgimpwidgets/gimppageselector.c:320 +#: ../libgimpwidgets/gimppageselector.c:307 msgid "Select _range:" msgstr "Valitse a_lue:" -#: ../libgimpwidgets/gimppageselector.c:332 +#: ../libgimpwidgets/gimppageselector.c:319 msgid "Open _pages as" msgstr "Avaa _sivut muodossa" -#: ../libgimpwidgets/gimppageselector.c:433 -msgid "Page 000" -msgstr "Sivu 000" - -#: ../libgimpwidgets/gimppageselector.c:521 -#: ../libgimpwidgets/gimppageselector.c:758 +#: ../libgimpwidgets/gimppageselector.c:449 +#: ../libgimpwidgets/gimppageselector.c:647 #, c-format msgid "Page %d" msgstr "Sivu %d" -#: ../libgimpwidgets/gimppageselector.c:1183 +#: ../libgimpwidgets/gimppageselector.c:1072 msgid "One page selected" msgstr "Yksi sivu valittu" -#: ../libgimpwidgets/gimppageselector.c:1190 -#: ../libgimpwidgets/gimppageselector.c:1194 +#: ../libgimpwidgets/gimppageselector.c:1079 +#: ../libgimpwidgets/gimppageselector.c:1083 #, c-format msgid "%d page selected" msgid_plural "All %d pages selected" @@ -1520,13 +1402,11 @@ msgid "_Randomize" msgstr "S_atunnaista" #: ../libgimpwidgets/gimpwidgets-private.c:49 -#| msgid "Visible" msgctxt "input-mode" msgid "Disabled" msgstr "Pois käytöstä" #: ../libgimpwidgets/gimpwidgets-private.c:50 -#| msgid "Green" msgctxt "input-mode" msgid "Screen" msgstr "Näyttö" @@ -1537,25 +1417,21 @@ msgid "Window" msgstr "Ikkuna" #: ../libgimpwidgets/gimpwidgetsenums.c:24 -#| msgid "Square" msgctxt "aspect-type" msgid "Square" msgstr "Neliö" #: ../libgimpwidgets/gimpwidgetsenums.c:25 -#| msgid "Portrait" msgctxt "aspect-type" msgid "Portrait" msgstr "Pystysuuntainen" #: ../libgimpwidgets/gimpwidgetsenums.c:26 -#| msgid "Landscape" msgctxt "aspect-type" msgid "Landscape" msgstr "Vaakasuuntainen" #: ../libgimpwidgets/gimpwidgetsenums.c:126 -#| msgid "_H" msgctxt "color-selector-channel" msgid "_H" msgstr "_H" @@ -1565,7 +1441,6 @@ msgid "Hue" msgstr "Sävy" #: ../libgimpwidgets/gimpwidgetsenums.c:127 -#| msgid "_S" msgctxt "color-selector-channel" msgid "_S" msgstr "_S" @@ -1575,7 +1450,6 @@ msgid "Saturation" msgstr "Kylläisyys" #: ../libgimpwidgets/gimpwidgetsenums.c:128 -#| msgid "_V" msgctxt "color-selector-channel" msgid "_V" msgstr "_V" @@ -1585,7 +1459,6 @@ msgid "Value" msgstr "Arvo" #: ../libgimpwidgets/gimpwidgetsenums.c:129 -#| msgid "_R" msgctxt "color-selector-channel" msgid "_R" msgstr "_R" @@ -1595,7 +1468,6 @@ msgid "Red" msgstr "Punainen" #: ../libgimpwidgets/gimpwidgetsenums.c:130 -#| msgid "_G" msgctxt "color-selector-channel" msgid "_G" msgstr "_G" @@ -1605,7 +1477,6 @@ msgid "Green" msgstr "Vihreä" #: ../libgimpwidgets/gimpwidgetsenums.c:131 -#| msgid "_B" msgctxt "color-selector-channel" msgid "_B" msgstr "_B" @@ -1615,7 +1486,6 @@ msgid "Blue" msgstr "Sininen" #: ../libgimpwidgets/gimpwidgetsenums.c:132 -#| msgid "_A" msgctxt "color-selector-channel" msgid "_A" msgstr "_A" @@ -1625,87 +1495,83 @@ msgid "Alpha" msgstr "Alfa" #: ../libgimpwidgets/gimpwidgetsenums.c:161 -#| msgid "Layers" msgctxt "page-selector-target" msgid "Layers" msgstr "Tasot" #: ../libgimpwidgets/gimpwidgetsenums.c:162 -#| msgid "Images" msgctxt "page-selector-target" msgid "Images" msgstr "Kuvat" #: ../libgimpwidgets/gimpwidgetsenums.c:223 -#| msgid "Zoom in" msgctxt "zoom-type" msgid "Zoom in" msgstr "Lähennä" #: ../libgimpwidgets/gimpwidgetsenums.c:224 -#| msgid "Zoom out" msgctxt "zoom-type" msgid "Zoom out" msgstr "Loitonna" -#: ../modules/color-selector-cmyk-lcms.c:86 +#: ../modules/color-selector-cmyk-lcms.c:91 msgid "CMYK color selector (using color profile)" msgstr "CMYK-värivalitsin (käyttäen väriprofiilia)" -#: ../modules/color-selector-cmyk-lcms.c:149 +#: ../modules/color-selector-cmyk-lcms.c:154 #: ../modules/color-selector-cmyk.c:101 msgid "CMYK" msgstr "CMYK" #. Cyan -#: ../modules/color-selector-cmyk-lcms.c:168 +#: ../modules/color-selector-cmyk-lcms.c:175 #: ../modules/color-selector-cmyk.c:124 msgid "_C" msgstr "_C" #. Magenta -#: ../modules/color-selector-cmyk-lcms.c:170 +#: ../modules/color-selector-cmyk-lcms.c:177 #: ../modules/color-selector-cmyk.c:126 msgid "_M" msgstr "_M" #. Yellow -#: ../modules/color-selector-cmyk-lcms.c:172 +#: ../modules/color-selector-cmyk-lcms.c:179 #: ../modules/color-selector-cmyk.c:128 msgid "_Y" msgstr "_Y" #. Key (Black) -#: ../modules/color-selector-cmyk-lcms.c:174 +#: ../modules/color-selector-cmyk-lcms.c:181 #: ../modules/color-selector-cmyk.c:130 msgid "_K" msgstr "_K" -#: ../modules/color-selector-cmyk-lcms.c:178 +#: ../modules/color-selector-cmyk-lcms.c:185 #: ../modules/color-selector-cmyk.c:134 msgid "Cyan" msgstr "Syaani" -#: ../modules/color-selector-cmyk-lcms.c:179 +#: ../modules/color-selector-cmyk-lcms.c:186 #: ../modules/color-selector-cmyk.c:135 msgid "Magenta" msgstr "Magenta" -#: ../modules/color-selector-cmyk-lcms.c:180 +#: ../modules/color-selector-cmyk-lcms.c:187 #: ../modules/color-selector-cmyk.c:136 msgid "Yellow" msgstr "Keltainen" -#: ../modules/color-selector-cmyk-lcms.c:181 +#: ../modules/color-selector-cmyk-lcms.c:188 #: ../modules/color-selector-cmyk.c:137 msgid "Black" msgstr "Musta" -#: ../modules/color-selector-cmyk-lcms.c:412 +#: ../modules/color-selector-cmyk-lcms.c:425 msgid "Profile: (none)" msgstr "Profiili: (ei mitään)" -#: ../modules/color-selector-cmyk-lcms.c:433 +#: ../modules/color-selector-cmyk-lcms.c:488 #, c-format msgid "Profile: %s" msgstr "Profiili: %s" @@ -1734,11 +1600,11 @@ msgstr "Vesiväri" msgid "Pressure" msgstr "Paine" -#: ../modules/color-selector-wheel.c:71 +#: ../modules/color-selector-wheel.c:69 msgid "HSV color wheel" msgstr "HSV-väripyörä" -#: ../modules/color-selector-wheel.c:102 +#: ../modules/color-selector-wheel.c:101 msgid "Wheel" msgstr "Pyörä" @@ -2133,73 +1999,76 @@ msgstr "Kontrasti" msgid "Contrast c_ycles:" msgstr "Kontrasti_kierrokset:" -#: ../modules/display-filter-lcms.c:97 +#: ../modules/display-filter-lcms.c:104 msgid "Color management display filter using ICC color profiles" msgstr "Värikorjaussuodatin käyttäen ICC-profiileja" -#: ../modules/display-filter-lcms.c:129 +#: ../modules/display-filter-lcms.c:136 msgid "Color Management" msgstr "Värinhallinta" -#: ../modules/display-filter-lcms.c:186 +#: ../modules/display-filter-lcms.c:265 ../modules/display-filter-lcms.c:267 msgid "None" msgstr "Ei mitään" -#: ../modules/display-filter-lcms.c:207 +#: ../modules/display-filter-lcms.c:289 msgid "" "This filter takes its configuration from the Color Management section in the " "Preferences dialog." msgstr "" "Tämä suodatin ottaa asetuksensa Värienhallinta-osiosta asetusikkunassa." -#: ../modules/display-filter-lcms.c:221 +#: ../modules/display-filter-lcms.c:303 msgid "Mode of operation:" msgstr "Toimintatila:" -#: ../modules/display-filter-lcms.c:228 +#: ../modules/display-filter-lcms.c:310 msgid "Image profile:" msgstr "Kuvaprofiili:" -#: ../modules/display-filter-lcms.c:236 +#: ../modules/display-filter-lcms.c:318 msgid "Monitor profile:" msgstr "Näytön profiili:" -#: ../modules/display-filter-lcms.c:244 +#: ../modules/display-filter-lcms.c:326 msgid "Print simulation profile:" msgstr "Tulostus-simulaation profiili:" -#: ../modules/display-filter-proof.c:93 +#: ../modules/display-filter-proof.c:98 msgid "Color proof filter using ICC color profile" -msgstr "Värikorjaussuodatin ICC profiileille" +msgstr "Värikorjaussuodatin ICC-profiileille" -#: ../modules/display-filter-proof.c:141 +#: ../modules/display-filter-proof.c:146 msgid "Color Proof" msgstr "Värikorjaus" -#: ../modules/display-filter-proof.c:338 +#: ../modules/display-filter-proof.c:381 msgid "Choose an ICC Color Profile" msgstr "Valitse ICC-väriprofiili" -#: ../modules/display-filter-proof.c:365 +#: ../modules/display-filter-proof.c:408 msgid "All files (*.*)" msgstr "Kaikki tiedostot (*.*)" -#: ../modules/display-filter-proof.c:370 +#: ../modules/display-filter-proof.c:413 msgid "ICC color profile (*.icc, *.icm)" -msgstr "ICC-väriprofiilit (*.icc,*.icm)" +msgstr "ICC-väriprofiilit (*.icc, *.icm)" -#: ../modules/display-filter-proof.c:428 +#: ../modules/display-filter-proof.c:471 msgid "_Profile:" msgstr "_Profiili:" -#: ../modules/display-filter-proof.c:434 +#: ../modules/display-filter-proof.c:477 msgid "_Intent:" msgstr "_Aiottu:" -#: ../modules/display-filter-proof.c:439 +#: ../modules/display-filter-proof.c:482 msgid "_Black Point Compensation" msgstr "_Mustan pisteen kompensaatio" +#~ msgid "Page 000" +#~ msgstr "Sivu 000" + #~ msgid "gradient|Linear" #~ msgstr "Suora" diff --git a/po-libgimp/ru.po b/po-libgimp/ru.po index 1383203fb9..c9def372e3 100644 --- a/po-libgimp/ru.po +++ b/po-libgimp/ru.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: libgimp trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 11:18+0400\n" +"POT-Creation-Date: 2013-08-17 14:24+0300\n" "PO-Revision-Date: 2011-11-15 00:23+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \n" @@ -24,22 +24,22 @@ msgstr "" "%100>=20) ? 1 : 2);\n" #. procedure executed successfully -#: ../libgimp/gimp.c:1081 +#: ../libgimp/gimp.c:1097 msgid "success" msgstr "успешно" #. procedure execution failed -#: ../libgimp/gimp.c:1085 +#: ../libgimp/gimp.c:1101 msgid "execution error" msgstr "ошибка выполнения" #. procedure called incorrectly -#: ../libgimp/gimp.c:1089 +#: ../libgimp/gimp.c:1105 msgid "calling error" msgstr "ошибка вызова" #. procedure execution cancelled -#: ../libgimp/gimp.c:1093 +#: ../libgimp/gimp.c:1109 msgid "cancelled" msgstr "отменено" @@ -1134,7 +1134,7 @@ msgstr "Сбой при загрузке" msgid "Not loaded" msgstr "Не загружен" -#: ../libgimpthumb/gimpthumb-utils.c:157 +#: ../libgimpthumb/gimpthumb-utils.c:153 #, c-format msgid "" "Cannot determine a valid home directory.\n" @@ -1144,7 +1144,7 @@ msgstr "" "Файлы предварительного просмотра будут храниться в каталоге для временных " "файлов (%s)." -#: ../libgimpthumb/gimpthumb-utils.c:281 ../libgimpthumb/gimpthumb-utils.c:349 +#: ../libgimpthumb/gimpthumb-utils.c:277 ../libgimpthumb/gimpthumb-utils.c:345 #, c-format msgid "Failed to create thumbnail folder '%s'." msgstr "Не удалось создать каталог файлов предварительного просмотра '%s'." @@ -1625,11 +1625,11 @@ msgstr "Акварель" msgid "Pressure" msgstr "Давление" -#: ../modules/color-selector-wheel.c:71 +#: ../modules/color-selector-wheel.c:69 msgid "HSV color wheel" msgstr "Цветовой круг HSV" -#: ../modules/color-selector-wheel.c:102 +#: ../modules/color-selector-wheel.c:101 msgid "Wheel" msgstr "Круг" diff --git a/po-plug-ins/es.po b/po-plug-ins/es.po index 3f2573e83f..4d17fe9c56 100644 --- a/po-plug-ins/es.po +++ b/po-plug-ins/es.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: gimp-plug-ins.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-24 17:55+0000\n" -"PO-Revision-Date: 2013-03-25 12:10+0100\n" +"POT-Creation-Date: 2013-07-08 00:45+0000\n" +"PO-Revision-Date: 2013-07-08 13:55+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "Language: \n" @@ -292,97 +292,97 @@ msgstr "Modelo de color _RGB" msgid "_HSL color model" msgstr "Modelo de color _HSL" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "Alinear todas las capas visibles de la imagen" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "Alinear capas _visibles…" -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "No hay suficientes capas para alinear." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Alinear capas visibles" -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "Ninguno" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Recolectar" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Rellenar (izq. a der.)" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Rellenar (der. a izq.)" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Ajustar a la rejilla" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "Estilo _horizontal:" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Borde izquierdo" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Centro" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Borde derecho" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "Base ho_rizontal:" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Rellenar (superior a inferior)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Rellenar (inferior a superior)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "Estilo _vertical:" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Borde superior" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Borde inferior" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "Base ver_tical:" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "Tamaño de re_jilla:" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "No cons_iderar la capa inferior aunque esté visible" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "_Usar la capa inferior (invisible) como base" @@ -809,7 +809,7 @@ msgstr "Desenfoque sencillo, rápido pero no muy fuerte" msgid "_Blur" msgstr "_Desenfoque (Blur)" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Desenfocando" @@ -1072,7 +1072,7 @@ msgstr "Guardar la configuración del mezclador de canales" #: ../plug-ins/common/channel-mixer.c:1058 #: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 #: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407 -#: ../plug-ins/common/file-dicom.c:1351 ../plug-ins/common/file-gbr.c:663 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663 #: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 @@ -2173,30 +2173,48 @@ msgid "Autocrop Imag_e" msgstr "_Autorecortar imagen" #: ../plug-ins/common/crop-auto.c:98 -msgid "Remove empty borders from the layer" -msgstr "Quitar bordes vacíos de la capa" +msgid "Crop the active layer based on empty borders of the input drawable" +msgstr "" +"Recortar la capa activa basándose en los bordes vacíos del dibujable de " +"entrada" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:99 +msgid "" +"Crop the active layer of the input \"image\" based on empty borders of the " +"input \"drawable\".\n" +"\n" +"The input drawable serves as a base for detecting cropping extents " +"(transparency or background color), and is not necessarily the cropped layer " +"(the current active layer)." +msgstr "" +"Recortar la capa activa basándose de la «imagen» de entrada en los bordes " +"vacíos del «dibujable» de entrada.\n" +"\n" +"El dibujable de entrada sirve como base para detectar las extensiones de " +"recortado (transparencia o color de fondo), y no es necesariamente la capa " +"recortada (la capa activa actual)." + +#: ../plug-ins/common/crop-auto.c:105 msgid "Autocrop Lay_er" msgstr "_Autorecortar capa" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:152 msgid "Cropping" msgstr "Recortando" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "Auto-recortar el espacio sin utilizar de los bordes y el medio" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "Recorte _Zealous" -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Recorte Zealous" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "Nada para recortar." @@ -2667,7 +2685,7 @@ msgstr "R_ecursivo" #: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2889,7 +2907,7 @@ msgstr "Neón" msgid "Neon Detection" msgstr "Detección de neón" -#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "C_antidad:" @@ -3229,12 +3247,12 @@ msgstr "Imagen «Digital Imaging and Communications in Medicine»" msgid "'%s' is not a DICOM file." msgstr "«%s» no es un archivo DICOM." -#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676 #: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "No se puede guardar imágenes con canales alfa." -#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1180 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180 #: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613 #: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." @@ -6896,7 +6914,7 @@ msgid "Red Eye Removal" msgstr "Quitar ojos rojos" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -8050,11 +8068,11 @@ msgstr "El método más usado para enfocar una imagen" msgid "_Unsharp Mask..." msgstr "Máscara de _desenfoque…" -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Mezclando" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Máscara de desenfoque" @@ -9376,7 +9394,6 @@ msgstr "URI" # //R ¿Drawables? #: ../plug-ins/file-uri/uri.c:318 #, c-format -#| msgid "Failed to save PPM file '%s': %s" msgid "Failed to save to temporary file '%s'" msgstr "Falló al guardar el archivo temporal «%s»" @@ -13378,3 +13395,6 @@ msgstr "_Captura de pantalla…" #: ../plug-ins/win-snap/winsnap.c:1149 msgid "No data captured" msgstr "No se capturó nada" + +#~ msgid "Remove empty borders from the layer" +#~ msgstr "Quitar bordes vacíos de la capa" diff --git a/po-plug-ins/eu.po b/po-plug-ins/eu.po index 3de9c4d02f..fcd106fccc 100644 --- a/po-plug-ins/eu.po +++ b/po-plug-ins/eu.po @@ -4,138 +4,139 @@ # # Hizkuntza Politikarako Sailburuordetza , 2004. # Iñaki Larrañaga Murgoitio , 2005, 2006, 2008, 2010. -# Iñaki Larrañaga Murgoitio , 2007, 2011. +# Iñaki Larrañaga Murgoitio , 2007, 2011, 2013. msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-15 18:20+0200\n" -"PO-Revision-Date: 2011-09-15 18:16+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"POT-Creation-Date: 2013-08-28 21:07+0200\n" +"PO-Revision-Date: 2013-08-27 22:48+0200\n" +"Last-Translator: \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:118 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" msgstr "Jatorrizkoa" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:136 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:138 msgid "Rotated" msgstr "Biratuta" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:154 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:156 msgid "Continuous update" msgstr "Etengabeko eguneratzea" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:167 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:169 msgid "Area:" msgstr "Area:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:171 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 msgid "Entire Layer" msgstr "Geruza osoa" #. Create selection -#: ../plug-ins/color-rotate/color-rotate-dialog.c:172 -#: ../plug-ins/common/film.c:967 ../plug-ins/imagemap/imap_selection.c:339 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:174 +#: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "Hautapena" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:175 msgid "Context" msgstr "Testuingurua" #. spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:297 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:299 msgctxt "color-range" msgid "From:" msgstr "Nondik:" #. spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:323 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:326 msgctxt "color-range" msgid "To:" msgstr "Nora:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:375 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 msgctxt "color-rotate" msgid "From:" msgstr "Nondik:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:378 msgctxt "color-rotate" msgid "To:" msgstr "Nora:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:416 -#: ../plug-ins/common/file-ps.c:3237 ../plug-ins/imagemap/imap_menu.c:213 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:418 +#: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Grisa" #. Gray: Circle: Spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:464 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:466 msgid "Hue:" msgstr "Ñabardura:" #. Gray: Circle: Spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:491 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:553 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:493 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:555 msgid "Saturation:" msgstr "Saturazioa:" #. * Gray: Operation-Mode * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:511 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:513 msgid "Gray Mode" msgstr "Gris-modua" #. Gray: Operation-Mode: two radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:520 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:522 msgid "Treat as this" msgstr "Tratatu hau bezala" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:532 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:534 msgid "Change to this" msgstr "Aldatu honetara" #. * Gray: What is gray? * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:545 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:547 msgid "Gray Threshold" msgstr "Gris-muga" #. * Misc: Used unit selection * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:585 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:695 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:587 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:697 msgid "Units" msgstr "Unitateak" #. Misc: Used unit selection: 3 radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:594 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:596 msgid "Radians" msgstr "Radianak" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:606 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:608 msgid "Radians/Pi" msgstr "Radian/Pi" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:618 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:620 msgid "Degrees" msgstr "Graduak" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:649 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:651 msgid "Rotate Colors" msgstr "Biratu koloreak" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:689 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:691 msgid "Main Options" msgstr "Aukera nagusiak" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:692 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:694 msgid "Gray Options" msgstr "Gris-aukerak" @@ -280,105 +281,97 @@ msgstr "_GBU kolore-eredua" msgid "_HSL color model" msgstr "_HSL kolore-eredua" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "Lerrokatu irudiaren geruza ikusgai guztiak" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "Lerrokatu geruza _ikusgaiak..." -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "Ez daude nahiko geruza lerrokatzeko." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Lerrokatu geruza ikusgaiak" -#. if and how to center the image on the page -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 -#: ../plug-ins/common/cml-explorer.c:166 ../plug-ins/common/file-ps.c:3253 -#: ../plug-ins/common/file-ps.c:3265 ../plug-ins/common/file-psp.c:647 -#: ../plug-ins/file-fits/fits.c:1044 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:998 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1039 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1080 -#: ../plug-ins/lighting/lighting-ui.c:418 -#: ../plug-ins/print/print-page-layout.c:461 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 +msgctxt "align-style" msgid "None" msgstr "Bat ere ez" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Bildu" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Bete (ezkerretik eskuinera)" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Bete (eskuinetik ezkerrera)" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Atxiki saretari" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "Estilo _horizontala:" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Ezkerreko ertza" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Erdikoa" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Eskuineko ertza" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "_Oinarri horizontala:" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Bete (goitik behera)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Bete (behetik gora)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "Estilo _bertikala:" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Goiko ertza" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Beheko ertza" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "Oinarri be_rtikala:" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "_Saretaren tamaina:" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "_Ez ikusi egin beheko geruzari, baita ikusgai badago ere" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "_Erabili beheko geruza (ikusezina) oinarri gisa" @@ -526,7 +519,7 @@ msgstr "Antialiasing-a Scale3X ertz-estrapolazioaren algoritmoa erabiliz" msgid "_Antialias" msgstr "_Antialiasing-a" -#: ../plug-ins/common/antialias.c:149 +#: ../plug-ins/common/antialias.c:147 msgid "Antialiasing..." msgstr "Antialiasing-a..." @@ -549,7 +542,7 @@ msgstr "Aplikatu oihala" #. ***************************************************** #. radio buttons for choosing LEFT or RIGHT #. ************************************************* -#: ../plug-ins/common/apply-canvas.c:1293 ../plug-ins/common/wind.c:948 +#: ../plug-ins/common/apply-canvas.c:1293 ../plug-ins/common/wind.c:943 #: ../plug-ins/lighting/lighting-ui.c:520 msgid "Direction" msgstr "Noranzkoa" @@ -598,12 +591,12 @@ msgid "Orientation" msgstr "Orientazioa" #: ../plug-ins/common/blinds.c:262 ../plug-ins/common/ripple.c:561 -#: ../plug-ins/common/tile-small.c:433 ../plug-ins/pagecurl/pagecurl.c:534 +#: ../plug-ins/common/tile-small.c:434 ../plug-ins/pagecurl/pagecurl.c:537 msgid "_Horizontal" msgstr "_Horizontala" #: ../plug-ins/common/blinds.c:265 ../plug-ins/common/ripple.c:564 -#: ../plug-ins/common/tile-small.c:443 ../plug-ins/pagecurl/pagecurl.c:533 +#: ../plug-ins/common/tile-small.c:444 ../plug-ins/pagecurl/pagecurl.c:536 msgid "_Vertical" msgstr "_Bertikala" @@ -611,25 +604,25 @@ msgstr "_Bertikala" #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:727 ../plug-ins/common/file-cel.c:363 -#: ../plug-ins/common/file-cel.c:366 ../plug-ins/common/file-dicom.c:614 -#: ../plug-ins/common/file-gif-load.c:930 -#: ../plug-ins/common/file-jp2-load.c:357 ../plug-ins/common/file-pcx.c:425 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:441 +#: ../plug-ins/common/file-cel.c:444 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/file-gif-load.c:943 +#: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 #: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:881 ../plug-ins/common/file-pnm.c:583 +#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:585 #: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:999 -#: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:747 -#: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267 -#: ../plug-ins/file-bmp/bmp-read.c:380 ../plug-ins/file-bmp/bmp-read.c:647 -#: ../plug-ins/file-faxg3/faxg3.c:477 ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:252 ../plug-ins/file-jpeg/jpeg-load.c:816 -#: ../plug-ins/file-psd/psd-image-res-load.c:997 +#: ../plug-ins/common/file-tga.c:1072 ../plug-ins/common/file-tiff-load.c:1010 +#: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 +#: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 +#: ../plug-ins/file-bmp/bmp-read.c:677 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:255 +#: ../plug-ins/file-jpeg/jpeg-load.c:819 +#: ../plug-ins/file-psd/psd-image-res-load.c:1001 #: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 -#: ../plug-ins/gfig/gfig-dialog.c:1306 +#: ../plug-ins/gfig/gfig-dialog.c:1321 #: ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 -#: ../plug-ins/win-snap/winsnap.c:1156 +#: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" msgstr "Atzeko planoa" @@ -664,7 +657,7 @@ msgstr "Gauss-en lausotze selektiboa" #: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 #: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 #: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 -#: ../plug-ins/file-sgi/sgi.c:559 ../plug-ins/file-xjt/xjt.c:1687 +#: ../plug-ins/file-sgi/sgi.c:558 ../plug-ins/file-xjt/xjt.c:1687 #: ../plug-ins/gradient-flare/gradient-flare.c:966 msgid "Cannot operate on indexed color images." msgstr "Ezin da kolore-irudi indexatuekin erabili." @@ -699,12 +692,12 @@ msgstr "Gauss-en lausotzea" msgid "Blur Radius" msgstr "Lausotze-erradioa" -#: ../plug-ins/common/blur-gauss.c:523 ../plug-ins/common/jigsaw.c:2459 +#: ../plug-ins/common/blur-gauss.c:523 ../plug-ins/common/jigsaw.c:2435 #: ../plug-ins/common/noise-spread.c:385 msgid "_Horizontal:" msgstr "_Horizontala:" -#: ../plug-ins/common/blur-gauss.c:527 ../plug-ins/common/jigsaw.c:2476 +#: ../plug-ins/common/blur-gauss.c:527 ../plug-ins/common/jigsaw.c:2452 #: ../plug-ins/common/noise-spread.c:389 msgid "_Vertical:" msgstr "_Bertikala:" @@ -729,38 +722,38 @@ msgstr "Simulatu mugimendua direkziozko lausoa erabiliz" msgid "_Motion Blur..." msgstr "Mugimendu-lausotzea..." -#: ../plug-ins/common/blur-motion.c:905 +#: ../plug-ins/common/blur-motion.c:909 msgid "Motion blurring" msgstr "Mugimendu-lausotzea" -#: ../plug-ins/common/blur-motion.c:1008 +#: ../plug-ins/common/blur-motion.c:1012 msgid "Motion Blur" msgstr "Mugimendu-lausotzea" -#: ../plug-ins/common/blur-motion.c:1042 +#: ../plug-ins/common/blur-motion.c:1046 msgid "Blur Type" msgstr "Lausotze-mota" -#: ../plug-ins/common/blur-motion.c:1046 +#: ../plug-ins/common/blur-motion.c:1050 msgctxt "blur-type" msgid "_Linear" msgstr "_Lineala" -#: ../plug-ins/common/blur-motion.c:1047 +#: ../plug-ins/common/blur-motion.c:1051 msgctxt "blur-type" msgid "_Radial" msgstr "Er_radiala" -#: ../plug-ins/common/blur-motion.c:1048 +#: ../plug-ins/common/blur-motion.c:1052 msgctxt "blur-type" msgid "_Zoom" msgstr "_Zooma" -#: ../plug-ins/common/blur-motion.c:1055 +#: ../plug-ins/common/blur-motion.c:1059 msgid "Blur Center" msgstr "Lausotze-erdigunea" -#: ../plug-ins/common/blur-motion.c:1091 ../plug-ins/common/lens-flare.c:764 +#: ../plug-ins/common/blur-motion.c:1095 ../plug-ins/common/lens-flare.c:764 #: ../plug-ins/common/nova.c:454 ../plug-ins/common/tile-paper.c:283 #: ../plug-ins/flame/flame.c:1250 #: ../plug-ins/gradient-flare/gradient-flare.c:2724 @@ -768,7 +761,7 @@ msgstr "Lausotze-erdigunea" msgid "_X:" msgstr "_X:" -#: ../plug-ins/common/blur-motion.c:1096 ../plug-ins/common/lens-flare.c:769 +#: ../plug-ins/common/blur-motion.c:1100 ../plug-ins/common/lens-flare.c:769 #: ../plug-ins/common/nova.c:459 ../plug-ins/common/tile-paper.c:292 #: ../plug-ins/flame/flame.c:1264 #: ../plug-ins/gradient-flare/gradient-flare.c:2728 @@ -776,20 +769,20 @@ msgstr "_X:" msgid "_Y:" msgstr "_Y:" -#: ../plug-ins/common/blur-motion.c:1098 +#: ../plug-ins/common/blur-motion.c:1102 msgid "Blur _outward" msgstr "Lausotu _kanpoaldea" -#: ../plug-ins/common/blur-motion.c:1111 +#: ../plug-ins/common/blur-motion.c:1115 msgid "Blur Parameters" msgstr "Lausotu parametroak" -#: ../plug-ins/common/blur-motion.c:1122 +#: ../plug-ins/common/blur-motion.c:1126 #: ../plug-ins/map-object/map-object-ui.c:1206 msgid "L_ength:" msgstr "L_uzera:" -#: ../plug-ins/common/blur-motion.c:1135 ../plug-ins/common/newsprint.c:992 +#: ../plug-ins/common/blur-motion.c:1139 ../plug-ins/common/newsprint.c:992 msgid "_Angle:" msgstr "_Angelua:" @@ -801,7 +794,7 @@ msgstr "Lauso bakuna, azkarra baina indarrik gabea" msgid "_Blur" msgstr "_Lausotu" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:584 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Lausotzen" @@ -831,7 +824,7 @@ msgstr "_Lodiera:" #. Number of Colors frame #: ../plug-ins/common/border-average.c:412 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:907 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:910 msgid "Number of Colors" msgstr "Kolore-kopurua" @@ -902,7 +895,7 @@ msgstr "_Azimuta:" msgid "_Elevation:" msgstr "_Goratzea:" -#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3390 +#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3250 msgid "_X offset:" msgstr "_X desplazamendua:" @@ -914,7 +907,7 @@ msgstr "" "Desplazamendua egokitu daiteke aurrebista arrastatuz saguaren erdiko botoia " "erabiliz." -#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3399 +#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3259 msgid "_Y offset:" msgstr "_Y desplazamendua:" @@ -968,19 +961,19 @@ msgstr "_Irteerako kanala:" #. Redmode radio frame #: ../plug-ins/common/channel-mixer.c:539 ../plug-ins/common/decompose.c:174 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:990 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:993 msgid "Red" msgstr "Gorria" #. Greenmode radio frame #: ../plug-ins/common/channel-mixer.c:544 ../plug-ins/common/decompose.c:175 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1031 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1034 msgid "Green" msgstr "Berdea" #. Bluemode radio frame #: ../plug-ins/common/channel-mixer.c:549 ../plug-ins/common/decompose.c:176 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1072 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1075 msgid "Blue" msgstr "Urdina" @@ -1016,83 +1009,78 @@ msgstr "_Monokromoa" msgid "Preserve _luminosity" msgstr "_Mantendu argitasuna" -#: ../plug-ins/common/channel-mixer.c:879 +#: ../plug-ins/common/channel-mixer.c:876 msgid "Load Channel Mixer Settings" msgstr "Kargatu kanal-nahasgailuaren ezarpenak" #. stat error (file does not exist) -#: ../plug-ins/common/channel-mixer.c:983 -#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892 -#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-compressor.c:497 -#: ../plug-ins/common/file-compressor.c:666 -#: ../plug-ins/common/file-dicom.c:340 ../plug-ins/common/file-gbr.c:368 -#: ../plug-ins/common/file-gif-load.c:355 ../plug-ins/common/file-gih.c:645 -#: ../plug-ins/common/file-jp2-load.c:197 -#: ../plug-ins/common/file-jp2-load.c:206 ../plug-ins/common/file-mng.c:1156 +#: ../plug-ins/common/channel-mixer.c:980 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 +#: ../plug-ins/common/file-cel.c:296 ../plug-ins/common/file-cel.c:348 +#: ../plug-ins/common/file-cel.c:579 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355 +#: ../plug-ins/common/file-gih.c:640 ../plug-ins/common/file-jp2-load.c:194 +#: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 #: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 -#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:746 -#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1037 -#: ../plug-ins/common/file-ps.c:3052 ../plug-ins/common/file-psp.c:1709 +#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1014 +#: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717 #: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 -#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:334 -#: ../plug-ins/common/file-svg.c:732 ../plug-ins/common/file-tga.c:442 -#: ../plug-ins/common/file-tiff-load.c:292 ../plug-ins/common/file-xbm.c:737 -#: ../plug-ins/common/file-xmc.c:667 ../plug-ins/common/file-xmc.c:852 -#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2005 -#: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:232 +#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 +#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442 +#: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:655 +#: ../plug-ins/common/file-xmc.c:840 ../plug-ins/common/file-xwd.c:435 +#: ../plug-ins/common/sphere-designer.c:2010 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 #: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 -#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:114 -#: ../plug-ins/file-jpeg/jpeg-load.c:886 ../plug-ins/file-psd/psd-load.c:130 +#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 +#: ../plug-ins/file-jpeg/jpeg-load.c:889 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 #: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 #: ../plug-ins/flame/flame.c:411 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1862 -#: ../plug-ins/fractal-explorer/fractal-explorer.c:928 -#: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:222 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:923 +#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:222 #: ../plug-ins/help/gimphelplocale.c:238 #: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format msgid "Could not open '%s' for reading: %s" msgstr "Ezin da '%s' irakurtzeko ireki: %s" -#: ../plug-ins/common/channel-mixer.c:1006 +#: ../plug-ins/common/channel-mixer.c:1003 msgid "Save Channel Mixer Settings" msgstr "Gorde kanal-nahastailea ezarpenak" -#: ../plug-ins/common/channel-mixer.c:1061 -#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840 -#: ../plug-ins/common/file-cel.c:585 ../plug-ins/common/file-compressor.c:425 -#: ../plug-ins/common/file-compressor.c:507 -#: ../plug-ins/common/file-compressor.c:589 -#: ../plug-ins/common/file-compressor.c:677 -#: ../plug-ins/common/file-csource.c:407 ../plug-ins/common/file-dicom.c:1353 -#: ../plug-ins/common/file-gbr.c:663 ../plug-ins/common/file-gif-save.c:782 -#: ../plug-ins/common/file-gih.c:1263 ../plug-ins/common/file-html-table.c:236 -#: ../plug-ins/common/file-mng.c:649 ../plug-ins/common/file-mng.c:984 -#: ../plug-ins/common/file-pat.c:486 ../plug-ins/common/file-pcx.c:712 -#: ../plug-ins/common/file-pix.c:526 ../plug-ins/common/file-png.c:1268 -#: ../plug-ins/common/file-pnm.c:1010 ../plug-ins/common/file-ps.c:1214 -#: ../plug-ins/common/file-raw.c:591 ../plug-ins/common/file-raw.c:619 -#: ../plug-ins/common/file-sunras.c:565 ../plug-ins/common/file-tga.c:1171 -#: ../plug-ins/common/file-tiff-save.c:684 ../plug-ins/common/file-xbm.c:1036 -#: ../plug-ins/common/file-xmc.c:1459 ../plug-ins/common/file-xwd.c:619 -#: ../plug-ins/common/sphere-designer.c:2116 -#: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:476 +#: ../plug-ins/common/channel-mixer.c:1058 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 +#: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258 +#: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 +#: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 +#: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526 +#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1012 +#: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591 +#: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565 +#: ../plug-ins/common/file-tga.c:1179 ../plug-ins/common/file-tiff-save.c:708 +#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1447 +#: ../plug-ins/common/file-xwd.c:623 ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:476 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007 -#: ../plug-ins/file-jpeg/jpeg-save.c:329 ../plug-ins/file-psd/psd-save.c:1655 +#: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 #: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1715 #: ../plug-ins/flame/flame.c:442 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545 -#: ../plug-ins/gfig/gfig.c:798 ../plug-ins/ifs-compose/ifs-compose.c:2413 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 +#: ../plug-ins/gfig/gfig.c:797 ../plug-ins/ifs-compose/ifs-compose.c:2408 #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "Ezin da '%s' idazteko ireki:%s" -#: ../plug-ins/common/channel-mixer.c:1069 +#: ../plug-ins/common/channel-mixer.c:1066 #: ../plug-ins/common/cml-explorer.c:2090 #, c-format msgid "Parameters were saved to '%s'" @@ -1114,8 +1102,8 @@ msgstr "Xake-taula gehitzen" msgid "Checkerboard" msgstr "Xake-taula" -#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1166 -#: ../plug-ins/gimpressionist/sizemap.c:511 +#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1154 +#: ../plug-ins/gimpressionist/sizemap.c:510 msgid "_Size:" msgstr "Ta_maina:" @@ -1175,6 +1163,11 @@ msgstr "sin^p oinarri duen funtzioa" msgid "sin^p, stepped" msgstr "sin^p, urratsez urrats" +#: ../plug-ins/common/cml-explorer.c:166 +msgctxt "cml-composition" +msgid "None" +msgstr "Bat ere ez" + #: ../plug-ins/common/cml-explorer.c:167 msgid "Max (x, -)" msgstr "Max (x, -)" @@ -1231,7 +1224,7 @@ msgstr "Min (x-d, -), (x < 0,5)" msgid "Min (x-d, -), (0.5 < x)" msgstr "Min (x-d, -), (0,5 < x)" -#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1639 +#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1635 msgid "Standard" msgstr "Estandarra" @@ -1326,7 +1319,7 @@ msgstr "Saturazioa" #: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310 #: ../plug-ins/common/decompose.c:190 #: ../plug-ins/gimpressionist/orientation.c:155 -#: ../plug-ins/gimpressionist/size.c:158 +#: ../plug-ins/gimpressionist/size.c:158 ../plug-ins/metadata/interface.c:144 msgid "Value" msgstr "Balioa" @@ -1362,7 +1355,7 @@ msgstr "Hazi finkoa" msgid "Random Seed" msgstr "Ausazko hazia" -#: ../plug-ins/common/cml-explorer.c:1293 ../plug-ins/common/filter-pack.c:700 +#: ../plug-ins/common/cml-explorer.c:1293 ../plug-ins/common/filter-pack.c:702 #: ../plug-ins/common/van-gogh-lic.c:675 msgid "_Hue" msgstr "_Ñabardura" @@ -1371,7 +1364,7 @@ msgstr "_Ñabardura" msgid "Sat_uration" msgstr "Sat_urazioa" -#: ../plug-ins/common/cml-explorer.c:1301 ../plug-ins/common/filter-pack.c:708 +#: ../plug-ins/common/cml-explorer.c:1301 ../plug-ins/common/filter-pack.c:710 msgid "_Value" msgstr "_Balioa" @@ -1949,7 +1942,7 @@ msgstr "Konposatu" msgid "Compose Channels" msgstr "Konposatu kanalak" -#: ../plug-ins/common/compose.c:1521 ../plug-ins/common/decompose.c:1526 +#: ../plug-ins/common/compose.c:1521 ../plug-ins/common/decompose.c:1528 msgid "Color _model:" msgstr "Kolore-modeloa:" @@ -2019,7 +2012,7 @@ msgstr "Eskala-_banaketa:" msgid "Dy_namic:" msgstr "_Dinamikoa:" -#: ../plug-ins/common/contrast-retinex.c:636 +#: ../plug-ins/common/contrast-retinex.c:633 msgid "Retinex: filtering" msgstr "Retinex: iragaztea" @@ -2082,7 +2075,7 @@ msgid "E_xtend" msgstr "_Hedatu" #: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:706 +#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 #: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "_Doitu" @@ -2109,36 +2102,36 @@ msgstr "" msgid "Applying convolution" msgstr "Konboluzioa aplikatzen" -#: ../plug-ins/common/convolution-matrix.c:907 +#: ../plug-ins/common/convolution-matrix.c:898 msgid "Convolution Matrix" msgstr "Konboluzio-matrizea" -#: ../plug-ins/common/convolution-matrix.c:946 +#: ../plug-ins/common/convolution-matrix.c:937 msgid "Matrix" msgstr "Matrizea" -#: ../plug-ins/common/convolution-matrix.c:984 +#: ../plug-ins/common/convolution-matrix.c:975 msgid "D_ivisor:" msgstr "_Bereizlea:" -#: ../plug-ins/common/convolution-matrix.c:1010 +#: ../plug-ins/common/convolution-matrix.c:1001 #: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1121 msgid "O_ffset:" msgstr "_Desplazamendua:" -#: ../plug-ins/common/convolution-matrix.c:1039 +#: ../plug-ins/common/convolution-matrix.c:1030 msgid "N_ormalise" msgstr "_Normalizatu" -#: ../plug-ins/common/convolution-matrix.c:1051 +#: ../plug-ins/common/convolution-matrix.c:1042 msgid "A_lpha-weighting" msgstr "A_lfa ponderazioa" -#: ../plug-ins/common/convolution-matrix.c:1070 +#: ../plug-ins/common/convolution-matrix.c:1061 msgid "Border" msgstr "Ertza" -#: ../plug-ins/common/convolution-matrix.c:1097 +#: ../plug-ins/common/convolution-matrix.c:1088 msgid "Channels" msgstr "Kanalak" @@ -2146,35 +2139,35 @@ msgstr "Kanalak" msgid "Remove empty borders from the image" msgstr "Kendu ertz hutsak iruditik" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "Moztu _irudia automatikoki" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "Kendu ertz hutsak geruzatik" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "Moztu g_eruza automatikoki" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "Mozten" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "Moztu automatikoki erabili gabeko tartea ertzetatik eta erditik" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "_Kontuz moztea..." -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Kontuz mozten" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "Ez dago zer moztu." @@ -2206,159 +2199,159 @@ msgstr "_Erabili atzeko planoaren kolorea" msgid "Cubistic transformation" msgstr "Eraldatze kubista" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "Tolestu irudia bi kurba-kontrolak erabiliz" -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "Tolestu _kurba..." -#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "" "Geruzetan bakarrik funtzionatzen du (baina kanalean edo maskaran deitzen " "zaio)" -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "Ezin da geruzak maskarekin lan egin." -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "Ezin da hautapen hutsekin lan egin" -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format msgid "Error while reading '%s': %s" msgstr "Errorea '%s' irakurtzean. %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2965 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "Tolestu kurbaren arabera" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 -#: ../plug-ins/gimpressionist/orientmap.c:591 -#: ../plug-ins/gimpressionist/sizemap.c:461 -#: ../plug-ins/print/print-page-layout.c:171 +#: ../plug-ins/common/curve-bend.c:1261 +#: ../plug-ins/gimpressionist/orientmap.c:590 +#: ../plug-ins/gimpressionist/sizemap.c:459 +#: ../plug-ins/print/print-page-layout.c:175 msgid "Preview" msgstr "Aurrebista" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "_Aurrebista behin" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "Au_rrebista automatikoa" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523 -#: ../plug-ins/gfig/gfig-dialog.c:1228 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 +#: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "Aukerak" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "Bira_tu:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "_Leuntzea" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:732 -#: ../plug-ins/common/qbist.c:860 ../plug-ins/common/ripple.c:532 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "_Antialiasing-a" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "_Kopian lan egin" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "Aldatu kurbak" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "Kurba ertzerako" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "_Goikoa" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "_Behekoa" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "Kurba-mota" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "Leu_ntzea" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "_Libre" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "_Kopiatu" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "Kopiatu kurba aktiboa beste ertzean" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "_Ispilatu" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "Ispilatu kurba aktiboa beste ertzean" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "_Trukatu" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "Trukatu bi kurbak" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "Berrezarri kurba aktiboa" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "Kargatu kurbak fitxategi batetik" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "Gorde kurbak fitxategi batean" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "Kargatu kurba-puntuak fitxategitik" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "Gorde kurba-puntuak fitxategian" @@ -2533,23 +2526,23 @@ msgstr "_Deskonposatu..." msgid "Decomposing" msgstr "Deskonposatzen" -#: ../plug-ins/common/decompose.c:1491 +#: ../plug-ins/common/decompose.c:1493 msgid "Decompose" msgstr "Deskonposatu" -#: ../plug-ins/common/decompose.c:1514 +#: ../plug-ins/common/decompose.c:1516 msgid "Extract Channels" msgstr "Erauzi kanalak" -#: ../plug-ins/common/decompose.c:1561 +#: ../plug-ins/common/decompose.c:1563 msgid "_Decompose to layers" msgstr "_Deskonposatu geruzetan" -#: ../plug-ins/common/decompose.c:1572 +#: ../plug-ins/common/decompose.c:1574 msgid "_Foreground as registration color" msgstr "_Aurreko planoa erregistratze-kolore gisa" -#: ../plug-ins/common/decompose.c:1573 +#: ../plug-ins/common/decompose.c:1575 msgid "" "Pixels in the foreground color will appear black in all output images. This " "can be used for things like crop marks that have to show up on all channels." @@ -2642,9 +2635,9 @@ msgstr "_Moldagarria" msgid "R_ecursive" msgstr "Er_rekurtsiboa" -#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734 -#: ../plug-ins/common/nl-filter.c:1092 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:867 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 +#: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2675,12 +2668,12 @@ msgid "Destripe" msgstr "Kendu marrak" #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 -#: ../plug-ins/common/file-ps.c:3175 ../plug-ins/common/file-ps.c:3372 +#: ../plug-ins/common/file-ps.c:3034 ../plug-ins/common/file-ps.c:3232 #: ../plug-ins/common/file-raw.c:1134 ../plug-ins/common/smooth-palette.c:437 -#: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:433 +#: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 -#: ../plug-ins/print/print-page-layout.c:264 +#: ../plug-ins/print/print-page-layout.c:280 msgid "_Width:" msgstr "_Zabalera:" @@ -2796,12 +2789,12 @@ msgstr "_Polarra" msgid "Edge Behavior" msgstr "Ertzaren portaera" -#: ../plug-ins/common/displace.c:479 ../plug-ins/common/edge.c:719 +#: ../plug-ins/common/displace.c:479 ../plug-ins/common/edge.c:713 #: ../plug-ins/common/ripple.c:586 ../plug-ins/common/waves.c:283 msgid "_Smear" msgstr "_Lohitu" -#: ../plug-ins/common/displace.c:481 ../plug-ins/common/edge.c:732 +#: ../plug-ins/common/displace.c:481 ../plug-ins/common/edge.c:726 #: ../plug-ins/common/fractal-trace.c:741 ../plug-ins/common/newsprint.c:389 msgid "_Black" msgstr "_Beltza" @@ -2842,7 +2835,7 @@ msgstr "Bereizmen altuko ertz-detekzioa" msgid "_Laplace" msgstr "_Laplace" -#: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:670 +#: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:664 msgid "Laplace" msgstr "Laplace" @@ -2862,11 +2855,11 @@ msgstr "_Neon..." msgid "Neon" msgstr "Neon" -#: ../plug-ins/common/edge-neon.c:696 +#: ../plug-ins/common/edge-neon.c:697 msgid "Neon Detection" msgstr "Neon-detekzioa" -#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:880 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "_Kopurua:" @@ -2894,7 +2887,7 @@ msgstr "Sobel _bertikalki" msgid "_Keep sign of result (one direction only)" msgstr "_Mantendu emaitzaren zeinua (noranzko batean bakarrik)" -#: ../plug-ins/common/edge-sobel.c:371 +#: ../plug-ins/common/edge-sobel.c:372 msgid "Sobel edge detecting" msgstr "Sobel ertz-detekzioa" @@ -2910,35 +2903,35 @@ msgstr "_Ertza..." msgid "Edge detection" msgstr "Ertz-detekzioa" -#: ../plug-ins/common/edge.c:629 +#: ../plug-ins/common/edge.c:623 msgid "Edge Detection" msgstr "Ertz-detekzioa" -#: ../plug-ins/common/edge.c:665 +#: ../plug-ins/common/edge.c:659 msgid "Sobel" msgstr "Sobel" -#: ../plug-ins/common/edge.c:666 +#: ../plug-ins/common/edge.c:660 msgid "Prewitt compass" msgstr "Prewitt iparrorratza" -#: ../plug-ins/common/edge.c:667 ../plug-ins/common/sinus.c:905 +#: ../plug-ins/common/edge.c:661 ../plug-ins/common/sinus.c:905 msgid "Gradient" msgstr "Gradientea" -#: ../plug-ins/common/edge.c:668 +#: ../plug-ins/common/edge.c:662 msgid "Roberts" msgstr "Roberts" -#: ../plug-ins/common/edge.c:669 +#: ../plug-ins/common/edge.c:663 msgid "Differential" msgstr "Diferentziala" -#: ../plug-ins/common/edge.c:679 +#: ../plug-ins/common/edge.c:673 msgid "_Algorithm:" msgstr "_Algoritmoa:" -#: ../plug-ins/common/edge.c:687 +#: ../plug-ins/common/edge.c:681 msgid "A_mount:" msgstr "_Kopurua:" @@ -2987,12 +2980,12 @@ msgid "Engrave" msgstr "Grabatua" #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 -#: ../plug-ins/common/file-ps.c:3185 ../plug-ins/common/file-ps.c:3381 -#: ../plug-ins/common/file-raw.c:1147 ../plug-ins/common/film.c:1004 +#: ../plug-ins/common/file-ps.c:3044 ../plug-ins/common/file-ps.c:3241 +#: ../plug-ins/common/file-raw.c:1147 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 -#: ../plug-ins/common/tile.c:437 ../plug-ins/imagemap/imap_cmd_guides.c:174 +#: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 -#: ../plug-ins/print/print-page-layout.c:266 +#: ../plug-ins/print/print-page-layout.c:282 msgid "_Height:" msgstr "_Altuera:" @@ -3013,129 +3006,170 @@ msgstr "Testua" msgid "_Format:" msgstr "_Formatua:" -#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129 +#: ../plug-ins/common/file-cel.c:114 ../plug-ins/common/file-cel.c:132 msgid "KISS CEL" msgstr "KISS CEL" -#: ../plug-ins/common/file-cel.c:191 +#: ../plug-ins/common/file-cel.c:202 msgid "Load KISS Palette" msgstr "Kargatu KISS paleta" +#: ../plug-ins/common/file-cel.c:308 ../plug-ins/common/file-cel.c:363 +#: ../plug-ins/common/file-cel.c:383 +#, c-format +msgid "EOF or error while reading image header" +msgstr "EOF edo errorea irudiaren goiburua irakurtzean" + #. max. rows allocated #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:353 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360 -#: ../plug-ins/common/file-gih.c:650 ../plug-ins/common/file-jp2-load.c:190 +#: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 #: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 -#: ../plug-ins/common/file-pdf-load.c:844 ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:753 ../plug-ins/common/file-pnm.c:499 -#: ../plug-ins/common/file-ps.c:1043 ../plug-ins/common/file-raw.c:716 +#: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348 +#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716 #: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 -#: ../plug-ins/common/file-tiff-load.c:605 ../plug-ins/common/file-wmf.c:994 -#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:679 -#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:524 -#: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:216 +#: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 +#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:667 +#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:526 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 -#: ../plug-ins/file-jpeg/jpeg-load.c:120 ../plug-ins/file-psd/psd-load.c:135 +#: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 #: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 #, c-format msgid "Opening '%s'" msgstr "'%s' irekitzen" -#: ../plug-ins/common/file-cel.c:354 +#: ../plug-ins/common/file-cel.c:391 +#, c-format +msgid "is not a CEL image file" +msgstr "ez da CEL irudi-fitxategia" + +#: ../plug-ins/common/file-cel.c:405 +#, c-format +msgid "illegal bpp value in image: %hhu" +msgstr "bpp balio ilegala irudian: %hhu" + +#: ../plug-ins/common/file-cel.c:419 +#, c-format +msgid "" +"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " +"vertical offset: %d" +msgstr "" +"irudiaren dimentsio ilegala: zabalera: %d; desplazamendu horizontala: %d; " +"altuera: %d; desplazamendu bertikala: %d" + +#: ../plug-ins/common/file-cel.c:432 +#, c-format msgid "Can't create a new image" msgstr "Ezin da irudi berria sortu" -#: ../plug-ins/common/file-cel.c:444 +#: ../plug-ins/common/file-cel.c:470 ../plug-ins/common/file-cel.c:505 +#: ../plug-ins/common/file-cel.c:530 +#, c-format +msgid "EOF or error while reading image data" +msgstr "EOF edo errorea irudiaren datuak irakurtzean" + +#: ../plug-ins/common/file-cel.c:547 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Kolore-sakonera (%d) ez da onartzen" +#: ../plug-ins/common/file-cel.c:629 ../plug-ins/common/file-cel.c:641 +#, c-format +msgid "'%s': EOF or error while reading palette header" +msgstr "'%s': EOF edo errorea paletaren goiburua irakurtzean" + +#: ../plug-ins/common/file-cel.c:650 +#, c-format +msgid "'%s': is not a KCF palette file" +msgstr "'%s': ez da KCF paleta-fitxategia" + +#: ../plug-ins/common/file-cel.c:659 +#, c-format +msgid "'%s': illegal bpp value in palette: %hhu" +msgstr "'%s': bpp balio ilegala paletan: %hhu" + +#: ../plug-ins/common/file-cel.c:668 +#, c-format +msgid "'%s': illegal number of colors: %u" +msgstr "'%s': kolore kopuru ilegala: %u" + +#: ../plug-ins/common/file-cel.c:683 ../plug-ins/common/file-cel.c:700 +#: ../plug-ins/common/file-cel.c:720 +#, c-format +msgid "'%s': EOF or error while reading palette data" +msgstr "'%s': EOF edo errorea paletaren datuak irakurtzean" + #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:590 ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1268 +#: ../plug-ins/common/file-cel.c:777 ../plug-ins/common/file-gbr.c:668 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1263 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 #: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1275 ../plug-ins/common/file-pnm.c:1015 -#: ../plug-ins/common/file-ps.c:1219 ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:694 -#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1464 -#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:624 -#: ../plug-ins/file-bmp/bmp-write.c:317 ../plug-ins/file-fits/fits.c:481 +#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570 +#: ../plug-ins/common/file-tga.c:1184 ../plug-ins/common/file-tiff-save.c:716 +#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1452 +#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:628 +#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:481 #: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001 -#: ../plug-ins/file-jpeg/jpeg-save.c:286 ../plug-ins/file-psd/psd-save.c:1660 -#: ../plug-ins/file-sgi/sgi.c:577 ../plug-ins/file-xjt/xjt.c:1696 +#: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657 +#: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696 #, c-format msgid "Saving '%s'" msgstr "'%s' gordetzen" -#: ../plug-ins/common/file-compressor.c:159 -msgid "gzip archive" -msgstr "gzip artxiboa" - -#: ../plug-ins/common/file-compressor.c:180 -msgid "bzip archive" -msgstr "bzip artxiboa" - -#: ../plug-ins/common/file-compressor.c:389 -msgid "No sensible file extension, saving as compressed XCF." -msgstr "Ez dago luzapen garbirik, XCF konprimitu gisa gordeko da." - -#: ../plug-ins/common/file-compressor.c:571 -msgid "No sensible file extension, attempting to load with file magic." -msgstr "" -"Ez dago luzapen garbirik, fitxategi magikoarekin kargatzen saiatuko naiz." - #: ../plug-ins/common/file-csource.c:113 msgid "C source code" msgstr "C iturburuko kodea" -#: ../plug-ins/common/file-csource.c:705 +#: ../plug-ins/common/file-csource.c:701 msgid "C-Source" msgstr "C iturburua" -#: ../plug-ins/common/file-csource.c:723 +#: ../plug-ins/common/file-csource.c:719 msgid "_Prefixed name:" msgstr "_Aurrefinkatutako izena:" -#: ../plug-ins/common/file-csource.c:732 +#: ../plug-ins/common/file-csource.c:728 msgid "Co_mment:" msgstr "Iru_zkina:" #. Use Comment #. -#: ../plug-ins/common/file-csource.c:739 +#: ../plug-ins/common/file-csource.c:735 msgid "_Save comment to file" msgstr "_Gorde iruzkina fitxategian" #. GLib types #. -#: ../plug-ins/common/file-csource.c:751 +#: ../plug-ins/common/file-csource.c:747 msgid "_Use GLib types (guint8*)" msgstr "_Erabili GLib motak (guint8*)" -#: ../plug-ins/common/file-csource.c:764 +#: ../plug-ins/common/file-csource.c:760 msgid "Us_e macros instead of struct" msgstr "Erabi_li makroak egituraren ordez" -#: ../plug-ins/common/file-csource.c:777 +#: ../plug-ins/common/file-csource.c:773 msgid "Use _1 byte Run-Length-Encoding" msgstr "Erabili byte _1eko Run-Length-Encoding" -#: ../plug-ins/common/file-csource.c:790 +#: ../plug-ins/common/file-csource.c:786 msgid "Sa_ve alpha channel (RGBA/RGB)" msgstr "Gor_de alfa kanala (GBUA/GBU)" #. RGB-565 #. -#: ../plug-ins/common/file-csource.c:802 +#: ../plug-ins/common/file-csource.c:798 msgid "Save as _RGB565 (16-bit)" msgstr "Gorde _RGB565 (16-bit) gisa" -#: ../plug-ins/common/file-csource.c:825 +#: ../plug-ins/common/file-csource.c:821 msgid "Op_acity:" msgstr "_Opakutasuna:" @@ -3161,14 +3195,14 @@ msgstr "'Digital Imaging and Communications in Medicine' irudia" msgid "'%s' is not a DICOM file." msgstr "'%s' ez da DICOM fitxategia" -#: ../plug-ins/common/file-dicom.c:1321 ../plug-ins/common/file-pcx.c:676 -#: ../plug-ins/common/file-pnm.c:1000 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676 +#: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "Ezin izan da alfa kanalak dituzten irudiak gorde." -#: ../plug-ins/common/file-dicom.c:1336 ../plug-ins/common/file-ps.c:1204 -#: ../plug-ins/common/file-xwd.c:609 ../plug-ins/file-fits/fits.c:466 -#: ../plug-ins/file-xjt/xjt.c:1691 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180 +#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613 +#: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." msgstr "Ezin izan da irudi-mota ezezagunekin lan egin" @@ -3196,8 +3230,8 @@ msgstr "Errorea GIMPen brotxa-fitxategian '%s'" msgid "Invalid UTF-8 string in brush file '%s'." msgstr "UTF-8 kate baliogabea '%s' brotxa-fitxategian." -#: ../plug-ins/common/file-gbr.c:461 ../plug-ins/common/file-gih.c:492 -#: ../plug-ins/common/file-gih.c:1142 +#: ../plug-ins/common/file-gbr.c:461 ../plug-ins/common/file-gih.c:487 +#: ../plug-ins/common/file-gih.c:1137 #: ../plug-ins/gradient-flare/gradient-flare.c:3064 msgid "Unnamed" msgstr "Izengabea" @@ -3215,7 +3249,7 @@ msgstr "Brotxa" msgid "Spacing:" msgstr "Tartea:" -#: ../plug-ins/common/file-gbr.c:795 ../plug-ins/common/file-gih.c:893 +#: ../plug-ins/common/file-gbr.c:795 ../plug-ins/common/file-gih.c:888 #: ../plug-ins/common/file-pat.c:568 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Azalpena:" @@ -3233,28 +3267,28 @@ msgstr "Ez da GIF fitxategia." msgid "Non-square pixels. Image might look squashed." msgstr "Pixel ez-laukiak: irudia zapalduta ikusiko da." -#: ../plug-ins/common/file-gif-load.c:932 +#: ../plug-ins/common/file-gif-load.c:945 #, c-format msgid "Background (%d%s)" msgstr "Atzeko planoa (%d%s)" -#: ../plug-ins/common/file-gif-load.c:955 +#: ../plug-ins/common/file-gif-load.c:968 #, c-format msgid "Opening '%s' (frame %d)" msgstr "'%s' irekitzen (%d. markoa)" -#: ../plug-ins/common/file-gif-load.c:984 ../plug-ins/common/iwarp.c:794 -#: ../plug-ins/common/iwarp.c:829 +#: ../plug-ins/common/file-gif-load.c:997 ../plug-ins/common/iwarp.c:792 +#: ../plug-ins/common/iwarp.c:827 #, c-format msgid "Frame %d" msgstr "%d markoa " -#: ../plug-ins/common/file-gif-load.c:986 +#: ../plug-ins/common/file-gif-load.c:999 #, c-format msgid "Frame %d (%d%s)" msgstr "%d markoa (%d%s)" -#: ../plug-ins/common/file-gif-load.c:1017 +#: ../plug-ins/common/file-gif-load.c:1030 #, c-format msgid "" "GIF: Undocumented GIF composite type %d is not handled. Animation might not " @@ -3263,11 +3297,11 @@ msgstr "" "GIF: dokumentatu gabeko GIF %d konposaketa mota ezin da kudeatu. Animazioa " "ez da egokiro erreproduzituko edo berriro gordeko." -#: ../plug-ins/common/file-gif-save.c:468 +#: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "Ezin izan dira koloreak gehiago murriztu. Opaku gisa gordeko da." -#: ../plug-ins/common/file-gif-save.c:583 +#: ../plug-ins/common/file-gif-save.c:591 #, c-format msgid "" "Unable to save '%s'. The GIF file format does not support images that are " @@ -3276,7 +3310,7 @@ msgstr "" "Ezin izan da '%s' gorde. GIF fitxategi-formatuak ez du luzeran edo zabaleran " "%d pixel gainditzen duten irudirik onartzen." -#: ../plug-ins/common/file-gif-save.c:694 +#: ../plug-ins/common/file-gif-save.c:704 msgid "" "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." @@ -3284,19 +3318,19 @@ msgstr "" "GIF formatuak 7 biteko ASCII kodetzea duten iruzkinak bakarrik onartzen " "ditu. Ez da iradokizunik gorde." -#: ../plug-ins/common/file-gif-save.c:753 +#: ../plug-ins/common/file-gif-save.c:763 msgid "" "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" "Ezin dira GBU irudiak GIF gisa gorde. Bihurtu irudi indexatu edo gris-" "eskalara lehenik." -#: ../plug-ins/common/file-gif-save.c:931 +#: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "" "Atzerapena txertatu da, PUZ xurgatzen duen animazio gaizto hori eragozteko." -#: ../plug-ins/common/file-gif-save.c:972 +#: ../plug-ins/common/file-gif-save.c:982 msgid "" "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." @@ -3304,7 +3338,7 @@ msgstr "" "GIF gisa gorde nahi duzun irudiak irudiaren uneko ertzak gainditzen dituzten " "geruzak ditu." -#: ../plug-ins/common/file-gif-save.c:989 +#: ../plug-ins/common/file-gif-save.c:999 msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." @@ -3313,11 +3347,11 @@ msgstr "" "ertzetaraino moztu nahi dituzun edo gordetzea bertan behera utzi nahi duzun " "hauta dezakezu." -#: ../plug-ins/common/file-gif-save.c:1125 +#: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" msgstr "GIF" -#: ../plug-ins/common/file-gif-save.c:1133 +#: ../plug-ins/common/file-gif-save.c:1143 #, c-format msgid "" "Error loading UI file '%s':\n" @@ -3326,19 +3360,19 @@ msgstr "" "Errorea interfazearen '%s' fitxategia irakurtzean:\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1187 +#: ../plug-ins/common/file-gif-save.c:1197 msgid "I don't care" msgstr "Ez dit axola" -#: ../plug-ins/common/file-gif-save.c:1189 +#: ../plug-ins/common/file-gif-save.c:1199 msgid "Cumulative layers (combine)" msgstr "Geruza metagarriak (konbinatu)" -#: ../plug-ins/common/file-gif-save.c:1191 +#: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" msgstr "Marko bat geruzako (ordeztu)" -#: ../plug-ins/common/file-gif-save.c:1208 +#: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." @@ -3346,11 +3380,12 @@ msgstr "" "Irudiak geruza bat baino gehiago duenean soilik esporta dezakezu animazio " "gisa. Esportatzea saiatzen ari zaren irudiak geruza bat bakarrik dauka." -#: ../plug-ins/common/file-gif-save.c:2351 +#: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." msgstr "Errorea irteera-fitxategia idaztean." -#: ../plug-ins/common/file-gif-save.c:2421 +#. translators: the %d is *always* 240 here +#: ../plug-ins/common/file-gif-save.c:2395 #, c-format msgid "The default comment is limited to %d characters." msgstr "Iruzkin lehenetsiak gehienez %d karaktere izan ditzake." @@ -3359,63 +3394,63 @@ msgstr "Iruzkin lehenetsiak gehienez %d karaktere izan ditzake." msgid "GIMP brush (animated)" msgstr "GIMPeko brotxa (animatua)" -#: ../plug-ins/common/file-gih.c:485 +#: ../plug-ins/common/file-gih.c:480 msgid "Error in GIMP brush pipe file." msgstr "Errorea GIMPeko brotxa animatuan." -#: ../plug-ins/common/file-gih.c:551 +#: ../plug-ins/common/file-gih.c:546 msgid "GIMP brush file appears to be corrupted." msgstr "GIMPeko brotxa-fitxategia hondatuta dagoela ematen du." -#: ../plug-ins/common/file-gih.c:701 +#: ../plug-ins/common/file-gih.c:696 msgid "Couldn't load one brush in the pipe, giving up." msgstr "Ezin izan da animazioan brotxa bat kargatu, amore emango da." -#: ../plug-ins/common/file-gih.c:862 +#: ../plug-ins/common/file-gih.c:857 msgid "Brush Pipe" msgstr "Brotxa animatu gisa" -#: ../plug-ins/common/file-gih.c:879 +#: ../plug-ins/common/file-gih.c:874 msgid "Spacing (percent):" msgstr "Tartea (ehunekoa):" -#: ../plug-ins/common/file-gih.c:946 +#: ../plug-ins/common/file-gih.c:941 msgid "Pixels" msgstr "Pixelak" -#: ../plug-ins/common/file-gih.c:951 +#: ../plug-ins/common/file-gih.c:946 msgid "Cell size:" msgstr "Gelaxka-tamaina:" -#: ../plug-ins/common/file-gih.c:963 +#: ../plug-ins/common/file-gih.c:958 msgid "Number of cells:" msgstr "Gelaxka-kopurua:" -#: ../plug-ins/common/file-gih.c:988 +#: ../plug-ins/common/file-gih.c:983 msgid " Rows of " msgstr " Errenkadak: " -#: ../plug-ins/common/file-gih.c:1000 +#: ../plug-ins/common/file-gih.c:995 msgid " Columns on each layer" msgstr " Geruza bakoitzeko zutabeak" -#: ../plug-ins/common/file-gih.c:1004 +#: ../plug-ins/common/file-gih.c:999 msgid " (Width Mismatch!) " msgstr " (zabalera ez dator bat!) " -#: ../plug-ins/common/file-gih.c:1008 +#: ../plug-ins/common/file-gih.c:1003 msgid " (Height Mismatch!) " msgstr " (altuera ez dator bat!) " -#: ../plug-ins/common/file-gih.c:1013 +#: ../plug-ins/common/file-gih.c:1008 msgid "Display as:" msgstr "Bistaratu honela:" -#: ../plug-ins/common/file-gih.c:1022 +#: ../plug-ins/common/file-gih.c:1017 msgid "Dimension:" msgstr "Neurria:" -#: ../plug-ins/common/file-gih.c:1097 +#: ../plug-ins/common/file-gih.c:1092 msgid "Ranks:" msgstr "Heinak:" @@ -3557,22 +3592,22 @@ msgstr "Gelaxka-tartearen kopurua." msgid "JPEG 2000 image" msgstr "JPEG 2000 irudia" -#: ../plug-ins/common/file-jp2-load.c:215 +#: ../plug-ins/common/file-jp2-load.c:212 #, c-format msgid "Couldn't decode '%s'." msgstr "Ezin izan da '%s' dekodetu" -#: ../plug-ins/common/file-jp2-load.c:238 +#: ../plug-ins/common/file-jp2-load.c:235 #, c-format msgid "The image '%s' is in grayscale but does not contain any gray component." msgstr "'%s' irudia gris-eskalan egon arren ez dauka gris osagairik." -#: ../plug-ins/common/file-jp2-load.c:264 +#: ../plug-ins/common/file-jp2-load.c:261 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." msgstr "'%s' irudia GBUn dago, hala ere osagaietariko batzuk falta zaizkio." -#: ../plug-ins/common/file-jp2-load.c:290 +#: ../plug-ins/common/file-jp2-load.c:287 #, c-format msgid "" "The image '%s' is in the CIEXYZ color space, but there is no code in place " @@ -3581,7 +3616,7 @@ msgstr "" "'%s' irudia CIEXYZ kolore-espazioan dago, baina ez dago koderik hura GBUra " "bihurtzeko." -#: ../plug-ins/common/file-jp2-load.c:297 +#: ../plug-ins/common/file-jp2-load.c:294 #, c-format msgid "" "The image '%s' is in the CIELAB color space, but there is no code in place " @@ -3590,7 +3625,7 @@ msgstr "" "'%s' irudia CIELAB kolore-espazioan dago, baina ez dago koderik hura GBUra " "bihurtzeko." -#: ../plug-ins/common/file-jp2-load.c:304 +#: ../plug-ins/common/file-jp2-load.c:301 #, c-format msgid "" "The image '%s' is in the YCbCr color space, but there is no code in place to " @@ -3599,12 +3634,12 @@ msgstr "" "'%s' irudia YCbCr kolore-espazioan dago, baina ez dago koderik hura GBUra " "bihurtzeko." -#: ../plug-ins/common/file-jp2-load.c:312 +#: ../plug-ins/common/file-jp2-load.c:309 #, c-format msgid "The image '%s' is in an unknown color space." msgstr "'%s' irudiak kolore-espazio ezezaguna du." -#: ../plug-ins/common/file-jp2-load.c:326 +#: ../plug-ins/common/file-jp2-load.c:323 #, c-format msgid "" "Image component %d of image '%s' does not have the same size as the image. " @@ -3613,12 +3648,12 @@ msgstr "" "'%2$s' irudiaren %1$d irudi-osagaiak ez dauka irudiaren tamaina berdina. Hau " "oraingoz ez dago onartuta." -#: ../plug-ins/common/file-jp2-load.c:337 +#: ../plug-ins/common/file-jp2-load.c:334 #, c-format msgid "Image component %d of image '%s' does not have both a hstep and vstep." msgstr "'%2$s' irudiaren %1$d irudi-osagaiak ez dauka hstep ezta vstep ere." -#: ../plug-ins/common/file-jp2-load.c:346 +#: ../plug-ins/common/file-jp2-load.c:343 #, c-format msgid "" "Image component %d of image '%s' is signed. This is currently not supported." @@ -3628,7 +3663,7 @@ msgstr "" #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1812 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1902 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Ezin izan da gardentasuna galerarik gabe gorde, horren ordez opakutasuna " @@ -3650,7 +3685,7 @@ msgstr "Gurutzelarkatu" msgid "Save background color" msgstr "Gorde atzeko planoaren kolorea" -#: ../plug-ins/common/file-mng.c:1371 +#: ../plug-ins/common/file-mng.c:1371 ../plug-ins/ui/plug-in-file-png.ui.h:3 msgid "Save gamma" msgstr "Gorde Gamma" @@ -3663,7 +3698,7 @@ msgid "Save creation time" msgstr "Gorde sortze-denbora" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1861 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1951 msgid "PNG" msgstr "PNG" @@ -3703,39 +3738,39 @@ msgstr "Ordeztu" msgid "Default frame disposal:" msgstr "Marko-baztertze lehenetsia:" -#: ../plug-ins/common/file-mng.c:1456 +#: ../plug-ins/common/file-mng.c:1457 msgid "PNG compression level:" msgstr "PNG konpresio-maila:" -#: ../plug-ins/common/file-mng.c:1464 +#: ../plug-ins/common/file-mng.c:1465 ../plug-ins/ui/plug-in-file-png.ui.h:10 msgid "Choose a high compression level for small file size" msgstr "Hautatu konprimatze-maila handia fitxategi-tamaina txikietarako" -#: ../plug-ins/common/file-mng.c:1477 +#: ../plug-ins/common/file-mng.c:1479 msgid "JPEG compression quality:" msgstr "JPEG konprimatze-kalitatea:" -#: ../plug-ins/common/file-mng.c:1493 +#: ../plug-ins/common/file-mng.c:1496 msgid "JPEG smoothing factor:" msgstr "JPEG leuntze-faktorea:" -#: ../plug-ins/common/file-mng.c:1503 +#: ../plug-ins/common/file-mng.c:1506 msgid "Animated MNG Options" msgstr "MNG animatuen aukerak" -#: ../plug-ins/common/file-mng.c:1509 +#: ../plug-ins/common/file-mng.c:1512 msgid "Loop" msgstr "Begiztak" -#: ../plug-ins/common/file-mng.c:1523 +#: ../plug-ins/common/file-mng.c:1526 msgid "Default frame delay:" msgstr "Marko-atzerapen lehenetsia:" -#: ../plug-ins/common/file-mng.c:1539 +#: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:7 msgid "milliseconds" msgstr "milisegundo" -#: ../plug-ins/common/file-mng.c:1552 +#: ../plug-ins/common/file-mng.c:1555 msgid "" "These options are only available when the exported image has more than one " "layer. The image you are exporting only has one layer." @@ -3743,7 +3778,7 @@ msgstr "" "Aukera hauek esportatutako irudiak geruza bat baino gehiago dituztenean " "soilik daude erabilgarri. Esportatzen ari zaren irudiak geruza bakarra du." -#: ../plug-ins/common/file-mng.c:1605 +#: ../plug-ins/common/file-mng.c:1608 msgid "MNG animation" msgstr "MNG animazioa" @@ -3774,13 +3809,13 @@ msgstr "Ezin da goiburua irakurri '%s'(e)tik" msgid "'%s' is not a PCX file" msgstr "'%s' ez da PCX fitxategia" -#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:636 +#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:666 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Ez da onartzen edo irudiaren zabalera baliogabea da: %d" -#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:642 +#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:672 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -3824,71 +3859,165 @@ msgstr "Azpiko ertza barrutitik kanpo (< %d izan behar ): %d" msgid "Writing to file '%s' failed: %s" msgstr "Errorea '%s' fitxategian idaztean: %s" -#: ../plug-ins/common/file-pdf-load.c:297 +#: ../plug-ins/common/file-pdf-load.c:300 +#: ../plug-ins/common/file-pdf-save.c:290 msgid "Portable Document Format" msgstr "PDF" -#: ../plug-ins/common/file-pdf-load.c:564 +#: ../plug-ins/common/file-pdf-load.c:548 +#: ../plug-ins/common/file-pdf-load.c:567 #, c-format msgid "Could not load '%s': %s" msgstr "Ezin izan da '%s' fitxategia kargatu: %s" -#: ../plug-ins/common/file-pdf-load.c:878 +#: ../plug-ins/common/file-pdf-load.c:895 #, c-format msgid "%s-%s" msgstr "%s-%s" -#: ../plug-ins/common/file-pdf-load.c:880 ../plug-ins/common/file-ps.c:1126 +#: ../plug-ins/common/file-pdf-load.c:897 ../plug-ins/common/file-ps.c:1102 #, c-format msgid "%s-pages" msgstr "%s-orriak" -#: ../plug-ins/common/file-pdf-load.c:1070 +#: ../plug-ins/common/file-pdf-load.c:1088 msgid "Import from PDF" msgstr "Inportatu PDF-tik" -#: ../plug-ins/common/file-pdf-load.c:1075 ../plug-ins/common/file-ps.c:3104 -#: ../plug-ins/common/file-tiff-load.c:484 +#: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2962 +#: ../plug-ins/common/file-tiff-load.c:491 msgid "_Import" msgstr "_Inportatu" -#: ../plug-ins/common/file-pdf-load.c:1143 +#: ../plug-ins/common/file-pdf-load.c:1126 +msgid "Error getting number of pages from the given PDF file." +msgstr "Errorea emandako PDF fitxategitik orrialde kopurua lortzean." + +#: ../plug-ins/common/file-pdf-load.c:1168 msgid "_Width (pixels):" msgstr "_Zabalera (pixeletan):" -#: ../plug-ins/common/file-pdf-load.c:1144 +#: ../plug-ins/common/file-pdf-load.c:1169 msgid "_Height (pixels):" msgstr "_Altuera (pixeletan):" -#: ../plug-ins/common/file-pdf-load.c:1146 +#: ../plug-ins/common/file-pdf-load.c:1171 msgid "_Resolution:" msgstr "_Bereizmena:" +#. Antialiasing +#: ../plug-ins/common/file-pdf-load.c:1182 +msgid "Use _Anti-aliasing" +msgstr "Erabili _antialiasing-a" + +#: ../plug-ins/common/file-pdf-load.c:1460 +#: ../plug-ins/common/file-pdf-load.c:1461 ../plug-ins/common/file-svg.c:917 +#: ../plug-ins/common/file-wmf.c:698 ../plug-ins/print/print-page-layout.c:301 +#, c-format +msgid "pixels/%a" +msgstr "pixel/%a" + +#: ../plug-ins/common/file-pdf-save.c:305 +msgid "_Create multipage PDF..." +msgstr "_Sortu orrialde anitzeko PDFa..." + +#: ../plug-ins/common/file-pdf-save.c:412 +msgid "You must select a file to save!" +msgstr "Fitxategi bat hautatu behar duzu gordetzeko!" + +#: ../plug-ins/common/file-pdf-save.c:422 +#, c-format +msgid "" +"An error occured while creating the PDF file:\n" +"%s\n" +"Make sure you entered a valid filename and that the selected location isn't " +"read only!" +msgstr "" +"Errorea gertatu da PDF fitxategia sortzean:\n" +"%s\n" +"Ziurtatu zaitez sartutako fitxategi-izena baliozkoa dela eta hautatutako " +"kokalekua ez dela irakurtzeko soilik." + +#: ../plug-ins/common/file-pdf-save.c:746 +#: ../plug-ins/common/file-pdf-save.c:863 +msgid "Omit hidden layers and layers with zero opacity" +msgstr "Ez ikusi egin ezkutuko geruzei eta zero opakutasuna duten geruzei" + +#: ../plug-ins/common/file-pdf-save.c:750 +#: ../plug-ins/common/file-pdf-save.c:867 +msgid "Convert bitmaps to vector graphics where possible" +msgstr "Bihurtu bit-mapak bektore grafikotara ahal denean" + +#: ../plug-ins/common/file-pdf-save.c:754 +#: ../plug-ins/common/file-pdf-save.c:871 +msgid "Apply layer masks before saving" +msgstr "Aplikatu geruza-maskarak gorde aurretik" + +#: ../plug-ins/common/file-pdf-save.c:757 +#: ../plug-ins/common/file-pdf-save.c:874 +msgid "Keeping the masks will not change the output" +msgstr "Maskarak mantentzeak ez du irteera aldatuko" + +#: ../plug-ins/common/file-pdf-save.c:810 +msgid "Save to:" +msgstr "Gorde hemen:" + +#: ../plug-ins/common/file-pdf-save.c:814 +msgid "Browse..." +msgstr "Arakatu..." + +#: ../plug-ins/common/file-pdf-save.c:815 +msgid "Multipage PDF export" +msgstr "Orrialde anitzeko PDFa esportatzea" + +#: ../plug-ins/common/file-pdf-save.c:848 +msgid "Remove the selected pages" +msgstr "Kendu hautatutako orrialdeak" + +#: ../plug-ins/common/file-pdf-save.c:858 +msgid "Add this image" +msgstr "Gorde irudi hau" + +#: ../plug-ins/common/file-pdf-save.c:971 +msgid "Error! In order to save the file, at least one image should be added!" +msgstr "" +"Errorea. Gutxienez irudi bat gehitu behar da fitxategia gorde ahal izateko." + #: ../plug-ins/common/file-pix.c:142 ../plug-ins/common/file-pix.c:159 msgid "Alias Pix image" msgstr "Alias Pix irudia" -#: ../plug-ins/common/file-png.c:275 ../plug-ins/common/file-png.c:296 -#: ../plug-ins/common/file-png.c:316 ../plug-ins/common/file-png.c:333 +#: ../plug-ins/common/file-png.c:279 ../plug-ins/common/file-png.c:300 +#: ../plug-ins/common/file-png.c:320 ../plug-ins/common/file-png.c:337 msgid "PNG image" msgstr "PNG irudia" -#: ../plug-ins/common/file-png.c:640 +#: ../plug-ins/common/file-png.c:644 #, c-format msgid "Error loading PNG file: %s" msgstr "Errorea PNG fitxategia kargatzean: %s" -#: ../plug-ins/common/file-png.c:728 +#: ../plug-ins/common/file-png.c:732 +#, c-format +msgid "Error creating PNG read struct while saving '%s'." +msgstr "Errorea PNGaren irakurtzeko egitura sortzean '%s' gordetzean." + +#: ../plug-ins/common/file-png.c:742 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "Errorea '%s' irakurtzean. Fitxategia hondatuta dago?" -#: ../plug-ins/common/file-png.c:861 +#: ../plug-ins/common/file-png.c:871 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "Kolore modelu ezezaguna '%s' PNG fitxategian." -#: ../plug-ins/common/file-png.c:921 +#: ../plug-ins/common/file-png.c:882 +#, c-format +msgid "Could not create new image for '%s': %s" +msgstr "Ezin izan da '%s'(r)en irudi berria sortu: %s" + +#: ../plug-ins/common/file-png.c:936 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -3896,16 +4025,46 @@ msgstr "" "PNG fitxategiak desplazamendu bat zehazten du, geruza irudiaren kanpoan " "kokatu dezakelarik." -#: ../plug-ins/common/file-png.c:1255 +#: ../plug-ins/common/file-png.c:1238 +msgid "Apply PNG Offset" +msgstr "Aplikatu PNGren desplazamendua" + +#: ../plug-ins/common/file-png.c:1242 +msgid "Ignore PNG offset" +msgstr "Ez ikusi egin PNGren desplazamenduari" + +#: ../plug-ins/common/file-png.c:1243 +msgid "Apply PNG offset to layer" +msgstr "Aplikatu PNGren desplazamendua geruzari" + +#: ../plug-ins/common/file-png.c:1267 +#, c-format +msgid "" +"The PNG image you are importing specifies an offset of %d, %d. Do you want " +"to apply this offset to the layer?" +msgstr "" +"Inportatzen ari zaren PNG irudiak '%d, %d'(e)ko desplazamendua zehazten du. Nahi " +"duzu desplazamendu hori geruzari aplikatzea?" + +#: ../plug-ins/common/file-png.c:1335 +#, c-format +msgid "Error creating PNG write struct while saving '%s'." +msgstr "Errorea PNGaren idazteko egitura sortzean '%s' gordetzean." + +#: ../plug-ins/common/file-png.c:1345 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "Errorea '%s' gordetzean. Ezin izan da irudia gorde." -#: ../plug-ins/common/file-png.c:1878 +#: ../plug-ins/common/file-png.c:1968 #, c-format msgid "Error loading UI file '%s': %s" msgstr "Errorea interfazeko '%s' fitxategia kargatzean: %s" +#: ../plug-ins/common/file-png.c:1969 +msgid "Unknown error" +msgstr "Errore ezezaguna" + #: ../plug-ins/common/file-pnm.c:248 msgid "PNM Image" msgstr "PNM irudia" @@ -3926,197 +4085,189 @@ msgstr "PGM irudia" msgid "PPM image" msgstr "PPM irudia" -#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550 -#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570 -#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "Fitxategiaren uste baino lehenagoko amaiera." -#: ../plug-ins/common/file-pnm.c:530 +#: ../plug-ins/common/file-pnm.c:532 msgid "Invalid file." msgstr "Fitxategi baliogabea." -#: ../plug-ins/common/file-pnm.c:544 +#: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." msgstr "Fitxategiaren formatua ez da onartzen." -#: ../plug-ins/common/file-pnm.c:553 +#: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." msgstr "X bereizmen baliogabea." -#: ../plug-ins/common/file-pnm.c:555 +#: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "Irudiaren zabalera handiegia GIMPek kudeatzeko." -#: ../plug-ins/common/file-pnm.c:562 +#: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." msgstr "Y bereizmen baliogabea." -#: ../plug-ins/common/file-pnm.c:564 +#: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." msgstr "Irudiaren altuera handiegia GIMPek kudeatzeko." -#: ../plug-ins/common/file-pnm.c:574 +#: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." msgstr "Onartu gabeko gehienezko balioa." -#: ../plug-ins/common/file-pnm.c:814 +#: ../plug-ins/common/file-pnm.c:816 msgid "Error reading file." msgstr "Errorea fitxategia irakurtzean." -#: ../plug-ins/common/file-pnm.c:1219 +#: ../plug-ins/common/file-pnm.c:1221 msgid "PNM" msgstr "PNM" #. file save type -#: ../plug-ins/common/file-pnm.c:1222 +#: ../plug-ins/common/file-pnm.c:1224 msgid "Data formatting" msgstr "Datu-formateatzea" -#: ../plug-ins/common/file-pnm.c:1226 +#: ../plug-ins/common/file-pnm.c:1228 msgid "Raw" msgstr "Formaturik gabe" -#: ../plug-ins/common/file-pnm.c:1227 -msgid "Ascii" -msgstr "Ascii" +#: ../plug-ins/common/file-pnm.c:1229 +msgid "ASCII" +msgstr "ASCII" -#: ../plug-ins/common/file-ps.c:601 ../plug-ins/common/file-ps.c:693 +#: ../plug-ins/common/file-ps.c:579 ../plug-ins/common/file-ps.c:671 msgid "PostScript document" msgstr "PostScript dokumentua" -#: ../plug-ins/common/file-ps.c:620 ../plug-ins/common/file-ps.c:709 +#: ../plug-ins/common/file-ps.c:598 ../plug-ins/common/file-ps.c:687 msgid "Encapsulated PostScript image" msgstr "PostScript kapsulatutako irudia" -#: ../plug-ins/common/file-ps.c:640 +#: ../plug-ins/common/file-ps.c:618 msgid "PDF document" msgstr "PDF dokumentua" -#: ../plug-ins/common/file-ps.c:1051 +#: ../plug-ins/common/file-ps.c:1027 #, c-format msgid "Could not interpret Postscript file '%s'" msgstr "Ezin izan da '%s' Postscript fitxategia interpretatu" -#: ../plug-ins/common/file-ps.c:1193 +#: ../plug-ins/common/file-ps.c:1169 #, c-format msgid "PostScript save cannot handle images with alpha channels" msgstr "Alfa kanalak dituzten irudiak ezin dira PostScript gisa gorde" -#: ../plug-ins/common/file-ps.c:1731 ../plug-ins/common/file-ps.c:1766 -#, c-format -msgid "" -"Error starting Ghostscript. Make sure that Ghostscript is installed and - if " -"necessary - use the environment variable GS_PROG to tell GIMP about its " -"location.\n" -"(%s)" -msgstr "" -"Errorea Ghostscript abiaraztean. Ziurtatu Ghostscript instalatuta dagoela " -"eta, beharrezkoa bada, erabili inguruneko GS_PROG aldagaia GIMP aplikazioari " -"bere kokalekua zein den adierazteko.\n" -"(%s)" - -#: ../plug-ins/common/file-ps.c:1933 ../plug-ins/common/file-tiff-load.c:1001 +#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1012 #, c-format msgid "Page %d" msgstr "%d. orrialdea" -#: ../plug-ins/common/file-ps.c:2605 ../plug-ins/common/file-ps.c:2738 -#: ../plug-ins/common/file-ps.c:2889 ../plug-ins/common/file-ps.c:3015 -#: ../plug-ins/common/file-sunras.c:1506 ../plug-ins/common/file-sunras.c:1614 +#: ../plug-ins/common/file-ps.c:2469 ../plug-ins/common/file-ps.c:2600 +#: ../plug-ins/common/file-ps.c:2749 ../plug-ins/common/file-ps.c:2873 +#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1610 #: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:973 msgid "Write error occurred" msgstr "Errorea gertatu da idaztean" -#: ../plug-ins/common/file-ps.c:3099 +#: ../plug-ins/common/file-ps.c:2957 msgid "Import from PostScript" msgstr "Inportatu PostScript-etik" #. Rendering -#: ../plug-ins/common/file-ps.c:3142 +#: ../plug-ins/common/file-ps.c:3001 msgid "Rendering" msgstr "Errendatzen" #. Resolution -#: ../plug-ins/common/file-ps.c:3158 ../plug-ins/common/file-svg.c:930 +#: ../plug-ins/common/file-ps.c:3017 ../plug-ins/common/file-svg.c:911 #: ../plug-ins/common/file-wmf.c:692 msgid "Resolution:" msgstr "Bereizmena:" -#: ../plug-ins/common/file-ps.c:3197 +#: ../plug-ins/common/file-ps.c:3056 msgid "Pages:" msgstr "Orrialdeak:" -#: ../plug-ins/common/file-ps.c:3204 +#: ../plug-ins/common/file-ps.c:3063 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "Orrialdeak kargatzeko (adib.: 1-4 edo 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3209 ../plug-ins/common/sphere-designer.c:2651 +#: ../plug-ins/common/file-ps.c:3068 ../plug-ins/common/sphere-designer.c:2657 msgid "Layers" msgstr "Geruzak" -#: ../plug-ins/common/file-ps.c:3212 +#: ../plug-ins/common/file-ps.c:3071 msgid "Images" msgstr "Irudiak" -#: ../plug-ins/common/file-ps.c:3215 +#: ../plug-ins/common/file-ps.c:3074 msgid "Open as" msgstr "Ireki honela" -#: ../plug-ins/common/file-ps.c:3219 +#: ../plug-ins/common/file-ps.c:3078 msgid "Try Bounding Box" msgstr "Probatu muga-koadroa " #. Colouring -#: ../plug-ins/common/file-ps.c:3232 +#: ../plug-ins/common/file-ps.c:3091 msgid "Coloring" msgstr "Koloreztatzea" -#: ../plug-ins/common/file-ps.c:3236 +#: ../plug-ins/common/file-ps.c:3095 msgid "B/W" msgstr "Z/B" -#: ../plug-ins/common/file-ps.c:3238 ../plug-ins/common/file-xpm.c:479 +#: ../plug-ins/common/file-ps.c:3097 ../plug-ins/common/file-xpm.c:479 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:212 msgid "Color" msgstr "Kolorea" -#: ../plug-ins/common/file-ps.c:3239 ../plug-ins/file-fits/fits.c:1032 +#: ../plug-ins/common/file-ps.c:3098 ../plug-ins/file-fits/fits.c:1032 msgid "Automatic" msgstr "Automatikoa" -#: ../plug-ins/common/file-ps.c:3249 +#: ../plug-ins/common/file-ps.c:3109 msgid "Text antialiasing" msgstr "Testuaren antialiasing-a" -#: ../plug-ins/common/file-ps.c:3254 ../plug-ins/common/file-ps.c:3266 +#: ../plug-ins/common/file-ps.c:3113 ../plug-ins/common/file-ps.c:3125 +msgctxt "antialiasing" +msgid "None" +msgstr "Bat ere ez" + +#: ../plug-ins/common/file-ps.c:3114 ../plug-ins/common/file-ps.c:3126 msgid "Weak" msgstr "Ahula" -#: ../plug-ins/common/file-ps.c:3255 ../plug-ins/common/file-ps.c:3267 +#: ../plug-ins/common/file-ps.c:3115 ../plug-ins/common/file-ps.c:3127 msgid "Strong" msgstr "Indartsua" -#: ../plug-ins/common/file-ps.c:3261 +#: ../plug-ins/common/file-ps.c:3121 msgid "Graphic antialiasing" msgstr "Irudiaren antialiasing-a" -#: ../plug-ins/common/file-ps.c:3339 +#: ../plug-ins/common/file-ps.c:3199 msgid "PostScript" msgstr "PostScript" #. Image Size -#: ../plug-ins/common/file-ps.c:3356 +#: ../plug-ins/common/file-ps.c:3216 msgid "Image Size" msgstr "Irudiaren tamaina" -#: ../plug-ins/common/file-ps.c:3405 +#: ../plug-ins/common/file-ps.c:3265 msgid "_Keep aspect ratio" msgstr "_Mantendu aspektu-erlazioa" -#: ../plug-ins/common/file-ps.c:3411 +#: ../plug-ins/common/file-ps.c:3271 msgid "" "When toggled, the resulting image will be scaled to fit into the given size " "without changing the aspect ratio." @@ -4125,42 +4276,42 @@ msgstr "" "aspektu-erlazioa aldatu gabe." #. Unit -#: ../plug-ins/common/file-ps.c:3421 +#: ../plug-ins/common/file-ps.c:3281 msgid "Unit" msgstr "Unitatea" -#: ../plug-ins/common/file-ps.c:3425 +#: ../plug-ins/common/file-ps.c:3285 msgid "_Inch" msgstr "_Hazbete" -#: ../plug-ins/common/file-ps.c:3426 +#: ../plug-ins/common/file-ps.c:3286 msgid "_Millimeter" msgstr "_Milimetro" #. Rotation -#: ../plug-ins/common/file-ps.c:3437 +#: ../plug-ins/common/file-ps.c:3297 #: ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "Biraketa" #. Format -#: ../plug-ins/common/file-ps.c:3452 +#: ../plug-ins/common/file-ps.c:3312 msgid "Output" msgstr "Irteera" -#: ../plug-ins/common/file-ps.c:3458 +#: ../plug-ins/common/file-ps.c:3318 msgid "_PostScript level 2" msgstr "_PostScript 2. maila" -#: ../plug-ins/common/file-ps.c:3467 +#: ../plug-ins/common/file-ps.c:3327 msgid "_Encapsulated PostScript" msgstr "_PostScript kapsulatua" -#: ../plug-ins/common/file-ps.c:3476 +#: ../plug-ins/common/file-ps.c:3336 msgid "P_review" msgstr "A_urrebista" -#: ../plug-ins/common/file-ps.c:3498 +#: ../plug-ins/common/file-ps.c:3358 msgid "Preview _size:" msgstr "Aurrebistaren _tamaina:" @@ -4177,6 +4328,11 @@ msgstr "PSP" msgid "Data Compression" msgstr "Datu-konprimatzea" +#: ../plug-ins/common/file-psp.c:647 +msgctxt "compression" +msgid "None" +msgstr "Bat ere ez" + #: ../plug-ins/common/file-psp.c:648 msgid "RLE" msgstr "RLE" @@ -4292,7 +4448,7 @@ msgid "Type of colormap not supported" msgstr "Kolore-mapa mota hori ez da onartzen" #: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827 -#: ../plug-ins/common/file-xwd.c:489 +#: ../plug-ins/common/file-xwd.c:491 #, c-format msgid "" "'%s':\n" @@ -4302,7 +4458,7 @@ msgstr "" "Ez da irudi-zabalerarik zehaztu" #: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834 -#: ../plug-ins/common/file-xwd.c:499 +#: ../plug-ins/common/file-xwd.c:501 #, c-format msgid "" "'%s':\n" @@ -4312,7 +4468,7 @@ msgstr "" "Irudiaren zabalera handiegia da GIMPek kudeatzeko" #: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841 -#: ../plug-ins/common/file-xwd.c:508 +#: ../plug-ins/common/file-xwd.c:510 #, c-format msgid "" "'%s':\n" @@ -4322,7 +4478,7 @@ msgstr "" "Ez da irudi-altuerarik zehaztu" #: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848 -#: ../plug-ins/common/file-xwd.c:517 +#: ../plug-ins/common/file-xwd.c:519 #, c-format msgid "" "'%s':\n" @@ -4346,47 +4502,47 @@ msgstr "Ezin da irudi-mota ezezagunekin lan egin" #: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175 #: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351 -#: ../plug-ins/common/file-xwd.c:1355 ../plug-ins/common/file-xwd.c:1456 -#: ../plug-ins/common/file-xwd.c:1614 ../plug-ins/common/file-xwd.c:1814 -#: ../plug-ins/common/file-xwd.c:2071 ../plug-ins/file-fits/fits.c:698 +#: ../plug-ins/common/file-xwd.c:1361 ../plug-ins/common/file-xwd.c:1462 +#: ../plug-ins/common/file-xwd.c:1620 ../plug-ins/common/file-xwd.c:1832 +#: ../plug-ins/common/file-xwd.c:2095 ../plug-ins/file-fits/fits.c:698 msgid "EOF encountered on reading" msgstr "EOF aurkitu da irakurtzean" -#: ../plug-ins/common/file-sunras.c:1631 +#: ../plug-ins/common/file-sunras.c:1627 msgid "SUNRAS" msgstr "SUNRAS" #. file save type -#: ../plug-ins/common/file-sunras.c:1634 +#: ../plug-ins/common/file-sunras.c:1630 msgid "Data Formatting" msgstr "Datu-formateatzea" -#: ../plug-ins/common/file-sunras.c:1638 +#: ../plug-ins/common/file-sunras.c:1634 msgid "RunLength Encoded" msgstr "RunLength kodetzea" -#: ../plug-ins/common/file-svg.c:141 +#: ../plug-ins/common/file-svg.c:140 msgid "SVG image" msgstr "SVG irudia" -#: ../plug-ins/common/file-svg.c:336 ../plug-ins/common/file-svg.c:734 +#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:715 msgid "Unknown reason" msgstr "Zergatia ezezaguna" -#: ../plug-ins/common/file-svg.c:342 +#: ../plug-ins/common/file-svg.c:341 msgid "Rendering SVG" msgstr "SVG errendatzen" -#: ../plug-ins/common/file-svg.c:354 +#: ../plug-ins/common/file-svg.c:353 msgid "Rendered SVG" msgstr "SVG errendatua" -#: ../plug-ins/common/file-svg.c:568 ../plug-ins/common/file-wmf.c:358 +#: ../plug-ins/common/file-svg.c:549 ../plug-ins/common/file-wmf.c:358 #, c-format msgid "%d × %d" msgstr "%d x %d" -#: ../plug-ins/common/file-svg.c:576 +#: ../plug-ins/common/file-svg.c:557 msgid "" "SVG file does not\n" "specify a size!" @@ -4395,51 +4551,45 @@ msgstr "" "tamainarik zehazten." #. Scalable Vector Graphics is SVG, should perhaps not be translated -#: ../plug-ins/common/file-svg.c:743 +#: ../plug-ins/common/file-svg.c:724 msgid "Render Scalable Vector Graphics" msgstr "Errendatu Grafiko Bektorial Eskalakorrak (SVG)" #. Width and Height -#: ../plug-ins/common/file-svg.c:809 ../plug-ins/common/file-wmf.c:571 +#: ../plug-ins/common/file-svg.c:790 ../plug-ins/common/file-wmf.c:571 #: ../plug-ins/common/grid.c:726 msgid "Width:" msgstr "Zabalera:" -#: ../plug-ins/common/file-svg.c:815 ../plug-ins/common/file-wmf.c:577 +#: ../plug-ins/common/file-svg.c:796 ../plug-ins/common/file-wmf.c:577 msgid "Height:" msgstr "Altuera:" -#: ../plug-ins/common/file-svg.c:889 ../plug-ins/common/file-wmf.c:651 +#: ../plug-ins/common/file-svg.c:870 ../plug-ins/common/file-wmf.c:651 msgid "_X ratio:" msgstr "_X tasa:" -#: ../plug-ins/common/file-svg.c:911 ../plug-ins/common/file-wmf.c:673 +#: ../plug-ins/common/file-svg.c:892 ../plug-ins/common/file-wmf.c:673 msgid "_Y ratio:" msgstr "_Y tasa:" -#: ../plug-ins/common/file-svg.c:925 ../plug-ins/common/file-wmf.c:687 +#: ../plug-ins/common/file-svg.c:906 ../plug-ins/common/file-wmf.c:687 msgid "Constrain aspect ratio" msgstr "Mantendu aspektu-erlazioa" -#: ../plug-ins/common/file-svg.c:936 ../plug-ins/common/file-wmf.c:698 -#: ../plug-ins/print/print-page-layout.c:285 -#, c-format -msgid "pixels/%a" -msgstr "pixel/%a" - #. Path Import -#: ../plug-ins/common/file-svg.c:956 +#: ../plug-ins/common/file-svg.c:937 msgid "Import _paths" msgstr "Inportatu _bideak" -#: ../plug-ins/common/file-svg.c:963 +#: ../plug-ins/common/file-svg.c:944 msgid "" "Import path elements of the SVG so they can be used with the GIMP path tool" msgstr "" "Inportatu SVG-ko bide-elementuak, GIMPeko bide-tresnarekin erabil ahal " "izateko." -#: ../plug-ins/common/file-svg.c:971 +#: ../plug-ins/common/file-svg.c:952 msgid "Merge imported paths" msgstr "Batu inportatutako bideak" @@ -4462,52 +4612,52 @@ msgstr "Ezin da luzapena irakurri '%s'(e)tik" msgid "Cannot read header from '%s'" msgstr "Ezin da goiburua irakurri '%s'(e)tik" -#: ../plug-ins/common/file-tga.c:1372 +#: ../plug-ins/common/file-tga.c:1380 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1389 msgid "_RLE compression" msgstr "_RLE konprimatzea" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1403 msgid "Or_igin:" msgstr "_Jatorria:" -#: ../plug-ins/common/file-tga.c:1399 +#: ../plug-ins/common/file-tga.c:1407 msgid "Bottom left" msgstr "Behean ezkerrean" -#: ../plug-ins/common/file-tga.c:1400 +#: ../plug-ins/common/file-tga.c:1408 msgid "Top left" msgstr "Goian ezkerrean" -#: ../plug-ins/common/file-tiff-load.c:241 -#: ../plug-ins/common/file-tiff-save.c:183 -#: ../plug-ins/common/file-tiff-save.c:200 +#: ../plug-ins/common/file-tiff-load.c:243 +#: ../plug-ins/common/file-tiff-save.c:186 +#: ../plug-ins/common/file-tiff-save.c:203 msgid "TIFF image" msgstr "TIFF irudia" -#: ../plug-ins/common/file-tiff-load.c:311 +#: ../plug-ins/common/file-tiff-load.c:297 #, c-format msgid "TIFF '%s' does not contain any directories" msgstr "'%s' TIFFak ez du direktoriorik" -#: ../plug-ins/common/file-tiff-load.c:479 +#: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" msgstr "Inportatu TIFF-etik" -#: ../plug-ins/common/file-tiff-load.c:782 +#: ../plug-ins/common/file-tiff-load.c:818 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-(%d / %d)-orrialde" -#: ../plug-ins/common/file-tiff-load.c:1017 +#: ../plug-ins/common/file-tiff-load.c:1028 msgid "TIFF Channel" msgstr "TIFF kanala" -#: ../plug-ins/common/file-tiff-load.c:1026 +#: ../plug-ins/common/file-tiff-load.c:1037 #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" @@ -4520,7 +4670,7 @@ msgstr "" "kudea ditzakeenez, bihurtu egingo du. Bihurketa horren ondorioz, informazioa " "galduko da." -#: ../plug-ins/common/file-tiff-save.c:888 +#: ../plug-ins/common/file-tiff-save.c:910 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." @@ -4528,48 +4678,48 @@ msgstr "" "TIFF formatuak 7 biteko ASCII kodetzea duten\n" "iruzkinak bakarrik onartzen ditu. Ez da iradokizunik gorde." -#: ../plug-ins/common/file-tiff-save.c:1062 +#: ../plug-ins/common/file-tiff-save.c:1083 msgid "TIFF" msgstr "TIFF" #. compression -#: ../plug-ins/common/file-tiff-save.c:1070 +#: ../plug-ins/common/file-tiff-save.c:1091 msgid "Compression" msgstr "Konpresioa" -#: ../plug-ins/common/file-tiff-save.c:1074 +#: ../plug-ins/common/file-tiff-save.c:1095 msgid "_None" msgstr "_Bat ere ez" -#: ../plug-ins/common/file-tiff-save.c:1075 +#: ../plug-ins/common/file-tiff-save.c:1096 msgid "_LZW" msgstr "_LZW" -#: ../plug-ins/common/file-tiff-save.c:1076 +#: ../plug-ins/common/file-tiff-save.c:1097 msgid "_Pack Bits" msgstr "_Paketatu bitak" -#: ../plug-ins/common/file-tiff-save.c:1077 +#: ../plug-ins/common/file-tiff-save.c:1098 msgid "_Deflate" msgstr "_Hustu" -#: ../plug-ins/common/file-tiff-save.c:1078 +#: ../plug-ins/common/file-tiff-save.c:1099 msgid "_JPEG" msgstr "_JPEG" -#: ../plug-ins/common/file-tiff-save.c:1079 +#: ../plug-ins/common/file-tiff-save.c:1100 msgid "CCITT Group _3 fax" msgstr "CCITT Group _3 faxa" -#: ../plug-ins/common/file-tiff-save.c:1080 +#: ../plug-ins/common/file-tiff-save.c:1101 msgid "CCITT Group _4 fax" msgstr "CCITT Group _4 faxa" -#: ../plug-ins/common/file-tiff-save.c:1102 +#: ../plug-ins/common/file-tiff-save.c:1123 msgid "Save _color values from transparent pixels" msgstr "Gorde _kolore-balioak pixel gardenetik" -#: ../plug-ins/common/file-tiff-save.c:1118 ../plug-ins/common/file-xbm.c:1235 +#: ../plug-ins/common/file-tiff-save.c:1139 ../plug-ins/common/file-xbm.c:1235 msgid "Comment:" msgstr "Iruzkina:" @@ -4663,7 +4813,7 @@ msgstr "_Identifikatzaile-aurrizkia:" msgid "_Write hot spot values" msgstr "_Idatzi Hot Spot balioak" -#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1093 +#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1081 msgid "Hot spot _X:" msgstr "Hot Spot _X:" @@ -4684,12 +4834,12 @@ msgstr "I_datzi maskara-fitxategi estra" msgid "_Mask file extension:" msgstr "_Maskara-fitxategiaren luzapena:" -#: ../plug-ins/common/file-xmc.c:333 ../plug-ins/common/file-xmc.c:373 -#: ../plug-ins/common/file-xmc.c:1056 +#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 +#: ../plug-ins/common/file-xmc.c:1044 msgid "X11 Mouse Cursor" msgstr "X11 saguaren kurtsorea" -#: ../plug-ins/common/file-xmc.c:481 +#: ../plug-ins/common/file-xmc.c:473 #, c-format msgid "" "Cannot set the hot spot!\n" @@ -4698,39 +4848,37 @@ msgstr "" "Ezin da puntu aktiboa ezarri.\n" "Geruzak antolatu behar dituzu guzti haiek gurutzapen bat edukitzeko." -#: ../plug-ins/common/file-xmc.c:674 +#: ../plug-ins/common/file-xmc.c:662 #, c-format msgid "'%s' is not a valid X cursor." msgstr "'%s' ez da baliozko X kurtsorea." -#: ../plug-ins/common/file-xmc.c:690 +#: ../plug-ins/common/file-xmc.c:678 #, c-format -msgid "The width of frame %d of '%s' is too big for X cursor." -msgstr "" -"'%2$s' irudiaren %1$d markoaren zabalera handiegia da X kurtsorearentzako." +msgid "Frame %d of '%s' is too wide for an X cursor." +msgstr "'%2$s'(r)en %1$dfotograma zabalegia da X kurtsorearentzako." -#: ../plug-ins/common/file-xmc.c:697 +#: ../plug-ins/common/file-xmc.c:685 #, c-format -msgid "The height of frame %d of '%s' is too big for X cursor." -msgstr "" -"'%2$s' irudiaren %1$d markoaren altuera handiegia da X kurtsorearentzako." +msgid "Frame %d of '%s' is too high for an X cursor." +msgstr "'%2$s'(r)en %1$d. fotograma altuegia da X kurtsorearentzako." -#: ../plug-ins/common/file-xmc.c:900 +#: ../plug-ins/common/file-xmc.c:888 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "ez dago irudi zatirik '%s'(e)n." -#: ../plug-ins/common/file-xmc.c:942 +#: ../plug-ins/common/file-xmc.c:930 #, c-format -msgid "The width of '%s' is too big for X cursor." -msgstr "'%s'(r)en zabalera handiegia da X kurtsorearentzako." +msgid "'%s' is too wide for an X cursor." +msgstr "'%s' zabalegia da X kurtsorearentzako." -#: ../plug-ins/common/file-xmc.c:949 +#: ../plug-ins/common/file-xmc.c:937 #, c-format -msgid "The height of '%s' is too big for X cursor." -msgstr "'%s'(r)en altuera handiegia da X kurtsorearentzako." +msgid "'%s' is too high for an X cursor." +msgstr "'%s' altuegia da X kurtsorearentzako." -#: ../plug-ins/common/file-xmc.c:1019 +#: ../plug-ins/common/file-xmc.c:1007 #, c-format msgid "A read error occurred." msgstr "Errorea gertatu da irakurtzean." @@ -4738,25 +4886,25 @@ msgstr "Errorea gertatu da irakurtzean." #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1061 +#: ../plug-ins/common/file-xmc.c:1049 msgid "XMC Options" msgstr "XMC aukerak" -#: ../plug-ins/common/file-xmc.c:1089 +#: ../plug-ins/common/file-xmc.c:1077 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "" "Sartu puntu aktiboaren X koordenatua. Jatorria goiko ezkerreko izkina da." -#: ../plug-ins/common/file-xmc.c:1107 +#: ../plug-ins/common/file-xmc.c:1095 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "" "Sartu puntu aktiboaren Y koordenatua. Jatorria goiko ezkerreko izkina da." -#: ../plug-ins/common/file-xmc.c:1118 +#: ../plug-ins/common/file-xmc.c:1106 msgid "_Auto-Crop all frames." msgstr "Marko guztien mozketa _automatikoa." -#: ../plug-ins/common/file-xmc.c:1131 +#: ../plug-ins/common/file-xmc.c:1119 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4769,7 +4917,7 @@ msgstr "" "Desgaitu hau esportatutako kurtsorea beste programa batzuekin erabiltzeko " "asmoa baduzu." -#: ../plug-ins/common/file-xmc.c:1154 +#: ../plug-ins/common/file-xmc.c:1142 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4788,57 +4936,57 @@ msgstr "" "erabiltzen da, eta zein sekuentzia erabiltzen den \"gtk-cursor-theme-size\" " "balioan oinarrituta." -#: ../plug-ins/common/file-xmc.c:1171 +#: ../plug-ins/common/file-xmc.c:1159 msgid "_Use this value only for a frame which size is not specified." msgstr "_Erabili balio hau tamaina zehaztu ez zaion markoan soilik." -#: ../plug-ins/common/file-xmc.c:1174 +#: ../plug-ins/common/file-xmc.c:1162 msgid "_Replace the size of all frames even if it is specified." msgstr "_Ordeztu marko guztien tamaina nahiz eta zehaztuta egon." -#: ../plug-ins/common/file-xmc.c:1208 +#: ../plug-ins/common/file-xmc.c:1196 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "Sartu marko bakoitza errendatzen den bitartea milisegundotan." -#: ../plug-ins/common/file-xmc.c:1211 +#: ../plug-ins/common/file-xmc.c:1199 msgid "_Delay:" msgstr "_Atzerapena:" -#: ../plug-ins/common/file-xmc.c:1216 +#: ../plug-ins/common/file-xmc.c:1204 msgid "_Use this value only for a frame which delay is not specified." msgstr "_Erabili balio hau atzerapena zehaztu ez zaion markoan soilik." -#: ../plug-ins/common/file-xmc.c:1219 +#: ../plug-ins/common/file-xmc.c:1207 msgid "_Replace the delay of all frames even if it is specified." msgstr "_Ordeztu marko guztien atzerapena nahiz eta zehaztuta egon." -#: ../plug-ins/common/file-xmc.c:1244 +#: ../plug-ins/common/file-xmc.c:1232 msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" "65535 karaktere baino luzeagoa den Copyright-aren informazioaren zatia kendu " "egin da." -#: ../plug-ins/common/file-xmc.c:1254 +#: ../plug-ins/common/file-xmc.c:1242 msgid "Enter copyright information." msgstr "Sartu Copyrightaren informazioa." -#: ../plug-ins/common/file-xmc.c:1256 +#: ../plug-ins/common/file-xmc.c:1244 msgid "_Copyright:" msgstr "_Copyright-a:" -#: ../plug-ins/common/file-xmc.c:1272 +#: ../plug-ins/common/file-xmc.c:1260 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" "65535 karaktere baino luzeagoa den lizentziaren informazioaren zatia kendu " "egin da." -#: ../plug-ins/common/file-xmc.c:1282 +#: ../plug-ins/common/file-xmc.c:1270 msgid "Enter license information." msgstr "Sartu lizentziaren informazioa." -#: ../plug-ins/common/file-xmc.c:1284 +#: ../plug-ins/common/file-xmc.c:1272 msgid "_License:" msgstr "_Lizentzia:" @@ -4847,86 +4995,87 @@ msgstr "_Lizentzia:" #. #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". -#: ../plug-ins/common/file-xmc.c:1291 +#: ../plug-ins/common/file-xmc.c:1279 msgid "_Other:" msgstr "_Bestelakoa:" -#: ../plug-ins/common/file-xmc.c:1325 +#: ../plug-ins/common/file-xmc.c:1313 msgid "Enter other comment if you want." msgstr "Sartu bestelako iruzkina nahi baduzu." -#: ../plug-ins/common/file-xmc.c:1375 +#: ../plug-ins/common/file-xmc.c:1363 #, c-format msgid "Comment is limited to %d characters." msgstr "Iruzkinak gehienez %d karaktere izan ditzake." -#: ../plug-ins/common/file-xmc.c:1493 +#: ../plug-ins/common/file-xmc.c:1481 #, c-format -msgid "This plug-in can only handle RGBA image format with 8bit color depth." +msgid "This plug-in can only handle RGBA image files with 8bit color depth." msgstr "" -"Plugin honek soilik GBUA formatuko irudiak kudea ditzake, 8 biteko kolore-" +"Plugin honek soilik GBUA irudien fitxategiak kudea ditzake, 8 biteko kolore-" "sakonerarekin." -#: ../plug-ins/common/file-xmc.c:1511 +#: ../plug-ins/common/file-xmc.c:1499 #, c-format -msgid "Width of '%s' is too large. Please reduce more than %dpx." -msgstr "'%s'(r)en zabalera handiegia da. Txikiagotu %d px baino gehiago." +msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." +msgstr "'%s' fotograma zabalegia da. Txikiagotu %d px baino gutxiago." -#: ../plug-ins/common/file-xmc.c:1518 +#: ../plug-ins/common/file-xmc.c:1506 #, c-format -msgid "Height of '%s' is too large. Please reduce more than %dpx." -msgstr "'%s'(r)en altuera handiegia da. Txikiagotu %d px baino gehiago." +msgid "Frame '%s' is too high. Please reduce to no more than %dpx." +msgstr "'%s' fotograma altuegia da. Txikiagotu %d px baino gutxiago." -#: ../plug-ins/common/file-xmc.c:1525 +#: ../plug-ins/common/file-xmc.c:1513 #, c-format -msgid "The size of '%s' is zero!" -msgstr "'%s'(r)en tamaina zero da." +msgid "Width and/or height of frame '%s' is zero!" +msgstr "'%s' fotogramaren zabalera eta edo altuera zero da." -#: ../plug-ins/common/file-xmc.c:1565 +#: ../plug-ins/common/file-xmc.c:1553 #, c-format msgid "" -"Cannot save the cursor because the hot spot is not on '%s'.\n" +"Cannot save the cursor because the hot spot is not on frame '%s'.\n" "Try to change the hot spot position, layer geometry or save without auto-" "crop." msgstr "" -"Ezin da kurtsorea gorde puntu aktiboa ez dagoelako '%s'(e)n.\n" +"Ezin da kurtsorea gorde puntu aktiboa ez dagoelako '%s' fotograman.\n" "Saia zaitez puntu aktiboa posizioz, geruzaren geometria aldatzen, edo gorde " "mozketa automatikorik gabe." -#: ../plug-ins/common/file-xmc.c:1721 +#: ../plug-ins/common/file-xmc.c:1710 #, c-format msgid "" -"Your cursor was successfully saved but it contains one or more frames which " +"Your cursor was successfully saved but it contains one or more frames whose " "width or height is more than %ipx.\n" "It will clutter the screen in some environments." msgstr "" -"Kurtsorea ongi gorde da, baina marko bat edo gehiago ditu %d px baino " +"Kurtsorea ongi gorde da, baina marko bat edo gehiago ditu %i px baino " "handiagoak diren zabalera edo altuerarekin.\n" "Ingurune batzuetan, pantaila ankazgora jarri dezake." -#: ../plug-ins/common/file-xmc.c:1728 +#: ../plug-ins/common/file-xmc.c:1717 msgid "" "Your cursor was successfully saved but it contains one or more frames whose " -"nominal size is not supported by gnome-appearance-properties.\n" -"You can satisfy it by checking \"Replace the size of all frame...\" in the " -"save dialog, or your cursor may not appear in gnome-appearance-properties." +"nominal size is not supported by GNOME settings.\n" +"You can satisfy it by checking \"Replace the size of all frames...\" in the " +"save dialog, or your cursor may not appear in GNOME settings." msgstr "" -"Zure kurtsorea ongi gorde da, baina ' gnome-appearance-properties'-ek " -"onartzen ez dituen izenezko tamaina dituzten marko bat edo gehiago ditu.\n" -"Aktibatu ezazu 'Ordeztu marko guztien tamaina...' 'Gorde' elkarrizketa-" -"koadroan hauek onartzeko, edo zure kurtsorea ez da 'gnome-appearance-" -"properties'-en agertuko." +"Zure kurtsorea ongi gorde da, baina GNOMEren ezarpenak onartzen ez dituen " +"izenezko tamaina dituzten marko bat edo gehiago ditu.\n" +"Aktibatu ezazu \"Ordeztu marko guztien tamaina...\" 'Gorde' elkarrizketa-" +"koadroan hauek onartzeko, edo zure kurtsorea ez da GNOMEren ezarpenetan " +"agertuko." -#: ../plug-ins/common/file-xmc.c:1965 +#: ../plug-ins/common/file-xmc.c:1954 #, c-format msgid "" -"The parasite \"%s\" is too long for X cursor.\n" -"The overflowed string was dropped." +"The parasite \"%s\" is too long for an X cursor comment. It was cut off to " +"fit." msgstr "" -"'%s' parasitoa handiegia da X kurtsorearentzako.\n" -"Gainezkatutako katea jaregin egin da." +"'%s' parasitoa handiegia da X kurtsorearen iruzkinarentzako.\n" +"Moztu egin da da doitzeko." -#: ../plug-ins/common/file-xmc.c:2167 +#. translators: the %i is *always* 8 here +#: ../plug-ins/common/file-xmc.c:2157 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -4956,20 +5105,20 @@ msgstr "XPM" msgid "_Alpha threshold:" msgstr "_Alfa muga:" -#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298 +#: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 msgid "X window dump" msgstr "X window-ren iraulia" -#: ../plug-ins/common/file-xwd.c:442 +#: ../plug-ins/common/file-xwd.c:444 #, c-format msgid "Could not read XWD header from '%s'" msgstr "Ezin da XWD goiburua irakurri '%s'(e)tik" -#: ../plug-ins/common/file-xwd.c:480 +#: ../plug-ins/common/file-xwd.c:482 msgid "Can't read color entries" msgstr "ezin dira kolore-sarrerak irakurri" -#: ../plug-ins/common/file-xwd.c:575 +#: ../plug-ins/common/file-xwd.c:579 #, c-format msgid "" "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " @@ -4978,15 +5127,20 @@ msgstr "" "%s XWD fitxategiak %d formatua, %d sakoneraeta %d bit pixeleko ditu.Une " "honetan hori ez da onartzen." -#: ../plug-ins/common/file-xwd.c:598 +#: ../plug-ins/common/file-xwd.c:602 msgid "Cannot save images with alpha channels." msgstr "Ezin izan dira alfa kanalak dituzten irudiak gorde." -#: ../plug-ins/common/file-xwd.c:2202 +#: ../plug-ins/common/file-xwd.c:1692 ../plug-ins/common/file-xwd.c:1930 +#, c-format +msgid "XWD-file %s is corrupt." +msgstr "%s XWD-fitxategia hondatuta dago." + +#: ../plug-ins/common/file-xwd.c:2224 msgid "Error during writing indexed/gray image" msgstr "Errorea irudi indexatu/grisa idaztean" -#: ../plug-ins/common/file-xwd.c:2300 +#: ../plug-ins/common/file-xwd.c:2320 msgid "Error during writing rgb image" msgstr "Errorea GBU irudia idaztean" @@ -5002,103 +5156,103 @@ msgstr "_Filma..." msgid "Composing images" msgstr "Irudiak konposatzen" -#: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:215 -#: ../plug-ins/help-browser/dialog.c:1114 +#: ../plug-ins/common/film.c:423 ../plug-ins/common/guillotine.c:215 +#: ../plug-ins/help-browser/dialog.c:1132 msgid "Untitled" msgstr "Izengabea" -#: ../plug-ins/common/film.c:880 +#: ../plug-ins/common/film.c:878 msgid "Available images:" msgstr "Erabilgarri dauden irudiak:" -#: ../plug-ins/common/film.c:881 +#: ../plug-ins/common/film.c:879 msgid "On film:" msgstr "Filmean:" #. Film height/colour -#: ../plug-ins/common/film.c:977 ../plug-ins/common/film.c:1252 +#: ../plug-ins/common/film.c:975 ../plug-ins/common/film.c:1251 msgid "Filmstrip" msgstr "Filma" #. Keep maximum image height -#: ../plug-ins/common/film.c:986 +#: ../plug-ins/common/film.c:984 msgid "_Fit height to images" msgstr "_Doitu altuera irudiei" #. Film color -#: ../plug-ins/common/film.c:1025 +#: ../plug-ins/common/film.c:1023 msgid "Select Film Color" msgstr "Hautatu film-kolorea" -#: ../plug-ins/common/film.c:1030 ../plug-ins/common/film.c:1080 +#: ../plug-ins/common/film.c:1028 ../plug-ins/common/film.c:1078 #: ../plug-ins/common/nova.c:349 msgid "Co_lor:" msgstr "Ko_lorea:" #. Film numbering: Startindex/Font/colour -#: ../plug-ins/common/film.c:1039 +#: ../plug-ins/common/film.c:1037 msgid "Numbering" msgstr "Zenbatzea" -#: ../plug-ins/common/film.c:1057 +#: ../plug-ins/common/film.c:1055 msgid "Start _index:" msgstr "Hasi _indizea:" -#: ../plug-ins/common/film.c:1070 +#: ../plug-ins/common/film.c:1068 msgid "_Font:" msgstr "Letra-_tipoa:" #. Numbering color -#: ../plug-ins/common/film.c:1075 +#: ../plug-ins/common/film.c:1073 msgid "Select Number Color" msgstr "Hautatu zenbakiaren kolorea" -#: ../plug-ins/common/film.c:1090 +#: ../plug-ins/common/film.c:1088 msgid "At _bottom" msgstr "_Behean" -#: ../plug-ins/common/film.c:1091 +#: ../plug-ins/common/film.c:1089 msgid "At _top" msgstr "_Goian" #. ** The right frame keeps the image selection ** -#: ../plug-ins/common/film.c:1104 +#: ../plug-ins/common/film.c:1102 msgid "Image Selection" msgstr "Irudi-hautapena" -#: ../plug-ins/common/film.c:1132 +#: ../plug-ins/common/film.c:1131 msgid "All Values are Fractions of the Strip Height" msgstr "Balio guztiak film-altueraren frakzioak dira" -#: ../plug-ins/common/film.c:1135 +#: ../plug-ins/common/film.c:1134 msgid "Ad_vanced" msgstr "Au_rreratua" -#: ../plug-ins/common/film.c:1154 +#: ../plug-ins/common/film.c:1153 msgid "Image _height:" msgstr "Irudiaren a_ltuera:" -#: ../plug-ins/common/film.c:1165 +#: ../plug-ins/common/film.c:1164 msgid "Image spac_ing:" msgstr "Irudiaren _tartea:" -#: ../plug-ins/common/film.c:1176 +#: ../plug-ins/common/film.c:1175 msgid "_Hole offset:" msgstr "_Zuloaren desplazamendua:" -#: ../plug-ins/common/film.c:1187 +#: ../plug-ins/common/film.c:1186 msgid "Ho_le width:" msgstr "Zu_loaren zabalera:" -#: ../plug-ins/common/film.c:1198 +#: ../plug-ins/common/film.c:1197 msgid "Hol_e height:" msgstr "Zul_oaren altuera:" -#: ../plug-ins/common/film.c:1209 +#: ../plug-ins/common/film.c:1208 msgid "Hole sp_acing:" msgstr "Zuloa_ren tartea:" -#: ../plug-ins/common/film.c:1220 +#: ../plug-ins/common/film.c:1219 msgid "_Number height:" msgstr "_Zenbakien altuera:" @@ -5106,17 +5260,17 @@ msgstr "_Zenbakien altuera:" #. to figure out which button the user pushed, etc. #. Not my design, please don't blame me -- njl #: ../plug-ins/common/filter-pack.c:220 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:952 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:955 msgid "Red:" msgstr "Gorria:" #: ../plug-ins/common/filter-pack.c:221 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:962 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:965 msgid "Green:" msgstr "Berdea:" #: ../plug-ins/common/filter-pack.c:222 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:972 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:975 msgid "Blue:" msgstr "Urdina:" @@ -5184,96 +5338,96 @@ msgstr "Ñabardura-aldakuntzak" msgid "Roughness" msgstr "Zimurtasuna" -#: ../plug-ins/common/filter-pack.c:674 ../plug-ins/common/filter-pack.c:1318 +#: ../plug-ins/common/filter-pack.c:676 ../plug-ins/common/filter-pack.c:1320 msgid "Affected Range" msgstr "Eraginpeko barrutia" -#: ../plug-ins/common/filter-pack.c:678 +#: ../plug-ins/common/filter-pack.c:680 msgid "Sha_dows" msgstr "_Itzalak" -#: ../plug-ins/common/filter-pack.c:679 +#: ../plug-ins/common/filter-pack.c:681 msgid "_Midtones" msgstr "_Tarteko tonuak" -#: ../plug-ins/common/filter-pack.c:680 +#: ../plug-ins/common/filter-pack.c:682 msgid "H_ighlights" msgstr "T_onu argiak" -#: ../plug-ins/common/filter-pack.c:694 +#: ../plug-ins/common/filter-pack.c:696 msgid "Windows" msgstr "Leihoak" -#: ../plug-ins/common/filter-pack.c:704 ../plug-ins/common/van-gogh-lic.c:676 +#: ../plug-ins/common/filter-pack.c:706 ../plug-ins/common/van-gogh-lic.c:676 msgid "_Saturation" msgstr "_Saturazioa" -#: ../plug-ins/common/filter-pack.c:712 +#: ../plug-ins/common/filter-pack.c:714 msgid "A_dvanced" msgstr "A_urreratua" -#: ../plug-ins/common/filter-pack.c:732 +#: ../plug-ins/common/filter-pack.c:734 msgid "Value Variations" msgstr "Balio-aldakuntzak" -#: ../plug-ins/common/filter-pack.c:777 +#: ../plug-ins/common/filter-pack.c:779 msgid "Saturation Variations" msgstr "Saturazioaren aldakuntzak" -#: ../plug-ins/common/filter-pack.c:830 +#: ../plug-ins/common/filter-pack.c:832 msgid "Select Pixels By" msgstr "Hautatu pixelak honen arabera:" -#: ../plug-ins/common/filter-pack.c:835 +#: ../plug-ins/common/filter-pack.c:837 msgid "H_ue" msgstr "_Ñabardura" -#: ../plug-ins/common/filter-pack.c:836 +#: ../plug-ins/common/filter-pack.c:838 msgid "Satu_ration" msgstr "Satu_razioa" -#: ../plug-ins/common/filter-pack.c:837 +#: ../plug-ins/common/filter-pack.c:839 msgid "V_alue" msgstr "_Balioa" -#: ../plug-ins/common/filter-pack.c:863 +#: ../plug-ins/common/filter-pack.c:865 msgid "Show" msgstr "Erakutsi" -#: ../plug-ins/common/filter-pack.c:868 +#: ../plug-ins/common/filter-pack.c:870 msgid "_Entire image" msgstr "_Irudi osoa" -#: ../plug-ins/common/filter-pack.c:869 +#: ../plug-ins/common/filter-pack.c:871 msgid "Se_lection only" msgstr "_Hautapena bakarrik" -#: ../plug-ins/common/filter-pack.c:870 +#: ../plug-ins/common/filter-pack.c:872 msgid "Selec_tion in context" msgstr "Hau_tapena testuinguruan" -#: ../plug-ins/common/filter-pack.c:1201 +#: ../plug-ins/common/filter-pack.c:1203 msgid "Filter Pack Simulation" msgstr "Iragazki-paketearen simulazioa" -#: ../plug-ins/common/filter-pack.c:1291 +#: ../plug-ins/common/filter-pack.c:1293 msgid "Shadows:" msgstr "Itzalak:" -#: ../plug-ins/common/filter-pack.c:1292 +#: ../plug-ins/common/filter-pack.c:1294 msgid "Midtones:" msgstr "Tarteko tonuak:" -#: ../plug-ins/common/filter-pack.c:1293 +#: ../plug-ins/common/filter-pack.c:1295 msgid "Highlights:" msgstr "Tonu argiak:" -#: ../plug-ins/common/filter-pack.c:1306 +#: ../plug-ins/common/filter-pack.c:1308 msgid "Advanced Filter Pack Options" msgstr "Iragazki-paketeen aukera aurreratuak" #. ****************** MISC OPTIONS ************************** -#: ../plug-ins/common/filter-pack.c:1417 +#: ../plug-ins/common/filter-pack.c:1420 msgid "Preview Size" msgstr "Aurrebistaren tamaina" @@ -5355,7 +5509,7 @@ msgstr "_Sareta..." msgid "Drawing grid" msgstr "Sareta marrazten" -#: ../plug-ins/common/grid.c:636 ../plug-ins/gfig/gfig-dialog.c:1376 +#: ../plug-ins/common/grid.c:636 ../plug-ins/gfig/gfig-dialog.c:1391 #: ../plug-ins/imagemap/imap_menu.c:208 msgid "Grid" msgstr "Sareta" @@ -5475,105 +5629,105 @@ msgstr "Erabili saguaren kontrola irudiaren areak doitzeko" msgid "_IWarp..." msgstr "Okertze interaktiboa..." -#: ../plug-ins/common/iwarp.c:699 +#: ../plug-ins/common/iwarp.c:697 msgid "Warping" msgstr "Okertzen" -#: ../plug-ins/common/iwarp.c:805 +#: ../plug-ins/common/iwarp.c:803 #, c-format msgid "Warping Frame %d" msgstr "%d. markoa okertzen" -#: ../plug-ins/common/iwarp.c:817 +#: ../plug-ins/common/iwarp.c:815 msgid "Ping pong" msgstr "Ping Pong" -#: ../plug-ins/common/iwarp.c:976 ../plug-ins/common/whirl-pinch.c:193 +#: ../plug-ins/common/iwarp.c:974 ../plug-ins/common/whirl-pinch.c:193 msgid "Region affected by plug-in is empty" msgstr "Pluginak eragindako eskualdea hutsik dago" -#: ../plug-ins/common/iwarp.c:1032 +#: ../plug-ins/common/iwarp.c:1030 msgid "A_nimate" msgstr "A_nimatu" -#: ../plug-ins/common/iwarp.c:1052 +#: ../plug-ins/common/iwarp.c:1050 msgid "Number of _frames:" msgstr "_Marko-kopurua:" -#: ../plug-ins/common/iwarp.c:1061 +#: ../plug-ins/common/iwarp.c:1059 msgid "R_everse" msgstr "A_lderantzikatu" -#: ../plug-ins/common/iwarp.c:1070 +#: ../plug-ins/common/iwarp.c:1068 msgid "_Ping pong" msgstr "_Ping Pong" -#: ../plug-ins/common/iwarp.c:1083 +#: ../plug-ins/common/iwarp.c:1081 msgid "_Animate" msgstr "_Animatu" -#: ../plug-ins/common/iwarp.c:1104 +#: ../plug-ins/common/iwarp.c:1102 msgid "Deform Mode" msgstr "Deformatze-modua" -#: ../plug-ins/common/iwarp.c:1117 +#: ../plug-ins/common/iwarp.c:1116 msgid "_Move" msgstr "_Mugitu" -#: ../plug-ins/common/iwarp.c:1118 +#: ../plug-ins/common/iwarp.c:1117 msgid "_Grow" msgstr "_Hazi" -#: ../plug-ins/common/iwarp.c:1119 +#: ../plug-ins/common/iwarp.c:1118 msgid "S_wirl CCW" msgstr "Z_urrunbiloa erlojuaren kontrako noranzkoan " -#: ../plug-ins/common/iwarp.c:1120 +#: ../plug-ins/common/iwarp.c:1119 msgid "Remo_ve" msgstr "_Kendu" -#: ../plug-ins/common/iwarp.c:1121 +#: ../plug-ins/common/iwarp.c:1120 msgid "S_hrink" msgstr "T_xikitu" -#: ../plug-ins/common/iwarp.c:1122 +#: ../plug-ins/common/iwarp.c:1121 msgid "Sw_irl CW" msgstr "_Zurrunbiloa erlojuaren noranzkoan" -#: ../plug-ins/common/iwarp.c:1151 +#: ../plug-ins/common/iwarp.c:1150 msgid "_Deform radius:" msgstr "_Deformatze-erradioa:" -#: ../plug-ins/common/iwarp.c:1161 +#: ../plug-ins/common/iwarp.c:1160 msgid "D_eform amount:" msgstr "D_eformatze-kopurua:" -#: ../plug-ins/common/iwarp.c:1170 +#: ../plug-ins/common/iwarp.c:1169 msgid "_Bilinear" msgstr "_Bilineala" -#: ../plug-ins/common/iwarp.c:1184 +#: ../plug-ins/common/iwarp.c:1183 msgid "Adaptive s_upersample" msgstr "S_uperadibide moldakorra" -#: ../plug-ins/common/iwarp.c:1205 +#: ../plug-ins/common/iwarp.c:1204 msgid "Ma_x depth:" msgstr "Ge_h sakonera:" -#: ../plug-ins/common/iwarp.c:1215 +#: ../plug-ins/common/iwarp.c:1214 msgid "Thresho_ld:" msgstr "_Muga:" -#: ../plug-ins/common/iwarp.c:1228 ../plug-ins/common/sinus.c:772 +#: ../plug-ins/common/iwarp.c:1227 ../plug-ins/common/sinus.c:772 #: ../plug-ins/gradient-flare/gradient-flare.c:2868 msgid "_Settings" msgstr "_Ezarpenak" -#: ../plug-ins/common/iwarp.c:1287 +#: ../plug-ins/common/iwarp.c:1286 msgid "IWarp" msgstr "Okertze interaktiboa" -#: ../plug-ins/common/iwarp.c:1325 +#: ../plug-ins/common/iwarp.c:1324 msgid "" "Click and drag in the preview to define the distortions to apply to the " "image." @@ -5593,60 +5747,60 @@ msgstr "_Puzzlea..." msgid "Assembling jigsaw" msgstr "Puzzlea egiten" -#: ../plug-ins/common/jigsaw.c:2417 +#: ../plug-ins/common/jigsaw.c:2393 msgid "Jigsaw" msgstr "Puzzlea" -#: ../plug-ins/common/jigsaw.c:2447 +#: ../plug-ins/common/jigsaw.c:2423 msgid "Number of Tiles" msgstr "Pieza-kopurua" -#: ../plug-ins/common/jigsaw.c:2462 +#: ../plug-ins/common/jigsaw.c:2438 msgid "Number of pieces going across" msgstr "Pieza horizontalen kopurua" -#: ../plug-ins/common/jigsaw.c:2479 +#: ../plug-ins/common/jigsaw.c:2455 msgid "Number of pieces going down" msgstr "Pieza bertikalen kopurua" -#: ../plug-ins/common/jigsaw.c:2493 +#: ../plug-ins/common/jigsaw.c:2469 msgid "Bevel Edges" msgstr "Alakaren ertzak" -#: ../plug-ins/common/jigsaw.c:2503 +#: ../plug-ins/common/jigsaw.c:2479 msgid "_Bevel width:" msgstr "_Alakaren zabalera:" -#: ../plug-ins/common/jigsaw.c:2507 +#: ../plug-ins/common/jigsaw.c:2483 msgid "Degree of slope of each piece's edge" msgstr "Pieza bakoitzaren ertzaren malda" -#: ../plug-ins/common/jigsaw.c:2520 +#: ../plug-ins/common/jigsaw.c:2496 msgid "H_ighlight:" msgstr "_Islak:" -#: ../plug-ins/common/jigsaw.c:2524 +#: ../plug-ins/common/jigsaw.c:2500 msgid "The amount of highlighting on the edges of each piece" msgstr "Pieza bakoitzaren ertzetako isla-kopurua" #. frame for primitive radio buttons -#: ../plug-ins/common/jigsaw.c:2541 +#: ../plug-ins/common/jigsaw.c:2517 msgid "Jigsaw Style" msgstr "Puzzle-estiloa" -#: ../plug-ins/common/jigsaw.c:2545 +#: ../plug-ins/common/jigsaw.c:2521 msgid "_Square" msgstr "_Karratua" -#: ../plug-ins/common/jigsaw.c:2546 +#: ../plug-ins/common/jigsaw.c:2522 msgid "C_urved" msgstr "K_urbaduna" -#: ../plug-ins/common/jigsaw.c:2550 +#: ../plug-ins/common/jigsaw.c:2526 msgid "Each piece has straight sides" msgstr "Pieza bakoitzak albo zuzenak ditu" -#: ../plug-ins/common/jigsaw.c:2551 +#: ../plug-ins/common/jigsaw.c:2527 msgid "Each piece has curved sides" msgstr "Pieza bakoitzak albo kurbatuak ditu" @@ -5735,7 +5889,7 @@ msgstr "_Mantendu" msgid "_Convert" msgstr "_Bihurtu" -#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:440 +#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "_Ez galdetu berriro" @@ -5836,35 +5990,35 @@ msgstr "Lentearen distortsioa zuzentzen du" msgid "Lens Distortion..." msgstr "Lentearen distortsioa..." -#: ../plug-ins/common/lens-distortion.c:381 +#: ../plug-ins/common/lens-distortion.c:379 msgid "Lens distortion" msgstr "Lentearen distortsioa" -#: ../plug-ins/common/lens-distortion.c:481 +#: ../plug-ins/common/lens-distortion.c:479 msgid "Lens Distortion" msgstr "Lentearen distortsioa" -#: ../plug-ins/common/lens-distortion.c:520 +#: ../plug-ins/common/lens-distortion.c:518 msgid "_Main:" msgstr "_Nagusia:" -#: ../plug-ins/common/lens-distortion.c:534 +#: ../plug-ins/common/lens-distortion.c:532 msgid "_Edge:" msgstr "_Ertza:" -#: ../plug-ins/common/lens-distortion.c:548 ../plug-ins/flame/flame.c:1236 +#: ../plug-ins/common/lens-distortion.c:546 ../plug-ins/flame/flame.c:1236 msgid "_Zoom:" msgstr "_Zooma:" -#: ../plug-ins/common/lens-distortion.c:562 +#: ../plug-ins/common/lens-distortion.c:560 msgid "_Brighten:" msgstr "_Argitu:" -#: ../plug-ins/common/lens-distortion.c:576 +#: ../plug-ins/common/lens-distortion.c:574 msgid "_X shift:" msgstr "_X desplazamendua:" -#: ../plug-ins/common/lens-distortion.c:590 +#: ../plug-ins/common/lens-distortion.c:588 msgid "_Y shift:" msgstr "_Y desplazamendua:" @@ -5972,76 +6126,76 @@ msgid "_Mosaic..." msgstr "_Mosaikoa..." #. progress bar for gradient finding -#: ../plug-ins/common/mosaic.c:506 +#: ../plug-ins/common/mosaic.c:505 msgid "Finding edges" msgstr "Ertzak aurkitzen" #. Progress bar for rendering tiles -#: ../plug-ins/common/mosaic.c:560 +#: ../plug-ins/common/mosaic.c:557 msgid "Rendering tiles" msgstr "Lauzak errendatzen" -#: ../plug-ins/common/mosaic.c:593 +#: ../plug-ins/common/mosaic.c:590 msgid "Mosaic" msgstr "Mosaikoa" -#: ../plug-ins/common/mosaic.c:634 +#: ../plug-ins/common/mosaic.c:631 msgid "Squares" msgstr "Karratuak" -#: ../plug-ins/common/mosaic.c:635 +#: ../plug-ins/common/mosaic.c:632 msgid "Hexagons" msgstr "Hexagonoak" -#: ../plug-ins/common/mosaic.c:636 +#: ../plug-ins/common/mosaic.c:633 msgid "Octagons & squares" msgstr "Oktagonoak eta karratuak" -#: ../plug-ins/common/mosaic.c:637 +#: ../plug-ins/common/mosaic.c:634 msgid "Triangles" msgstr "Triangeluak" -#: ../plug-ins/common/mosaic.c:645 +#: ../plug-ins/common/mosaic.c:642 msgid "_Tiling primitives:" msgstr "_Lauzen formak:" -#: ../plug-ins/common/mosaic.c:653 +#: ../plug-ins/common/mosaic.c:650 msgid "Tile _size:" msgstr "Mosaiko-_tamaina:" -#: ../plug-ins/common/mosaic.c:665 ../plug-ins/common/tile-glass.c:304 +#: ../plug-ins/common/mosaic.c:662 ../plug-ins/common/tile-glass.c:304 msgid "Tile _height:" msgstr "Mosaikoaren _altuera:" -#: ../plug-ins/common/mosaic.c:678 +#: ../plug-ins/common/mosaic.c:675 msgid "Til_e spacing:" msgstr "_Mosaiko-tartea:" -#: ../plug-ins/common/mosaic.c:690 +#: ../plug-ins/common/mosaic.c:687 msgid "Tile _neatness:" msgstr "Mosaikoaren tx_ukuntasuna:" -#: ../plug-ins/common/mosaic.c:703 +#: ../plug-ins/common/mosaic.c:700 msgid "Light _direction:" msgstr "A_rgiaren noranzkoa:" -#: ../plug-ins/common/mosaic.c:715 +#: ../plug-ins/common/mosaic.c:712 msgid "Color _variation:" msgstr "Kolore-al_dakuntza:" -#: ../plug-ins/common/mosaic.c:744 +#: ../plug-ins/common/mosaic.c:741 msgid "Co_lor averaging" msgstr "_Kolorearen batez bestekoa" -#: ../plug-ins/common/mosaic.c:757 +#: ../plug-ins/common/mosaic.c:754 msgid "Allo_w tile splitting" msgstr "_Baimendu lauza-banatzea" -#: ../plug-ins/common/mosaic.c:770 +#: ../plug-ins/common/mosaic.c:767 msgid "_Pitted surfaces" msgstr "_Gainazal zulodunak" -#: ../plug-ins/common/mosaic.c:783 +#: ../plug-ins/common/mosaic.c:780 msgid "_FG/BG lighting" msgstr "_AurPl-aren/AtzPl-aren argiztapena" @@ -6157,7 +6311,7 @@ msgid "_Factory Defaults" msgstr "_Fabrikako lehenetsiak" #. anti-alias control -#: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1278 +#: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1293 msgid "Antialiasing" msgstr "Antialiasing-a" @@ -6173,27 +6327,27 @@ msgstr "Erabilpen ugariko iragazki ez-lineala" msgid "_NL Filter..." msgstr "_NL iragazkia..." -#: ../plug-ins/common/nl-filter.c:953 ../plug-ins/common/nl-filter.c:1017 +#: ../plug-ins/common/nl-filter.c:952 ../plug-ins/common/nl-filter.c:1016 msgid "NL Filter" msgstr "NL iragazkia" -#: ../plug-ins/common/nl-filter.c:1047 +#: ../plug-ins/common/nl-filter.c:1046 msgid "Filter" msgstr "Iragazkia" -#: ../plug-ins/common/nl-filter.c:1051 +#: ../plug-ins/common/nl-filter.c:1050 msgid "_Alpha trimmed mean" msgstr "_Alfak murriztutako batez bestekoa" -#: ../plug-ins/common/nl-filter.c:1053 +#: ../plug-ins/common/nl-filter.c:1052 msgid "Op_timal estimation" msgstr "_Zenbatespen optimoa" -#: ../plug-ins/common/nl-filter.c:1055 +#: ../plug-ins/common/nl-filter.c:1054 msgid "_Edge enhancement" msgstr "_Ertzaren hobetzea" -#: ../plug-ins/common/nl-filter.c:1080 +#: ../plug-ins/common/nl-filter.c:1079 msgid "A_lpha:" msgstr "A_lfa:" @@ -6253,24 +6407,24 @@ msgstr "_Jaso..." msgid "_Slur..." msgstr "_Urtu..." -#: ../plug-ins/common/noise-randomize.c:772 +#: ../plug-ins/common/noise-randomize.c:767 #: ../plug-ins/common/noise-solid.c:603 msgid "_Random seed:" msgstr "Ausazko _hazia:" -#: ../plug-ins/common/noise-randomize.c:781 +#: ../plug-ins/common/noise-randomize.c:776 msgid "R_andomization (%):" msgstr "A_usaz nahastea (%):" -#: ../plug-ins/common/noise-randomize.c:784 +#: ../plug-ins/common/noise-randomize.c:779 msgid "Percentage of pixels to be filtered" msgstr "Iragazi beharreko pixelen ehunekoa" -#: ../plug-ins/common/noise-randomize.c:796 +#: ../plug-ins/common/noise-randomize.c:791 msgid "R_epeat:" msgstr "Er_repikatu:" -#: ../plug-ins/common/noise-randomize.c:799 +#: ../plug-ins/common/noise-randomize.c:794 msgid "Number of times to apply filter" msgstr "Iragazkia zenbat aldiz aplikatu behar den" @@ -6516,60 +6670,60 @@ msgstr "Bistaratu pluginei buruzko informazioa" msgid "_Plug-In Browser" msgstr "_Plugin-en arakatzailea" -#: ../plug-ins/common/plugin-browser.c:377 +#: ../plug-ins/common/plugin-browser.c:363 msgid "Searching by name" msgstr "Bilatu izenaren arabera" -#: ../plug-ins/common/plugin-browser.c:391 +#: ../plug-ins/common/plugin-browser.c:377 #, c-format msgid "%d plug-in" msgid_plural "%d plug-ins" msgstr[0] "plugin %d" msgstr[1] "%d plugin" -#: ../plug-ins/common/plugin-browser.c:400 +#: ../plug-ins/common/plugin-browser.c:386 msgid "No matches for your query" msgstr "Ez dago bat datorrenik kontsultarekin" -#: ../plug-ins/common/plugin-browser.c:403 +#: ../plug-ins/common/plugin-browser.c:389 #, c-format msgid "%d plug-in matches your query" msgid_plural "%d plug-ins match your query" msgstr[0] "Plugin %d bat dator kontsultarekin" msgstr[1] "%d plugin bat datoz kontsultarekin" -#: ../plug-ins/common/plugin-browser.c:534 +#: ../plug-ins/common/plugin-browser.c:520 msgid "No matches" msgstr "Ez dago bat datorrenik" -#: ../plug-ins/common/plugin-browser.c:560 +#: ../plug-ins/common/plugin-browser.c:546 msgid "Plug-In Browser" msgstr "Plugin-en arakatzailea" -#: ../plug-ins/common/plugin-browser.c:603 +#: ../plug-ins/common/plugin-browser.c:589 msgid "Name" msgstr "Izena" -#: ../plug-ins/common/plugin-browser.c:611 -#: ../plug-ins/common/plugin-browser.c:674 +#: ../plug-ins/common/plugin-browser.c:597 +#: ../plug-ins/common/plugin-browser.c:660 msgid "Menu Path" msgstr "Menuaren bide-izena" -#: ../plug-ins/common/plugin-browser.c:619 -#: ../plug-ins/common/plugin-browser.c:683 +#: ../plug-ins/common/plugin-browser.c:605 +#: ../plug-ins/common/plugin-browser.c:669 msgid "Image Types" msgstr "Irudi-motak" -#: ../plug-ins/common/plugin-browser.c:629 -#: ../plug-ins/common/plugin-browser.c:692 +#: ../plug-ins/common/plugin-browser.c:615 +#: ../plug-ins/common/plugin-browser.c:678 msgid "Installation Date" msgstr "Instalazioaren data" -#: ../plug-ins/common/plugin-browser.c:653 +#: ../plug-ins/common/plugin-browser.c:639 msgid "List View" msgstr "Zerrenda-ikuspegia" -#: ../plug-ins/common/plugin-browser.c:715 +#: ../plug-ins/common/plugin-browser.c:701 msgid "Tree View" msgstr "Zuhaitz-ikuspegia" @@ -6585,34 +6739,34 @@ msgstr "Koordenatu p_olarrak..." msgid "Polar coordinates" msgstr "Koordenatu polarrak" -#: ../plug-ins/common/polar-coords.c:593 +#: ../plug-ins/common/polar-coords.c:591 msgid "Polar Coordinates" msgstr "Polar koordenatuak" -#: ../plug-ins/common/polar-coords.c:633 +#: ../plug-ins/common/polar-coords.c:631 msgid "Circle _depth in percent:" msgstr "Zirkuluaren _sakonera ehunekotan:" -#: ../plug-ins/common/polar-coords.c:645 +#: ../plug-ins/common/polar-coords.c:643 msgid "Offset _angle:" msgstr "Desplazamendu-ange_lua:" -#: ../plug-ins/common/polar-coords.c:660 +#: ../plug-ins/common/polar-coords.c:659 msgid "_Map backwards" msgstr "_Mapatu atzerantz" -#: ../plug-ins/common/polar-coords.c:666 +#: ../plug-ins/common/polar-coords.c:665 msgid "" "If checked the mapping will begin at the right side, as opposed to beginning " "at the left." msgstr "" "Hau hautatuz gero, mapatzea eskuineko aldean hasiko da, eta ez ezkerrekoan." -#: ../plug-ins/common/polar-coords.c:677 +#: ../plug-ins/common/polar-coords.c:676 msgid "Map from _top" msgstr "Mapatu g_oitik" -#: ../plug-ins/common/polar-coords.c:683 +#: ../plug-ins/common/polar-coords.c:682 msgid "" "If unchecked the mapping will put the bottom row in the middle and the top " "row on the outside. If checked it will be the opposite." @@ -6620,11 +6774,11 @@ msgstr "" "Hautatzen ez bada, mapatzeak beheko errenkada erdian jarriko du, eta goiko " "errenkada kanpoan. Hautatzen baduzu, aurkakoa egingo du." -#: ../plug-ins/common/polar-coords.c:695 +#: ../plug-ins/common/polar-coords.c:694 msgid "To _polar" msgstr "_Polarretara" -#: ../plug-ins/common/polar-coords.c:701 +#: ../plug-ins/common/polar-coords.c:700 msgid "" "If unchecked the image will be circularly mapped onto a rectangle. If " "checked the image will be mapped onto a circle." @@ -6652,19 +6806,19 @@ msgstr "Sortu eredu abstrakto asko" msgid "_Qbist..." msgstr "_Qbista ..." -#: ../plug-ins/common/qbist.c:517 +#: ../plug-ins/common/qbist.c:515 msgid "Qbist" msgstr "Qbist" -#: ../plug-ins/common/qbist.c:714 +#: ../plug-ins/common/qbist.c:712 msgid "Load QBE File" msgstr "Kargatu QBE fitxategia" -#: ../plug-ins/common/qbist.c:756 +#: ../plug-ins/common/qbist.c:754 msgid "Save as QBE File" msgstr "Gorde QBE fitxategi gisa" -#: ../plug-ins/common/qbist.c:810 +#: ../plug-ins/common/qbist.c:808 msgid "G-Qbist" msgstr "G-Qbist" @@ -6681,7 +6835,7 @@ msgid "Red Eye Removal" msgstr "Begi gorria kentzea" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:893 ../plug-ins/common/wind.c:1011 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -6753,19 +6907,19 @@ msgstr "A_nplitudea:" msgid "Phase _shift:" msgstr "Fasearen _desplazamendua:" -#: ../plug-ins/common/rotate.c:412 +#: ../plug-ins/common/rotate.c:408 msgid "You can not rotate the whole image if there's a selection." msgstr "Ezin duzu irudi osoa biratu hautapena eginda badago." -#: ../plug-ins/common/rotate.c:419 +#: ../plug-ins/common/rotate.c:415 msgid "You can not rotate the whole image if there's a floating selection." msgstr "Ezin duzu irudi osoa biratu hautapen mugikorra eginda badago." -#: ../plug-ins/common/rotate.c:430 +#: ../plug-ins/common/rotate.c:426 msgid "Sorry, channels and masks can not be rotated." msgstr "Kanalak eta maskarak ezin dira biratu." -#: ../plug-ins/common/rotate.c:436 +#: ../plug-ins/common/rotate.c:432 msgid "Rotating" msgstr "Biraketa" @@ -6815,121 +6969,121 @@ msgstr "Erakutsi hautapena" msgid "Show color" msgstr "Erakutsi kolorea" -#: ../plug-ins/common/sample-colorize.c:1562 +#: ../plug-ins/common/sample-colorize.c:1563 msgid "Input levels:" msgstr "Sarrera-mailak:" -#: ../plug-ins/common/sample-colorize.c:1612 +#: ../plug-ins/common/sample-colorize.c:1614 msgid "Output levels:" msgstr "Irteera-mailak:" #. check button -#: ../plug-ins/common/sample-colorize.c:1652 +#: ../plug-ins/common/sample-colorize.c:1654 msgid "Hold intensity" msgstr "Eutsi intentsitateari" #. check button -#: ../plug-ins/common/sample-colorize.c:1663 +#: ../plug-ins/common/sample-colorize.c:1665 msgid "Original intensity" msgstr "Jatorrizko intentsitatea" #. check button -#: ../plug-ins/common/sample-colorize.c:1681 +#: ../plug-ins/common/sample-colorize.c:1683 msgid "Use subcolors" msgstr "Erabili azpikoloreak" #. check button -#: ../plug-ins/common/sample-colorize.c:1692 +#: ../plug-ins/common/sample-colorize.c:1694 msgid "Smooth samples" msgstr "Leundu laginak" -#: ../plug-ins/common/sample-colorize.c:2664 +#: ../plug-ins/common/sample-colorize.c:2666 msgid "Sample analyze" msgstr "Laginaren analisia" -#: ../plug-ins/common/sample-colorize.c:3044 +#: ../plug-ins/common/sample-colorize.c:3046 msgid "Remap colorized" msgstr "Mapatu berriro koloreztatua" -#: ../plug-ins/common/screenshot.c:240 +#: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" msgstr "Sortu irudia pantailako area batetik" -#: ../plug-ins/common/screenshot.c:253 +#: ../plug-ins/common/screenshot.c:272 msgid "_Screenshot..." msgstr "_Pantaila-argazkia..." -#: ../plug-ins/common/screenshot.c:418 +#: ../plug-ins/common/screenshot.c:445 msgid "Error selecting the window" msgstr "Errorea leihoa hautatzean" -#: ../plug-ins/common/screenshot.c:787 +#: ../plug-ins/common/screenshot.c:813 msgid "Importing screenshot" msgstr "Pantaila-argazkia inportatzen" -#: ../plug-ins/common/screenshot.c:813 ../plug-ins/common/screenshot.c:1086 +#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 msgid "Screenshot" msgstr "Pantaila-argazkia" -#: ../plug-ins/common/screenshot.c:854 +#: ../plug-ins/common/screenshot.c:880 msgid "Mouse Pointer" msgstr "Saguaren erakuslea" -#: ../plug-ins/common/screenshot.c:973 +#: ../plug-ins/common/screenshot.c:1014 msgid "Specified window not found" msgstr "Zehaztutako leihoa ez da aurkitu" -#: ../plug-ins/common/screenshot.c:1095 +#: ../plug-ins/common/screenshot.c:1213 msgid "S_nap" msgstr "_Atxikitu" -#: ../plug-ins/common/screenshot.c:1125 +#: ../plug-ins/common/screenshot.c:1243 msgid "After the delay, the screenshot is taken." msgstr "Atzerapenaren ondoren, pantailaren kaptura egingo da." -#: ../plug-ins/common/screenshot.c:1127 +#: ../plug-ins/common/screenshot.c:1245 msgid "" "After the delay, drag your mouse to select the region for the screenshot." msgstr "" "Atzerapenaren ondoren, sagua erabil dezakezu pantailaren eskualde laukiluzea " "hautatzeko." -#: ../plug-ins/common/screenshot.c:1130 +#: ../plug-ins/common/screenshot.c:1248 msgid "At the end of the delay, click in a window to snap it." msgstr "Atzerapenaren amaieran, egin klik leihoan atxikitzeko." #. Area -#: ../plug-ins/common/screenshot.c:1136 +#: ../plug-ins/common/screenshot.c:1254 msgid "Area" msgstr "Area" -#: ../plug-ins/common/screenshot.c:1147 +#: ../plug-ins/common/screenshot.c:1265 msgid "Take a screenshot of a single _window" msgstr "Egin _leiho bakarraren kaptura" -#: ../plug-ins/common/screenshot.c:1166 +#: ../plug-ins/common/screenshot.c:1284 msgid "Include window _decoration" msgstr "Sartu leiho _apaingarria" -#: ../plug-ins/common/screenshot.c:1186 +#: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" msgstr "Egin pantaila _osoaren kaptura" -#: ../plug-ins/common/screenshot.c:1205 +#: ../plug-ins/common/screenshot.c:1323 msgid "Include _mouse pointer" msgstr "Sartu _saguaren erakuslea" -#: ../plug-ins/common/screenshot.c:1226 +#: ../plug-ins/common/screenshot.c:1344 msgid "Select a _region to grab" msgstr "Hautatu _eskualdea kapturatzeko" #. Delay -#: ../plug-ins/common/screenshot.c:1241 +#: ../plug-ins/common/screenshot.c:1359 msgid "Delay" msgstr "Atzerapena" #. this is the unit label of a spinbutton -#: ../plug-ins/common/screenshot.c:1263 +#: ../plug-ins/common/screenshot.c:1381 msgid "seconds" msgstr "segundo" @@ -6941,7 +7095,7 @@ msgstr "Ordeztu gardentasun partziala uneko atzeko planoko kolorearekin" msgid "_Semi-Flatten" msgstr "_Erdizka berdintzea" -#: ../plug-ins/common/semi-flatten.c:117 +#: ../plug-ins/common/semi-flatten.c:112 msgid "Semi-Flattening" msgstr "Erdizka berdintzen" @@ -7089,7 +7243,7 @@ msgid "S_econd color:" msgstr "B_igarren kolorea:" #: ../plug-ins/common/sinus.c:887 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:903 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:906 msgid "Co_lors" msgstr "Ko_loreak" @@ -7330,137 +7484,137 @@ msgstr "Espirala" msgid "Spots" msgstr "Pikortak" -#: ../plug-ins/common/sphere-designer.c:1744 -#: ../plug-ins/common/sphere-designer.c:2698 +#: ../plug-ins/common/sphere-designer.c:1749 +#: ../plug-ins/common/sphere-designer.c:2705 msgid "Texture" msgstr "Testura" -#: ../plug-ins/common/sphere-designer.c:1746 +#: ../plug-ins/common/sphere-designer.c:1751 msgid "Bumpmap" msgstr "Erliebe-mapa" -#: ../plug-ins/common/sphere-designer.c:1748 -#: ../plug-ins/common/sphere-designer.c:2700 +#: ../plug-ins/common/sphere-designer.c:1753 +#: ../plug-ins/common/sphere-designer.c:2707 msgid "Light" msgstr "Zuria" -#: ../plug-ins/common/sphere-designer.c:2012 +#: ../plug-ins/common/sphere-designer.c:2017 #, c-format msgid "File '%s' is not a valid save file." msgstr "'%s' fitxategia ez da baliozkoa." -#: ../plug-ins/common/sphere-designer.c:2192 +#: ../plug-ins/common/sphere-designer.c:2197 msgid "Open File" msgstr "Ireki fitxategia" -#: ../plug-ins/common/sphere-designer.c:2192 +#: ../plug-ins/common/sphere-designer.c:2197 msgid "Save File" msgstr "Gorde fitxategia" -#: ../plug-ins/common/sphere-designer.c:2551 +#: ../plug-ins/common/sphere-designer.c:2556 msgid "Sphere Designer" msgstr "Esfera-diseinatzailea" -#: ../plug-ins/common/sphere-designer.c:2683 +#: ../plug-ins/common/sphere-designer.c:2690 msgid "Properties" msgstr "Propietateak" -#: ../plug-ins/common/sphere-designer.c:2699 +#: ../plug-ins/common/sphere-designer.c:2706 msgid "Bump" msgstr "Erliebea" #. row labels -#: ../plug-ins/common/sphere-designer.c:2707 +#: ../plug-ins/common/sphere-designer.c:2714 #: ../plug-ins/lighting/lighting-ui.c:407 msgid "Type:" msgstr "Mota:" -#: ../plug-ins/common/sphere-designer.c:2726 +#: ../plug-ins/common/sphere-designer.c:2733 msgid "Texture:" msgstr "Testura:" -#: ../plug-ins/common/sphere-designer.c:2731 +#: ../plug-ins/common/sphere-designer.c:2738 msgid "Colors:" msgstr "Koloreak:" -#: ../plug-ins/common/sphere-designer.c:2734 -#: ../plug-ins/common/sphere-designer.c:2745 +#: ../plug-ins/common/sphere-designer.c:2741 +#: ../plug-ins/common/sphere-designer.c:2752 msgid "Color Selection Dialog" msgstr "Kolorea hautatzeko elkarrizketa-koadroa" #. Scale -#: ../plug-ins/common/sphere-designer.c:2756 +#: ../plug-ins/common/sphere-designer.c:2763 #: ../plug-ins/gimpressionist/paper.c:193 #: ../plug-ins/ifs-compose/ifs-compose.c:553 msgid "Scale:" msgstr "Eskala:" -#: ../plug-ins/common/sphere-designer.c:2764 +#: ../plug-ins/common/sphere-designer.c:2771 msgid "Turbulence:" msgstr "Turbulentzia:" -#: ../plug-ins/common/sphere-designer.c:2771 +#: ../plug-ins/common/sphere-designer.c:2778 msgid "Amount:" msgstr "Kopurua:" -#: ../plug-ins/common/sphere-designer.c:2778 +#: ../plug-ins/common/sphere-designer.c:2785 msgid "Exp.:" msgstr "Berr:" -#: ../plug-ins/common/sphere-designer.c:2785 +#: ../plug-ins/common/sphere-designer.c:2792 msgid "Transformations" msgstr "Eraldaketak" -#: ../plug-ins/common/sphere-designer.c:2801 +#: ../plug-ins/common/sphere-designer.c:2808 #: ../plug-ins/map-object/map-object-ui.c:1097 msgid "Scale X:" msgstr "X eskala:" -#: ../plug-ins/common/sphere-designer.c:2808 +#: ../plug-ins/common/sphere-designer.c:2815 msgid "Scale Y:" msgstr "Y eskala:" -#: ../plug-ins/common/sphere-designer.c:2814 +#: ../plug-ins/common/sphere-designer.c:2821 msgid "Scale Z:" msgstr "Z eskala:" -#: ../plug-ins/common/sphere-designer.c:2821 +#: ../plug-ins/common/sphere-designer.c:2828 msgid "Rotate X:" msgstr "Biratu X:" -#: ../plug-ins/common/sphere-designer.c:2828 +#: ../plug-ins/common/sphere-designer.c:2835 msgid "Rotate Y:" msgstr "Biratu Y:" -#: ../plug-ins/common/sphere-designer.c:2835 +#: ../plug-ins/common/sphere-designer.c:2842 msgid "Rotate Z:" msgstr "Biratu Z:" -#: ../plug-ins/common/sphere-designer.c:2842 +#: ../plug-ins/common/sphere-designer.c:2849 msgid "Position X:" msgstr "X kokalekua:" -#: ../plug-ins/common/sphere-designer.c:2849 +#: ../plug-ins/common/sphere-designer.c:2856 msgid "Position Y:" msgstr "Y kokalekua:" -#: ../plug-ins/common/sphere-designer.c:2856 +#: ../plug-ins/common/sphere-designer.c:2863 msgid "Position Z:" msgstr "Z kokalekua:" -#: ../plug-ins/common/sphere-designer.c:2973 +#: ../plug-ins/common/sphere-designer.c:2979 msgid "Rendering sphere" msgstr "Esfera errendatzen" -#: ../plug-ins/common/sphere-designer.c:3024 +#: ../plug-ins/common/sphere-designer.c:3030 msgid "Create an image of a textured sphere" msgstr "Sortu testuradun esferaren irudia" -#: ../plug-ins/common/sphere-designer.c:3031 +#: ../plug-ins/common/sphere-designer.c:3037 msgid "Sphere _Designer..." msgstr "Esfera-_diseinatzailea..." -#: ../plug-ins/common/sphere-designer.c:3101 +#: ../plug-ins/common/sphere-designer.c:3107 msgid "Region selected for plug-in is empty" msgstr "Plugin-entzako hautatutako eskualdea hutsik dago" @@ -7613,7 +7767,7 @@ msgid "Region selected for filter is empty." msgstr "Iragazteko hautatutako eskualdea hutsik dago." #. Set the tile cache size -#: ../plug-ins/common/tile-small.c:328 ../plug-ins/common/tile.c:190 +#: ../plug-ins/common/tile-small.c:328 ../plug-ins/common/tile.c:185 msgid "Tiling" msgstr "Mosaikoa egiten" @@ -7629,32 +7783,32 @@ msgstr "Mosaiko txikiak..." msgid "Flip" msgstr "Irauli" -#: ../plug-ins/common/tile-small.c:469 +#: ../plug-ins/common/tile-small.c:470 msgid "A_ll tiles" msgstr "_Lauza guztiak" -#: ../plug-ins/common/tile-small.c:483 +#: ../plug-ins/common/tile-small.c:484 msgid "Al_ternate tiles" msgstr "T_xandakatu lauzak" -#: ../plug-ins/common/tile-small.c:497 +#: ../plug-ins/common/tile-small.c:498 msgid "_Explicit tile" msgstr "L_auza esplizitua" -#: ../plug-ins/common/tile-small.c:503 +#: ../plug-ins/common/tile-small.c:504 msgid "Ro_w:" msgstr "Er_renkada:" -#: ../plug-ins/common/tile-small.c:529 +#: ../plug-ins/common/tile-small.c:530 msgid "Col_umn:" msgstr "Zu_tabea:" -#: ../plug-ins/common/tile-small.c:584 +#: ../plug-ins/common/tile-small.c:585 msgid "O_pacity:" msgstr "_Opakutasuna:" #. Lower frame saying howmany segments -#: ../plug-ins/common/tile-small.c:593 +#: ../plug-ins/common/tile-small.c:594 msgid "Number of Segments" msgstr "Segmentu-kopurua:" @@ -7666,15 +7820,15 @@ msgstr "Sortu irudiaren kopien array-a" msgid "_Tile..." msgstr "_Mosaikoa..." -#: ../plug-ins/common/tile.c:402 +#: ../plug-ins/common/tile.c:397 msgid "Tile" msgstr "Mosaikoa" -#: ../plug-ins/common/tile.c:424 +#: ../plug-ins/common/tile.c:419 msgid "Tile to New Size" msgstr "Egin mosaikoa tamaina berrian" -#: ../plug-ins/common/tile.c:446 +#: ../plug-ins/common/tile.c:441 msgid "C_reate new image" msgstr "_Sortu irudi berria" @@ -7776,47 +7930,47 @@ msgstr "Sortu edo eraldatu GIMPen erabilitako unitateak" msgid "U_nits" msgstr "_Unitateak" -#: ../plug-ins/common/unit-editor.c:208 +#: ../plug-ins/common/unit-editor.c:205 msgid "Add a New Unit" msgstr "Gehitu unitate berria" -#: ../plug-ins/common/unit-editor.c:237 +#: ../plug-ins/common/unit-editor.c:234 msgid "_ID:" msgstr "_IDa:" -#: ../plug-ins/common/unit-editor.c:248 +#: ../plug-ins/common/unit-editor.c:245 msgid "_Factor:" msgstr "_Faktorea:" -#: ../plug-ins/common/unit-editor.c:258 +#: ../plug-ins/common/unit-editor.c:255 msgid "_Digits:" msgstr "_Digituak:" -#: ../plug-ins/common/unit-editor.c:270 +#: ../plug-ins/common/unit-editor.c:267 msgid "_Symbol:" msgstr "_Ikurra:" -#: ../plug-ins/common/unit-editor.c:282 +#: ../plug-ins/common/unit-editor.c:279 msgid "_Abbreviation:" msgstr "_Laburdura:" -#: ../plug-ins/common/unit-editor.c:294 +#: ../plug-ins/common/unit-editor.c:291 msgid "Si_ngular:" msgstr "Si_ngularra:" -#: ../plug-ins/common/unit-editor.c:306 +#: ../plug-ins/common/unit-editor.c:303 msgid "_Plural:" msgstr "_Plurala:" -#: ../plug-ins/common/unit-editor.c:349 +#: ../plug-ins/common/unit-editor.c:346 msgid "Incomplete input" msgstr "Osatu gabeko sarrera" -#: ../plug-ins/common/unit-editor.c:352 +#: ../plug-ins/common/unit-editor.c:349 msgid "Please fill in all text fields." msgstr "Bete testu-eremu guztiak" -#: ../plug-ins/common/unit-editor.c:411 +#: ../plug-ins/common/unit-editor.c:408 msgid "Unit Editor" msgstr "Unitate-editorea" @@ -7828,11 +7982,11 @@ msgstr "Gehien erabiltzen den metodoa irudia zehazteko" msgid "_Unsharp Mask..." msgstr "_Desenfokatze-maskara..." -#: ../plug-ins/common/unsharp-mask.c:686 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Batzen" -#: ../plug-ins/common/unsharp-mask.c:830 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Desenfokatze-maskara" @@ -8100,7 +8254,7 @@ msgid "Step size:" msgstr "Urratsaren tamaina:" #: ../plug-ins/common/warp.c:434 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:769 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:771 #: ../plug-ins/ifs-compose/ifs-compose.c:1209 msgid "Iterations:" msgstr "Iterazioak:" @@ -8125,7 +8279,7 @@ msgid "Smear" msgstr "Lohitu" #: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1020 -#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1482 +#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1497 msgid "Black" msgstr "Beltza" @@ -8188,20 +8342,20 @@ msgid "Fixed-direction-vector map selection menu" msgstr "Noranzko finkoko bektorearen mapa hautatzeko menua" #. make sure layer is visible -#: ../plug-ins/common/warp.c:1181 +#: ../plug-ins/common/warp.c:1178 msgid "Smoothing X gradient" msgstr "X gradientea leuntzen" -#: ../plug-ins/common/warp.c:1184 +#: ../plug-ins/common/warp.c:1181 msgid "Smoothing Y gradient" msgstr "Y gradientea leuntzen" #. calculate new X,Y Displacement image maps -#: ../plug-ins/common/warp.c:1234 +#: ../plug-ins/common/warp.c:1228 msgid "Finding XY gradient" msgstr "XY gradientea bilatzen" -#: ../plug-ins/common/warp.c:1259 +#: ../plug-ins/common/warp.c:1249 #, c-format msgid "Flow step %d" msgstr "%d. fluxu-urratsa" @@ -8234,141 +8388,141 @@ msgstr "_Fasea:" msgid "_Wavelength:" msgstr "_Uhin-luzera:" -#: ../plug-ins/common/waves.c:450 +#: ../plug-ins/common/waves.c:449 msgid "Waving" msgstr "Uhintzen" -#: ../plug-ins/common/web-browser.c:137 +#: ../plug-ins/common/web-browser.c:135 msgid "The operating system is out of memory or resources." msgstr "Sistema eragilea memoriarik edo baliabiderik gabe dago." -#: ../plug-ins/common/web-browser.c:140 +#: ../plug-ins/common/web-browser.c:138 msgid "The specified file was not found." msgstr "Zehaztutako fitxategia ez da aurkitu." -#: ../plug-ins/common/web-browser.c:143 +#: ../plug-ins/common/web-browser.c:141 msgid "The specified path was not found." msgstr "Zehaztutako bidea ez da aurkitu." -#: ../plug-ins/common/web-browser.c:146 +#: ../plug-ins/common/web-browser.c:144 msgid "" "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" ".exe fitxategia baliogabea da (ez da Microsoft 32ko .exe edo errorea .exe " "irudian)." -#: ../plug-ins/common/web-browser.c:149 +#: ../plug-ins/common/web-browser.c:147 msgid "The operating system denied access to the specified file." msgstr "" "Sistema eragileak zehaztutako fitxategirako sarbidetza debekatu egin du." -#: ../plug-ins/common/web-browser.c:152 +#: ../plug-ins/common/web-browser.c:150 msgid "The file name association is incomplete or invalid." msgstr "Esleitutako fitxategi-izena osatu gabea edo ez da baliozkoa." -#: ../plug-ins/common/web-browser.c:155 +#: ../plug-ins/common/web-browser.c:153 msgid "DDE transaction busy" msgstr "DDE transakzioa lanpetuta" -#: ../plug-ins/common/web-browser.c:158 +#: ../plug-ins/common/web-browser.c:156 msgid "The DDE transaction failed." msgstr "Huts egin du DDE transakzioak." -#: ../plug-ins/common/web-browser.c:161 +#: ../plug-ins/common/web-browser.c:159 msgid "The DDE transaction timed out." msgstr "DDE transakzioaren denbora iraungituta." -#: ../plug-ins/common/web-browser.c:164 +#: ../plug-ins/common/web-browser.c:162 msgid "The specified DLL was not found." msgstr "Zehaztutako DLL ez da aurkitu" -#: ../plug-ins/common/web-browser.c:167 +#: ../plug-ins/common/web-browser.c:165 msgid "There is no application associated with the given file name extension." msgstr "Ez dago aplikaziorik emandako fitxategiaren hedapenarekin esleituta." -#: ../plug-ins/common/web-browser.c:170 +#: ../plug-ins/common/web-browser.c:168 msgid "There was not enough memory to complete the operation." msgstr "Ez dago nahikoa memoriarik eragiketa burutzeko." -#: ../plug-ins/common/web-browser.c:173 +#: ../plug-ins/common/web-browser.c:171 msgid "A sharing violation occurred." msgstr "Partekatzearen bortxaketa gertatu da." -#: ../plug-ins/common/web-browser.c:176 +#: ../plug-ins/common/web-browser.c:174 msgid "Unknown Microsoft Windows error." msgstr "Microsoft Windows-en errore ezezaguna." -#: ../plug-ins/common/web-browser.c:179 +#: ../plug-ins/common/web-browser.c:177 #, c-format msgid "Failed to open '%s': %s" msgstr "Huts egin du '%s' ireki: %s" -#: ../plug-ins/common/web-page.c:99 +#: ../plug-ins/common/web-page.c:98 msgid "Create an image of a webpage" msgstr "Sortu web orrialdearen irudia" -#: ../plug-ins/common/web-page.c:105 +#: ../plug-ins/common/web-page.c:104 msgid "From _Webpage..." msgstr "_Web orrialdetik..." -#: ../plug-ins/common/web-page.c:234 +#: ../plug-ins/common/web-page.c:233 msgid "Create from webpage" msgstr "Sortu web-orrialdetik" -#: ../plug-ins/common/web-page.c:239 +#: ../plug-ins/common/web-page.c:238 msgid "_Create" msgstr "_Sortu" -#: ../plug-ins/common/web-page.c:267 +#: ../plug-ins/common/web-page.c:266 msgid "Enter location (URI):" msgstr "Sartu kokalekua (URIa):" #. entscale == Entry and Scale pair function found in pixelize.c -#: ../plug-ins/common/web-page.c:290 ../plug-ins/maze/maze-dialog.c:198 +#: ../plug-ins/common/web-page.c:289 ../plug-ins/maze/maze-dialog.c:198 msgid "Width (pixels):" msgstr "Zabalera (pixeletan):" -#: ../plug-ins/common/web-page.c:309 +#: ../plug-ins/common/web-page.c:308 msgid "Font size:" msgstr "Letra-tamaina:" -#: ../plug-ins/common/web-page.c:316 +#: ../plug-ins/common/web-page.c:315 msgid "Huge" msgstr "Itzela" -#: ../plug-ins/common/web-page.c:317 +#: ../plug-ins/common/web-page.c:316 msgid "Large" msgstr "Handia" -#: ../plug-ins/common/web-page.c:318 -#: ../plug-ins/gradient-flare/gradient-flare.c:2465 +#: ../plug-ins/common/web-page.c:317 +msgctxt "web-page" msgid "Default" msgstr "Lehenetsia" -#: ../plug-ins/common/web-page.c:319 +#: ../plug-ins/common/web-page.c:318 msgid "Small" msgstr "Txikia" -#: ../plug-ins/common/web-page.c:320 +#: ../plug-ins/common/web-page.c:319 msgid "Tiny" msgstr "Txikitxoa" -#: ../plug-ins/common/web-page.c:444 +#: ../plug-ins/common/web-page.c:443 #, c-format msgid "No URL was specified" msgstr "Ez da URLrik zehaztu" -#: ../plug-ins/common/web-page.c:511 +#: ../plug-ins/common/web-page.c:510 #, c-format msgid "Downloading webpage '%s'" msgstr "'%s' web-orrialdea deskargatzen" -#: ../plug-ins/common/web-page.c:528 +#: ../plug-ins/common/web-page.c:527 #, c-format msgid "Transferring webpage image for '%s'" msgstr "'%s'(r)en web-orrialdearen irudia transferitzen" -#: ../plug-ins/common/web-page.c:537 +#: ../plug-ins/common/web-page.c:536 msgid "Webpage" msgstr "Web-orrialdea" @@ -8404,103 +8558,108 @@ msgstr "Lohitu irudia haize-efektua emateko" msgid "Wi_nd..." msgstr "Uhintzen..." -#: ../plug-ins/common/wind.c:315 +#: ../plug-ins/common/wind.c:314 msgid "Rendering blast" msgstr "Haizealdia errendatzen" -#: ../plug-ins/common/wind.c:448 +#: ../plug-ins/common/wind.c:444 msgid "Rendering wind" msgstr "Haizea errendatzen" -#: ../plug-ins/common/wind.c:881 +#: ../plug-ins/common/wind.c:876 msgid "Wind" msgstr "Haizea" #. ******************************************************** #. radio buttons for choosing wind rendering algorithm #. ***************************************************** -#: ../plug-ins/common/wind.c:924 +#: ../plug-ins/common/wind.c:919 msgid "Style" msgstr "Estiloa" -#: ../plug-ins/common/wind.c:928 +#: ../plug-ins/common/wind.c:923 msgid "_Wind" msgstr "_Haizea" -#: ../plug-ins/common/wind.c:929 +#: ../plug-ins/common/wind.c:924 msgid "_Blast" msgstr "_Haizealdia " -#: ../plug-ins/common/wind.c:952 +#: ../plug-ins/common/wind.c:947 msgid "_Left" msgstr "E_zkerrera" -#: ../plug-ins/common/wind.c:953 +#: ../plug-ins/common/wind.c:948 msgid "_Right" msgstr "E_skuinera" #. **************************************************** #. radio buttons for choosing BOTH, LEADING, TRAILING #. ************************************************** -#: ../plug-ins/common/wind.c:972 +#: ../plug-ins/common/wind.c:967 msgid "Edge Affected" msgstr "Ertzari eragin dio" -#: ../plug-ins/common/wind.c:976 +#: ../plug-ins/common/wind.c:971 msgid "L_eading" msgstr "_Hasierakoa" -#: ../plug-ins/common/wind.c:977 +#: ../plug-ins/common/wind.c:972 msgid "Tr_ailing" msgstr "A_maierakoa" -#: ../plug-ins/common/wind.c:978 +#: ../plug-ins/common/wind.c:973 msgid "Bot_h" msgstr "_Biak" -#: ../plug-ins/common/wind.c:1015 +#: ../plug-ins/common/wind.c:1010 msgid "Higher values restrict the effect to fewer areas of the image" msgstr "Balio handiek efektua irudiaren eremu gutxiagotara murrizten dute" -#: ../plug-ins/common/wind.c:1030 ../plug-ins/gimpressionist/orientmap.c:693 +#: ../plug-ins/common/wind.c:1025 ../plug-ins/gimpressionist/orientmap.c:693 msgid "_Strength:" msgstr "_Indarra:" -#: ../plug-ins/common/wind.c:1034 +#: ../plug-ins/common/wind.c:1029 msgid "Higher values increase the magnitude of the effect" msgstr "Balio handiek efektuaren magnitudea handitzen dute" -#: ../plug-ins/file-bmp/bmp-read.c:85 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "Kolore-mapa okerra" -#: ../plug-ins/file-bmp/bmp-read.c:169 ../plug-ins/file-bmp/bmp-read.c:180 -#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196 -#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:416 -#: ../plug-ins/file-bmp/bmp-read.c:437 ../plug-ins/file-bmp/bmp-read.c:448 -#: ../plug-ins/file-bmp/bmp-read.c:456 ../plug-ins/file-bmp/bmp-read.c:464 -#: ../plug-ins/file-bmp/bmp-read.c:476 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:233 +#: ../plug-ins/file-bmp/bmp-read.c:240 ../plug-ins/file-bmp/bmp-read.c:249 +#: ../plug-ins/file-bmp/bmp-read.c:264 ../plug-ins/file-bmp/bmp-read.c:446 +#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:478 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:494 +#: ../plug-ins/file-bmp/bmp-read.c:506 #, c-format msgid "'%s' is not a valid BMP file" msgstr "'%s' ez da baliozko BMP fitxategia." -#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252 -#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345 -#: ../plug-ins/file-bmp/bmp-read.c:395 +#: ../plug-ins/file-bmp/bmp-read.c:278 ../plug-ins/file-bmp/bmp-read.c:305 +#: ../plug-ins/file-bmp/bmp-read.c:333 ../plug-ins/file-bmp/bmp-read.c:362 +#: ../plug-ins/file-bmp/bmp-read.c:392 ../plug-ins/file-bmp/bmp-read.c:426 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Errorea BMP fitxategi-goiburua '%s'tik irakurtzean" -#: ../plug-ins/file-bmp/bmp-read.c:588 +#: ../plug-ins/file-bmp/bmp-read.c:351 +#, c-format +msgid "Unsupported compression (%lu) in BMP file from '%s'" +msgstr "Onartu gabeko konpresioa (%lu) BMP fitxategian '%s'(e)tik" + +#: ../plug-ins/file-bmp/bmp-read.c:618 msgid "Unrecognized or invalid BMP compression format." msgstr "BMP konpresio-formatu ezezagune edo baliogabea." -#: ../plug-ins/file-bmp/bmp-read.c:630 +#: ../plug-ins/file-bmp/bmp-read.c:660 msgid "Unsupported or invalid bitdepth." msgstr "Kolore-sakonera ez da onartzen edo ez da baliagarria." -#: ../plug-ins/file-bmp/bmp-read.c:818 ../plug-ins/file-bmp/bmp-read.c:859 -#: ../plug-ins/file-bmp/bmp-read.c:909 +#: ../plug-ins/file-bmp/bmp-read.c:812 ../plug-ins/file-bmp/bmp-read.c:853 +#: ../plug-ins/file-bmp/bmp-read.c:903 msgid "The bitmap ends unexpectedly." msgstr "Bitmapa ustekabean amaitu da." @@ -8513,26 +8672,21 @@ msgstr "" msgid "Alpha channel will be ignored." msgstr "Alfa kanalari ez ikusi egingo zaio." -#. Dialog init -#: ../plug-ins/file-bmp/bmp-write.c:849 -msgid "BMP" -msgstr "BMP" - #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:860 +#: ../plug-ins/file-bmp/bmp-write.c:864 msgid "_Run-Length Encoded" msgstr "_Run-Length kodetzea" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:873 +#: ../plug-ins/file-bmp/bmp-write.c:877 msgid "Co_mpatibility Options" msgstr "_Bateragarritasunaren aukerak" -#: ../plug-ins/file-bmp/bmp-write.c:883 +#: ../plug-ins/file-bmp/bmp-write.c:887 msgid "_Do not write color space information" msgstr "_Ez idatzi kolore-espazioaren informazioa" -#: ../plug-ins/file-bmp/bmp-write.c:885 +#: ../plug-ins/file-bmp/bmp-write.c:889 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8544,19 +8698,19 @@ msgstr "" "informaziorik idatziko fitxategian." #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:901 ../plug-ins/file-jpeg/jpeg-save.c:898 +#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:901 msgid "_Advanced Options" msgstr "_Aukera aurreratuak" -#: ../plug-ins/file-bmp/bmp-write.c:916 +#: ../plug-ins/file-bmp/bmp-write.c:920 msgid "16 bits" msgstr "16 bit" -#: ../plug-ins/file-bmp/bmp-write.c:952 +#: ../plug-ins/file-bmp/bmp-write.c:956 msgid "24 bits" msgstr "24 bit" -#: ../plug-ins/file-bmp/bmp-write.c:969 +#: ../plug-ins/file-bmp/bmp-write.c:973 msgid "32 bits" msgstr "32 bit" @@ -8564,6 +8718,23 @@ msgstr "32 bit" msgid "Windows BMP image" msgstr "Windows-eko BMP irudia" +#: ../plug-ins/file-compressor/file-compressor.c:166 +msgid "gzip archive" +msgstr "gzip artxiboa" + +#: ../plug-ins/file-compressor/file-compressor.c:185 +msgid "bzip archive" +msgstr "bzip artxiboa" + +#: ../plug-ins/file-compressor/file-compressor.c:392 +msgid "No sensible file extension, saving as compressed XCF." +msgstr "Ez dago luzapen garbirik, XCF konprimitu gisa gordeko da." + +#: ../plug-ins/file-compressor/file-compressor.c:448 +msgid "No sensible file extension, attempting to load with file magic." +msgstr "" +"Ez dago luzapen garbirik, fitxategi magikoarekin kargatzen saiatuko naiz." + #: ../plug-ins/file-faxg3/faxg3.c:102 msgid "G3 fax image" msgstr "G3 fax irudia" @@ -8592,8 +8763,8 @@ msgstr "Kargatu FITS fitxategia" msgid "Replacement for undefined pixels" msgstr "Definitu gabeko pixelak ordeztea" -#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1308 -#: ../plug-ins/gfig/gfig-dialog.c:1483 +#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1323 +#: ../plug-ins/gfig/gfig-dialog.c:1498 msgid "White" msgstr "Zuria" @@ -8609,6 +8780,11 @@ msgstr "DATAMIN/DATAMAXen arabera" msgid "Image Composing" msgstr "Irudi-konposizioa" +#: ../plug-ins/file-fits/fits.c:1044 +msgctxt "composing" +msgid "None" +msgstr "Bat ere ez" + #: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186 msgid "AutoDesk FLIC animation" msgstr "AutoDesk FLIC animazioa" @@ -8686,7 +8862,7 @@ msgstr "Konprimituta (PNG)" msgid "Icon #%i" msgstr "Ikonoa: #%i" -#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:688 +#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:691 #: ../plug-ins/file-psd/psd-thumb-load.c:84 #, c-format msgid "Opening thumbnail for '%s'" @@ -8696,96 +8872,96 @@ msgstr "'%s'(r)en koadro txikia irekitzen" msgid "Microsoft Windows icon" msgstr "Microsoft Windows ikonoa" -#: ../plug-ins/file-jpeg/jpeg-exif.c:356 +#: ../plug-ins/file-jpeg/jpeg-exif.c:352 msgid "Rotate Image?" msgstr "Biratu irudia?" -#: ../plug-ins/file-jpeg/jpeg-exif.c:359 +#: ../plug-ins/file-jpeg/jpeg-exif.c:355 msgid "_Keep Orientation" msgstr "_Mantendu orientazioa" -#: ../plug-ins/file-jpeg/jpeg-exif.c:415 +#: ../plug-ins/file-jpeg/jpeg-exif.c:411 msgid "According to the EXIF data, this image is rotated." msgstr "EXIF datuek diotenez irudia biratuta dago." -#: ../plug-ins/file-jpeg/jpeg-exif.c:430 +#: ../plug-ins/file-jpeg/jpeg-exif.c:426 msgid "Would you like GIMP to rotate it into the standard orientation?" msgstr "Nahi duzu GIMPek orientazio estandarrera biratzea?" -#: ../plug-ins/file-jpeg/jpeg-load.c:244 +#: ../plug-ins/file-jpeg/jpeg-load.c:247 msgid "JPEG preview" msgstr "JPEGren aurrebista" -#: ../plug-ins/file-jpeg/jpeg-save.c:203 +#: ../plug-ins/file-jpeg/jpeg-save.c:206 #, c-format msgid "File size: %s" msgstr "Fitxategi-tamaina: %s" -#: ../plug-ins/file-jpeg/jpeg-save.c:687 +#: ../plug-ins/file-jpeg/jpeg-save.c:690 msgid "Calculating file size..." msgstr "Fitxategi-tamaina kalkulatzen..." -#: ../plug-ins/file-jpeg/jpeg-save.c:779 ../plug-ins/file-jpeg/jpeg-save.c:874 +#: ../plug-ins/file-jpeg/jpeg-save.c:782 ../plug-ins/file-jpeg/jpeg-save.c:877 msgid "File size: unknown" msgstr "Fitxategi-tamaina: ezezaguna" -#: ../plug-ins/file-jpeg/jpeg-save.c:837 +#: ../plug-ins/file-jpeg/jpeg-save.c:840 msgid "JPEG" msgstr "JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:860 +#: ../plug-ins/file-jpeg/jpeg-save.c:863 msgid "_Quality:" msgstr "_Kalitatea:" -#: ../plug-ins/file-jpeg/jpeg-save.c:864 +#: ../plug-ins/file-jpeg/jpeg-save.c:867 msgid "JPEG quality parameter" msgstr "JPEG kalitare-parametroa" -#: ../plug-ins/file-jpeg/jpeg-save.c:883 +#: ../plug-ins/file-jpeg/jpeg-save.c:886 msgid "Enable preview to obtain the file size." msgstr "Gaitu aurrebista fitxategi-tamaina lortzeko." -#: ../plug-ins/file-jpeg/jpeg-save.c:886 +#: ../plug-ins/file-jpeg/jpeg-save.c:889 msgid "Sho_w preview in image window" msgstr "Erakutsi _aurrebista irudi-leihoan" -#: ../plug-ins/file-jpeg/jpeg-save.c:927 +#: ../plug-ins/file-jpeg/jpeg-save.c:930 msgid "S_moothing:" msgstr "_Leuntzea:" -#: ../plug-ins/file-jpeg/jpeg-save.c:940 +#: ../plug-ins/file-jpeg/jpeg-save.c:943 msgid "Interval (MCU rows):" msgstr "Bitartea (MCU errenkadak):" -#: ../plug-ins/file-jpeg/jpeg-save.c:957 +#: ../plug-ins/file-jpeg/jpeg-save.c:960 msgid "Use _restart markers" msgstr "Erabili _berrabiarazte-markatzaileak" -#: ../plug-ins/file-jpeg/jpeg-save.c:973 +#: ../plug-ins/file-jpeg/jpeg-save.c:976 msgid "_Optimize" msgstr "_Optimizatu" -#: ../plug-ins/file-jpeg/jpeg-save.c:987 +#: ../plug-ins/file-jpeg/jpeg-save.c:990 msgid "_Progressive" msgstr "_Pixkanaka" -#: ../plug-ins/file-jpeg/jpeg-save.c:1003 +#: ../plug-ins/file-jpeg/jpeg-save.c:1006 msgid "Save _EXIF data" msgstr "Gorde _EXIF datuak" -#: ../plug-ins/file-jpeg/jpeg-save.c:1020 +#: ../plug-ins/file-jpeg/jpeg-save.c:1023 msgid "Save _thumbnail" msgstr "Gorde _koadro txikia" -#: ../plug-ins/file-jpeg/jpeg-save.c:1037 +#: ../plug-ins/file-jpeg/jpeg-save.c:1040 msgid "Save _XMP data" msgstr "Gorde _XMP datuak" -#: ../plug-ins/file-jpeg/jpeg-save.c:1052 +#: ../plug-ins/file-jpeg/jpeg-save.c:1058 msgid "_Use quality settings from original image" msgstr "_Erabili jatorrizko irudiaren kalitate-ezarpenak" -#: ../plug-ins/file-jpeg/jpeg-save.c:1058 +#: ../plug-ins/file-jpeg/jpeg-save.c:1064 msgid "" "If the original image was loaded from a JPEG file using non-standard quality " "settings (quantization tables), enable this option to get almost the same " @@ -8796,60 +8972,61 @@ msgstr "" "berdintsuena izateko." #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1082 +#: ../plug-ins/file-jpeg/jpeg-save.c:1088 msgid "Su_bsampling:" msgstr "A_zpilaginketa:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1089 +#: ../plug-ins/file-jpeg/jpeg-save.c:1095 msgid "4:4:4 (best quality)" msgstr "4:4:4 (kalitate onena)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1091 +#: ../plug-ins/file-jpeg/jpeg-save.c:1097 msgid "4:2:2 horizontal (chroma halved)" msgstr "4:2:2 horizontala (chroma erdia)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1093 +#: ../plug-ins/file-jpeg/jpeg-save.c:1099 msgid "4:2:2 vertical (chroma halved)" msgstr "4:2:2 bertikala (chroma erdia)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1095 +#: ../plug-ins/file-jpeg/jpeg-save.c:1101 msgid "4:2:0 (chroma quartered)" msgstr "4:2:0 (chroma laurdena)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1125 +#: ../plug-ins/file-jpeg/jpeg-save.c:1131 msgid "_DCT method:" msgstr "_DCT metodoa:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1131 +#: ../plug-ins/file-jpeg/jpeg-save.c:1137 msgid "Fast Integer" msgstr "Osoko bizkorra" -#: ../plug-ins/file-jpeg/jpeg-save.c:1132 +#: ../plug-ins/file-jpeg/jpeg-save.c:1138 msgid "Integer" msgstr "Osokoa" -#: ../plug-ins/file-jpeg/jpeg-save.c:1133 +#: ../plug-ins/file-jpeg/jpeg-save.c:1139 msgid "Floating-Point" msgstr "Koma mugikorra" -#: ../plug-ins/file-jpeg/jpeg-save.c:1149 +#: ../plug-ins/file-jpeg/jpeg-save.c:1155 msgid "Comment" msgstr "Iruzkina" -#: ../plug-ins/file-jpeg/jpeg-save.c:1186 +#: ../plug-ins/file-jpeg/jpeg-save.c:1192 +#: ../plug-ins/ui/plug-in-file-png.ui.h:11 msgid "_Load Defaults" msgstr "_Kargatu lehenetsiak" -#: ../plug-ins/file-jpeg/jpeg-save.c:1195 +#: ../plug-ins/file-jpeg/jpeg-save.c:1201 msgid "Sa_ve Defaults" msgstr "_Gorde lehenetsiak" -#: ../plug-ins/file-jpeg/jpeg.c:136 ../plug-ins/file-jpeg/jpeg.c:174 +#: ../plug-ins/file-jpeg/jpeg.c:139 ../plug-ins/file-jpeg/jpeg.c:177 msgid "JPEG image" msgstr "JPEG irudia" -#: ../plug-ins/file-jpeg/jpeg.c:300 +#: ../plug-ins/file-jpeg/jpeg.c:303 msgid "Export Preview" msgstr "Esportatu aurrebista" @@ -8962,7 +9139,7 @@ msgstr "" msgid "Error: Can't convert GIMP base imagetype to PSD mode" msgstr "Errorea: ezin da GIMP oinarriko irudi-mota PSD modura bihurtu" -#: ../plug-ins/file-psd/psd-save.c:1625 +#: ../plug-ins/file-psd/psd-save.c:1622 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images that are " @@ -8971,7 +9148,7 @@ msgstr "" "Ezin izan da '%s' gorde. PSD fitxategi-formatuak ez du luzeran edo zabaleran " "30000 pixel gainditzen duten irudirik onartzen." -#: ../plug-ins/file-psd/psd-save.c:1640 +#: ../plug-ins/file-psd/psd-save.c:1637 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images with " @@ -9008,28 +9185,28 @@ msgstr "Altuera baliogabea: %hu" msgid "Invalid number of channels: %hu" msgstr "Kanal kopuru baliogabea: %hu" -#: ../plug-ins/file-sgi/sgi.c:572 +#: ../plug-ins/file-sgi/sgi.c:571 #, c-format msgid "Could not open '%s' for writing." msgstr "Ezin da '%s' idazteko ireki." -#: ../plug-ins/file-sgi/sgi.c:653 +#: ../plug-ins/file-sgi/sgi.c:652 msgid "SGI" msgstr "SGI" -#: ../plug-ins/file-sgi/sgi.c:655 +#: ../plug-ins/file-sgi/sgi.c:654 msgid "Compression type" msgstr "Konprimatze-mota" -#: ../plug-ins/file-sgi/sgi.c:659 +#: ../plug-ins/file-sgi/sgi.c:658 msgid "No compression" msgstr "Konprimatzerik ez" -#: ../plug-ins/file-sgi/sgi.c:661 +#: ../plug-ins/file-sgi/sgi.c:660 msgid "RLE compression" msgstr "RLE konprimatzea" -#: ../plug-ins/file-sgi/sgi.c:663 +#: ../plug-ins/file-sgi/sgi.c:662 msgid "" "Aggressive RLE\n" "(not supported by SGI)" @@ -9120,6 +9297,11 @@ msgstr "Kopuru ezezaguna deskargatzen irudi-datutik" msgid "URI" msgstr "URIa" +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +msgid "Failed to save to temporary file '%s'" +msgstr "Huts egin du aldi baterako '%s' fitxategia gordetzean" + #: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 msgid "GIMP compressed XJT image" msgstr "GIMPeko XJT irudi-konprimatua" @@ -9247,7 +9429,7 @@ msgstr "Zurrunbiloa" msgid "Horseshoe" msgstr "Ferra" -#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1464 +#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1479 msgid "Polar" msgstr "Polarra" @@ -9276,7 +9458,7 @@ msgid "Ex" msgstr "Ex" #: ../plug-ins/flame/flame.c:761 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:843 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:846 msgid "Julia" msgstr "Julia" @@ -9297,9 +9479,9 @@ msgid "Power" msgstr "Berretura" #: ../plug-ins/flame/flame.c:767 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:996 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1037 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1078 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:999 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1040 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1081 msgid "Cosine" msgstr "Kosinua" @@ -9384,7 +9566,7 @@ msgid "C_amera" msgstr "K_amera" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:546 -#: ../plug-ins/gfig/gfig-dialog.c:277 ../plug-ins/gimpressionist/utils.c:142 +#: ../plug-ins/gfig/gfig-dialog.c:275 ../plug-ins/gimpressionist/utils.c:142 #: ../plug-ins/gradient-flare/gradient-flare.c:881 #, c-format msgid "" @@ -9420,168 +9602,175 @@ msgstr "_Berriro marraztu aurrebista" msgid "Zoom" msgstr "Zooma" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:692 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:694 msgid "Undo last zoom change" msgstr "Desegin azken zoomaren aldaketak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:702 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:704 msgid "Redo last zoom change" msgstr "Berregin azken zoomaren aldaketak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:717 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:719 msgid "_Parameters" msgstr "_Parametroak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:720 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:722 msgid "Fractal Parameters" msgstr "Parametro fraktalak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:733 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:735 #: ../plug-ins/map-object/map-object-ui.c:1053 msgid "Left:" msgstr "Ezkerrean:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:742 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:744 #: ../plug-ins/map-object/map-object-ui.c:1053 msgid "Right:" msgstr "Eskuinean:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:751 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:753 #: ../plug-ins/map-object/map-object-ui.c:1052 msgid "Top:" msgstr "Goian:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:760 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:762 #: ../plug-ins/map-object/map-object-ui.c:1052 msgid "Bottom:" msgstr "Behean:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:772 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:774 msgid "" "The higher the number of iterations, the more details will be calculated" msgstr "Zenbat eta handiagoa izan, xehetasun gehiago kalkulatuko dira" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:780 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:782 msgid "CX:" msgstr "CX:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:783 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:793 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:785 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:795 msgid "Changes aspect of fractal" msgstr "Fraktalaren itxura aldaketak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:790 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:792 msgid "CY:" msgstr "CY:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:808 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:811 msgid "Load a fractal from file" msgstr "Kargatu fraktal bat fitxategitik" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:816 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:819 msgid "Reset parameters to default values" msgstr "Berrezarri parametroak balio lehenetsietan" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:825 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:828 msgid "Save active fractal to file" msgstr "Gorde fraktal aktiboa fitxategian" #. Fractal type toggle box -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:828 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:831 msgid "Fractal Type" msgstr "Fraktal-mota" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:841 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:844 msgid "Mandelbrot" msgstr "Mandelbrot" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:845 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:848 msgid "Barnsley 1" msgstr "Barnsley 1" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:847 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:850 msgid "Barnsley 2" msgstr "Barnsley 2" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:849 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:852 msgid "Barnsley 3" msgstr "Barnsley 3" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:851 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:854 msgid "Spider" msgstr "Armiarma" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:853 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:856 msgid "Man'o'war" msgstr "Man'o'war" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:855 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:858 msgid "Lambda" msgstr "Lambda" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:857 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:860 msgid "Sierpinski" msgstr "Sierpinski" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:919 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:922 msgid "Number of colors:" msgstr "Kolore-kopurua:" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:922 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:925 msgid "Change the number of colors in the mapping" msgstr "Aldatu mapatzeko kolore-kopurua" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:929 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:932 msgid "Use loglog smoothing" msgstr "Erabili loglog leuntzea" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:936 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:939 msgid "Use log log smoothing to eliminate \"banding\" in the result" msgstr "Erabili log log leuntzea emaitzatik \"zerrendak\" kentzeko" #. Color Density frame -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:940 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:943 msgid "Color Density" msgstr "Kolorearen dentsitatea" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:955 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:958 msgid "Change the intensity of the red channel" msgstr "Aldatu kanal gorriaren intentsitatea" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:965 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:968 msgid "Change the intensity of the green channel" msgstr "Aldatu kanal berdearen intentsitatea" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:975 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:978 msgid "Change the intensity of the blue channel" msgstr "Aldatu kanal urdinaren intentsitatea" #. Color Function frame -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:981 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:984 msgid "Color Function" msgstr "Kolorearen funtzioa" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:994 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1035 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1076 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:997 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1038 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1079 msgid "Sine" msgstr "Sinua" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1003 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1044 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1085 -msgid "Use sine-function for this color component" -msgstr "Erabili sinu-funtzioa kolore-osagai honetarako" +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1001 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1042 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1083 +msgctxt "color-function" +msgid "None" +msgstr "Bat ere ez" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1006 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1047 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1088 -msgid "Use cosine-function for this color component" -msgstr "Erabili kosinu-funtzioa kolore-osagai honetarako" +msgid "Use sine-function for this color component" +msgstr "Erabili sinu-funtzioa kolore-osagai honetarako" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1009 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1050 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1091 +msgid "Use cosine-function for this color component" +msgstr "Erabili kosinu-funtzioa kolore-osagai honetarako" + +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1012 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1053 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1094 msgid "" "Use linear mapping instead of any trigonometrical function for this color " "channel" @@ -9589,15 +9778,15 @@ msgstr "" "Erabili mapatze lineala funtzio trigonometrikoen ordez kolore-kanal " "honetarako" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1018 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1059 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1100 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1021 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1062 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1103 msgid "Inversion" msgstr "Alderantzikatu" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1026 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1067 -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1108 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1029 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1070 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1111 msgid "" "If you enable this option higher color values will be swapped with lower " "ones and vice versa" @@ -9606,15 +9795,15 @@ msgstr "" "trukatuko dira, eta alderantziz" #. Colormode toggle box -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1113 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1116 msgid "Color Mode" msgstr "Kolore-modua" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1122 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1125 msgid "As specified above" msgstr "Goian zehaztu bezala" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1134 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1137 msgid "" "Create a color-map with the options you specified above (color density/" "function). The result is visible in the preview image" @@ -9622,73 +9811,73 @@ msgstr "" "Sortu kolore-mapa bat goian zehaztutako aukerekin (kolore-dentsitatea/" "funtzioa). Emaitza aurrebista-panelean ikus daiteke" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1144 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1147 msgid "Apply active gradient to final image" msgstr "Aplikatu gradiente aktiboa azken irudiari" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1156 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1159 msgid "Create a color-map using a gradient from the gradient editor" msgstr "Sortu kolore-mapa bat gradiente-editoreko gradiente bat erabiliz" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1167 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1170 msgid "FractalExplorer Gradient" msgstr "FractalExplorer gradientea" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1197 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1200 msgid "_Fractals" msgstr "_Fraktalak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1559 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1562 #, c-format msgid "Could not write '%s': %s" msgstr "Ezin izan da '%s' fitxategian idatzi: %s" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1634 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1637 msgid "Load Fractal Parameters" msgstr "Kargatu parametro fraktalak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1672 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1675 msgid "Save Fractal Parameters" msgstr "Gorde parametro fraktalak" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1870 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1873 #, c-format msgid "'%s' is not a FractalExplorer file" msgstr "'%s' ez da FractalExplorer fitxategia" -#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877 +#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1880 #, c-format msgid "'%s' is corrupt. Line %d Option section incorrect" msgstr "'%s' hondatuta dago. %d lerroko Aukera sekzioa okerra da" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:238 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:236 msgid "Render fractal art" msgstr "Fraktala errendatzearen artea" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:243 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:241 msgid "_Fractal Explorer..." msgstr "_Fraktal-arakatzailea..." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:373 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:368 msgid "Rendering fractal" msgstr "Fraktala errendatzen" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:756 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:751 #: ../plug-ins/gradient-flare/gradient-flare.c:3201 #, c-format msgid "Are you sure you want to delete \"%s\" from the list and from disk?" msgstr "Ziur zaude \"%s\" ezabatu nahi duzula zerrendatik eta diskotik?" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:760 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:755 msgid "Delete Fractal" msgstr "Ezabatu fraktala" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:949 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:944 #, c-format msgid "File '%s' is not a FractalExplorer file" msgstr "`%s' fitxategia ez da FractalExplorer fitxategia." -#: ../plug-ins/fractal-explorer/fractal-explorer.c:959 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:954 #, c-format msgid "" "File '%s' is corrupt.\n" @@ -9697,248 +9886,248 @@ msgstr "" "'%s' fitxategia hondatuta dago.\n" "%d lerroko Aukera sekzioa okerra da" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1004 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:999 msgid "My first fractal" msgstr "Nire lehen fraktala" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1068 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1063 msgid "Select folder and rescan collection" msgstr "Hautatu karpeta eta ikusi berriro bilduma" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1080 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1075 msgid "Apply currently selected fractal" msgstr "Aplikatu unean hautatutako fraktala" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1092 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1087 msgid "Delete currently selected fractal" msgstr "Ezabatu une honetan hautatutako fraktala" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1115 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1110 msgid "Rescan for Fractals" msgstr "Berriro bilatu fraktalak" -#: ../plug-ins/fractal-explorer/fractal-explorer.c:1134 +#: ../plug-ins/fractal-explorer/fractal-explorer.c:1129 msgid "Add FractalExplorer Path" msgstr "Gehitu FractalExplorer-en bide-izena" -#: ../plug-ins/gfig/gfig-bezier.c:442 +#: ../plug-ins/gfig/gfig-bezier.c:401 msgid "Closed" msgstr "Itxita" -#: ../plug-ins/gfig/gfig-bezier.c:447 +#: ../plug-ins/gfig/gfig-bezier.c:406 msgid "Close curve on completion" msgstr "Itxi kurba osatutakoan" -#: ../plug-ins/gfig/gfig-bezier.c:452 +#: ../plug-ins/gfig/gfig-bezier.c:411 msgid "Show Line Frame" msgstr "Erakutsi marraren markoa" -#: ../plug-ins/gfig/gfig-bezier.c:457 +#: ../plug-ins/gfig/gfig-bezier.c:416 msgid "Draws lines between the control points. Only during curve creation" msgstr "Marraztu marrak kontrol-puntuen artean. Kurba sortzean bakarrik" #. Start building the dialog up -#: ../plug-ins/gfig/gfig-dialog.c:289 +#: ../plug-ins/gfig/gfig-dialog.c:287 msgid "Gfig" msgstr "Gfig" #. Tool options notebook -#: ../plug-ins/gfig/gfig-dialog.c:337 +#: ../plug-ins/gfig/gfig-dialog.c:335 msgid "Tool Options" msgstr "Tresnen aukerak" -#: ../plug-ins/gfig/gfig-dialog.c:354 +#: ../plug-ins/gfig/gfig-dialog.c:352 msgid "_Stroke" msgstr "_Trazua" #. Fill frame on right side -#: ../plug-ins/gfig/gfig-dialog.c:401 +#: ../plug-ins/gfig/gfig-dialog.c:399 msgid "Fill" msgstr "Betegarria" -#: ../plug-ins/gfig/gfig-dialog.c:415 +#: ../plug-ins/gfig/gfig-dialog.c:413 msgid "No fill" msgstr "Ez bete" -#: ../plug-ins/gfig/gfig-dialog.c:416 +#: ../plug-ins/gfig/gfig-dialog.c:414 msgid "Color fill" msgstr "Kolorea" -#: ../plug-ins/gfig/gfig-dialog.c:417 +#: ../plug-ins/gfig/gfig-dialog.c:415 msgid "Pattern fill" msgstr "Eredua" -#: ../plug-ins/gfig/gfig-dialog.c:418 +#: ../plug-ins/gfig/gfig-dialog.c:416 msgid "Shape gradient" msgstr "Gradiente forma" -#: ../plug-ins/gfig/gfig-dialog.c:419 +#: ../plug-ins/gfig/gfig-dialog.c:417 msgid "Vertical gradient" msgstr "Gradiente bertikala:" -#: ../plug-ins/gfig/gfig-dialog.c:420 +#: ../plug-ins/gfig/gfig-dialog.c:418 msgid "Horizontal gradient" msgstr "Gradiente horizontala:" #. "show image" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:480 +#: ../plug-ins/gfig/gfig-dialog.c:478 msgid "Show image" msgstr "Erakutsi irudia" #. "snap to grid" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:493 +#: ../plug-ins/gfig/gfig-dialog.c:491 msgctxt "checkbutton" msgid "Snap to grid" msgstr "Atxiki saretari" #. "show grid" checkbutton at bottom of style frame -#: ../plug-ins/gfig/gfig-dialog.c:502 +#: ../plug-ins/gfig/gfig-dialog.c:500 msgid "Show grid" msgstr "Erakutsi sareta" -#: ../plug-ins/gfig/gfig-dialog.c:639 +#: ../plug-ins/gfig/gfig-dialog.c:635 msgid "Load Gfig Object Collection" msgstr "Kargatu Gfig objektu-bilduma" -#: ../plug-ins/gfig/gfig-dialog.c:688 +#: ../plug-ins/gfig/gfig-dialog.c:684 msgid "Save Gfig Drawing" msgstr "Gorde Gfig marrazkia" -#: ../plug-ins/gfig/gfig-dialog.c:833 +#: ../plug-ins/gfig/gfig-dialog.c:848 msgid "First Gfig" msgstr "Lehen Gfig" -#: ../plug-ins/gfig/gfig-dialog.c:871 +#: ../plug-ins/gfig/gfig-dialog.c:886 msgid "_Undo" msgstr "_Desegin" -#: ../plug-ins/gfig/gfig-dialog.c:875 +#: ../plug-ins/gfig/gfig-dialog.c:890 msgid "_Clear" msgstr "_Garbitu" -#: ../plug-ins/gfig/gfig-dialog.c:879 ../plug-ins/imagemap/imap_menu.c:208 +#: ../plug-ins/gfig/gfig-dialog.c:894 ../plug-ins/imagemap/imap_menu.c:208 msgid "_Grid" msgstr "_Sareta" -#: ../plug-ins/gfig/gfig-dialog.c:887 +#: ../plug-ins/gfig/gfig-dialog.c:902 msgid "Raise selected object" msgstr "Eraman gora hautatutako objektua" -#: ../plug-ins/gfig/gfig-dialog.c:891 +#: ../plug-ins/gfig/gfig-dialog.c:906 msgid "Lower selected object" msgstr "Eraman behera hautatutako objektuak" -#: ../plug-ins/gfig/gfig-dialog.c:895 +#: ../plug-ins/gfig/gfig-dialog.c:910 msgid "Raise selected object to top" msgstr "Eraman hautatutako objektua goienera" -#: ../plug-ins/gfig/gfig-dialog.c:899 +#: ../plug-ins/gfig/gfig-dialog.c:914 msgid "Lower selected object to bottom" msgstr "Eraman hautatutako objektua leku baxuenera" -#: ../plug-ins/gfig/gfig-dialog.c:903 +#: ../plug-ins/gfig/gfig-dialog.c:918 msgid "Show previous object" msgstr "Erakutsi aurreko objektua" -#: ../plug-ins/gfig/gfig-dialog.c:907 +#: ../plug-ins/gfig/gfig-dialog.c:922 msgid "Show next object" msgstr "Erakutsi hurrengo objektua" -#: ../plug-ins/gfig/gfig-dialog.c:911 ../plug-ins/gfig/gfig-stock.c:52 +#: ../plug-ins/gfig/gfig-dialog.c:926 ../plug-ins/gfig/gfig-stock.c:52 msgid "Show all objects" msgstr "Erakutsi objektu guztiak" -#: ../plug-ins/gfig/gfig-dialog.c:917 ../plug-ins/gfig/gfig-stock.c:46 +#: ../plug-ins/gfig/gfig-dialog.c:932 ../plug-ins/gfig/gfig-stock.c:46 msgid "Create line" msgstr "Sortu marra" -#: ../plug-ins/gfig/gfig-dialog.c:920 ../plug-ins/gfig/gfig-stock.c:50 +#: ../plug-ins/gfig/gfig-dialog.c:935 ../plug-ins/gfig/gfig-stock.c:50 msgid "Create rectangle" msgstr "Sortu laukizuzena" -#: ../plug-ins/gfig/gfig-dialog.c:923 ../plug-ins/gfig/gfig-stock.c:41 +#: ../plug-ins/gfig/gfig-dialog.c:938 ../plug-ins/gfig/gfig-stock.c:41 msgid "Create circle" msgstr "Sortu zirkulua" -#: ../plug-ins/gfig/gfig-dialog.c:926 ../plug-ins/gfig/gfig-stock.c:45 +#: ../plug-ins/gfig/gfig-dialog.c:941 ../plug-ins/gfig/gfig-stock.c:45 msgid "Create ellipse" msgstr "Sortu elipsea" -#: ../plug-ins/gfig/gfig-dialog.c:929 ../plug-ins/gfig/gfig-stock.c:43 +#: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:43 msgid "Create arc" msgstr "Sortu arkua" -#: ../plug-ins/gfig/gfig-dialog.c:932 ../plug-ins/gfig/gfig-stock.c:49 +#: ../plug-ins/gfig/gfig-dialog.c:947 ../plug-ins/gfig/gfig-stock.c:49 msgid "Create reg polygon" msgstr "Sortu poligono erregularra" -#: ../plug-ins/gfig/gfig-dialog.c:935 ../plug-ins/gfig/gfig-stock.c:54 +#: ../plug-ins/gfig/gfig-dialog.c:950 ../plug-ins/gfig/gfig-stock.c:54 msgid "Create star" msgstr "Sortu izarra" -#: ../plug-ins/gfig/gfig-dialog.c:938 ../plug-ins/gfig/gfig-stock.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:953 ../plug-ins/gfig/gfig-stock.c:53 msgid "Create spiral" msgstr "Sortu espirala" -#: ../plug-ins/gfig/gfig-dialog.c:941 +#: ../plug-ins/gfig/gfig-dialog.c:956 msgid "Create bezier curve. Shift + Button ends object creation." msgstr "" "Sortu bezier kurba. Maius + botoia sakatuz gero, objektuaren sorrera " "amaituko da." -#: ../plug-ins/gfig/gfig-dialog.c:945 ../plug-ins/gfig/gfig-stock.c:47 +#: ../plug-ins/gfig/gfig-dialog.c:960 ../plug-ins/gfig/gfig-stock.c:47 msgid "Move an object" msgstr "Aldatu lekuz objektua" -#: ../plug-ins/gfig/gfig-dialog.c:948 ../plug-ins/gfig/gfig-stock.c:48 +#: ../plug-ins/gfig/gfig-dialog.c:963 ../plug-ins/gfig/gfig-stock.c:48 msgid "Move a single point" msgstr "Aldatu lekuz puntu bakarra" -#: ../plug-ins/gfig/gfig-dialog.c:951 ../plug-ins/gfig/gfig-stock.c:42 +#: ../plug-ins/gfig/gfig-dialog.c:966 ../plug-ins/gfig/gfig-stock.c:42 msgid "Copy an object" msgstr "Kopiatu objektua" -#: ../plug-ins/gfig/gfig-dialog.c:954 ../plug-ins/gfig/gfig-stock.c:44 +#: ../plug-ins/gfig/gfig-dialog.c:969 ../plug-ins/gfig/gfig-stock.c:44 msgid "Delete an object" msgstr "Ezabatu objektua" -#: ../plug-ins/gfig/gfig-dialog.c:957 ../plug-ins/gfig/gfig-stock.c:51 +#: ../plug-ins/gfig/gfig-dialog.c:972 ../plug-ins/gfig/gfig-stock.c:51 msgid "Select an object" msgstr "Ezabatu objektua" -#: ../plug-ins/gfig/gfig-dialog.c:1039 +#: ../plug-ins/gfig/gfig-dialog.c:1054 msgid "This tool has no options" msgstr "Tresna honek ez du aukerarik" #. Put buttons in -#: ../plug-ins/gfig/gfig-dialog.c:1250 +#: ../plug-ins/gfig/gfig-dialog.c:1265 msgid "Show position" msgstr "Erakutsi posizioa" -#: ../plug-ins/gfig/gfig-dialog.c:1262 +#: ../plug-ins/gfig/gfig-dialog.c:1277 msgid "Show control points" msgstr "Ezkutatu kontrol-puntuak" -#: ../plug-ins/gfig/gfig-dialog.c:1296 +#: ../plug-ins/gfig/gfig-dialog.c:1311 msgid "Max undo:" msgstr "Geh desegitea:" -#: ../plug-ins/gfig/gfig-dialog.c:1305 +#: ../plug-ins/gfig/gfig-dialog.c:1320 #: ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Gardena" -#: ../plug-ins/gfig/gfig-dialog.c:1307 +#: ../plug-ins/gfig/gfig-dialog.c:1322 msgid "Foreground" msgstr "Aurreko planoa" -#: ../plug-ins/gfig/gfig-dialog.c:1309 ../plug-ins/imagemap/imap_cmd_copy.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:1324 ../plug-ins/imagemap/imap_cmd_copy.c:53 #: ../plug-ins/imagemap/imap_cmd_copy_object.c:54 #: ../plug-ins/imagemap/imap_menu.c:159 msgid "Copy" msgstr "Kopiatu" -#: ../plug-ins/gfig/gfig-dialog.c:1318 +#: ../plug-ins/gfig/gfig-dialog.c:1333 msgid "" "Layer background type. Copy causes the previous layer to be copied before " "the draw is performed." @@ -9946,114 +10135,114 @@ msgstr "" "Geruzaren atzeko planoaren mota. Kopiatuz gero, aurreko geruza kopiatu " "egingo da marrazkia burutu aurretik" -#: ../plug-ins/gfig/gfig-dialog.c:1324 +#: ../plug-ins/gfig/gfig-dialog.c:1339 msgid "Background:" msgstr "Atzeko planoa:" -#: ../plug-ins/gfig/gfig-dialog.c:1327 +#: ../plug-ins/gfig/gfig-dialog.c:1342 msgid "Feather" msgstr "Difuminatu" -#: ../plug-ins/gfig/gfig-dialog.c:1350 +#: ../plug-ins/gfig/gfig-dialog.c:1365 msgid "Radius:" msgstr "Erradioa:" -#: ../plug-ins/gfig/gfig-dialog.c:1408 +#: ../plug-ins/gfig/gfig-dialog.c:1423 msgid "Grid spacing:" msgstr "Saretaren tartea:" -#: ../plug-ins/gfig/gfig-dialog.c:1425 +#: ../plug-ins/gfig/gfig-dialog.c:1440 msgid "Polar grid sectors desired:" msgstr "nahi diren sareta polarreko sektoreak:" -#: ../plug-ins/gfig/gfig-dialog.c:1447 +#: ../plug-ins/gfig/gfig-dialog.c:1462 msgid "Polar grid radius interval:" msgstr "Sareta polarreko bitartea (radianak):" -#: ../plug-ins/gfig/gfig-dialog.c:1463 ../plug-ins/imagemap/imap_menu.c:219 +#: ../plug-ins/gfig/gfig-dialog.c:1478 ../plug-ins/imagemap/imap_menu.c:219 msgid "Rectangle" msgstr "Laukizuzena" -#: ../plug-ins/gfig/gfig-dialog.c:1465 +#: ../plug-ins/gfig/gfig-dialog.c:1480 msgid "Isometric" msgstr "Isometrikoa" -#: ../plug-ins/gfig/gfig-dialog.c:1474 +#: ../plug-ins/gfig/gfig-dialog.c:1489 msgid "Grid type:" msgstr "Sareta-mota:" -#: ../plug-ins/gfig/gfig-dialog.c:1481 +#: ../plug-ins/gfig/gfig-dialog.c:1496 #: ../plug-ins/gradient-flare/gradient-flare.c:551 msgid "Normal" msgstr "Normala" -#: ../plug-ins/gfig/gfig-dialog.c:1484 +#: ../plug-ins/gfig/gfig-dialog.c:1499 msgid "Grey" msgstr "Grisa" -#: ../plug-ins/gfig/gfig-dialog.c:1485 +#: ../plug-ins/gfig/gfig-dialog.c:1500 msgid "Darker" msgstr "Ilunago" -#: ../plug-ins/gfig/gfig-dialog.c:1486 +#: ../plug-ins/gfig/gfig-dialog.c:1501 msgid "Lighter" msgstr "Argiago" -#: ../plug-ins/gfig/gfig-dialog.c:1487 +#: ../plug-ins/gfig/gfig-dialog.c:1502 msgid "Very dark" msgstr "Oso iluna" -#: ../plug-ins/gfig/gfig-dialog.c:1496 +#: ../plug-ins/gfig/gfig-dialog.c:1511 msgid "Grid color:" msgstr "Saretaren kolorea:" -#: ../plug-ins/gfig/gfig-dialog.c:1717 +#: ../plug-ins/gfig/gfig-dialog.c:1732 msgid "Sides:" msgstr "Alboak:" -#: ../plug-ins/gfig/gfig-dialog.c:1727 +#: ../plug-ins/gfig/gfig-dialog.c:1742 msgid "Right" msgstr "Eskuina" -#: ../plug-ins/gfig/gfig-dialog.c:1728 +#: ../plug-ins/gfig/gfig-dialog.c:1743 msgid "Left" msgstr "Ezkerra" -#: ../plug-ins/gfig/gfig-dialog.c:1738 +#: ../plug-ins/gfig/gfig-dialog.c:1753 #: ../plug-ins/gimpressionist/orientation.c:147 msgid "Orientation:" msgstr "Orientazioa:" -#: ../plug-ins/gfig/gfig-dobject.c:584 +#: ../plug-ins/gfig/gfig-dobject.c:580 msgid "Hey where has the object gone ?" msgstr "Nora joan ote da objektua ?" -#: ../plug-ins/gfig/gfig-dobject.c:953 +#: ../plug-ins/gfig/gfig-dobject.c:922 msgid "Error reading file" msgstr "Errorea fitxategia irakurtzean" -#: ../plug-ins/gfig/gfig-dobject.c:1042 +#: ../plug-ins/gfig/gfig-dobject.c:1011 msgid "Editing read-only object - you will not be able to save it" msgstr "Irakurtzeko soilik den objektua editatzen - ezingo duzu gorde" -#: ../plug-ins/gfig/gfig-poly.c:50 +#: ../plug-ins/gfig/gfig-poly.c:51 msgid "Regular Polygon Number of Sides" msgstr "Poligono erregularra: alde-kopurua" -#: ../plug-ins/gfig/gfig-preview.c:328 +#: ../plug-ins/gfig/gfig-preview.c:337 msgid "Object Details" msgstr "Objektuaren xehetasunak" #. Position labels -#: ../plug-ins/gfig/gfig-preview.c:378 +#: ../plug-ins/gfig/gfig-preview.c:388 msgid "XY position:" msgstr "XY posizioa:" -#: ../plug-ins/gfig/gfig-spiral.c:54 +#: ../plug-ins/gfig/gfig-spiral.c:55 msgid "Spiral Number of Turns" msgstr "Espirala: bira-kopurua" -#: ../plug-ins/gfig/gfig-star.c:51 +#: ../plug-ins/gfig/gfig-star.c:52 msgid "Star Number of Points" msgstr "Izarra: puntu-kopurua" @@ -10061,65 +10250,65 @@ msgstr "Izarra: puntu-kopurua" msgid "Create bezier curve" msgstr "Sortu bezier kurba" -#: ../plug-ins/gfig/gfig.c:123 +#: ../plug-ins/gfig/gfig.c:122 msgid "Create geometric shapes" msgstr "Sortu forma geometrikoak" -#: ../plug-ins/gfig/gfig.c:134 +#: ../plug-ins/gfig/gfig.c:133 msgid "_Gfig..." msgstr "_Irudi geometrikoak (Gfig)..." -#: ../plug-ins/gfig/gfig.c:735 +#: ../plug-ins/gfig/gfig.c:734 msgid "" "Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" "Errorea irudia parasito gisa gordetzean: ezin da parasitoa marrazgaiari " "erantsi." -#: ../plug-ins/gfig/gfig.c:762 +#: ../plug-ins/gfig/gfig.c:761 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" msgstr "" "Errorea '%s' aldi baterako fitxategia irekitzean parasitoa kargatzeko: %s" -#: ../plug-ins/gimpressionist/brush.c:246 +#: ../plug-ins/gimpressionist/brush.c:243 msgid "Can only save drawables!" msgstr "Marrazgaiak bakarrik gorde ditzaket!" -#: ../plug-ins/gimpressionist/brush.c:251 +#: ../plug-ins/gimpressionist/brush.c:248 msgid "Save Brush" msgstr "Gorde brotxa" -#: ../plug-ins/gimpressionist/brush.c:506 +#: ../plug-ins/gimpressionist/brush.c:503 msgid "_Brush" msgstr "_Brotxa" -#: ../plug-ins/gimpressionist/brush.c:543 +#: ../plug-ins/gimpressionist/brush.c:540 msgid "Gamma:" msgstr "Gamma:" -#: ../plug-ins/gimpressionist/brush.c:561 +#: ../plug-ins/gimpressionist/brush.c:558 msgid "Changes the gamma (brightness) of the selected brush" msgstr "Hautatutako brotxaren gamma (distira) aldatzen du" -#: ../plug-ins/gimpressionist/brush.c:569 +#: ../plug-ins/gimpressionist/brush.c:566 msgid "Select:" msgstr "Hautatu:" -#: ../plug-ins/gimpressionist/brush.c:598 +#: ../plug-ins/gimpressionist/brush.c:595 msgid "Aspect ratio:" msgstr "Aspektu-erlazioa:" -#: ../plug-ins/gimpressionist/brush.c:602 +#: ../plug-ins/gimpressionist/brush.c:599 msgid "Specifies the aspect ratio of the brush" msgstr "Brotxaren aspektu-erlazioa zehazten du" -#: ../plug-ins/gimpressionist/brush.c:611 +#: ../plug-ins/gimpressionist/brush.c:608 #: ../plug-ins/gimpressionist/paper.c:205 msgid "Relief:" msgstr "Erliebea:" -#: ../plug-ins/gimpressionist/brush.c:615 +#: ../plug-ins/gimpressionist/brush.c:612 #: ../plug-ins/gimpressionist/paper.c:209 msgid "Specifies the amount of embossing to apply to the image (in percent)" msgstr "Irudiari aplikatu beharreko erliebea (ehunekotan)" @@ -10366,15 +10555,15 @@ msgstr "Trazuaren orientazioa eskuz hautatzen da" msgid "Opens up the Orientation Map Editor" msgstr "Orientazio-mapen editorea irekitzen du" -#: ../plug-ins/gimpressionist/orientmap.c:525 +#: ../plug-ins/gimpressionist/orientmap.c:523 msgid "Orientation Map Editor" msgstr "Orientazio-mapen editorea" -#: ../plug-ins/gimpressionist/orientmap.c:554 +#: ../plug-ins/gimpressionist/orientmap.c:552 msgid "Vectors" msgstr "Bektoreak" -#: ../plug-ins/gimpressionist/orientmap.c:566 +#: ../plug-ins/gimpressionist/orientmap.c:564 msgid "" "The vector-field. Left-click to move selected vector, Right-click to point " "it towards mouse, Middle-click to add a new vector." @@ -10383,8 +10572,8 @@ msgstr "" "eskuineko botoian sagurantz seinalatzeko, eta erdiko botoian bektore berria " "gehitzeko." -#: ../plug-ins/gimpressionist/orientmap.c:589 -#: ../plug-ins/gimpressionist/sizemap.c:459 +#: ../plug-ins/gimpressionist/orientmap.c:588 +#: ../plug-ins/gimpressionist/sizemap.c:457 msgid "Adjust the preview's brightness" msgstr "Doitu aurrebistaren distira" @@ -10397,7 +10586,7 @@ msgid "Select next vector" msgstr "Hautatu hurrengo bektorea" #: ../plug-ins/gimpressionist/orientmap.c:619 -#: ../plug-ins/gimpressionist/sizemap.c:490 +#: ../plug-ins/gimpressionist/sizemap.c:489 msgid "A_dd" msgstr "_Gehitu" @@ -10406,7 +10595,7 @@ msgid "Add new vector" msgstr "Gehitu bektore berria" #: ../plug-ins/gimpressionist/orientmap.c:625 -#: ../plug-ins/gimpressionist/sizemap.c:497 +#: ../plug-ins/gimpressionist/sizemap.c:496 msgid "_Kill" msgstr "_Hil" @@ -10435,7 +10624,7 @@ msgid "Vortex_3" msgstr "_3.arranpa" #: ../plug-ins/gimpressionist/orientmap.c:653 -#: ../plug-ins/gimpressionist/sizemap.c:542 +#: ../plug-ins/gimpressionist/sizemap.c:541 msgid "_Voronoi" msgstr "_Voronoi" @@ -10472,7 +10661,7 @@ msgid "S_trength exp.:" msgstr "I_ndarraren berr.:" #: ../plug-ins/gimpressionist/orientmap.c:708 -#: ../plug-ins/gimpressionist/sizemap.c:537 +#: ../plug-ins/gimpressionist/sizemap.c:536 msgid "Change the exponent of the strength" msgstr "Aldatu indarraren berretzailea" @@ -10540,7 +10729,7 @@ msgstr "Brotxaren trazuen dentsitate erlatiboa" #. * gimp_filename_to_utf8 () and g_strerror () return temporary strings #. * that need not and should not be freed. So this call is OK. #. * -#: ../plug-ins/gimpressionist/ppmtool.c:652 +#: ../plug-ins/gimpressionist/ppmtool.c:648 #, c-format msgid "Failed to save PPM file '%s': %s" msgstr "Ezin izan da '%s' PPM fitxategian gorde: %s" @@ -10577,18 +10766,18 @@ msgstr "Hautatutako aurrezarpenak ezabatzen ditu" msgid "Reread the folder of Presets" msgstr "Irakurri berriro aurrezarpenen karpeta" -#: ../plug-ins/gimpressionist/preview.c:173 -#: ../plug-ins/gimpressionist/repaint.c:1183 -#: ../plug-ins/imagemap/imap_polygon.c:513 +#: ../plug-ins/gimpressionist/preview.c:174 +#: ../plug-ins/gimpressionist/repaint.c:1182 +#: ../plug-ins/imagemap/imap_polygon.c:515 #: ../plug-ins/lighting/lighting-ui.c:1082 msgid "_Update" msgstr "_Eguneratu" -#: ../plug-ins/gimpressionist/preview.c:179 +#: ../plug-ins/gimpressionist/preview.c:180 msgid "Refresh the Preview window" msgstr "Freskatu aurrebistaren leihoa" -#: ../plug-ins/gimpressionist/preview.c:187 +#: ../plug-ins/gimpressionist/preview.c:188 msgid "Revert to the original image" msgstr "Leheneratu jatorrizko irudira" @@ -10658,15 +10847,15 @@ msgstr "Trazuaren tamaina eskuz hautatzen da" msgid "Opens up the Size Map Editor" msgstr "Tamaina-mapen editorea irekitzen du" -#: ../plug-ins/gimpressionist/sizemap.c:400 +#: ../plug-ins/gimpressionist/sizemap.c:397 msgid "Size Map Editor" msgstr "Tamaina-mapen editorea" -#: ../plug-ins/gimpressionist/sizemap.c:429 +#: ../plug-ins/gimpressionist/sizemap.c:426 msgid "Smvectors" msgstr "Bektoreak" -#: ../plug-ins/gimpressionist/sizemap.c:439 +#: ../plug-ins/gimpressionist/sizemap.c:436 msgid "" "The smvector-field. Left-click to move selected smvector, Right-click to " "point it towards mouse, Middle-click to add a new smvector." @@ -10675,39 +10864,39 @@ msgstr "" "mugitzeko, eskuineko botoian sagurantz seinalatzeko, eta erdiko botoian " "tamaina-bektore berria gehitzeko." -#: ../plug-ins/gimpressionist/sizemap.c:481 +#: ../plug-ins/gimpressionist/sizemap.c:480 msgid "Select previous smvector" msgstr "Hautatu aurreko bektorea" -#: ../plug-ins/gimpressionist/sizemap.c:488 +#: ../plug-ins/gimpressionist/sizemap.c:487 msgid "Select next smvector" msgstr "Hautatu hurrengo bektorea" -#: ../plug-ins/gimpressionist/sizemap.c:495 +#: ../plug-ins/gimpressionist/sizemap.c:494 msgid "Add new smvector" msgstr "Gehitu bektore berria" -#: ../plug-ins/gimpressionist/sizemap.c:502 +#: ../plug-ins/gimpressionist/sizemap.c:501 msgid "Delete selected smvector" msgstr "Ezabatu hautatutako bektorea" -#: ../plug-ins/gimpressionist/sizemap.c:515 +#: ../plug-ins/gimpressionist/sizemap.c:514 msgid "Change the angle of the selected smvector" msgstr "Aldatu hautatutako bektorearen angelua" -#: ../plug-ins/gimpressionist/sizemap.c:522 +#: ../plug-ins/gimpressionist/sizemap.c:521 msgid "S_trength:" msgstr "_Indarra:" -#: ../plug-ins/gimpressionist/sizemap.c:526 +#: ../plug-ins/gimpressionist/sizemap.c:525 msgid "Change the strength of the selected smvector" msgstr "Aldatu hautatutako bektorearen indarra" -#: ../plug-ins/gimpressionist/sizemap.c:533 +#: ../plug-ins/gimpressionist/sizemap.c:532 msgid "St_rength exp.:" msgstr "I_ndararen berr.:" -#: ../plug-ins/gimpressionist/sizemap.c:549 +#: ../plug-ins/gimpressionist/sizemap.c:548 msgid "" "Voronoi-mode makes only the smvector closest to the given point have any " "influence" @@ -10715,6 +10904,82 @@ msgstr "" "Voronoi moduan, adierazitako puntutik hurbilen dagoen bektoreak bakarrik du " "eragina" +#: ../plug-ins/ui/plug-in-file-gif.ui.h:1 +msgid "I_nterlace" +msgstr "_Gurutzelarkatu" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:2 +msgid "_GIF comment:" +msgstr "_GIF iruzkina:" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:3 +msgid "As _animation" +msgstr "_Animazio gisa" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:4 +msgid "GIF Options" +msgstr "GIF aukerak" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:5 +msgid "_Loop forever" +msgstr "_Begiztatu betirako" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:6 +msgid "_Delay between frames where unspecified:" +msgstr "Fotogramen arteko atzerapena zehaztu ez denean:" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:8 +msgid "_Frame disposal where unspecified:" +msgstr "_Fotogramak baztertzea, zehaztu ez denean:" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:9 +msgid "_Use delay entered above for all frames" +msgstr "_Erabili gainean sartutako atzerapena fotograma guztietan" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:10 +msgid "U_se disposal entered above for all frames" +msgstr "E_rabili gainean sartutako hondakina fotograma guztietan" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:11 +msgid "Animated GIF Options" +msgstr "GIF animatuen aukerak" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:1 +msgid "_Interlacing (Adam7)" +msgstr "_Gurutzelarkatu (Adam7)" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:2 +msgid "Save _background color" +msgstr "Gorde a_tzeko planoaren kolorea" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:4 +msgid "Save layer o_ffset" +msgstr "Gorde geruzaren _desplazamendua" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:5 +msgid "Save _resolution" +msgstr "Gorde _bereizmena" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:6 +msgid "Save creation _time" +msgstr "Gorde _sorrera-denbora" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:7 +msgid "Save comme_nt" +msgstr "Gorde _iruzkina" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:8 +msgid "Save color _values from transparent pixels" +msgstr "Gorde _kolore-balioak pixel gardenetik" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:9 +msgid "Co_mpression level:" +msgstr "_Konpresio-maila:" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:12 +msgid "S_ave Defaults" +msgstr "Gorde _lehenetsiak" + #: ../plug-ins/gradient-flare/gradient-flare.c:552 msgid "Addition" msgstr "Batuketa" @@ -10780,6 +11045,10 @@ msgstr "_Eguneratu automatikoki aurrebista" msgid "`Default' is created." msgstr "`Lehenetsia' sortuko da." +#: ../plug-ins/gradient-flare/gradient-flare.c:2465 +msgid "Default" +msgstr "Lehenetsia" + #. #. * Scales #. @@ -10991,77 +11260,77 @@ msgstr "Ausazko hazia:" msgid "_Second Flares" msgstr "_Bigarren erlantzak" -#: ../plug-ins/help-browser/dialog.c:186 -#: ../plug-ins/help-browser/dialog.c:1115 +#: ../plug-ins/help-browser/dialog.c:184 +#: ../plug-ins/help-browser/dialog.c:1133 msgid "GIMP Help Browser" msgstr "GIMPeko Laguntza arakatzailea" -#: ../plug-ins/help-browser/dialog.c:564 +#: ../plug-ins/help-browser/dialog.c:582 msgid "Go back one page" msgstr "Joan orrialde bat atzera" -#: ../plug-ins/help-browser/dialog.c:569 +#: ../plug-ins/help-browser/dialog.c:587 msgid "Go forward one page" msgstr "Joan orrialde bat aurrera" -#: ../plug-ins/help-browser/dialog.c:574 +#: ../plug-ins/help-browser/dialog.c:592 msgid "_Reload" msgstr "_Birkargatu" -#: ../plug-ins/help-browser/dialog.c:574 +#: ../plug-ins/help-browser/dialog.c:592 msgid "Reload current page" msgstr "Birkargatu uneko orrialdea" -#: ../plug-ins/help-browser/dialog.c:579 +#: ../plug-ins/help-browser/dialog.c:597 msgid "_Stop" msgstr "_Gelditu" -#: ../plug-ins/help-browser/dialog.c:579 +#: ../plug-ins/help-browser/dialog.c:597 msgid "Stop loading this page" msgstr "Geldiarazi orrialde hau kargatzea" -#: ../plug-ins/help-browser/dialog.c:584 +#: ../plug-ins/help-browser/dialog.c:602 msgid "Go to the index page" msgstr "Joan indize orrialdera" -#: ../plug-ins/help-browser/dialog.c:589 +#: ../plug-ins/help-browser/dialog.c:607 msgid "C_opy location" msgstr "Kopiatu _kokapena" -#: ../plug-ins/help-browser/dialog.c:590 +#: ../plug-ins/help-browser/dialog.c:608 msgid "Copy the location of this page to the clipboard" msgstr "Kopiatu orrialde honen kokalekua arbelean" -#: ../plug-ins/help-browser/dialog.c:610 +#: ../plug-ins/help-browser/dialog.c:628 msgid "Find text in current page" msgstr "Bilatu testua uneko orrialdean" -#: ../plug-ins/help-browser/dialog.c:615 +#: ../plug-ins/help-browser/dialog.c:633 msgid "Find _Again" msgstr "Bilat_u berriro" -#: ../plug-ins/help-browser/dialog.c:634 +#: ../plug-ins/help-browser/dialog.c:652 msgid "S_how Index" msgstr "E_rakutsi indizea" -#: ../plug-ins/help-browser/dialog.c:635 +#: ../plug-ins/help-browser/dialog.c:653 msgid "Toggle the visibility of the sidebar" msgstr "Txandakatu albo-barraren ikusgaitasuna" -#: ../plug-ins/help-browser/dialog.c:656 +#: ../plug-ins/help-browser/dialog.c:674 msgid "Visit the GIMP documentation website" msgstr "Bisitatu GIMPen dokumentazioaren web gunea" -#: ../plug-ins/help-browser/dialog.c:1156 +#: ../plug-ins/help-browser/dialog.c:1174 msgid "Find:" msgstr "Bilatu:" -#: ../plug-ins/help-browser/dialog.c:1173 +#: ../plug-ins/help-browser/dialog.c:1191 msgctxt "search" msgid "_Previous" msgstr "_Aurrekoa" -#: ../plug-ins/help-browser/dialog.c:1185 +#: ../plug-ins/help-browser/dialog.c:1203 msgctxt "search" msgid "_Next" msgstr "_Hurrengoa" @@ -11260,25 +11529,28 @@ msgstr "IFS errendatzen (%d/%d)" msgid "Transformation %s" msgstr "%s eraldaketa" -#: ../plug-ins/ifs-compose/ifs-compose.c:2418 +#: ../plug-ins/ifs-compose/ifs-compose.c:2413 +#: ../plug-ins/metadata/interface.c:507 ../plug-ins/metadata/interface.c:517 msgid "Save failed" msgstr "Huts egin du gordetzean" -#: ../plug-ins/ifs-compose/ifs-compose.c:2501 -#: ../plug-ins/ifs-compose/ifs-compose.c:2514 +#: ../plug-ins/ifs-compose/ifs-compose.c:2496 +#: ../plug-ins/ifs-compose/ifs-compose.c:2509 +#: ../plug-ins/metadata/interface.c:413 ../plug-ins/metadata/interface.c:423 +#: ../plug-ins/metadata/interface.c:497 msgid "Open failed" msgstr "Huts egin du irekitzean" -#: ../plug-ins/ifs-compose/ifs-compose.c:2509 +#: ../plug-ins/ifs-compose/ifs-compose.c:2504 #, c-format msgid "File '%s' doesn't seem to be an IFS Fractal file." msgstr "Ez dirudi '%s' fitxategia IFS fraktal-fitxategia denik." -#: ../plug-ins/ifs-compose/ifs-compose.c:2549 +#: ../plug-ins/ifs-compose/ifs-compose.c:2544 msgid "Save as IFS Fractal file" msgstr "Gorde IFS fraktal-fitxategi gisa" -#: ../plug-ins/ifs-compose/ifs-compose.c:2586 +#: ../plug-ins/ifs-compose/ifs-compose.c:2581 msgid "Open IFS Fractal file" msgstr "Ireki IFS fraktal-fitxategia" @@ -11306,8 +11578,8 @@ msgstr "_x zentrua:" #: ../plug-ins/imagemap/imap_circle.c:275 #: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 #: ../plug-ins/imagemap/imap_grid.c:255 -#: ../plug-ins/imagemap/imap_polygon.c:503 -#: ../plug-ins/imagemap/imap_polygon.c:511 +#: ../plug-ins/imagemap/imap_polygon.c:505 +#: ../plug-ins/imagemap/imap_polygon.c:513 #: ../plug-ins/imagemap/imap_rectangle.c:392 #: ../plug-ins/imagemap/imap_rectangle.c:399 #: ../plug-ins/imagemap/imap_rectangle.c:406 @@ -11663,41 +11935,41 @@ msgstr "Sortu irudi-mapa klikagarria" msgid "_Image Map..." msgstr "_Irudi-mapa..." -#: ../plug-ins/imagemap/imap_main.c:484 +#: ../plug-ins/imagemap/imap_main.c:490 #: ../plug-ins/imagemap/imap_settings.c:170 msgid "" msgstr "" -#: ../plug-ins/imagemap/imap_main.c:626 +#: ../plug-ins/imagemap/imap_main.c:632 msgid "Some data has been changed!" msgstr "Datu batzuk aldatu egin dituzu!" -#: ../plug-ins/imagemap/imap_main.c:629 +#: ../plug-ins/imagemap/imap_main.c:635 msgid "Do you really want to discard your changes?" msgstr "Ziur zaude ez dituzula gorde nahi?" -#: ../plug-ins/imagemap/imap_main.c:841 +#: ../plug-ins/imagemap/imap_main.c:847 #, c-format msgid "File \"%s\" saved." msgstr "\"%s\" fitxategia gorde da." -#: ../plug-ins/imagemap/imap_main.c:845 +#: ../plug-ins/imagemap/imap_main.c:851 msgid "Couldn't save file:" msgstr "Ezin izan da fitxategia gorde:" -#: ../plug-ins/imagemap/imap_main.c:858 +#: ../plug-ins/imagemap/imap_main.c:864 msgid "Image size has changed." msgstr "Irudi-tamaina aldatu egin da." -#: ../plug-ins/imagemap/imap_main.c:859 +#: ../plug-ins/imagemap/imap_main.c:865 msgid "Resize area's?" msgstr "Arearen tamaina aldatu?" -#: ../plug-ins/imagemap/imap_main.c:892 +#: ../plug-ins/imagemap/imap_main.c:898 msgid "Couldn't read file:" msgstr "Ezin izan da fitxategia irakurri:" -#: ../plug-ins/imagemap/imap_main.c:939 +#: ../plug-ins/imagemap/imap_main.c:945 #, c-format msgid "URL: %s" msgstr "URLa: %s" @@ -11860,27 +12132,27 @@ msgstr "Zehaztu area biribila/obala" msgid "Define Polygon area" msgstr "Zehaztu area poligonala" -#: ../plug-ins/imagemap/imap_polygon.c:71 +#: ../plug-ins/imagemap/imap_polygon.c:73 msgid "_Polygon" msgstr "_Poligonoa" -#: ../plug-ins/imagemap/imap_polygon.c:472 +#: ../plug-ins/imagemap/imap_polygon.c:474 msgid "x (pixels)" msgstr "x (pixelak)" -#: ../plug-ins/imagemap/imap_polygon.c:481 +#: ../plug-ins/imagemap/imap_polygon.c:483 msgid "y (pixels)" msgstr "y (pixelak)" -#: ../plug-ins/imagemap/imap_polygon.c:519 +#: ../plug-ins/imagemap/imap_polygon.c:521 msgid "_Insert" msgstr "_Txertatu" -#: ../plug-ins/imagemap/imap_polygon.c:525 +#: ../plug-ins/imagemap/imap_polygon.c:527 msgid "A_ppend" msgstr "E_rantsi" -#: ../plug-ins/imagemap/imap_polygon.c:531 +#: ../plug-ins/imagemap/imap_polygon.c:533 msgid "_Remove" msgstr "_Kendu" @@ -12017,6 +12289,7 @@ msgid "Default _URL:" msgstr "_URL lehenetsia:" #: ../plug-ins/imagemap/imap_settings.c:107 +#: ../plug-ins/metadata/interface.c:247 msgid "_Description:" msgstr "_Azalpena:" @@ -12109,6 +12382,11 @@ msgstr "6. argia" msgid "Color:" msgstr "Kolorea:" +#: ../plug-ins/lighting/lighting-ui.c:418 +msgctxt "light-source" +msgid "None" +msgstr "Bat ere ez" + #: ../plug-ins/lighting/lighting-ui.c:419 msgid "Directional" msgstr "Direkziozkoa" @@ -12143,7 +12421,7 @@ msgstr "Argiaren intentsitatea" #: ../plug-ins/lighting/lighting-ui.c:469 #: ../plug-ins/map-object/map-object-ui.c:613 #: ../plug-ins/map-object/map-object-ui.c:940 -#: ../plug-ins/print/print-page-layout.c:355 +#: ../plug-ins/print/print-page-layout.c:371 msgid "Position" msgstr "Kokalekua" @@ -12540,12 +12818,12 @@ msgid "Z scale (size)" msgstr "Z eskala (tamaina)" #: ../plug-ins/map-object/map-object-ui.c:1147 -#: ../plug-ins/print/print-page-layout.c:414 +#: ../plug-ins/print/print-page-layout.c:430 msgid "_Top:" msgstr "_Goian:" #: ../plug-ins/map-object/map-object-ui.c:1147 -#: ../plug-ins/print/print-page-layout.c:433 +#: ../plug-ins/print/print-page-layout.c:449 msgid "_Bottom:" msgstr "_Behean:" @@ -12554,7 +12832,7 @@ msgid "Images for the Cap Faces" msgstr "Estalkietarako irudiak" #: ../plug-ins/map-object/map-object-ui.c:1181 -#: ../plug-ins/print/print-page-layout.c:231 +#: ../plug-ins/print/print-page-layout.c:247 msgid "Size" msgstr "Tamaina" @@ -12646,10 +12924,96 @@ msgstr "Marraztu labirintua" msgid "_Maze..." msgstr "_Labirintoa..." -#: ../plug-ins/maze/maze.c:425 +#: ../plug-ins/maze/maze.c:427 msgid "Drawing maze" msgstr "Labirintoa marrazten" +#: ../plug-ins/metadata/interface.c:110 +msgid "Property" +msgstr "Propietateak" + +#: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 +msgid "Description" +msgstr "Azalpena" + +#: ../plug-ins/metadata/interface.c:222 +msgid "Image _title:" +msgstr "Irudiaren _titulua:" + +#: ../plug-ins/metadata/interface.c:231 +msgid "_Author:" +msgstr "_Egilea:" + +#: ../plug-ins/metadata/interface.c:256 +msgid "Description _writer:" +msgstr "Azalpenaren _idazlea:" + +#: ../plug-ins/metadata/interface.c:272 +msgid "_Keywords:" +msgstr "_Gako-hitzak:" + +#. FIXME: add entries, cross-link with XMP model +#: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 +#: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 +msgid "Empty" +msgstr "Hutsa" + +#: ../plug-ins/metadata/interface.c:286 +msgid "Copyright" +msgstr "Copyright-a" + +#: ../plug-ins/metadata/interface.c:298 +msgid "Origin" +msgstr "Jatorrizkoa" + +#: ../plug-ins/metadata/interface.c:310 +msgid "Camera 1" +msgstr "1. kamera" + +#: ../plug-ins/metadata/interface.c:322 +msgid "Camera 2" +msgstr "2. kamera" + +#: ../plug-ins/metadata/interface.c:337 +msgid "Thumbnail" +msgstr "Koadro txikia" + +#: ../plug-ins/metadata/interface.c:356 +msgid "Advanced" +msgstr "Aurreratua" + +#: ../plug-ins/metadata/interface.c:447 +msgid "Import XMP from File" +msgstr "Inportatu XMP fitxategitik" + +#: ../plug-ins/metadata/interface.c:498 +msgid "Cannot create file" +msgstr "Ezin da fitxategia sortu" + +#: ../plug-ins/metadata/interface.c:508 +msgid "Some error occurred while saving" +msgstr "Errorea gertatu da gordetzean" + +#: ../plug-ins/metadata/interface.c:518 +msgid "Could not close the file" +msgstr "Ezin izan da fitxategia itxi" + +#: ../plug-ins/metadata/interface.c:540 +msgid "Export XMP to File" +msgstr "Esportatu XMP fitxategian" + +#: ../plug-ins/metadata/interface.c:607 +msgid "Image Properties" +msgstr "Irudiaren propietateak" + +#: ../plug-ins/metadata/interface.c:611 +msgid "_Import XMP..." +msgstr "_Inportatu XMP..." + +#: ../plug-ins/metadata/interface.c:612 +msgid "_Export XMP..." +msgstr "_Esportatu XMP..." + #: ../plug-ins/metadata/metadata.c:185 msgid "View and edit metadata (EXIF, IPTC, XMP)" msgstr "Ikusi eta editatu metadatuak (EXIF, IPTC, XMP)" @@ -12658,65 +13022,65 @@ msgstr "Ikusi eta editatu metadatuak (EXIF, IPTC, XMP)" msgid "Propert_ies" msgstr "_Propietateak" -#: ../plug-ins/metadata/xmp-parse.c:238 +#: ../plug-ins/metadata/xmp-parse.c:237 #, c-format msgid "Error: No XMP packet found" msgstr "Errorea: ez da XMP paketerik aurkitu" -#: ../plug-ins/metadata/xmp-parse.c:254 +#: ../plug-ins/metadata/xmp-parse.c:253 #, c-format msgid "Error on line %d char %d: %s" msgstr "Errorea %d lerroan %d karakterean: %s" -#: ../plug-ins/metadata/xmp-parse.c:276 +#: ../plug-ins/metadata/xmp-parse.c:275 #, c-format msgid "Expected text or optional element <%s>, found <%s> instead" msgstr "Testua edo aukerazko <%s> elementua espero zen, baina <%s> aurkitu da" -#: ../plug-ins/metadata/xmp-parse.c:280 +#: ../plug-ins/metadata/xmp-parse.c:279 #, c-format msgid "Expected element <%s>, found <%s> instead" msgstr "<%s> elementua espero zen, baina <%s> aurkitu da" -#: ../plug-ins/metadata/xmp-parse.c:295 +#: ../plug-ins/metadata/xmp-parse.c:294 #, c-format msgid "Unknown element <%s>" msgstr "<%s> elementu ezezaguna" -#: ../plug-ins/metadata/xmp-parse.c:324 +#: ../plug-ins/metadata/xmp-parse.c:323 #, c-format msgid "Unknown attribute \"%s\"=\"%s\" in element <%s>" msgstr "\"%s\"=\"%s\" atributu ezezaguna <%s> elementuan" -#: ../plug-ins/metadata/xmp-parse.c:677 +#: ../plug-ins/metadata/xmp-parse.c:676 #, c-format msgid "Required attribute rdf:about missing in <%s>" msgstr "<%s>(e)n falta den rdf:about atributua behar da" -#: ../plug-ins/metadata/xmp-parse.c:903 +#: ../plug-ins/metadata/xmp-parse.c:902 #, c-format msgid "Nested elements (<%s>) are not allowed in this context" msgstr "Habiaratutako elementuak (<%s>) ez dira testuinguru honetan onartzen" -#: ../plug-ins/metadata/xmp-parse.c:1032 +#: ../plug-ins/metadata/xmp-parse.c:1031 #, c-format msgid "End of element <%s> not expected in this context" msgstr "Ez zen <%s> elementuaren amaiera espero testuinguru honetan" -#: ../plug-ins/metadata/xmp-parse.c:1134 +#: ../plug-ins/metadata/xmp-parse.c:1139 #, c-format msgid "The current element (<%s>) cannot contain text" msgstr "Uneko elementuak (<%s>) ezin du testurik eduki" -#: ../plug-ins/metadata/xmp-parse.c:1159 +#: ../plug-ins/metadata/xmp-parse.c:1164 msgid "XMP packets must start with " msgstr "XMP paketeak goiburuarekin hasi behar dute" -#: ../plug-ins/metadata/xmp-parse.c:1173 +#: ../plug-ins/metadata/xmp-parse.c:1178 msgid "XMP packets must end with " msgstr "XMP paketeak goiburuarekin amaitu behar dute" -#: ../plug-ins/metadata/xmp-parse.c:1186 +#: ../plug-ins/metadata/xmp-parse.c:1191 msgid "XMP cannot contain XML comments or processing instructions" msgstr "XMPk ezin du XML osagairik edo prozesatzeko instrukziorik eduki" @@ -12728,128 +13092,134 @@ msgstr "Kiribildu irudiaren ertzetariko bat" msgid "_Pagecurl..." msgstr "_Kiribildu orrialdea..." -#: ../plug-ins/pagecurl/pagecurl.c:440 +#: ../plug-ins/pagecurl/pagecurl.c:442 msgid "Pagecurl Effect" msgstr "Kiribiltze-efektua" -#: ../plug-ins/pagecurl/pagecurl.c:462 +#: ../plug-ins/pagecurl/pagecurl.c:464 msgid "Curl Location" msgstr "Kiribilaren kokalekua" -#: ../plug-ins/pagecurl/pagecurl.c:481 +#: ../plug-ins/pagecurl/pagecurl.c:483 msgid "Lower right" msgstr "Behean eskuinean" -#: ../plug-ins/pagecurl/pagecurl.c:482 +#: ../plug-ins/pagecurl/pagecurl.c:484 msgid "Lower left" msgstr "Behean ezkerrean" -#: ../plug-ins/pagecurl/pagecurl.c:483 +#: ../plug-ins/pagecurl/pagecurl.c:485 msgid "Upper left" msgstr "Goian ezkerrean" -#: ../plug-ins/pagecurl/pagecurl.c:484 +#: ../plug-ins/pagecurl/pagecurl.c:486 msgid "Upper right" msgstr "Goian eskuinean" -#: ../plug-ins/pagecurl/pagecurl.c:524 +#: ../plug-ins/pagecurl/pagecurl.c:526 msgid "Curl Orientation" msgstr "Kiribilaren orientazioa" -#: ../plug-ins/pagecurl/pagecurl.c:568 +#: ../plug-ins/pagecurl/pagecurl.c:571 msgid "_Shade under curl" msgstr "Kiribilaren azpiko _itzala" -#: ../plug-ins/pagecurl/pagecurl.c:581 +#: ../plug-ins/pagecurl/pagecurl.c:584 msgid "Current gradient (reversed)" msgstr "Uneko gradientea (alderantzikatua)" -#: ../plug-ins/pagecurl/pagecurl.c:586 +#: ../plug-ins/pagecurl/pagecurl.c:589 msgid "Current gradient" msgstr "Uneko gradientea" -#: ../plug-ins/pagecurl/pagecurl.c:591 +#: ../plug-ins/pagecurl/pagecurl.c:594 msgid "Foreground / background colors" msgstr "AurPl-aren eta AtzPL-aren koloreak" -#: ../plug-ins/pagecurl/pagecurl.c:611 +#: ../plug-ins/pagecurl/pagecurl.c:614 msgid "_Opacity:" msgstr "_Opakutasuna:" -#: ../plug-ins/pagecurl/pagecurl.c:734 +#: ../plug-ins/pagecurl/pagecurl.c:730 msgid "Curl Layer" msgstr "Kiribilaren geruza" -#: ../plug-ins/pagecurl/pagecurl.c:1025 +#: ../plug-ins/pagecurl/pagecurl.c:1022 msgid "Page Curl" msgstr "Kiribildu orrialdea" -#: ../plug-ins/print/print-page-layout.c:149 +#: ../plug-ins/print/print-page-layout.c:153 msgid "Ignore Page _Margins" msgstr "Ez ikusi egin orrialdeko _marjinei" #. crop marks toggle -#: ../plug-ins/print/print-page-layout.c:160 +#: ../plug-ins/print/print-page-layout.c:164 msgid "_Draw Crop Marks" msgstr "_Marraztu mozketa markak" -#: ../plug-ins/print/print-page-layout.c:306 +#: ../plug-ins/print/print-page-layout.c:322 msgid "_X resolution:" msgstr "_X bereizmena:" -#: ../plug-ins/print/print-page-layout.c:310 +#: ../plug-ins/print/print-page-layout.c:326 msgid "_Y resolution:" msgstr "_Y bereizmena:" -#: ../plug-ins/print/print-page-layout.c:381 +#: ../plug-ins/print/print-page-layout.c:397 msgid "_Left:" msgstr "E_zkerrean:" -#: ../plug-ins/print/print-page-layout.c:400 +#: ../plug-ins/print/print-page-layout.c:416 msgid "_Right:" msgstr "E_skuinean:" -#: ../plug-ins/print/print-page-layout.c:454 +#: ../plug-ins/print/print-page-layout.c:470 msgid "C_enter:" msgstr "_Zentratuta:" -#: ../plug-ins/print/print-page-layout.c:462 +#. if and how to center the image on the page +#: ../plug-ins/print/print-page-layout.c:477 +msgctxt "center-mode" +msgid "None" +msgstr "Bat ere ez" + +#: ../plug-ins/print/print-page-layout.c:478 msgid "Horizontally" msgstr "Horizontalki" -#: ../plug-ins/print/print-page-layout.c:463 +#: ../plug-ins/print/print-page-layout.c:479 msgid "Vertically" msgstr "Bertikalki" -#: ../plug-ins/print/print-page-layout.c:464 +#: ../plug-ins/print/print-page-layout.c:480 msgid "Both" msgstr "Biak" -#: ../plug-ins/print/print.c:102 +#: ../plug-ins/print/print.c:107 msgid "Print the image" msgstr "Inprimatu irudia" -#: ../plug-ins/print/print.c:107 +#: ../plug-ins/print/print.c:112 msgid "_Print..." msgstr "_Inprimatu..." -#: ../plug-ins/print/print.c:118 +#: ../plug-ins/print/print.c:124 msgid "Adjust page size and orientation for printing" msgstr "Doitu orrialdearen tamaina eta orientazioa inprimatzeko" -#: ../plug-ins/print/print.c:124 +#: ../plug-ins/print/print.c:130 msgid "Page Set_up" msgstr "Orrialdearen _konfigurazioa" -#: ../plug-ins/print/print.c:263 +#: ../plug-ins/print/print.c:275 msgid "Image Settings" msgstr "Irudiaren ezarpenak" -#: ../plug-ins/print/print.c:347 +#: ../plug-ins/print/print.c:373 msgid "An error occurred while trying to print:" msgstr "Errorea gertatu da inprimatzen saiatzean:" -#: ../plug-ins/print/print.c:374 +#: ../plug-ins/print/print.c:400 msgid "Printing" msgstr "Inprimatzen" @@ -12879,38 +13249,72 @@ msgstr "_Eskanerra/Kamera..." msgid "Transferring data from scanner/camera" msgstr "Eskanerretik/kameratik datuak transferitzen" -#: ../plug-ins/win-snap/winsnap.c:865 +#: ../plug-ins/win-snap/winsnap.c:871 msgid "Grab" msgstr "Kapturatu" -#: ../plug-ins/win-snap/winsnap.c:882 +#: ../plug-ins/win-snap/winsnap.c:888 msgid "Grab a single window" msgstr "Kapturatu leiho bakarra" -#: ../plug-ins/win-snap/winsnap.c:896 +#: ../plug-ins/win-snap/winsnap.c:902 msgid "Grab the whole screen" msgstr "Kapturatu pantaila osoa" -#: ../plug-ins/win-snap/winsnap.c:912 +#: ../plug-ins/win-snap/winsnap.c:918 msgid "after" msgstr "geroago" -#: ../plug-ins/win-snap/winsnap.c:924 +#: ../plug-ins/win-snap/winsnap.c:930 msgid "Seconds delay" msgstr "segundo" -#: ../plug-ins/win-snap/winsnap.c:931 +#: ../plug-ins/win-snap/winsnap.c:937 msgid "Include decorations" msgstr "Sartu apaingarriak ere" -#: ../plug-ins/win-snap/winsnap.c:990 +#: ../plug-ins/win-snap/winsnap.c:996 msgid "Capture a window or desktop image" msgstr "Egin leiho baten edo mahaigainaren kaptura" -#: ../plug-ins/win-snap/winsnap.c:995 +#: ../plug-ins/win-snap/winsnap.c:1001 msgid "_Screen Shot..." msgstr "_Pantaila-argazkia..." -#: ../plug-ins/win-snap/winsnap.c:1143 +#: ../plug-ins/win-snap/winsnap.c:1149 msgid "No data captured" msgstr "Ez da daturik kapturatu" + +#~ msgid "Ascii" +#~ msgstr "Ascii" + +#~ msgid "" +#~ "Error starting Ghostscript. Make sure that Ghostscript is installed and - " +#~ "if necessary - use the environment variable GS_PROG to tell GIMP about " +#~ "its location.\n" +#~ "(%s)" +#~ msgstr "" +#~ "Errorea Ghostscript abiaraztean. Ziurtatu Ghostscript instalatuta dagoela " +#~ "eta, beharrezkoa bada, erabili inguruneko GS_PROG aldagaia GIMP " +#~ "aplikazioari bere kokalekua zein den adierazteko.\n" +#~ "(%s)" + +#~ msgid "The width of frame %d of '%s' is too big for X cursor." +#~ msgstr "" +#~ "'%2$s' irudiaren %1$d markoaren zabalera handiegia da X kurtsorearentzako." + +#~ msgid "The height of frame %d of '%s' is too big for X cursor." +#~ msgstr "" +#~ "'%2$s' irudiaren %1$d markoaren altuera handiegia da X kurtsorearentzako." + +#~ msgid "The height of '%s' is too big for X cursor." +#~ msgstr "'%s'(r)en altuera handiegia da X kurtsorearentzako." + +#~ msgid "Width of '%s' is too large. Please reduce more than %dpx." +#~ msgstr "'%s'(r)en zabalera handiegia da. Txikiagotu %d px baino gehiago." + +#~ msgid "The size of '%s' is zero!" +#~ msgstr "'%s'(r)en tamaina zero da." + +#~ msgid "BMP" +#~ msgstr "BMP" diff --git a/po-plug-ins/hu.po b/po-plug-ins/hu.po index aadf3566c2..6141832a3d 100644 --- a/po-plug-ins/hu.po +++ b/po-plug-ins/hu.po @@ -9,137 +9,139 @@ # Gabor Kelemen , 2008. # Gabor Kelemen , 2010, 2012. # András Prim , 2012. +# Balázs Úr , 2013. msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins.gimp-2-6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 21:51+0200\n" -"PO-Revision-Date: 2012-06-06 21:54+0200\n" -"Last-Translator: Gabor Kelemen \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-21 15:32+0000\n" +"PO-Revision-Date: 2013-09-22 10:28+0200\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:118 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" msgstr "Eredeti" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:136 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:138 msgid "Rotated" msgstr "Elforgatott" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:154 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:156 msgid "Continuous update" msgstr "Folyamatos frissítés" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:167 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:169 msgid "Area:" msgstr "Terület:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:171 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 msgid "Entire Layer" msgstr "Teljes réteg" #. Create selection -#: ../plug-ins/color-rotate/color-rotate-dialog.c:172 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:174 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "Kijelölés" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:175 msgid "Context" msgstr "Környezet" #. spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:297 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:299 msgctxt "color-range" msgid "From:" msgstr "Innen:" #. spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:323 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:326 msgctxt "color-range" msgid "To:" msgstr "Ide:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:375 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 msgctxt "color-rotate" msgid "From:" msgstr "Innen:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:378 msgctxt "color-rotate" msgid "To:" msgstr "Ide:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:416 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:418 #: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Szürke" #. Gray: Circle: Spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:464 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:466 msgid "Hue:" msgstr "Árnyalat:" #. Gray: Circle: Spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:491 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:553 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:493 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:555 msgid "Saturation:" msgstr "Telítettség:" #. * Gray: Operation-Mode * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:511 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:513 msgid "Gray Mode" msgstr "Szürke-mód" #. Gray: Operation-Mode: two radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:520 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:522 msgid "Treat as this" msgstr "Ekként való kezelés" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:532 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:534 msgid "Change to this" msgstr "Erre történő módosítás" #. * Gray: What is gray? * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:545 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:547 msgid "Gray Threshold" msgstr "Szürke-küszöb" #. * Misc: Used unit selection * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:585 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:695 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:587 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:697 msgid "Units" msgstr "Mértékegységek" #. Misc: Used unit selection: 3 radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:594 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:596 msgid "Radians" msgstr "Radián" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:606 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:608 msgid "Radians/Pi" msgstr "Radián/Pi" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:618 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:620 msgid "Degrees" msgstr "Fok" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:649 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:651 msgid "Rotate Colors" msgstr "Színek elforgatása" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:689 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:691 msgid "Main Options" msgstr "Főbb beállítások" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:692 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:694 msgid "Gray Options" msgstr "Szürke-beállítások" @@ -284,97 +286,97 @@ msgstr "_RGB színmodell" msgid "_HSL color model" msgstr "_HSL színmodell" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "A kép összes látható rétegének igazítása" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "Lát_ható rétegek igazítása…" -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "Nincs elég réteg az igazításhoz." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Látható rétegek igazítása" -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "Nincs" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Összegyűjtés" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Kitöltés (balról jobbra)" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Kitöltés (jobbról balra)" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Rácshoz illesztés" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "_Vízszintes stílus:" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Bal szél" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Közép" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Jobb szél" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "Vízszintes _alap:" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Kitöltés (fentről le)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Kitöltés (lentről fel)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "_Függőleges stílus:" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Felső szél" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Alsó szél" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "Függőleges a_lap:" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "_Rácsméret:" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "A legalsó réteg figyelmen _kívül hagyása akkor is, ha látható" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "A l_egalsó (láthatatlan) réteg használata alapként" @@ -609,19 +611,19 @@ msgstr "Függő_leges" #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:363 -#: ../plug-ins/common/file-cel.c:366 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:441 +#: ../plug-ins/common/file-cel.c:444 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:943 #: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 #: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:583 +#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:585 #: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997 +#: ../plug-ins/common/file-tga.c:1072 ../plug-ins/common/file-tiff-load.c:1010 #: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:380 ../plug-ins/file-bmp/bmp-read.c:647 -#: ../plug-ins/file-faxg3/faxg3.c:474 ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:255 ../plug-ins/file-jpeg/jpeg-load.c:819 +#: ../plug-ins/file-bmp/bmp-read.c:677 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:260 +#: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 #: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 #: ../plug-ins/gfig/gfig-dialog.c:1321 @@ -646,7 +648,8 @@ msgstr "Sza_kaszok száma:" #: ../plug-ins/common/blur-gauss-selective.c:104 msgid "Blur neighboring pixels, but only in low-contrast areas" -msgstr "Szomszédos képpontok elmosása, de csak az alacsony kontrasztú területeken" +msgstr "" +"Szomszédos képpontok elmosása, de csak az alacsony kontrasztú területeken" #: ../plug-ins/common/blur-gauss-selective.c:115 msgid "_Selective Gaussian Blur..." @@ -799,7 +802,7 @@ msgstr "Egyszerű elmosás – gyors, de nem túl erős" msgid "_Blur" msgstr "_Elmosás" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Elmosás" @@ -908,7 +911,8 @@ msgstr "_X-eltolás:" msgid "" "The offset can be adjusted by dragging the preview using the middle mouse " "button." -msgstr "Az eltolás beállítható az előkép középső egérgombbal való húzásával is." +msgstr "" +"Az eltolás beállítható az előkép középső egérgombbal való húzásával is." #: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3259 msgid "_Y offset:" @@ -1018,26 +1022,27 @@ msgstr "Csatornakeverő beállításainak betöltése" #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 -#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892 -#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 +#: ../plug-ins/common/file-cel.c:296 ../plug-ins/common/file-cel.c:348 +#: ../plug-ins/common/file-cel.c:579 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355 #: ../plug-ins/common/file-gih.c:640 ../plug-ins/common/file-jp2-load.c:194 #: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 #: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756 -#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1014 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1014 #: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717 #: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 #: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442 -#: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:737 -#: ../plug-ins/common/file-xmc.c:663 ../plug-ins/common/file-xmc.c:848 -#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2010 -#: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:229 +#: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:655 +#: ../plug-ins/common/file-xmc.c:840 ../plug-ins/common/file-xwd.c:435 +#: ../plug-ins/common/sphere-designer.c:2010 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 #: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 -#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 -#: ../plug-ins/file-jpeg/jpeg-load.c:889 ../plug-ins/file-psd/psd-load.c:130 +#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:122 +#: ../plug-ins/file-jpeg/jpeg-load.c:894 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 #: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 @@ -1056,20 +1061,20 @@ msgid "Save Channel Mixer Settings" msgstr "Csatornakeverő beállításainak mentése" #: ../plug-ins/common/channel-mixer.c:1058 -#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840 -#: ../plug-ins/common/file-cel.c:585 ../plug-ins/common/file-csource.c:407 -#: ../plug-ins/common/file-dicom.c:1351 ../plug-ins/common/file-gbr.c:663 -#: ../plug-ins/common/file-gif-save.c:782 ../plug-ins/common/file-gih.c:1258 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 +#: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 #: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526 -#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1010 +#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1012 #: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591 #: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565 -#: ../plug-ins/common/file-tga.c:1171 ../plug-ins/common/file-tiff-save.c:684 -#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1455 -#: ../plug-ins/common/file-xwd.c:619 ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:476 +#: ../plug-ins/common/file-tga.c:1179 ../plug-ins/common/file-tiff-save.c:708 +#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1447 +#: ../plug-ins/common/file-xwd.c:623 ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:476 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007 #: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 @@ -1104,7 +1109,7 @@ msgstr "Sakktábla hozzáadása" msgid "Checkerboard" msgstr "Sakktábla" -#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1162 +#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1154 #: ../plug-ins/gimpressionist/sizemap.c:510 msgid "_Size:" msgstr "Mér_et:" @@ -1392,7 +1397,8 @@ msgstr "Kezdőérték eltolása:" #: ../plug-ins/common/cml-explorer.c:1366 msgid "Seed of Random (only for \"From Seed\" Modes)" -msgstr "Véletlenszám-generálás kiindulóértéke (csak a „kiindulóértékből” módokhoz)" +msgstr "" +"Véletlenszám-generálás kiindulóértéke (csak a „kiindulóértékből” módokhoz)" #: ../plug-ins/common/cml-explorer.c:1377 ../plug-ins/maze/maze-dialog.c:251 msgid "Seed:" @@ -1539,7 +1545,8 @@ msgstr "Figyelmeztetés: „%s” egy régi formátumú fájl" #: ../plug-ins/common/cml-explorer.c:2241 #, c-format msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer." -msgstr "Figyelmeztetés: a(z) „%s” paraméterfájl egy újabb CML-böngészőhöz készült." +msgstr "" +"Figyelmeztetés: a(z) „%s” paraméterfájl egy újabb CML-böngészőhöz készült." #: ../plug-ins/common/cml-explorer.c:2304 msgid "Error: failed to load parameters" @@ -1607,7 +1614,8 @@ msgstr "Szín-felcserélés" #: ../plug-ins/common/color-exchange.c:310 msgid "Middle-Click Inside Preview to Pick \"From Color\"" -msgstr "A kiindulási szín kijelöléséhez kattintson a középső egérgombbal az előképre" +msgstr "" +"A kiindulási szín kijelöléséhez kattintson a középső egérgombbal az előképre" #: ../plug-ins/common/color-exchange.c:355 msgid "To Color" @@ -1896,7 +1904,8 @@ msgstr "" #: ../plug-ins/common/compose.c:512 msgid "Error scanning 'decompose-data' parasite: too few layers found" -msgstr "Hiba az „adatok szétbontása” élősködő vizsgálatakor: túl kevés réteg van" +msgstr "" +"Hiba az „adatok szétbontása” élősködő vizsgálatakor: túl kevés réteg van" #: ../plug-ins/common/compose.c:545 #, c-format @@ -1961,7 +1970,8 @@ msgstr "Maszkolási érték" #: ../plug-ins/common/contrast-normalize.c:79 msgid "Stretch brightness values to cover the full range" -msgstr "Fényességi értékek kiterjesztése úgy, hogy a teljes tartományt fedjék le" +msgstr "" +"Fényességi értékek kiterjesztése úgy, hogy a teljes tartományt fedjék le" #: ../plug-ins/common/contrast-normalize.c:91 #: ../plug-ins/common/edge-dog.c:362 @@ -2022,7 +2032,8 @@ msgstr "Retinex: szűrés" #: ../plug-ins/common/contrast-stretch-hsv.c:67 msgid "Stretch image contrast to cover the maximum possible range" -msgstr "Képkontraszt kiterjesztése úgy, hogy a lehető legnagyobb tartományt fedje le" +msgstr "" +"Képkontraszt kiterjesztése úgy, hogy a lehető legnagyobb tartományt fedje le" #: ../plug-ins/common/contrast-stretch-hsv.c:80 msgid "Stretch _HSV" @@ -2038,7 +2049,8 @@ msgstr "autostretch_hsv: a cmap NULL. Kilépés…\n" #: ../plug-ins/common/contrast-stretch.c:67 msgid "Stretch contrast to cover the maximum possible range" -msgstr "Kontraszt kiterjesztése úgy, hogy a lehető legnagyobb tartományt fedje le" +msgstr "" +"Kontraszt kiterjesztése úgy, hogy a lehető legnagyobb tartományt fedje le" #: ../plug-ins/common/contrast-stretch.c:78 msgid "_Stretch Contrast" @@ -2141,35 +2153,35 @@ msgstr "Csatornák" msgid "Remove empty borders from the image" msgstr "A kép üres keretének eltávolítása" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "Kép a_utomatikus vágása" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "A réteg üres keretének eltávolítása" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "Réteg a_utomatikus vágása" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "Vágás" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "A nem használt terület automatikus levágása a szélekről és középről" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "_Zealous vágás" -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Zealous vágás" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "Nincs mit vágni." @@ -2201,40 +2213,40 @@ msgstr "_Háttérszín használata" msgid "Cubistic transformation" msgstr "Kubista átalakítás" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "A kép görbítése két vezérlőgörbe használatával" -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "Gör_bítés egy görbe szerint…" -#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "Csak rétegekre működik, csatornára és maszkra nem." -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "Maszkot tartalmazó rétegek kezelése nem lehetséges." -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "Üres kijelölés esetén nem használható." -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format msgid "Error while reading '%s': %s" msgstr "Hiba „%s” olvasásakor: %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2956 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "Görbítés egy görbe szerint" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 +#: ../plug-ins/common/curve-bend.c:1261 #: ../plug-ins/gimpressionist/orientmap.c:590 #: ../plug-ins/gimpressionist/sizemap.c:459 #: ../plug-ins/print/print-page-layout.c:175 @@ -2242,116 +2254,116 @@ msgid "Preview" msgstr "Előnézet" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "Előnézet eg_yszer" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "Automati_kus előnézet" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 #: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "Beállítások" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "Fo_rgatás:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "Simí_tás" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:729 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "Éls_imítás" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "M_unka a másolaton" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "Görbék módosítása" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "Ennek a szegélynek a görbéje" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "_Felső" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "_Alsó" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "Görbe típusa" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "Egye_nletes" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "Sza_bad" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "Máso_lás" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "Az aktív görbe másolása a másik szegélyhez" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "Tükrö_zés" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "Az aktív görbe tükrözése a másik szegélyhez" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "_Csere" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "A két görbe felcserélése" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "Az aktív görbe visszaállítása" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "Görbék betöltése fájlból" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "Görbék mentése fájlba" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "Görbe pontjainak betöltése fájlból" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "Görbe pontjainak mentése fájlba" @@ -2635,9 +2647,9 @@ msgstr "_Adaptív" msgid "R_ecursive" msgstr "R_ekurzív" -#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2856,11 +2868,11 @@ msgstr "_Neon…" msgid "Neon" msgstr "Neon" -#: ../plug-ins/common/edge-neon.c:696 +#: ../plug-ins/common/edge-neon.c:697 msgid "Neon Detection" msgstr "Neon-élkeresés" -#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "Mér_ték:" @@ -3008,58 +3020,121 @@ msgid "_Format:" msgstr "_Formátum:" # KISS CEL: file format -#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129 +#: ../plug-ins/common/file-cel.c:114 ../plug-ins/common/file-cel.c:132 msgid "KISS CEL" msgstr "KISS CEL" -#: ../plug-ins/common/file-cel.c:191 +#: ../plug-ins/common/file-cel.c:202 msgid "Load KISS Palette" msgstr "KISS paletta betöltése" +#: ../plug-ins/common/file-cel.c:308 ../plug-ins/common/file-cel.c:363 +#: ../plug-ins/common/file-cel.c:383 +#, c-format +#| msgid "Error while reading '%s': %s" +msgid "EOF or error while reading image header" +msgstr "Fájl vége vagy hiba a képfejléc olvasása közben" + #. max. rows allocated #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-cel.c:353 ../plug-ins/common/file-dicom.c:345 #: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360 #: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 #: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:499 +#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:501 #: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716 #: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 -#: ../plug-ins/common/file-tiff-load.c:603 ../plug-ins/common/file-wmf.c:994 -#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:675 -#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:524 -#: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:213 +#: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 +#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:667 +#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:526 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 -#: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 +#: ../plug-ins/file-jpeg/jpeg-load.c:128 ../plug-ins/file-psd/psd-load.c:135 #: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 #, c-format msgid "Opening '%s'" msgstr "„%s” megnyitása" -#: ../plug-ins/common/file-cel.c:354 +#: ../plug-ins/common/file-cel.c:391 +#, c-format +#| msgid "'%s' is not a PCX file" +msgid "is not a CEL image file" +msgstr "ez nem egy CEL képfájl" + +#: ../plug-ins/common/file-cel.c:405 +#, c-format +msgid "illegal bpp value in image: %hhu" +msgstr "érvénytelen bpp érték a képen: %hhu" + +#: ../plug-ins/common/file-cel.c:419 +#, c-format +msgid "" +"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " +"vertical offset: %d" +msgstr "" +"érvénytelen képdimenziók: szélesség: %d, vízszintes eltolás: %d, magasság: %" +"d, függőleges eltolás: %d" + +#: ../plug-ins/common/file-cel.c:432 +#, c-format msgid "Can't create a new image" msgstr "Nem lehet új képet létrehozni" -#: ../plug-ins/common/file-cel.c:444 +#: ../plug-ins/common/file-cel.c:470 ../plug-ins/common/file-cel.c:505 +#: ../plug-ins/common/file-cel.c:530 +#, c-format +#| msgid "Error while reading '%s': %s" +msgid "EOF or error while reading image data" +msgstr "Fájl vége vagy hiba a képadatok olvasása közben" + +#: ../plug-ins/common/file-cel.c:547 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Nem támogatott bitmélység (%d)" +#: ../plug-ins/common/file-cel.c:629 ../plug-ins/common/file-cel.c:641 +#, c-format +msgid "'%s': EOF or error while reading palette header" +msgstr "„%s”: fájl vége vagy hiba a palettafejléc olvasása közben" + +#: ../plug-ins/common/file-cel.c:650 +#, c-format +#| msgid "'%s' is not a PCX file" +msgid "'%s': is not a KCF palette file" +msgstr "„%s”: ez nem egy KCF palettafájl" + +#: ../plug-ins/common/file-cel.c:659 +#, c-format +msgid "'%s': illegal bpp value in palette: %hhu" +msgstr "„%s”: érvénytelen bpp érték a palettán: %hhu" + +#: ../plug-ins/common/file-cel.c:668 +#, c-format +#| msgid "Number of colors:" +msgid "'%s': illegal number of colors: %u" +msgstr "„%s”: a színek száma érvénytelen: %u" + +#: ../plug-ins/common/file-cel.c:683 ../plug-ins/common/file-cel.c:700 +#: ../plug-ins/common/file-cel.c:720 +#, c-format +msgid "'%s': EOF or error while reading palette data" +msgstr "„%s”: fájl vége vagy hiba a palettaadatok olvasása közben" + #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:590 ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1263 +#: ../plug-ins/common/file-cel.c:777 ../plug-ins/common/file-gbr.c:668 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1263 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 #: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1015 +#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1017 #: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:694 -#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1460 -#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:624 -#: ../plug-ins/file-bmp/bmp-write.c:317 ../plug-ins/file-fits/fits.c:481 +#: ../plug-ins/common/file-tga.c:1184 ../plug-ins/common/file-tiff-save.c:716 +#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1452 +#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:628 +#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:481 #: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001 #: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657 #: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696 @@ -3142,13 +3217,13 @@ msgstr "Digital Imaging and Communications in Medicine-kép" msgid "'%s' is not a DICOM file." msgstr "A(z) „%s” nem egy DICOM-fájl." -#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676 -#: ../plug-ins/common/file-pnm.c:1000 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676 +#: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "Az alfa-csatornás képek nem menthetők el." -#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1180 -#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:609 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180 +#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613 #: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." msgstr "Ismeretlen képtípusok nem kezelhetők." @@ -3160,7 +3235,8 @@ msgstr "GIMP-ecset" #: ../plug-ins/common/file-gbr.c:399 ../plug-ins/common/file-pat.c:418 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" -msgstr "Érvénytelen fejlécadatok ebben: „%s”: szélesség=%lu, magasság=%lu, bájtok=%lu" +msgstr "" +"Érvénytelen fejlécadatok ebben: „%s”: szélesség=%lu, magasság=%lu, bájtok=%lu" #: ../plug-ins/common/file-gbr.c:423 ../plug-ins/common/file-gbr.c:435 msgid "Unsupported brush format" @@ -3243,11 +3319,11 @@ msgstr "" "GIF: a nem dokumentált „%d” GIF-összetételi típus kezelése nem támogatott. " "Elképzelhető, hogy az animáció nem lesz lejátszható vagy újra elmenthető." -#: ../plug-ins/common/file-gif-save.c:468 +#: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "A színek további csökkentése nem sikerült. Mentés átlátszatlanként." -#: ../plug-ins/common/file-gif-save.c:583 +#: ../plug-ins/common/file-gif-save.c:591 #, c-format msgid "" "Unable to save '%s'. The GIF file format does not support images that are " @@ -3256,7 +3332,7 @@ msgstr "" "„%s” mentése nem lehetséges. A GIF fájlformátum nem tud olyan képeket " "eltárolni, amelyek szélessége vagy magassága %d képpontnál nagyobb." -#: ../plug-ins/common/file-gif-save.c:694 +#: ../plug-ins/common/file-gif-save.c:704 msgid "" "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." @@ -3264,17 +3340,18 @@ msgstr "" "A GIF formátum csak 7 bites ASCII kódolást engedélyez a megjegyzésekben. A " "megjegyzés nem lett elmentve." -#: ../plug-ins/common/file-gif-save.c:753 -msgid "Cannot save RGB color images. Convert to indexed color or grayscale first." +#: ../plug-ins/common/file-gif-save.c:763 +msgid "" +"Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" "RGB-színű képek nem menthetők. Alakítsa a képet indexelt színűre vagy " "szürkeárnyalatosra." -#: ../plug-ins/common/file-gif-save.c:931 +#: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "Késleltetés betéve a processzorterhelés csökkentésére." -#: ../plug-ins/common/file-gif-save.c:972 +#: ../plug-ins/common/file-gif-save.c:982 msgid "" "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." @@ -3282,7 +3359,7 @@ msgstr "" "A kép, amelyet Ön GIF-ként szeretne menteni, olyan rétegeket tartalmaz, " "amelyek a kép tényleges határain kívülre nyúlnak." -#: ../plug-ins/common/file-gif-save.c:989 +#: ../plug-ins/common/file-gif-save.c:999 msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." @@ -3290,11 +3367,11 @@ msgstr "" "A GIF fájlformátum ezt nem teszi lehetővé. Ön levághatja a rétegeket a " "képméretnek megfelelően, vagy megszakíthatja a mentést." -#: ../plug-ins/common/file-gif-save.c:1125 +#: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" msgstr "GIF" -#: ../plug-ins/common/file-gif-save.c:1133 +#: ../plug-ins/common/file-gif-save.c:1143 #, c-format msgid "" "Error loading UI file '%s':\n" @@ -3303,19 +3380,19 @@ msgstr "" "Hiba a(z) „%s” felületfájl betöltésekor:\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1187 +#: ../plug-ins/common/file-gif-save.c:1197 msgid "I don't care" msgstr "Nem lényeges" -#: ../plug-ins/common/file-gif-save.c:1189 +#: ../plug-ins/common/file-gif-save.c:1199 msgid "Cumulative layers (combine)" msgstr "Kumulatív rétegek (egyesítés)" -#: ../plug-ins/common/file-gif-save.c:1191 +#: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" msgstr "Rétegenként egy képkocka (helyettesítés)" -#: ../plug-ins/common/file-gif-save.c:1208 +#: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." @@ -3323,12 +3400,12 @@ msgstr "" "Csak egynél több rétegű képet exportálhat animációként. A kép, melyet " "exportálni kíván, csak egy réteget tartalmaz." -#: ../plug-ins/common/file-gif-save.c:2312 +#: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." msgstr "Hiba a kimeneti fájl írása közben." #. translators: the %d is *always* 240 here -#: ../plug-ins/common/file-gif-save.c:2385 +#: ../plug-ins/common/file-gif-save.c:2395 #, c-format msgid "The default comment is limited to %d characters." msgstr "Az alapértelmezett megjegyzés hossza maximum %d karakter." @@ -3593,8 +3670,10 @@ msgstr "A(z) „%2$s” kép %1$d. összetevőjében nincs hstep és vstep." #: ../plug-ins/common/file-jp2-load.c:343 #, c-format -msgid "Image component %d of image '%s' is signed. This is currently not supported." -msgstr "A(z) „%2$s” kép %1$d. összetevője előjeles. Ez egyelőre nem támogatott." +msgid "" +"Image component %d of image '%s' is signed. This is currently not supported." +msgstr "" +"A(z) „%2$s” kép %1$d. összetevője előjeles. Ez egyelőre nem támogatott." #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette @@ -3620,7 +3699,7 @@ msgstr "Váltottsoros" msgid "Save background color" msgstr "Háttérszín mentése" -#: ../plug-ins/common/file-mng.c:1371 ../plug-ins/ui/plug-in-file-png.ui.h:9 +#: ../plug-ins/common/file-mng.c:1371 ../plug-ins/ui/plug-in-file-png.ui.h:3 msgid "Save gamma" msgstr "Gamma mentése" @@ -3677,7 +3756,7 @@ msgstr "Alapértelmezett képkocka-eldobás:" msgid "PNG compression level:" msgstr "PNG tömörítési mérték:" -#: ../plug-ins/common/file-mng.c:1465 ../plug-ins/ui/plug-in-file-png.ui.h:1 +#: ../plug-ins/common/file-mng.c:1465 ../plug-ins/ui/plug-in-file-png.ui.h:10 msgid "Choose a high compression level for small file size" msgstr "Kis fájlméret eléréséhez válasszon magas tömörítési szintet" @@ -3701,7 +3780,7 @@ msgstr "Ismétlés" msgid "Default frame delay:" msgstr "Alapértelmezett késleltetés a képkockák közt:" -#: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:11 +#: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:7 msgid "milliseconds" msgstr "ezredmásodperc" @@ -3744,13 +3823,13 @@ msgstr "Nem sikerült beolvasni a fejlécet innen: „%s”" msgid "'%s' is not a PCX file" msgstr "„%s” nem PCX-fájl" -#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:636 +#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:666 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Nem támogatott vagy érvénytelen képszélesség: %d" -#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:642 +#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:672 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -3789,7 +3868,8 @@ msgstr "" #: ../plug-ins/common/file-pcx.c:704 #, c-format msgid "Bottom border out of bounds (must be < %d): %d" -msgstr "Az alsó szegély kívül esik a korlátokon (kisebbnek kell lennie, mint %d): %d" +msgstr "" +"Az alsó szegély kívül esik a korlátokon (kisebbnek kell lennie, mint %d): %d" #: ../plug-ins/common/file-pcx.c:769 #, c-format @@ -3797,7 +3877,7 @@ msgid "Writing to file '%s' failed: %s" msgstr "Nem sikerült írni a(z) „%s” fájlba: %s" #: ../plug-ins/common/file-pdf-load.c:300 -#: ../plug-ins/common/file-pdf-save.c:289 +#: ../plug-ins/common/file-pdf-save.c:290 msgid "Portable Document Format" msgstr "Portable Document Format" @@ -3822,7 +3902,7 @@ msgid "Import from PDF" msgstr "Importálás PDF-ből" #: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2962 -#: ../plug-ins/common/file-tiff-load.c:483 +#: ../plug-ins/common/file-tiff-load.c:491 msgid "_Import" msgstr "_Importálás" @@ -3854,15 +3934,15 @@ msgstr "Élsimítás _használata" msgid "pixels/%a" msgstr "képpont/%a" -#: ../plug-ins/common/file-pdf-save.c:304 +#: ../plug-ins/common/file-pdf-save.c:305 msgid "_Create multipage PDF..." msgstr "Több oldalas _PDF létrehozása…" -#: ../plug-ins/common/file-pdf-save.c:401 +#: ../plug-ins/common/file-pdf-save.c:412 msgid "You must select a file to save!" msgstr "Válasszon ki egy fájlt a mentéshez" -#: ../plug-ins/common/file-pdf-save.c:410 +#: ../plug-ins/common/file-pdf-save.c:422 #, c-format msgid "" "An error occured while creating the PDF file:\n" @@ -3875,47 +3955,47 @@ msgstr "" "Ellenőrizze, hogy megfelelő fájlnevet adott meg, és hogy a megadott mappa " "írható." -#: ../plug-ins/common/file-pdf-save.c:733 -#: ../plug-ins/common/file-pdf-save.c:850 +#: ../plug-ins/common/file-pdf-save.c:746 +#: ../plug-ins/common/file-pdf-save.c:863 msgid "Omit hidden layers and layers with zero opacity" msgstr "Rejtett és nulla átlátszatlanságú rétegek mellőzése" -#: ../plug-ins/common/file-pdf-save.c:737 -#: ../plug-ins/common/file-pdf-save.c:854 +#: ../plug-ins/common/file-pdf-save.c:750 +#: ../plug-ins/common/file-pdf-save.c:867 msgid "Convert bitmaps to vector graphics where possible" msgstr "Bitképek vektorgrafikává alakítása ahol lehetséges" -#: ../plug-ins/common/file-pdf-save.c:741 -#: ../plug-ins/common/file-pdf-save.c:858 +#: ../plug-ins/common/file-pdf-save.c:754 +#: ../plug-ins/common/file-pdf-save.c:871 msgid "Apply layer masks before saving" msgstr "Rétegmaszkok alkalmazása mentés előtt" -#: ../plug-ins/common/file-pdf-save.c:744 -#: ../plug-ins/common/file-pdf-save.c:861 +#: ../plug-ins/common/file-pdf-save.c:757 +#: ../plug-ins/common/file-pdf-save.c:874 msgid "Keeping the masks will not change the output" msgstr "A maszkok megtartása nem változtatja meg a kimenetet" -#: ../plug-ins/common/file-pdf-save.c:797 +#: ../plug-ins/common/file-pdf-save.c:810 msgid "Save to:" msgstr "Mentés fájlba:" -#: ../plug-ins/common/file-pdf-save.c:801 +#: ../plug-ins/common/file-pdf-save.c:814 msgid "Browse..." msgstr "Tallózás…" -#: ../plug-ins/common/file-pdf-save.c:802 +#: ../plug-ins/common/file-pdf-save.c:815 msgid "Multipage PDF export" msgstr "Több oldalas PDF exportálás" -#: ../plug-ins/common/file-pdf-save.c:835 +#: ../plug-ins/common/file-pdf-save.c:848 msgid "Remove the selected pages" msgstr "A kijelölt oldalak törlése" -#: ../plug-ins/common/file-pdf-save.c:845 +#: ../plug-ins/common/file-pdf-save.c:858 msgid "Add this image" msgstr "Ezen kép hozzáadása" -#: ../plug-ins/common/file-pdf-save.c:958 +#: ../plug-ins/common/file-pdf-save.c:971 msgid "Error! In order to save the file, at least one image should be added!" msgstr "Hiba! Legalább egy képet hozzá kell adni a fájl mentéséhez." @@ -3936,7 +4016,8 @@ msgstr "Hiba a PNG-fájl betöltésekor: %s" #: ../plug-ins/common/file-png.c:732 #, c-format msgid "Error creating PNG read struct while saving '%s'." -msgstr "Hiba „%s” mentése közben: nem sikerült létrehozni a PNG olvasási struktúrát." +msgstr "" +"Hiba „%s” mentése közben: nem sikerült létrehozni a PNG olvasási struktúrát." #: ../plug-ins/common/file-png.c:742 #, c-format @@ -3957,7 +4038,8 @@ msgstr "Nem sikerült létrehozni az új képet ehhez: „%s”: %s" msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." -msgstr "A PNG-fájl olyan eltolást ad meg, ami miatt a réteg a képen kívülre került." +msgstr "" +"A PNG-fájl olyan eltolást ad meg, ami miatt a réteg a képen kívülre került." #: ../plug-ins/common/file-png.c:1238 msgid "Apply PNG Offset" @@ -3983,7 +4065,8 @@ msgstr "" #: ../plug-ins/common/file-png.c:1335 #, c-format msgid "Error creating PNG write struct while saving '%s'." -msgstr "Hiba „%s” mentése közben: nem sikerült létrehozni a PNG írási struktúrát." +msgstr "" +"Hiba „%s” mentése közben: nem sikerült létrehozni a PNG írási struktúrát." #: ../plug-ins/common/file-png.c:1345 #, c-format @@ -4019,58 +4102,58 @@ msgstr "PGM-kép" msgid "PPM image" msgstr "PPM-kép" -#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550 -#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570 -#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "Túl korai fájlvég." -#: ../plug-ins/common/file-pnm.c:530 +#: ../plug-ins/common/file-pnm.c:532 msgid "Invalid file." msgstr "Érvénytelen fájl." -#: ../plug-ins/common/file-pnm.c:544 +#: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." msgstr "A fájl formátuma nem támogatott." -#: ../plug-ins/common/file-pnm.c:553 +#: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." msgstr "Érvénytelen X-felbontás." -#: ../plug-ins/common/file-pnm.c:555 +#: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "A képszélesség nagyobb, mint amekkorát a GIMP kezelni tud." -#: ../plug-ins/common/file-pnm.c:562 +#: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." msgstr "Érvénytelen Y-felbontás." -#: ../plug-ins/common/file-pnm.c:564 +#: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." msgstr "A képmagasság nagyobb, mint amekkorát a GIMP kezelni tud." -#: ../plug-ins/common/file-pnm.c:574 +#: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." msgstr "Nem támogatott maximumérték." -#: ../plug-ins/common/file-pnm.c:814 +#: ../plug-ins/common/file-pnm.c:816 msgid "Error reading file." msgstr "Fájlbeolvasási hiba." -#: ../plug-ins/common/file-pnm.c:1219 +#: ../plug-ins/common/file-pnm.c:1221 msgid "PNM" msgstr "PNM" #. file save type -#: ../plug-ins/common/file-pnm.c:1222 +#: ../plug-ins/common/file-pnm.c:1224 msgid "Data formatting" msgstr "Adatformázás" -#: ../plug-ins/common/file-pnm.c:1226 +#: ../plug-ins/common/file-pnm.c:1228 msgid "Raw" msgstr "Nyers" -#: ../plug-ins/common/file-pnm.c:1227 +#: ../plug-ins/common/file-pnm.c:1229 msgid "ASCII" msgstr "ASCII" @@ -4096,7 +4179,7 @@ msgstr "Nem lehet értelmezni a(z) „%s” Postscript fájlt" msgid "PostScript save cannot handle images with alpha channels" msgstr "A PostScript-mentés nem tud alfa-csatornát tartalmazó képeket kezelni" -#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:999 +#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1012 #, c-format msgid "Page %d" msgstr "%d. oldal" @@ -4382,7 +4465,7 @@ msgid "Type of colormap not supported" msgstr "A színtérkép típusa nem támogatott" #: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827 -#: ../plug-ins/common/file-xwd.c:489 +#: ../plug-ins/common/file-xwd.c:491 #, c-format msgid "" "'%s':\n" @@ -4392,7 +4475,7 @@ msgstr "" "Képszélesség nincs megadva" #: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834 -#: ../plug-ins/common/file-xwd.c:499 +#: ../plug-ins/common/file-xwd.c:501 #, c-format msgid "" "'%s':\n" @@ -4402,7 +4485,7 @@ msgstr "" "A képszélesség nagyobb, mint amekkorát a GIMP kezelni tud" #: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841 -#: ../plug-ins/common/file-xwd.c:508 +#: ../plug-ins/common/file-xwd.c:510 #, c-format msgid "" "'%s':\n" @@ -4412,7 +4495,7 @@ msgstr "" "Képmagasság nincs megadva" #: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848 -#: ../plug-ins/common/file-xwd.c:517 +#: ../plug-ins/common/file-xwd.c:519 #, c-format msgid "" "'%s':\n" @@ -4436,9 +4519,9 @@ msgstr "Ismeretlen képtípusok nem dolgozhatók fel" #: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175 #: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351 -#: ../plug-ins/common/file-xwd.c:1357 ../plug-ins/common/file-xwd.c:1458 -#: ../plug-ins/common/file-xwd.c:1616 ../plug-ins/common/file-xwd.c:1817 -#: ../plug-ins/common/file-xwd.c:2069 ../plug-ins/file-fits/fits.c:698 +#: ../plug-ins/common/file-xwd.c:1361 ../plug-ins/common/file-xwd.c:1462 +#: ../plug-ins/common/file-xwd.c:1620 ../plug-ins/common/file-xwd.c:1832 +#: ../plug-ins/common/file-xwd.c:2095 ../plug-ins/file-fits/fits.c:698 msgid "EOF encountered on reading" msgstr "Fájl vége olvasás közben" @@ -4517,7 +4600,8 @@ msgid "Import _paths" msgstr "Út_vonalak importálása" #: ../plug-ins/common/file-svg.c:944 -msgid "Import path elements of the SVG so they can be used with the GIMP path tool" +msgid "" +"Import path elements of the SVG so they can be used with the GIMP path tool" msgstr "" "Az SVG-dokumentumban levő útvonalak importálása a GIMP útvonaleszközével " "való használat céljából" @@ -4545,52 +4629,52 @@ msgstr "Nem sikerült beolvasni a kiterjesztést ebből: „%s”" msgid "Cannot read header from '%s'" msgstr "Nem sikerült beolvasni a fejlécet innen: „%s”" -#: ../plug-ins/common/file-tga.c:1372 +#: ../plug-ins/common/file-tga.c:1380 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1389 msgid "_RLE compression" msgstr "_RLE tömörítés" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1403 msgid "Or_igin:" msgstr "Or_igó:" -#: ../plug-ins/common/file-tga.c:1399 +#: ../plug-ins/common/file-tga.c:1407 msgid "Bottom left" msgstr "Bal alsó sarok" -#: ../plug-ins/common/file-tga.c:1400 +#: ../plug-ins/common/file-tga.c:1408 msgid "Top left" msgstr "Bal felső sarok" -#: ../plug-ins/common/file-tiff-load.c:240 -#: ../plug-ins/common/file-tiff-save.c:183 -#: ../plug-ins/common/file-tiff-save.c:200 +#: ../plug-ins/common/file-tiff-load.c:243 +#: ../plug-ins/common/file-tiff-save.c:186 +#: ../plug-ins/common/file-tiff-save.c:203 msgid "TIFF image" msgstr "TIFF-kép" -#: ../plug-ins/common/file-tiff-load.c:310 +#: ../plug-ins/common/file-tiff-load.c:297 #, c-format msgid "TIFF '%s' does not contain any directories" msgstr "„%s” TIFF nem tartalmaz könyvtárt" -#: ../plug-ins/common/file-tiff-load.c:478 +#: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" msgstr "Importálás TIFF-ből" -#: ../plug-ins/common/file-tiff-load.c:780 +#: ../plug-ins/common/file-tiff-load.c:818 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-/-%d-oldal" -#: ../plug-ins/common/file-tiff-load.c:1015 +#: ../plug-ins/common/file-tiff-load.c:1028 msgid "TIFF Channel" msgstr "TIFF-csatorna" -#: ../plug-ins/common/file-tiff-load.c:1024 +#: ../plug-ins/common/file-tiff-load.c:1037 #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" @@ -4603,7 +4687,7 @@ msgstr "" "kezelni, ezért a kép át lesz alakítva erre a formátumra. Ez bizonyos mértékű " "információvesztést okoz." -#: ../plug-ins/common/file-tiff-save.c:888 +#: ../plug-ins/common/file-tiff-save.c:910 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." @@ -4611,48 +4695,48 @@ msgstr "" "A TIFF formátum csak 7 bites ASCII kódolást engedélyez\n" "a megjegyzésekben. A megjegyzés nem lett elmentve." -#: ../plug-ins/common/file-tiff-save.c:1062 +#: ../plug-ins/common/file-tiff-save.c:1083 msgid "TIFF" msgstr "TIFF" #. compression -#: ../plug-ins/common/file-tiff-save.c:1070 +#: ../plug-ins/common/file-tiff-save.c:1091 msgid "Compression" msgstr "Tömörítés" -#: ../plug-ins/common/file-tiff-save.c:1074 +#: ../plug-ins/common/file-tiff-save.c:1095 msgid "_None" msgstr "_Nincs" -#: ../plug-ins/common/file-tiff-save.c:1075 +#: ../plug-ins/common/file-tiff-save.c:1096 msgid "_LZW" msgstr "_LZW" -#: ../plug-ins/common/file-tiff-save.c:1076 +#: ../plug-ins/common/file-tiff-save.c:1097 msgid "_Pack Bits" msgstr "_Bitek összecsomagolása" -#: ../plug-ins/common/file-tiff-save.c:1077 +#: ../plug-ins/common/file-tiff-save.c:1098 msgid "_Deflate" msgstr "„_Deflate” formátum" -#: ../plug-ins/common/file-tiff-save.c:1078 +#: ../plug-ins/common/file-tiff-save.c:1099 msgid "_JPEG" msgstr "_JPEG" -#: ../plug-ins/common/file-tiff-save.c:1079 +#: ../plug-ins/common/file-tiff-save.c:1100 msgid "CCITT Group _3 fax" msgstr "CCITT Group _3 fax" -#: ../plug-ins/common/file-tiff-save.c:1080 +#: ../plug-ins/common/file-tiff-save.c:1101 msgid "CCITT Group _4 fax" msgstr "CCITT Group _4 fax" -#: ../plug-ins/common/file-tiff-save.c:1102 +#: ../plug-ins/common/file-tiff-save.c:1123 msgid "Save _color values from transparent pixels" msgstr "Az á_tlátszó képpontok színértékeinek elmentése" -#: ../plug-ins/common/file-tiff-save.c:1118 ../plug-ins/common/file-xbm.c:1235 +#: ../plug-ins/common/file-tiff-save.c:1139 ../plug-ins/common/file-xbm.c:1235 msgid "Comment:" msgstr "Megjegyzés:" @@ -4746,7 +4830,7 @@ msgstr "_Azonosító-előtag:" msgid "_Write hot spot values" msgstr "_Forrópont-értékek írása" -#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1089 +#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1081 msgid "Hot spot _X:" msgstr "Forrópont, _X:" @@ -4767,12 +4851,12 @@ msgstr "Ex_tra maszkfájl írása" msgid "_Mask file extension:" msgstr "Maszkfájl _kiterjesztése:" -#: ../plug-ins/common/file-xmc.c:333 ../plug-ins/common/file-xmc.c:373 -#: ../plug-ins/common/file-xmc.c:1052 +#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 +#: ../plug-ins/common/file-xmc.c:1044 msgid "X11 Mouse Cursor" msgstr "X11 egérkurzor" -#: ../plug-ins/common/file-xmc.c:481 +#: ../plug-ins/common/file-xmc.c:473 #, c-format msgid "" "Cannot set the hot spot!\n" @@ -4781,37 +4865,37 @@ msgstr "" "Nem lehet beállítani a forrópontot!\n" "Úgy kell elhelyeznie a rétegeket, hogy az összesnek legyen közös átfedése." -#: ../plug-ins/common/file-xmc.c:670 +#: ../plug-ins/common/file-xmc.c:662 #, c-format msgid "'%s' is not a valid X cursor." msgstr "„%s” nem érvényes X kurzor." -#: ../plug-ins/common/file-xmc.c:686 +#: ../plug-ins/common/file-xmc.c:678 #, c-format msgid "Frame %d of '%s' is too wide for an X cursor." msgstr "A(z) „%2$s” %1$d. képkockája túl széles X kurzornak." -#: ../plug-ins/common/file-xmc.c:693 +#: ../plug-ins/common/file-xmc.c:685 #, c-format msgid "Frame %d of '%s' is too high for an X cursor." msgstr "A(z) „%2$s” %1$d. képkockája túl magas X kurzornak." -#: ../plug-ins/common/file-xmc.c:896 +#: ../plug-ins/common/file-xmc.c:888 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "A(z) „%s” nem tartalmaz képadatot." -#: ../plug-ins/common/file-xmc.c:938 +#: ../plug-ins/common/file-xmc.c:930 #, c-format msgid "'%s' is too wide for an X cursor." msgstr "A(z) „%s” túl széles X kurzornak." -#: ../plug-ins/common/file-xmc.c:945 +#: ../plug-ins/common/file-xmc.c:937 #, c-format msgid "'%s' is too high for an X cursor." msgstr "A(z) „%s” túl magas X kurzornak." -#: ../plug-ins/common/file-xmc.c:1015 +#: ../plug-ins/common/file-xmc.c:1007 #, c-format msgid "A read error occurred." msgstr "Hiba történt az olvasáskor." @@ -4819,23 +4903,23 @@ msgstr "Hiba történt az olvasáskor." #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1057 +#: ../plug-ins/common/file-xmc.c:1049 msgid "XMC Options" msgstr "XMC-beállítások" -#: ../plug-ins/common/file-xmc.c:1085 +#: ../plug-ins/common/file-xmc.c:1077 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "Írja be a forrópont X koordinátáját. A bal felső sarok az origó." -#: ../plug-ins/common/file-xmc.c:1103 +#: ../plug-ins/common/file-xmc.c:1095 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "Írja be a forrópont Y koordinátáját. A bal felső sarok az origó." -#: ../plug-ins/common/file-xmc.c:1114 +#: ../plug-ins/common/file-xmc.c:1106 msgid "_Auto-Crop all frames." msgstr "_Minden képkocka automatikus vágása." -#: ../plug-ins/common/file-xmc.c:1127 +#: ../plug-ins/common/file-xmc.c:1119 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4847,7 +4931,7 @@ msgstr "" "kurzor összezavarja a képernyőt.\n" "Ne jelölje be, ha az exportált kurzort más programokkal kívánja szerkeszteni." -#: ../plug-ins/common/file-xmc.c:1150 +#: ../plug-ins/common/file-xmc.c:1142 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4865,55 +4949,58 @@ msgstr "" "animációtól függ, és melyik animációt kell használni a „gtk-cursor-theme-" "size” értéke szerint." -#: ../plug-ins/common/file-xmc.c:1167 +#: ../plug-ins/common/file-xmc.c:1159 msgid "_Use this value only for a frame which size is not specified." -msgstr "C_sak azoknál a képkockáknál használja ezt, melyeknél nincs méret megadva." +msgstr "" +"C_sak azoknál a képkockáknál használja ezt, melyeknél nincs méret megadva." -#: ../plug-ins/common/file-xmc.c:1170 +#: ../plug-ins/common/file-xmc.c:1162 msgid "_Replace the size of all frames even if it is specified." msgstr "Min_den képkocka méretének átállítása erre." -#: ../plug-ins/common/file-xmc.c:1204 +#: ../plug-ins/common/file-xmc.c:1196 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "" "Adja meg ezredmásodpercben azt az időt, ameddig az egyes képkockák " "látszódnak." -#: ../plug-ins/common/file-xmc.c:1207 +#: ../plug-ins/common/file-xmc.c:1199 msgid "_Delay:" msgstr "_Késleltetés:" -#: ../plug-ins/common/file-xmc.c:1212 +#: ../plug-ins/common/file-xmc.c:1204 msgid "_Use this value only for a frame which delay is not specified." msgstr "" "Csak a_zoknál a képkockáknál használja ezt, melyeknél nincs késleltetés " "megadva." -#: ../plug-ins/common/file-xmc.c:1215 +#: ../plug-ins/common/file-xmc.c:1207 msgid "_Replace the delay of all frames even if it is specified." msgstr "Minden ké_pkocka késleltetésének átállítása erre." -#: ../plug-ins/common/file-xmc.c:1240 -msgid "The part of copyright information that exceeded 65535 characters was removed." +#: ../plug-ins/common/file-xmc.c:1232 +msgid "" +"The part of copyright information that exceeded 65535 characters was removed." msgstr "A copyright információk 65535 karakteren túli része levágva." -#: ../plug-ins/common/file-xmc.c:1250 +#: ../plug-ins/common/file-xmc.c:1242 msgid "Enter copyright information." msgstr "Írja be a copyright információkat." -#: ../plug-ins/common/file-xmc.c:1252 +#: ../plug-ins/common/file-xmc.c:1244 msgid "_Copyright:" msgstr "_Copyright:" -#: ../plug-ins/common/file-xmc.c:1268 -msgid "The part of license information that exceeded 65535 characters was removed." +#: ../plug-ins/common/file-xmc.c:1260 +msgid "" +"The part of license information that exceeded 65535 characters was removed." msgstr "A licencinformációk 65535 karakteren túli részét levágtuk." -#: ../plug-ins/common/file-xmc.c:1278 +#: ../plug-ins/common/file-xmc.c:1270 msgid "Enter license information." msgstr "Írja be a licencinformációkat." -#: ../plug-ins/common/file-xmc.c:1280 +#: ../plug-ins/common/file-xmc.c:1272 msgid "_License:" msgstr "_Licenc:" @@ -4922,40 +5009,40 @@ msgstr "_Licenc:" #. #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". -#: ../plug-ins/common/file-xmc.c:1287 +#: ../plug-ins/common/file-xmc.c:1279 msgid "_Other:" msgstr "Egyé_b" -#: ../plug-ins/common/file-xmc.c:1321 +#: ../plug-ins/common/file-xmc.c:1313 msgid "Enter other comment if you want." msgstr "Írjon be egyéb megjegyzéseket, ha kívánja." -#: ../plug-ins/common/file-xmc.c:1371 +#: ../plug-ins/common/file-xmc.c:1363 #, c-format msgid "Comment is limited to %d characters." msgstr "A megjegyzés hossza maximum %d karakter." -#: ../plug-ins/common/file-xmc.c:1489 +#: ../plug-ins/common/file-xmc.c:1481 #, c-format msgid "This plug-in can only handle RGBA image files with 8bit color depth." msgstr "Ez a bővítmény csak 8 bites színmélységű RGBA képeket képes kezelni." -#: ../plug-ins/common/file-xmc.c:1507 +#: ../plug-ins/common/file-xmc.c:1499 #, c-format msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." msgstr "A(z) „%s” képkocka túl széles. Ne legyen több %dpx-nél." -#: ../plug-ins/common/file-xmc.c:1514 +#: ../plug-ins/common/file-xmc.c:1506 #, c-format msgid "Frame '%s' is too high. Please reduce to no more than %dpx." msgstr "A(z) „%s” képkocka túl magas. Ne legyen több %dpx-nél." -#: ../plug-ins/common/file-xmc.c:1521 +#: ../plug-ins/common/file-xmc.c:1513 #, c-format msgid "Width and/or height of frame '%s' is zero!" msgstr "A(z) „%s” képkocka magassága és/vagy szélessége nulla." -#: ../plug-ins/common/file-xmc.c:1561 +#: ../plug-ins/common/file-xmc.c:1553 #, c-format msgid "" "Cannot save the cursor because the hot spot is not on frame '%s'.\n" @@ -4967,7 +5054,7 @@ msgstr "" "Próbálja megváltoztatni a forrópont helyzetét, a rétegek méretét vagy " "elhelyezkedését, vagy mentsen automatikus vágás nélkül." -#: ../plug-ins/common/file-xmc.c:1718 +#: ../plug-ins/common/file-xmc.c:1710 #, c-format msgid "" "Your cursor was successfully saved but it contains one or more frames whose " @@ -4978,7 +5065,7 @@ msgstr "" "szélessége több, mint %ipx.\n" "Bizonyos környezetekben ez túlzsúfolhatja a képernyőt." -#: ../plug-ins/common/file-xmc.c:1725 +#: ../plug-ins/common/file-xmc.c:1717 msgid "" "Your cursor was successfully saved but it contains one or more frames whose " "nominal size is not supported by GNOME settings.\n" @@ -4991,7 +5078,7 @@ msgstr "" "lehetőséget a mentés ablakban, különben ez a kurzor nem biztos, hogy meg fog " "jelenni a GNOME beállításai között." -#: ../plug-ins/common/file-xmc.c:1962 +#: ../plug-ins/common/file-xmc.c:1954 #, c-format msgid "" "The parasite \"%s\" is too long for an X cursor comment. It was cut off to " @@ -5001,7 +5088,7 @@ msgstr "" "hogy elférjen." #. translators: the %i is *always* 8 here -#: ../plug-ins/common/file-xmc.c:2165 +#: ../plug-ins/common/file-xmc.c:2157 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -5031,20 +5118,20 @@ msgstr "XPM" msgid "_Alpha threshold:" msgstr "_Alfa-küszöb:" -#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298 +#: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 msgid "X window dump" msgstr "X Window, formázatlan" -#: ../plug-ins/common/file-xwd.c:442 +#: ../plug-ins/common/file-xwd.c:444 #, c-format msgid "Could not read XWD header from '%s'" msgstr "Nem sikerült beolvasni az XWD-fejlécet innen: „%s”" -#: ../plug-ins/common/file-xwd.c:480 +#: ../plug-ins/common/file-xwd.c:482 msgid "Can't read color entries" msgstr "Színbejegyzések olvasása sikertelen" -#: ../plug-ins/common/file-xwd.c:575 +#: ../plug-ins/common/file-xwd.c:579 #, c-format msgid "" "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " @@ -5053,15 +5140,21 @@ msgstr "" "A(z) „%s” XWD-fájl formátuma „%d”, mélysége „%d”, képpontonkénti bitszáma " "„%d”. Jelenleg ez nem támogatott." -#: ../plug-ins/common/file-xwd.c:598 +#: ../plug-ins/common/file-xwd.c:602 msgid "Cannot save images with alpha channels." msgstr "Alfacsatornás képek nem menthetők el." -#: ../plug-ins/common/file-xwd.c:2198 +#: ../plug-ins/common/file-xwd.c:1692 ../plug-ins/common/file-xwd.c:1930 +#, c-format +#| msgid "The file is corrupt!" +msgid "XWD-file %s is corrupt." +msgstr "A(z) %s XWD-fájl sérült." + +#: ../plug-ins/common/file-xwd.c:2224 msgid "Error during writing indexed/gray image" msgstr "Hiba az indexelt/szürkeárnyalatos kép írása közben" -#: ../plug-ins/common/file-xwd.c:2294 +#: ../plug-ins/common/file-xwd.c:2320 msgid "Error during writing rgb image" msgstr "Hiba az RGB-kép írása közben" @@ -5652,7 +5745,8 @@ msgstr "I-görbítés" msgid "" "Click and drag in the preview to define the distortions to apply to the " "image." -msgstr "A képre alkalmazandó torzítások megadása: kattintás+húzás az előnézeten." +msgstr "" +"A képre alkalmazandó torzítások megadása: kattintás+húzás az előnézeten." #: ../plug-ins/common/jigsaw.c:356 msgid "Add a jigsaw-puzzle pattern to the image" @@ -5723,143 +5817,144 @@ msgstr "Az elemeknek egyenes szélei vannak" msgid "Each piece has curved sides" msgstr "Az elemeknek kerekített szélei vannak" -#: ../plug-ins/common/lcms.c:218 +#: ../plug-ins/common/lcms.c:223 msgid "Set a color profile on the image" msgstr "Színprofil beállítása a képre" -#: ../plug-ins/common/lcms.c:225 +#: ../plug-ins/common/lcms.c:230 msgid "_Assign Color Profile..." msgstr "Színprofil _hozzárendelése…" -#: ../plug-ins/common/lcms.c:241 +#: ../plug-ins/common/lcms.c:246 msgid "Assign default RGB Profile" msgstr "Alapértelmezett RGB-profil hozzárendelése" -#: ../plug-ins/common/lcms.c:248 +#: ../plug-ins/common/lcms.c:253 msgid "Apply a color profile on the image" msgstr "Színprofil alkalmazása a képre" -#: ../plug-ins/common/lcms.c:258 +#: ../plug-ins/common/lcms.c:263 msgid "_Convert to Color Profile..." msgstr "Át_alakítás színprofilra…" -#: ../plug-ins/common/lcms.c:276 +#: ../plug-ins/common/lcms.c:281 msgid "Convert to default RGB Profile" msgstr "Átalakítás alapértelmezett RGB-profilra" -#: ../plug-ins/common/lcms.c:290 +#: ../plug-ins/common/lcms.c:295 msgid "Image Color Profile Information" msgstr "Információ a kép színprofiljáról" -#: ../plug-ins/common/lcms.c:304 +#: ../plug-ins/common/lcms.c:309 msgid "Color Profile Information" msgstr "Színprofil-információ" -#: ../plug-ins/common/lcms.c:572 +#: ../plug-ins/common/lcms.c:648 #, c-format msgid "Color profile '%s' is not for RGB color space." msgstr "A(z) „%s” színprofil nem RGB színtérhez való." -#: ../plug-ins/common/lcms.c:679 +#: ../plug-ins/common/lcms.c:755 msgid "Default RGB working space" msgstr "Alapértelmezett RGB munkaterület" -#: ../plug-ins/common/lcms.c:775 -msgid "Data attached as 'icc-profile' does not appear to be an ICC color profile" +#: ../plug-ins/common/lcms.c:857 +msgid "" +"Data attached as 'icc-profile' does not appear to be an ICC color profile" msgstr "Az ICC-profilként csatolt adatok nem tűnnek ICC-színprofilnak" -#: ../plug-ins/common/lcms.c:825 +#: ../plug-ins/common/lcms.c:907 #, c-format msgid "'%s' does not appear to be an ICC color profile" msgstr "„%s” nem tűnik ICC-színprofilnak" #. ICC color profile conversion -#: ../plug-ins/common/lcms.c:885 +#: ../plug-ins/common/lcms.c:967 #, c-format msgid "Converting from '%s' to '%s'" msgstr "Átalakítás erről: „%s” erre: „%s”" -#: ../plug-ins/common/lcms.c:1129 +#: ../plug-ins/common/lcms.c:1211 #, c-format msgid "Could not load ICC profile from '%s'" msgstr "Nem sikerült betölteni ICC-profilt innen: „%s”" -#: ../plug-ins/common/lcms.c:1151 +#: ../plug-ins/common/lcms.c:1233 #, c-format msgid "The image '%s' has an embedded color profile:" msgstr "A(z) „%s” kép tartalmaz beágyazott színprofilt:" -#: ../plug-ins/common/lcms.c:1195 +#: ../plug-ins/common/lcms.c:1277 #, c-format msgid "Convert the image to the RGB working space (%s)?" msgstr "Kívánja átalakítani a képet RGB munkaterületre (%s)?" -#: ../plug-ins/common/lcms.c:1226 +#: ../plug-ins/common/lcms.c:1308 msgid "Convert to RGB working space?" msgstr "Átalakítás RGB munkaterületre?" -#: ../plug-ins/common/lcms.c:1231 +#: ../plug-ins/common/lcms.c:1313 msgid "_Keep" msgstr "M_egtartás" -#: ../plug-ins/common/lcms.c:1236 +#: ../plug-ins/common/lcms.c:1318 msgid "_Convert" msgstr "Át_alakítás" -#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436 +#: ../plug-ins/common/lcms.c:1346 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "A jövőben _ne kérdezze meg" -#: ../plug-ins/common/lcms.c:1328 +#: ../plug-ins/common/lcms.c:1410 msgid "Select destination profile" msgstr "Célprofil kiválasztása" -#: ../plug-ins/common/lcms.c:1355 +#: ../plug-ins/common/lcms.c:1437 msgid "All files (*.*)" msgstr "Minden fájl (*.*)" -#: ../plug-ins/common/lcms.c:1360 +#: ../plug-ins/common/lcms.c:1442 msgid "ICC color profile (*.icc, *.icm)" msgstr "ICC-színprofil (*.icc, *.icm)" -#: ../plug-ins/common/lcms.c:1403 +#: ../plug-ins/common/lcms.c:1485 #, c-format msgid "RGB workspace (%s)" msgstr "RGB munkaterület (%s)" -#: ../plug-ins/common/lcms.c:1453 +#: ../plug-ins/common/lcms.c:1535 msgid "Convert to ICC Color Profile" msgstr "Átalakítás ICC-színprofilra" -#: ../plug-ins/common/lcms.c:1454 +#: ../plug-ins/common/lcms.c:1536 msgid "Assign ICC Color Profile" msgstr "ICC-színprofil hozzárendelése" -#: ../plug-ins/common/lcms.c:1462 +#: ../plug-ins/common/lcms.c:1544 msgid "_Assign" msgstr "_Hozzárendelés" -#: ../plug-ins/common/lcms.c:1480 +#: ../plug-ins/common/lcms.c:1562 msgid "Current Color Profile" msgstr "Jelenlegi színprofil" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1577 msgid "Convert to" msgstr "Átalakítás erre:" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1577 msgid "Assign" msgstr "Hozzárendelés" -#: ../plug-ins/common/lcms.c:1519 +#: ../plug-ins/common/lcms.c:1601 msgid "_Rendering Intent:" msgstr "Meg_jelenítési cél:" -#: ../plug-ins/common/lcms.c:1535 +#: ../plug-ins/common/lcms.c:1617 msgid "_Black Point Compensation" msgstr "_Feketepont-kompenzáció" -#: ../plug-ins/common/lcms.c:1577 +#: ../plug-ins/common/lcms.c:1659 msgid "Destination profile is not for RGB color space." msgstr "A célprofil nem RGB színtérhez való." @@ -6756,7 +6851,7 @@ msgid "Red Eye Removal" msgstr "Vörös szem eltávolítása" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -6926,84 +7021,85 @@ msgstr "Mintaelemzés" msgid "Remap colorized" msgstr "Színezés átalakítása" -#: ../plug-ins/common/screenshot.c:240 +#: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" msgstr "Kép készítése a képernyő bizonyos részéről" -#: ../plug-ins/common/screenshot.c:253 +#: ../plug-ins/common/screenshot.c:272 msgid "_Screenshot..." msgstr "_Képernyőkép…" -#: ../plug-ins/common/screenshot.c:418 +#: ../plug-ins/common/screenshot.c:445 msgid "Error selecting the window" msgstr "Hiba az ablak kijelölése közben" -#: ../plug-ins/common/screenshot.c:786 +#: ../plug-ins/common/screenshot.c:813 msgid "Importing screenshot" msgstr "Képernyőkép importálása" -#: ../plug-ins/common/screenshot.c:812 ../plug-ins/common/screenshot.c:1085 +#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 msgid "Screenshot" msgstr "Képernyőkép" -#: ../plug-ins/common/screenshot.c:853 +#: ../plug-ins/common/screenshot.c:880 msgid "Mouse Pointer" msgstr "Egérmutató" -#: ../plug-ins/common/screenshot.c:972 +#: ../plug-ins/common/screenshot.c:1014 msgid "Specified window not found" msgstr "A megadott ablak nem található" -#: ../plug-ins/common/screenshot.c:1094 +#: ../plug-ins/common/screenshot.c:1213 msgid "S_nap" msgstr "_Képkészítés" -#: ../plug-ins/common/screenshot.c:1124 +#: ../plug-ins/common/screenshot.c:1243 msgid "After the delay, the screenshot is taken." msgstr "A késleltetés lejárta után elkészül a képernyőkép." -#: ../plug-ins/common/screenshot.c:1126 -msgid "After the delay, drag your mouse to select the region for the screenshot." +#: ../plug-ins/common/screenshot.c:1245 +msgid "" +"After the delay, drag your mouse to select the region for the screenshot." msgstr "" "A késleltetés lejárta után jelölje ki egérrel (húzással) a területet, " "amelyről a képernyőkép készüljön." -#: ../plug-ins/common/screenshot.c:1129 +#: ../plug-ins/common/screenshot.c:1248 msgid "At the end of the delay, click in a window to snap it." msgstr "A késleltetés lejárta után kattintson egy ablakra a képkészítéshez." #. Area -#: ../plug-ins/common/screenshot.c:1135 +#: ../plug-ins/common/screenshot.c:1254 msgid "Area" msgstr "Terület" -#: ../plug-ins/common/screenshot.c:1146 +#: ../plug-ins/common/screenshot.c:1265 msgid "Take a screenshot of a single _window" msgstr "Képkészítés _egyetlen ablakról" -#: ../plug-ins/common/screenshot.c:1165 +#: ../plug-ins/common/screenshot.c:1284 msgid "Include window _decoration" msgstr "Ablak_díszítésekkel együtt" -#: ../plug-ins/common/screenshot.c:1185 +#: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" msgstr "Képkészítés az egész képe_rnyőről" -#: ../plug-ins/common/screenshot.c:1204 +#: ../plug-ins/common/screenshot.c:1323 msgid "Include _mouse pointer" msgstr "Az e_gérmutató is legyen benne" -#: ../plug-ins/common/screenshot.c:1225 +#: ../plug-ins/common/screenshot.c:1344 msgid "Select a _region to grab" msgstr "Lefotózandó terület ki_jelölése" #. Delay -#: ../plug-ins/common/screenshot.c:1240 +#: ../plug-ins/common/screenshot.c:1359 msgid "Delay" msgstr "Késleltetés" #. this is the unit label of a spinbutton -#: ../plug-ins/common/screenshot.c:1262 +#: ../plug-ins/common/screenshot.c:1381 msgid "seconds" msgstr "másodperc" @@ -7021,7 +7117,8 @@ msgstr "Félig-lapítás" #: ../plug-ins/common/sharpen.c:111 msgid "Make image sharper (less powerful than Unsharp Mask)" -msgstr "A kép élesebbé tétele (nem ad olyan jó eredményt, mint az „Életlen maszk”)" +msgstr "" +"A kép élesebbé tétele (nem ad olyan jó eredményt, mint az „Életlen maszk”)" #: ../plug-ins/common/sharpen.c:118 msgid "_Sharpen..." @@ -7213,7 +7310,8 @@ msgstr "_Keresés mélysége:" #: ../plug-ins/common/softglow.c:134 msgid "Simulate glow by making highlights intense and fuzzy" -msgstr "Ragyogás szimulálása a kiemelt részek intenzívvé és homályossá tételével" +msgstr "" +"Ragyogás szimulálása a kiemelt részek intenzívvé és homályossá tételével" #: ../plug-ins/common/softglow.c:139 msgid "_Softglow..." @@ -7285,7 +7383,8 @@ msgstr "Ága_k szöge (-1: véletlenszerű):" #: ../plug-ins/common/sparkle.c:429 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)" -msgstr "Ágak szögének beállítása (-1 esetén egy véletlenszerű szög lesz kiválasztva)" +msgstr "" +"Ágak szögének beállítása (-1 esetén egy véletlenszerű szög lesz kiválasztva)" #: ../plug-ins/common/sparkle.c:440 msgid "Spik_e density:" @@ -7666,7 +7765,8 @@ msgstr "_Papírcsempe…" #: ../plug-ins/common/tile-seamless.c:66 msgid "Alters edges to make the image seamlessly tileable" -msgstr "Szélek módosítása úgy, hogy a kép alkalmas legyen finom átmenetű csempézéshez" +msgstr "" +"Szélek módosítása úgy, hogy a kép alkalmas legyen finom átmenetű csempézéshez" #: ../plug-ins/common/tile-seamless.c:72 msgid "_Make Seamless" @@ -7771,8 +7871,10 @@ msgid "ID" msgstr "Azonosító" #: ../plug-ins/common/unit-editor.c:96 -msgid "This string will be used to identify a unit in GIMP's configuration files." -msgstr "Ez a szöveg fogja azonosítani a mértékegységet a GIMP beállítási fájljaiban." +msgid "" +"This string will be used to identify a unit in GIMP's configuration files." +msgstr "" +"Ez a szöveg fogja azonosítani a mértékegységet a GIMP beállítási fájljaiban." #: ../plug-ins/common/unit-editor.c:98 msgid "Factor" @@ -7903,11 +8005,11 @@ msgstr "Az egyik legjobb képélesítési módszer" msgid "_Unsharp Mask..." msgstr "Életlen _maszk…" -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Összefésülés" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Életlen maszk" @@ -8328,8 +8430,10 @@ msgid "The specified path was not found." msgstr "A megadott útvonal nem található." #: ../plug-ins/common/web-browser.c:144 -msgid "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." -msgstr "Az .exe fájl érvénytelen (nem Microsoft Win32 .exe, vagy hibás az .exe kép)." +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgstr "" +"Az .exe fájl érvénytelen (nem Microsoft Win32 .exe, vagy hibás az .exe kép)." #: ../plug-ins/common/web-browser.c:147 msgid "The operating system denied access to the specified file." @@ -8533,7 +8637,8 @@ msgstr "M_indkettő" #: ../plug-ins/common/wind.c:1010 msgid "Higher values restrict the effect to fewer areas of the image" -msgstr "Magasabb érték esetén az effektus a kép kevesebb területén fog megjelenni" +msgstr "" +"Magasabb érték esetén az effektus a kép kevesebb területén fog megjelenni" #: ../plug-ins/common/wind.c:1025 ../plug-ins/gimpressionist/orientmap.c:693 msgid "_Strength:" @@ -8543,63 +8648,70 @@ msgstr "_Erősség:" msgid "Higher values increase the magnitude of the effect" msgstr "Magasabb érték esetén az effektus erősebb hatású lesz" -#: ../plug-ins/file-bmp/bmp-read.c:85 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "Helytelen színtérkép" -#: ../plug-ins/file-bmp/bmp-read.c:169 ../plug-ins/file-bmp/bmp-read.c:180 -#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196 -#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:416 -#: ../plug-ins/file-bmp/bmp-read.c:437 ../plug-ins/file-bmp/bmp-read.c:448 -#: ../plug-ins/file-bmp/bmp-read.c:456 ../plug-ins/file-bmp/bmp-read.c:464 -#: ../plug-ins/file-bmp/bmp-read.c:476 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:233 +#: ../plug-ins/file-bmp/bmp-read.c:240 ../plug-ins/file-bmp/bmp-read.c:249 +#: ../plug-ins/file-bmp/bmp-read.c:264 ../plug-ins/file-bmp/bmp-read.c:446 +#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:478 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:494 +#: ../plug-ins/file-bmp/bmp-read.c:506 #, c-format msgid "'%s' is not a valid BMP file" msgstr "„%s” nem érvényes BMP-fájl" -#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252 -#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345 -#: ../plug-ins/file-bmp/bmp-read.c:395 +#: ../plug-ins/file-bmp/bmp-read.c:278 ../plug-ins/file-bmp/bmp-read.c:305 +#: ../plug-ins/file-bmp/bmp-read.c:333 ../plug-ins/file-bmp/bmp-read.c:362 +#: ../plug-ins/file-bmp/bmp-read.c:392 ../plug-ins/file-bmp/bmp-read.c:426 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Hiba a BMP-fájlfejléc innen való beolvasásakor: „%s”" -#: ../plug-ins/file-bmp/bmp-read.c:588 +#: ../plug-ins/file-bmp/bmp-read.c:351 +#, c-format +#| msgid "Unsupported compression mode: %d" +msgid "Unsupported compression (%lu) in BMP file from '%s'" +msgstr "Nem támogatott tömörítés (%lu) a BMP fájlban innen: „%s”" + +#: ../plug-ins/file-bmp/bmp-read.c:618 msgid "Unrecognized or invalid BMP compression format." msgstr "Ismeretlen vagy érvénytelen BMP-tömörítési formátum." -#: ../plug-ins/file-bmp/bmp-read.c:630 +#: ../plug-ins/file-bmp/bmp-read.c:660 msgid "Unsupported or invalid bitdepth." msgstr "Nem támogatott vagy érvénytelen bitmélység." -#: ../plug-ins/file-bmp/bmp-read.c:818 ../plug-ins/file-bmp/bmp-read.c:859 -#: ../plug-ins/file-bmp/bmp-read.c:909 +#: ../plug-ins/file-bmp/bmp-read.c:812 ../plug-ins/file-bmp/bmp-read.c:853 +#: ../plug-ins/file-bmp/bmp-read.c:903 msgid "The bitmap ends unexpectedly." msgstr "A bitkép váratlanul véget ér." #: ../plug-ins/file-bmp/bmp-write.c:191 ../plug-ins/file-bmp/bmp-write.c:217 msgid "Cannot save indexed image with transparency in BMP file format." -msgstr "Átlátszósággal rendelkező indexelt kép nem menthető BMP-fájlformátumban." +msgstr "" +"Átlátszósággal rendelkező indexelt kép nem menthető BMP-fájlformátumban." #: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Alpha channel will be ignored." msgstr "Az alfa-csatorna figyelmen kívül lesz hagyva." #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:861 +#: ../plug-ins/file-bmp/bmp-write.c:864 msgid "_Run-Length Encoded" msgstr "_Hossz alapján kódolt (RLE)" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:874 +#: ../plug-ins/file-bmp/bmp-write.c:877 msgid "Co_mpatibility Options" msgstr "_Kompatibilitási beállítások:" -#: ../plug-ins/file-bmp/bmp-write.c:884 +#: ../plug-ins/file-bmp/bmp-write.c:887 msgid "_Do not write color space information" msgstr "_Ne írjon színtér-információkat" -#: ../plug-ins/file-bmp/bmp-write.c:886 +#: ../plug-ins/file-bmp/bmp-write.c:889 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8610,19 +8722,19 @@ msgstr "" "ezt a lehetőséget, akkor nem teszi." #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:902 ../plug-ins/file-jpeg/jpeg-save.c:901 +#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:901 msgid "_Advanced Options" msgstr "S_peciális beállítások" -#: ../plug-ins/file-bmp/bmp-write.c:917 +#: ../plug-ins/file-bmp/bmp-write.c:920 msgid "16 bits" msgstr "16 bit" -#: ../plug-ins/file-bmp/bmp-write.c:953 +#: ../plug-ins/file-bmp/bmp-write.c:956 msgid "24 bits" msgstr "24 bit" -#: ../plug-ins/file-bmp/bmp-write.c:970 +#: ../plug-ins/file-bmp/bmp-write.c:973 msgid "32 bits" msgstr "32 bit" @@ -8644,7 +8756,8 @@ msgstr "Nincs értelmezhető fájlkiterjesztés; mentés tömörített XCF-ként #: ../plug-ins/file-compressor/file-compressor.c:448 msgid "No sensible file extension, attempting to load with file magic." -msgstr "Nincs értelmezhető fájlkiterjesztés; feldolgozás a fájltartalom alapján." +msgstr "" +"Nincs értelmezhető fájlkiterjesztés; feldolgozás a fájltartalom alapján." #: ../plug-ins/file-faxg3/faxg3.c:102 msgid "G3 fax image" @@ -8775,7 +8888,7 @@ msgstr "Tömörített (PNG)" msgid "Icon #%i" msgstr "Ikon #%i" -#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:691 +#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:696 #: ../plug-ins/file-psd/psd-thumb-load.c:84 #, c-format msgid "Opening thumbnail for '%s'" @@ -8801,7 +8914,7 @@ msgstr "Az EXIF-adatok szerint ez a kép el van forgatva." msgid "Would you like GIMP to rotate it into the standard orientation?" msgstr "Kívánja, hogy a GIMP elfordítsa azt az eredeti tájolás szerintire?" -#: ../plug-ins/file-jpeg/jpeg-load.c:247 +#: ../plug-ins/file-jpeg/jpeg-load.c:252 msgid "JPEG preview" msgstr "JPEG-előnézet" @@ -8870,11 +8983,11 @@ msgstr "Bél_yegkép mentése" msgid "Save _XMP data" msgstr "XMP-_adatok mentése" -#: ../plug-ins/file-jpeg/jpeg-save.c:1055 +#: ../plug-ins/file-jpeg/jpeg-save.c:1058 msgid "_Use quality settings from original image" msgstr "Az ere_deti kép minőségi beállításainak használata" -#: ../plug-ins/file-jpeg/jpeg-save.c:1061 +#: ../plug-ins/file-jpeg/jpeg-save.c:1064 msgid "" "If the original image was loaded from a JPEG file using non-standard quality " "settings (quantization tables), enable this option to get almost the same " @@ -8885,53 +8998,53 @@ msgstr "" "bekapcsolásával közel azonos minőség és fájlméret érhető el." #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1085 +#: ../plug-ins/file-jpeg/jpeg-save.c:1088 msgid "Su_bsampling:" msgstr "Al_ulmintavételezés:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1092 +#: ../plug-ins/file-jpeg/jpeg-save.c:1095 msgid "4:4:4 (best quality)" msgstr "4:4:4 (legjobb minőség)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1094 +#: ../plug-ins/file-jpeg/jpeg-save.c:1097 msgid "4:2:2 horizontal (chroma halved)" msgstr "4:2:2 vízszintes (színesség fele)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1096 +#: ../plug-ins/file-jpeg/jpeg-save.c:1099 msgid "4:2:2 vertical (chroma halved)" msgstr "4:2:2 függőleges (színesség fele)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1098 +#: ../plug-ins/file-jpeg/jpeg-save.c:1101 msgid "4:2:0 (chroma quartered)" msgstr "4:2:0 (színesség negyede)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1128 +#: ../plug-ins/file-jpeg/jpeg-save.c:1131 msgid "_DCT method:" msgstr "D_CT-módszer:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1134 +#: ../plug-ins/file-jpeg/jpeg-save.c:1137 msgid "Fast Integer" msgstr "Gyors egész" -#: ../plug-ins/file-jpeg/jpeg-save.c:1135 +#: ../plug-ins/file-jpeg/jpeg-save.c:1138 msgid "Integer" msgstr "Egész" -#: ../plug-ins/file-jpeg/jpeg-save.c:1136 +#: ../plug-ins/file-jpeg/jpeg-save.c:1139 msgid "Floating-Point" msgstr "Lebegőpontos" -#: ../plug-ins/file-jpeg/jpeg-save.c:1152 +#: ../plug-ins/file-jpeg/jpeg-save.c:1155 msgid "Comment" msgstr "Megjegyzés" -#: ../plug-ins/file-jpeg/jpeg-save.c:1189 -#: ../plug-ins/ui/plug-in-file-png.ui.h:12 +#: ../plug-ins/file-jpeg/jpeg-save.c:1192 +#: ../plug-ins/ui/plug-in-file-png.ui.h:11 msgid "_Load Defaults" msgstr "Alapértelmezések _betöltése" -#: ../plug-ins/file-jpeg/jpeg-save.c:1198 +#: ../plug-ins/file-jpeg/jpeg-save.c:1201 msgid "Sa_ve Defaults" msgstr "Alapértelme_zések mentése" @@ -9213,6 +9326,12 @@ msgstr "Ismeretlen mennyiségű képadat letöltése" msgid "URI" msgstr "URI" +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +#| msgid "Failed to save PPM file '%s': %s" +msgid "Failed to save to temporary file '%s'" +msgstr "Nem sikerült menteni a(z) „%s” átmeneti fájlba" + #: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 msgid "GIMP compressed XJT image" msgstr "GIMP tömörített XJT-kép" @@ -9520,7 +9639,8 @@ msgstr "A nagyítási mérték legutóbbi módosításának visszavonása" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:704 msgid "Redo last zoom change" -msgstr "A nagyítási mérték legutóbb visszavont módosításának ismételt végrehajtása" +msgstr "" +"A nagyítási mérték legutóbb visszavont módosításának ismételt végrehajtása" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:719 msgid "_Parameters" @@ -9551,8 +9671,10 @@ msgid "Bottom:" msgstr "Alsó:" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:774 -msgid "The higher the number of iterations, the more details will be calculated" -msgstr "Minél nagyobb az iterációk száma, annál több részletet számol ki a program" +msgid "" +"The higher the number of iterations, the more details will be calculated" +msgstr "" +"Minél nagyobb az iterációk száma, annál több részletet számol ki a program" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:782 msgid "CX:" @@ -9728,7 +9850,8 @@ msgstr "Aktív színátmenet alkalmazása a végső képre" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1159 msgid "Create a color-map using a gradient from the gradient editor" -msgstr "Színtérkép létrehozása a színátmenet-szerkesztőben található színátmenetből" +msgstr "" +"Színtérkép létrehozása a színátmenet-szerkesztőben található színátmenetből" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1170 msgid "FractalExplorer Gradient" @@ -10170,7 +10293,8 @@ msgid "_Gfig..." msgstr "_GFig…" #: ../plug-ins/gfig/gfig.c:734 -msgid "Error trying to save figure as a parasite: can't attach parasite to drawable." +msgid "" +"Error trying to save figure as a parasite: can't attach parasite to drawable." msgstr "" "Hiba a kép élősködőként való mentésekor: élősködő nem csatolható a " "rajzfelülethez." @@ -10178,7 +10302,8 @@ msgstr "" #: ../plug-ins/gfig/gfig.c:761 #, c-format msgid "Error trying to open temporary file '%s' for parasite loading: %s" -msgstr "Hiba a(z) „%s” átmeneti fájl élősködő-betöltés számára való megnyitásakor: %s" +msgstr "" +"Hiba a(z) „%s” átmeneti fájl élősködő-betöltés számára való megnyitásakor: %s" #: ../plug-ins/gimpressionist/brush.c:243 msgid "Can only save drawables!" @@ -10325,8 +10450,10 @@ msgid "Shadow depth:" msgstr "Árnyék mélysége:" #: ../plug-ins/gimpressionist/general.c:261 -msgid "The depth of the drop shadow, i.e. how far apart from the object it should be" -msgstr "Az árnyék mélysége, vagyis milyen messze legyen az árnyék az objektumtól" +msgid "" +"The depth of the drop shadow, i.e. how far apart from the object it should be" +msgstr "" +"Az árnyék mélysége, vagyis milyen messze legyen az árnyék az objektumtól" #: ../plug-ins/gimpressionist/general.c:266 msgid "Shadow blur:" @@ -10717,11 +10844,13 @@ msgid "Size depends on:" msgstr "A méret ettől függ:" #: ../plug-ins/gimpressionist/size.c:159 -msgid "Let the value (brightness) of the region determine the size of the stroke" +msgid "" +"Let the value (brightness) of the region determine the size of the stroke" msgstr "Az ecsetvonás méretét a terület értéke (fényessége) szabja meg" #: ../plug-ins/gimpressionist/size.c:163 -msgid "The distance from the center of the image determines the size of the stroke" +msgid "" +"The distance from the center of the image determines the size of the stroke" msgstr "Az ecsetvonás méretét a kép középpontjától mért távolság szabja meg" #: ../plug-ins/gimpressionist/size.c:167 @@ -10806,80 +10935,80 @@ msgstr "" "hatása" #: ../plug-ins/ui/plug-in-file-gif.ui.h:1 -msgid "Animated GIF Options" -msgstr "Animált GIF beállításai" - -#: ../plug-ins/ui/plug-in-file-gif.ui.h:2 -msgid "As _animation" -msgstr "_Animációként" - -#: ../plug-ins/ui/plug-in-file-gif.ui.h:3 -msgid "GIF Options" -msgstr "GIF-beállítások" - -#: ../plug-ins/ui/plug-in-file-gif.ui.h:4 msgid "I_nterlace" msgstr "_Váltottsoros" +#: ../plug-ins/ui/plug-in-file-gif.ui.h:2 +msgid "_GIF comment:" +msgstr "GIF-meg_jegyzés:" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:3 +msgid "As _animation" +msgstr "_Animációként" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:4 +msgid "GIF Options" +msgstr "GIF-beállítások" + #: ../plug-ins/ui/plug-in-file-gif.ui.h:5 -msgid "U_se disposal entered above for all frames" -msgstr "A fent_i eldobás használata minden képkockához" +msgid "_Loop forever" +msgstr "Végtele_n ismétlés" #: ../plug-ins/ui/plug-in-file-gif.ui.h:6 msgid "_Delay between frames where unspecified:" msgstr "_Késleltetés a képkockák közt, ahol nincs megadva:" -#: ../plug-ins/ui/plug-in-file-gif.ui.h:7 +#: ../plug-ins/ui/plug-in-file-gif.ui.h:8 msgid "_Frame disposal where unspecified:" msgstr "Képkockák el_dobása, ahol nincs megadva:" -#: ../plug-ins/ui/plug-in-file-gif.ui.h:8 -msgid "_GIF comment:" -msgstr "GIF-meg_jegyzés:" - #: ../plug-ins/ui/plug-in-file-gif.ui.h:9 -msgid "_Loop forever" -msgstr "Végtele_n ismétlés" - -#: ../plug-ins/ui/plug-in-file-gif.ui.h:10 msgid "_Use delay entered above for all frames" msgstr "A _fenti késleltetés használata minden képkockához" +#: ../plug-ins/ui/plug-in-file-gif.ui.h:10 +msgid "U_se disposal entered above for all frames" +msgstr "A fent_i eldobás használata minden képkockához" + +#: ../plug-ins/ui/plug-in-file-gif.ui.h:11 +msgid "Animated GIF Options" +msgstr "Animált GIF beállításai" + +#: ../plug-ins/ui/plug-in-file-png.ui.h:1 +msgid "_Interlacing (Adam7)" +msgstr "_Váltottsoros (Adam7)" + #: ../plug-ins/ui/plug-in-file-png.ui.h:2 -msgid "Co_mpression level:" -msgstr "_Tömörítés mértéke:" - -#: ../plug-ins/ui/plug-in-file-png.ui.h:3 -msgid "S_ave Defaults" -msgstr "Alapértelmezések m_entése" - -#: ../plug-ins/ui/plug-in-file-png.ui.h:4 msgid "Save _background color" msgstr "_Háttérszín mentése" +#: ../plug-ins/ui/plug-in-file-png.ui.h:4 +msgid "Save layer o_ffset" +msgstr "_Rétegeltolás mentése" + #: ../plug-ins/ui/plug-in-file-png.ui.h:5 msgid "Save _resolution" msgstr "_Felbontás mentése" #: ../plug-ins/ui/plug-in-file-png.ui.h:6 -msgid "Save color _values from transparent pixels" -msgstr "Az át_látszó képpontok színértékeinek elmentése" +msgid "Save creation _time" +msgstr "Létrehozás _időpontjának mentése" #: ../plug-ins/ui/plug-in-file-png.ui.h:7 msgid "Save comme_nt" msgstr "Meg_jegyzés mentése" #: ../plug-ins/ui/plug-in-file-png.ui.h:8 -msgid "Save creation _time" -msgstr "Létrehozás _időpontjának mentése" +msgid "Save color _values from transparent pixels" +msgstr "Az át_látszó képpontok színértékeinek elmentése" -#: ../plug-ins/ui/plug-in-file-png.ui.h:10 -msgid "Save layer o_ffset" -msgstr "_Rétegeltolás mentése" +#: ../plug-ins/ui/plug-in-file-png.ui.h:9 +msgid "Co_mpression level:" +msgstr "_Tömörítés mértéke:" -#: ../plug-ins/ui/plug-in-file-png.ui.h:11 -msgid "_Interlacing (Adam7)" -msgstr "_Váltottsoros (Adam7)" +#: ../plug-ins/ui/plug-in-file-png.ui.h:12 +msgid "S_ave Defaults" +msgstr "Alapértelmezések m_entése" #: ../plug-ins/gradient-flare/gradient-flare.c:552 msgid "Addition" @@ -11257,7 +11386,8 @@ msgstr "" #: ../plug-ins/help/gimphelpdomain.c:196 msgid "Perhaps you are missing GIO backends and need to install GVFS?" -msgstr "Lehetséges, hogy hiányoznak a GIO-háttérmodulok és telepíteni kell a GVFS-t." +msgstr "" +"Lehetséges, hogy hiányoznak a GIO-háttérmodulok és telepíteni kell a GVFS-t." #: ../plug-ins/help/gimphelpdomain.c:215 #, c-format @@ -12609,7 +12739,8 @@ msgstr "Ki- és bekapcsolja a recés szélek eltüntetését (élsimítás)" #: ../plug-ins/map-object/map-object-ui.c:530 msgid "Antialiasing quality. Higher is better, but slower" -msgstr "Élsimítás minősége. Minél magasabb, annál jobb, viszont annál lassabb is" +msgstr "" +"Élsimítás minősége. Minél magasabb, annál jobb, viszont annál lassabb is" #: ../plug-ins/map-object/map-object-ui.c:547 msgid "Stop when pixel differences are smaller than this value" @@ -12658,7 +12789,8 @@ msgstr "Fényvisszaverés" #: ../plug-ins/map-object/map-object-ui.c:850 msgid "Higher values makes the object reflect more light (appear lighter)" -msgstr "Magasabb érték nagyobb fényvisszaverést eredményez (világosabb a tárgy)" +msgstr "" +"Magasabb érték nagyobb fényvisszaverést eredményez (világosabb a tárgy)" #: ../plug-ins/map-object/map-object-ui.c:864 msgid "Specular:" @@ -12964,22 +13096,23 @@ msgstr "Beágyazott elemek (<%s>) nem engedélyezettek ebben a kontextusban" msgid "End of element <%s> not expected in this context" msgstr "<%s> elem végződése váratlan ebben a kontextusban" -#: ../plug-ins/metadata/xmp-parse.c:1140 +#: ../plug-ins/metadata/xmp-parse.c:1139 #, c-format msgid "The current element (<%s>) cannot contain text" msgstr "A jelenlegi elem (<%s>) nem tartalmazhat szöveget" -#: ../plug-ins/metadata/xmp-parse.c:1165 +#: ../plug-ins/metadata/xmp-parse.c:1164 msgid "XMP packets must start with " msgstr "Az XMP-csomagoknak ezzel kell kezdődniük: " -#: ../plug-ins/metadata/xmp-parse.c:1179 +#: ../plug-ins/metadata/xmp-parse.c:1178 msgid "XMP packets must end with " msgstr "Az XMP-csomagoknak ezzel kell végződniük: " -#: ../plug-ins/metadata/xmp-parse.c:1192 +#: ../plug-ins/metadata/xmp-parse.c:1191 msgid "XMP cannot contain XML comments or processing instructions" -msgstr "Az XMP nem tartalmazhat XML-megjegyzéseket és feldolgozási utasításokat" +msgstr "" +"Az XMP nem tartalmazhat XML-megjegyzéseket és feldolgozási utasításokat" #: ../plug-ins/pagecurl/pagecurl.c:216 msgid "Curl up one of the image corners" @@ -13092,23 +13225,31 @@ msgstr "Függőlegesen" msgid "Both" msgstr "Mindkettő" -#: ../plug-ins/print/print.c:89 +#: ../plug-ins/print/print.c:107 msgid "Print the image" msgstr "A kép nyomtatása" -#: ../plug-ins/print/print.c:94 +#: ../plug-ins/print/print.c:112 msgid "_Print..." msgstr "_Nyomtatás…" -#: ../plug-ins/print/print.c:216 +#: ../plug-ins/print/print.c:124 +msgid "Adjust page size and orientation for printing" +msgstr "Lapméret és tájolás beállítása nyomtatáshoz" + +#: ../plug-ins/print/print.c:130 +msgid "Page Set_up" +msgstr "Ol_dalbeállítás" + +#: ../plug-ins/print/print.c:275 msgid "Image Settings" msgstr "Képbeállítások" -#: ../plug-ins/print/print.c:267 +#: ../plug-ins/print/print.c:373 msgid "An error occurred while trying to print:" msgstr "Hiba történt nyomtatás közben:" -#: ../plug-ins/print/print.c:294 +#: ../plug-ins/print/print.c:400 msgid "Printing" msgstr "Nyomtatás" @@ -13358,10 +13499,3 @@ msgstr "Nincs lefotózott adat" #~ msgid "Send to Back" #~ msgstr "Hátulra helyezés" - -#~ msgid "Adjust page size and orientation for printing" -#~ msgstr "Lapméret és tájolás beállítása nyomtatáshoz" - -#~ msgid "Page Set_up" -#~ msgstr "Ol_dalbeállítás" - diff --git a/po-plug-ins/ja.po b/po-plug-ins/ja.po index e8a1651bbc..16c1cd98ab 100644 --- a/po-plug-ins/ja.po +++ b/po-plug-ins/ja.po @@ -6,139 +6,140 @@ # Tadashi Jokagi , 2005. # Ken Okubo , 2009 # Kiyotaka NISHIBORI , 2008-2012. +# 島本良太 (SimaMoto,RyōTa) , 2013. # msgid "" msgstr "" "Project-Id-Version: gimp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-04-04 09:37+0000\n" -"PO-Revision-Date: 2012-04-05 22:16+0900\n" -"Last-Translator: Kiyotaka NISHIBORI \n" +"POT-Creation-Date: 2013-11-23 16:27+0000\n" +"PO-Revision-Date: 2013-11-23 15:00+0900\n" +"Last-Translator: 島本良太 (SimaMoto,RyōTa) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" # 「回転後」とバランスをとるために「回転前」にしている -#: ../plug-ins/color-rotate/color-rotate-dialog.c:118 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" msgstr "回転前" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:136 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:138 msgid "Rotated" msgstr "回転後" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:154 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:156 msgid "Continuous update" msgstr "プレビュー自動更新" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:167 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:169 msgid "Area:" msgstr "範囲:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:171 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 msgid "Entire Layer" msgstr "レイヤー全体" #. Create selection -#: ../plug-ins/color-rotate/color-rotate-dialog.c:172 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:174 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "選択範囲" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:175 msgid "Context" msgstr "状況に応じて" #. spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:297 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:299 msgctxt "color-range" msgid "From:" msgstr "開始位置:" #. spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:323 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:326 msgctxt "color-range" msgid "To:" msgstr "終了位置:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:375 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 msgctxt "color-rotate" msgid "From:" msgstr "回転させる色範囲:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:378 msgctxt "color-rotate" msgid "To:" msgstr "回転後の色範囲:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:416 -#: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:418 +#: ../plug-ins/common/file-ps.c:3099 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "グレー" #. Gray: Circle: Spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:464 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:466 msgid "Hue:" msgstr "色相:" #. Gray: Circle: Spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:491 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:553 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:493 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:555 msgid "Saturation:" msgstr "彩度:" #. * Gray: Operation-Mode * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:511 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:513 msgid "Gray Mode" msgstr "グレーモード" #. Gray: Operation-Mode: two radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:520 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:522 msgid "Treat as this" msgstr "この色として扱う" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:532 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:534 msgid "Change to this" msgstr "この色にする" #. * Gray: What is gray? * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:545 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:547 msgid "Gray Threshold" msgstr "グレーしきい値" #. * Misc: Used unit selection * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:585 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:695 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:587 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:697 msgid "Units" msgstr "単位" #. Misc: Used unit selection: 3 radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:594 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:596 msgid "Radians" msgstr "ラジアン" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:606 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:608 msgid "Radians/Pi" msgstr "ラジアン/π" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:618 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:620 msgid "Degrees" msgstr "度" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:649 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:651 msgid "Rotate Colors" msgstr "カラーマップ回転" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:689 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:691 msgid "Main Options" msgstr "主オプション" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:692 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:694 msgid "Gray Options" msgstr "グレーオプション" @@ -285,97 +286,97 @@ msgstr "RGB カラーモデル(_R)" msgid "_HSL color model" msgstr "HSL カラーモデル(_H)" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "すべての可視レイヤーを整列します" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "可視レイヤーの整列(_B)..." -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "整列させるに足るレイヤーがありません" -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "可視レイヤーの整列" -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "そのまま" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "合わせる" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "左から右へ順番に" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "右から左へ順番に" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "グリッドにスナップ" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "水平方向スタイル(_H):" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "左端" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "中央" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "右端" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "水平方向基準(_R):" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "上から下へ順番に" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "下から上へ順番に" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "垂直方向スタイル(_V):" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "上端" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "下端" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "垂直方向基準(_T):" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "グリッドサイズ(_G):" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "可視でも一番下のレイヤーを無視する(_I)" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "(不可視でも)一番下のレイヤーを基準に使う(_U)" @@ -609,21 +610,21 @@ msgstr "垂直(_V)" #. * Create the "background" layer to hold the image... #. #: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:363 -#: ../plug-ins/common/file-cel.c:366 ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:442 +#: ../plug-ins/common/file-cel.c:445 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:943 -#: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 -#: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:583 -#: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997 -#: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 +#: ../plug-ins/common/file-jp2-load.c:356 ../plug-ins/common/file-pcx.c:426 +#: ../plug-ins/common/file-pcx.c:432 ../plug-ins/common/file-pix.c:384 +#: ../plug-ins/common/file-png.c:892 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:979 +#: ../plug-ins/common/file-tga.c:1073 ../plug-ins/common/file-tiff-load.c:1010 +#: ../plug-ins/common/file-xbm.c:898 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:380 ../plug-ins/file-bmp/bmp-read.c:647 -#: ../plug-ins/file-faxg3/faxg3.c:474 ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:255 ../plug-ins/file-jpeg/jpeg-load.c:819 +#: ../plug-ins/file-bmp/bmp-read.c:680 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:532 ../plug-ins/file-jpeg/jpeg-load.c:260 +#: ../plug-ins/file-jpeg/jpeg-load.c:824 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 -#: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 +#: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:409 #: ../plug-ins/gfig/gfig-dialog.c:1321 #: ../plug-ins/gimpressionist/general.c:139 #: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 @@ -662,7 +663,7 @@ msgstr "選択的ガウスぼかし" #: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 #: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 #: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 -#: ../plug-ins/file-sgi/sgi.c:558 ../plug-ins/file-xjt/xjt.c:1687 +#: ../plug-ins/file-sgi/sgi.c:560 ../plug-ins/file-xjt/xjt.c:1687 #: ../plug-ins/gradient-flare/gradient-flare.c:966 msgid "Cannot operate on indexed color images." msgstr "インデックス画像には適用できません" @@ -804,7 +805,7 @@ msgstr "" msgid "_Blur" msgstr "ぼかし(_B)" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "ぼかしています" @@ -905,7 +906,7 @@ msgstr "方向(_A):" msgid "_Elevation:" msgstr "持ち上げ(_E):" -#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3250 +#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3253 msgid "_X offset:" msgstr "X オフセット(_X):" @@ -916,7 +917,7 @@ msgid "" msgstr "" "オフセットの調整は、プレビューをマウスの中ボタンでドラッグしても可能です。" -#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3259 +#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3262 msgid "_Y offset:" msgstr "Y オフセット(_Y):" @@ -1024,26 +1025,27 @@ msgstr "チャンネルミキサー設定読み込み" #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 -#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892 -#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-dicom.c:340 -#: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355 -#: ../plug-ins/common/file-gih.c:640 ../plug-ins/common/file-jp2-load.c:194 -#: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 -#: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 -#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756 -#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1014 -#: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 +#: ../plug-ins/common/file-cel.c:297 ../plug-ins/common/file-cel.c:349 +#: ../plug-ins/common/file-cel.c:580 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:370 ../plug-ins/common/file-gif-load.c:355 +#: ../plug-ins/common/file-gih.c:642 ../plug-ins/common/file-jp2-load.c:196 +#: ../plug-ins/common/file-jp2-load.c:205 ../plug-ins/common/file-mng.c:1156 +#: ../plug-ins/common/file-pat.c:339 ../plug-ins/common/file-pcx.c:362 +#: ../plug-ins/common/file-pix.c:345 ../plug-ins/common/file-png.c:757 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1017 +#: ../plug-ins/common/file-ps.c:2913 ../plug-ins/common/file-psp.c:1717 #: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 -#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 -#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442 -#: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:737 -#: ../plug-ins/common/file-xmc.c:663 ../plug-ins/common/file-xmc.c:848 -#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2010 -#: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:229 -#: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 -#: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 -#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 -#: ../plug-ins/file-jpeg/jpeg-load.c:889 ../plug-ins/file-psd/psd-load.c:130 +#: ../plug-ins/common/file-sunras.c:393 ../plug-ins/common/file-svg.c:333 +#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:443 +#: ../plug-ins/common/file-xbm.c:738 ../plug-ins/common/file-xmc.c:657 +#: ../plug-ins/common/file-xmc.c:842 ../plug-ins/common/file-xwd.c:437 +#: ../plug-ins/common/sphere-designer.c:2010 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 +#: ../plug-ins/file-fits/fits.c:360 ../plug-ins/file-fli/fli-gimp.c:461 +#: ../plug-ins/file-fli/fli-gimp.c:498 ../plug-ins/file-ico/ico-load.c:651 +#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:122 +#: ../plug-ins/file-jpeg/jpeg-load.c:894 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 #: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 @@ -1064,22 +1066,22 @@ msgid "Save Channel Mixer Settings" msgstr "チャンネルミキサー設定保存" #: ../plug-ins/common/channel-mixer.c:1058 -#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840 -#: ../plug-ins/common/file-cel.c:585 ../plug-ins/common/file-csource.c:407 -#: ../plug-ins/common/file-dicom.c:1351 ../plug-ins/common/file-gbr.c:663 -#: ../plug-ins/common/file-gif-save.c:782 ../plug-ins/common/file-gih.c:1258 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 +#: ../plug-ins/common/file-cel.c:773 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:665 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1260 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 -#: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 -#: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526 -#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1010 -#: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591 -#: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565 -#: ../plug-ins/common/file-tga.c:1171 ../plug-ins/common/file-tiff-save.c:684 -#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1455 -#: ../plug-ins/common/file-xwd.c:619 ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:476 -#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007 -#: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652 +#: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:488 +#: ../plug-ins/common/file-pcx.c:713 ../plug-ins/common/file-pix.c:528 +#: ../plug-ins/common/file-png.c:1359 ../plug-ins/common/file-pnm.c:1012 +#: ../plug-ins/common/file-ps.c:1193 ../plug-ins/common/file-raw.c:591 +#: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:567 +#: ../plug-ins/common/file-tga.c:1180 ../plug-ins/common/file-tiff-save.c:710 +#: ../plug-ins/common/file-xbm.c:1037 ../plug-ins/common/file-xmc.c:1449 +#: ../plug-ins/common/file-xwd.c:625 ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:478 +#: ../plug-ins/file-fli/fli-gimp.c:752 ../plug-ins/file-ico/ico-save.c:1007 +#: ../plug-ins/file-jpeg/jpeg-save.c:355 ../plug-ins/file-psd/psd-save.c:1653 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 #: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1715 #: ../plug-ins/flame/flame.c:442 @@ -1114,7 +1116,7 @@ msgstr "市松模様を描画しています..." msgid "Checkerboard" msgstr "市松模様" -#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1162 +#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1156 #: ../plug-ins/gimpressionist/sizemap.c:510 msgid "_Size:" msgstr "サイズ(_S):" @@ -1236,7 +1238,7 @@ msgstr "Min (x-d, -), (x < 0.5)" msgid "Min (x-d, -), (0.5 < x)" msgstr "Min (x-d, -), (0.5 < x)" -#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1635 +#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1637 msgid "Standard" msgstr "標準" @@ -1331,7 +1333,7 @@ msgstr "彩度" #: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310 #: ../plug-ins/common/decompose.c:190 #: ../plug-ins/gimpressionist/orientation.c:155 -#: ../plug-ins/gimpressionist/size.c:158 +#: ../plug-ins/gimpressionist/size.c:158 ../plug-ins/metadata/interface.c:144 msgid "Value" msgstr "明度" @@ -2152,37 +2154,37 @@ msgstr "チャンネル" msgid "Remove empty borders from the image" msgstr "描画された部分が収まるように画像を切り抜きます" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "画像の自動切り抜き(_E)" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "描画された部分が収まるようにレイヤーを切り抜きます" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "レイヤーの自動切り抜き(_E)" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "切り抜いています" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "" "画像の端と中央部の空白部分を切り取り、描かれているものが最小枠に収まるように" "します" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "最小枠で切り抜き(_Z)" -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "最小枠で切り抜いています" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "切り抜くものがありません" @@ -2214,31 +2216,31 @@ msgstr "背景色を使用する(_U)" msgid "Cubistic transformation" msgstr "キュービズム変換しています" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "画像を上下 2 つのカーブに沿って曲げます (旧バージョンの「ひん曲げる」)" # 「ひん曲げる」から「カーブに沿って曲げる」に変更 # - フィルターが提供する効果とタイトルの語感をマッチさせるため -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "カーブに沿って曲げる(_C)..." -#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "" "レイヤー以外には適用できません (チャンネルやマスクに対して適用しようとしまし" "た)" -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "マスク付きのレイヤーには適用できません" -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "空の選択範囲には適用できません" -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format msgid "Error while reading '%s': %s" msgstr "" @@ -2249,13 +2251,13 @@ msgstr "" # - フィルターが提供する効果とタイトルの語感をマッチさせるため #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2956 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "カーブに沿って曲げる" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 +#: ../plug-ins/common/curve-bend.c:1261 #: ../plug-ins/gimpressionist/orientmap.c:590 #: ../plug-ins/gimpressionist/sizemap.c:459 #: ../plug-ins/print/print-page-layout.c:175 @@ -2263,116 +2265,116 @@ msgid "Preview" msgstr "プレビュー" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "プレビュー更新(_P)" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "プレビュー自動更新(_V)" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 #: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "オプション" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "回転(_E):" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "スムージング(_T)" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:733 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "なめらかに(_A)" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "コピーで作業(_Y)" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "カーブ設定" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "カーブ設定する境界" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "上部境界(_U)" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "下部境界(_L)" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "カーブタイプ" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "なめらかな曲線(_H)" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "フリーハンド(_F)" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "コピー(_C)" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "このカーブをもう一方の境界にコピーします" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "ミラー(_M)" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "このカーブを鏡像反転してもう一方の境界に適用します" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "入れ替え(_W)" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "上下のカーブを入れ替えます" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "このカーブをリセットします" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "カーブをファイルから読み込みます" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "カーブをファイルに保存します" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "カーブをファイルから読み込み" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "カーブをファイルに保存" @@ -2661,9 +2663,9 @@ msgstr "適応的(_A)" msgid "R_ecursive" msgstr "再帰的(_E)" -#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2694,7 +2696,7 @@ msgid "Destripe" msgstr "ストライプ除去" #: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 -#: ../plug-ins/common/file-ps.c:3034 ../plug-ins/common/file-ps.c:3232 +#: ../plug-ins/common/file-ps.c:3037 ../plug-ins/common/file-ps.c:3235 #: ../plug-ins/common/file-raw.c:1134 ../plug-ins/common/smooth-palette.c:437 #: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 @@ -2881,11 +2883,11 @@ msgstr "ネオン光彩(_N)..." msgid "Neon" msgstr "ネオン光彩を適用しています" -#: ../plug-ins/common/edge-neon.c:696 +#: ../plug-ins/common/edge-neon.c:697 msgid "Neon Detection" msgstr "ネオン光彩" -#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "量(_A):" @@ -3006,7 +3008,7 @@ msgid "Engrave" msgstr "彫金" #: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 -#: ../plug-ins/common/file-ps.c:3044 ../plug-ins/common/file-ps.c:3241 +#: ../plug-ins/common/file-ps.c:3047 ../plug-ins/common/file-ps.c:3244 #: ../plug-ins/common/file-raw.c:1147 ../plug-ins/common/film.c:1002 #: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 #: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 @@ -3024,69 +3026,128 @@ msgid "ASCII art" msgstr "アスキーアート" #. Create the actual window. -#: ../plug-ins/common/file-aa.c:349 +#: ../plug-ins/common/file-aa.c:351 msgid "Text" msgstr "テキスト" -#: ../plug-ins/common/file-aa.c:357 +#: ../plug-ins/common/file-aa.c:359 msgid "_Format:" msgstr "形式(_F):" -#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129 +#: ../plug-ins/common/file-cel.c:114 ../plug-ins/common/file-cel.c:132 msgid "KISS CEL" msgstr "KISS CEL" -#: ../plug-ins/common/file-cel.c:191 +#: ../plug-ins/common/file-cel.c:202 msgid "Load KISS Palette" msgstr "KISS パレットの読み込み" +#: ../plug-ins/common/file-cel.c:309 ../plug-ins/common/file-cel.c:364 +#: ../plug-ins/common/file-cel.c:384 +#, c-format +msgid "EOF or error while reading image header" +msgstr "画像データのヘッダーの読み込み中に EOF またはエラーに遭遇しました。" + #. max. rows allocated #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:345 -#: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360 -#: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 -#: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 -#: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:499 -#: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716 -#: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 -#: ../plug-ins/common/file-tiff-load.c:603 ../plug-ins/common/file-wmf.c:994 -#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:675 -#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:524 -#: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:213 -#: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 -#: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 +#: ../plug-ins/common/file-cel.c:354 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-gbr.c:375 ../plug-ins/common/file-gif-load.c:360 +#: ../plug-ins/common/file-gih.c:647 ../plug-ins/common/file-jp2-load.c:189 +#: ../plug-ins/common/file-pat.c:344 ../plug-ins/common/file-pcx.c:367 +#: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:350 +#: ../plug-ins/common/file-png.c:764 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1023 ../plug-ins/common/file-raw.c:716 +#: ../plug-ins/common/file-sunras.c:489 ../plug-ins/common/file-tga.c:448 +#: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 +#: ../plug-ins/common/file-xbm.c:743 ../plug-ins/common/file-xmc.c:669 +#: ../plug-ins/common/file-xpm.c:353 ../plug-ins/common/file-xwd.c:528 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 +#: ../plug-ins/file-fli/fli-gimp.c:503 ../plug-ins/file-ico/ico-load.c:644 +#: ../plug-ins/file-jpeg/jpeg-load.c:128 ../plug-ins/file-psd/psd-load.c:135 +#: ../plug-ins/file-sgi/sgi.c:332 ../plug-ins/file-xjt/xjt.c:3333 #, c-format msgid "Opening '%s'" msgstr "'%s' を開いています" -#: ../plug-ins/common/file-cel.c:354 +#: ../plug-ins/common/file-cel.c:392 +#, c-format +msgid "is not a CEL image file" +msgstr "は CEL 画像ファイルではありません" + +#: ../plug-ins/common/file-cel.c:406 +#, c-format +msgid "illegal bpp value in image: %hhu" +msgstr "画像の色深度 (%hhu bpp) は不正です。" + +#: ../plug-ins/common/file-cel.c:420 +#, c-format +msgid "" +"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " +"vertical offset: %d" +msgstr "" +"画像の寸法が不正です。 幅: %d, 水平オフセット: %d, 高さ: %d, 垂直オフセット: " +"%d" + +#: ../plug-ins/common/file-cel.c:433 +#, c-format msgid "Can't create a new image" msgstr "新規画像を作成できません" -#: ../plug-ins/common/file-cel.c:444 +#: ../plug-ins/common/file-cel.c:471 ../plug-ins/common/file-cel.c:506 +#: ../plug-ins/common/file-cel.c:531 +#, c-format +msgid "EOF or error while reading image data" +msgstr "画像データの読み込み中に EOF またはエラーに遭遇しました。" + +#: ../plug-ins/common/file-cel.c:548 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "利用できない色数 (%d)!" +#: ../plug-ins/common/file-cel.c:630 ../plug-ins/common/file-cel.c:642 +#, c-format +msgid "'%s': EOF or error while reading palette header" +msgstr "" +"'%s': パレットのヘッダーの読み込み中に EOF またはエラーに遭遇しました。" + +#: ../plug-ins/common/file-cel.c:651 +#, c-format +msgid "'%s': is not a KCF palette file" +msgstr "'%s' は KCF パレットファイルではありません" + +#: ../plug-ins/common/file-cel.c:660 +#, c-format +msgid "'%s': illegal bpp value in palette: %hhu" +msgstr "'%s': パレットの画素あたりのビット数が不正です。 %hhu bpp" + +#: ../plug-ins/common/file-cel.c:669 +#, c-format +msgid "'%s': illegal number of colors: %u" +msgstr "'%s': 色数 (%u 色) が不正です。" + +#: ../plug-ins/common/file-cel.c:684 ../plug-ins/common/file-cel.c:701 +#: ../plug-ins/common/file-cel.c:721 +#, c-format +msgid "'%s': EOF or error while reading palette data" +msgstr "'%s': パレットのデータの読み込み中に EOF またはエラーに遭遇しました。" + #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:590 ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1263 -#: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 -#: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1015 -#: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:694 -#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1460 -#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:624 -#: ../plug-ins/file-bmp/bmp-write.c:317 ../plug-ins/file-fits/fits.c:481 -#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001 -#: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657 -#: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696 +#: ../plug-ins/common/file-cel.c:778 ../plug-ins/common/file-gbr.c:670 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1265 +#: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:493 +#: ../plug-ins/common/file-pcx.c:645 ../plug-ins/common/file-pix.c:533 +#: ../plug-ins/common/file-png.c:1366 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-ps.c:1198 ../plug-ins/common/file-sunras.c:572 +#: ../plug-ins/common/file-tga.c:1185 ../plug-ins/common/file-tiff-save.c:718 +#: ../plug-ins/common/file-xbm.c:1042 ../plug-ins/common/file-xmc.c:1454 +#: ../plug-ins/common/file-xpm.c:639 ../plug-ins/common/file-xwd.c:630 +#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:483 +#: ../plug-ins/file-fli/fli-gimp.c:720 ../plug-ins/file-ico/ico-save.c:1001 +#: ../plug-ins/file-jpeg/jpeg-save.c:312 ../plug-ins/file-psd/psd-save.c:1658 +#: ../plug-ins/file-sgi/sgi.c:578 ../plug-ins/file-xjt/xjt.c:1696 #, c-format msgid "Saving '%s'" msgstr "'%s' を保存しています" @@ -3163,14 +3224,14 @@ msgstr "医用デジタル画像と通信" msgid "'%s' is not a DICOM file." msgstr "'%s' は DICOM ファイルではありません" -#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676 -#: ../plug-ins/common/file-pnm.c:1000 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:677 +#: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "アルファチャンネルを持った画像は保存できません。" -#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1180 -#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:609 -#: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1183 +#: ../plug-ins/common/file-ps.c:1215 ../plug-ins/common/file-xwd.c:615 +#: ../plug-ins/file-fits/fits.c:468 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." msgstr "不明な画像タイプは扱えません。" @@ -3178,46 +3239,46 @@ msgstr "不明な画像タイプは扱えません。" msgid "GIMP brush" msgstr "GIMP ブラシ" -#: ../plug-ins/common/file-gbr.c:399 ../plug-ins/common/file-pat.c:418 +#: ../plug-ins/common/file-gbr.c:401 ../plug-ins/common/file-pat.c:420 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" msgstr "'%s' のヘッダーデータ (幅: %lu、高さ: %lu、バイト: %lu) は無効な値です" -#: ../plug-ins/common/file-gbr.c:423 ../plug-ins/common/file-gbr.c:435 +#: ../plug-ins/common/file-gbr.c:425 ../plug-ins/common/file-gbr.c:437 msgid "Unsupported brush format" msgstr "非対応のブラシフォーマット" -#: ../plug-ins/common/file-gbr.c:447 +#: ../plug-ins/common/file-gbr.c:449 #, c-format msgid "Error in GIMP brush file '%s'" msgstr "GIMP ブラシファイル '%s' でエラー発生" -#: ../plug-ins/common/file-gbr.c:455 +#: ../plug-ins/common/file-gbr.c:457 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "ブラシファイル '%s' に不正な UTF-8 文字列" -#: ../plug-ins/common/file-gbr.c:461 ../plug-ins/common/file-gih.c:487 -#: ../plug-ins/common/file-gih.c:1137 +#: ../plug-ins/common/file-gbr.c:463 ../plug-ins/common/file-gih.c:489 +#: ../plug-ins/common/file-gih.c:1139 #: ../plug-ins/gradient-flare/gradient-flare.c:3064 msgid "Unnamed" msgstr "名称未設定" -#: ../plug-ins/common/file-gbr.c:653 +#: ../plug-ins/common/file-gbr.c:655 msgid "GIMP brushes are either GRAYSCALE or RGBA" msgstr "GIMP ブラシファイルはグレースケールか RGBA のいずれかです" -#: ../plug-ins/common/file-gbr.c:770 +#: ../plug-ins/common/file-gbr.c:772 msgid "Brush" msgstr "ブラシ" #. attach labels -#: ../plug-ins/common/file-gbr.c:784 ../plug-ins/common/grid.c:792 +#: ../plug-ins/common/file-gbr.c:786 ../plug-ins/common/grid.c:792 msgid "Spacing:" msgstr "間隔:" -#: ../plug-ins/common/file-gbr.c:795 ../plug-ins/common/file-gih.c:888 -#: ../plug-ins/common/file-pat.c:568 ../plug-ins/gimpressionist/presets.c:666 +#: ../plug-ins/common/file-gbr.c:797 ../plug-ins/common/file-gih.c:890 +#: ../plug-ins/common/file-pat.c:570 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "説明:" @@ -3264,11 +3325,11 @@ msgstr "" "GIF: 文書化されていない GIF 合成タイプ %d は扱えません。動画が再生されない" "か、完全に保存できない可能性があります。" -#: ../plug-ins/common/file-gif-save.c:468 +#: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "これ以上単純には減色できません。不透明として保存します。" -#: ../plug-ins/common/file-gif-save.c:583 +#: ../plug-ins/common/file-gif-save.c:591 #, c-format msgid "" "Unable to save '%s'. The GIF file format does not support images that are " @@ -3277,7 +3338,7 @@ msgstr "" "'%s' を保存できません。 GIF 形式での保存では幅や高さが %d ピクセルを超える画" "像をサポートしていません。" -#: ../plug-ins/common/file-gif-save.c:694 +#: ../plug-ins/common/file-gif-save.c:704 msgid "" "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." @@ -3285,20 +3346,20 @@ msgstr "" "GIF フォーマットは 7bit ASCII エンコードのコメントしかサポートされません。コ" "メントは保存されませんでした。" -#: ../plug-ins/common/file-gif-save.c:753 +#: ../plug-ins/common/file-gif-save.c:763 msgid "" "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" "RGB 画像を直接 GIF 形式で保存することはできません。インデックス形式もしくはグ" "レースケールに変換してください。" -#: ../plug-ins/common/file-gif-save.c:931 +#: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "" "「悪意ある CPU-sucking アニメーション」になることを防ぐためにフレーム間に待ち" "時間を挿入しました" -#: ../plug-ins/common/file-gif-save.c:972 +#: ../plug-ins/common/file-gif-save.c:982 msgid "" "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." @@ -3306,7 +3367,7 @@ msgstr "" "GIF 形式で保存しようとしている画像中に実画像サイズより大きなレイヤーが含まれ" "ています" -#: ../plug-ins/common/file-gif-save.c:989 +#: ../plug-ins/common/file-gif-save.c:999 msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." @@ -3315,11 +3376,11 @@ msgstr "" "すべてのレイヤーを画像サイズ以下に切り詰めるか、保存をキャンセルしてくださ" "い。" -#: ../plug-ins/common/file-gif-save.c:1125 +#: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" msgstr "GIF 形式" -#: ../plug-ins/common/file-gif-save.c:1133 +#: ../plug-ins/common/file-gif-save.c:1143 #, c-format msgid "" "Error loading UI file '%s':\n" @@ -3328,19 +3389,19 @@ msgstr "" "UI ファイル '%s' 読み込み時にエラーが発生しました。\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1187 +#: ../plug-ins/common/file-gif-save.c:1197 msgid "I don't care" msgstr "気にしない" -#: ../plug-ins/common/file-gif-save.c:1189 +#: ../plug-ins/common/file-gif-save.c:1199 msgid "Cumulative layers (combine)" msgstr "累積レイヤー (結合)" -#: ../plug-ins/common/file-gif-save.c:1191 +#: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" msgstr "レイヤー毎に 1 フレーム (置換)" -#: ../plug-ins/common/file-gif-save.c:1208 +#: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." @@ -3348,12 +3409,12 @@ msgstr "" "エクスポートしようとする画像には 1 枚のレイヤーしかありません。複数のレイヤー" "を持つ画像でなければ、アニメーションとしてエクスポートすることはできません。" -#: ../plug-ins/common/file-gif-save.c:2312 +#: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." msgstr "出力ファイル書き込みエラー。" #. translators: the %d is *always* 240 here -#: ../plug-ins/common/file-gif-save.c:2385 +#: ../plug-ins/common/file-gif-save.c:2395 #, c-format msgid "The default comment is limited to %d characters." msgstr "デフォルトのコメントは %d 文字までです。" @@ -3362,63 +3423,63 @@ msgstr "デフォルトのコメントは %d 文字までです。" msgid "GIMP brush (animated)" msgstr "GIMP ブラシ (動画)" -#: ../plug-ins/common/file-gih.c:480 +#: ../plug-ins/common/file-gih.c:482 msgid "Error in GIMP brush pipe file." msgstr "GIMP ブラシパイプファイル中にエラー" -#: ../plug-ins/common/file-gih.c:546 +#: ../plug-ins/common/file-gih.c:548 msgid "GIMP brush file appears to be corrupted." msgstr "GIMP ブラシファイルが破損しているようです。" -#: ../plug-ins/common/file-gih.c:696 +#: ../plug-ins/common/file-gih.c:698 msgid "Couldn't load one brush in the pipe, giving up." msgstr "パイプ中のブラシが読み込めませんでした。" -#: ../plug-ins/common/file-gih.c:857 +#: ../plug-ins/common/file-gih.c:859 msgid "Brush Pipe" msgstr "パイプブラシ" -#: ../plug-ins/common/file-gih.c:874 +#: ../plug-ins/common/file-gih.c:876 msgid "Spacing (percent):" msgstr "間隔 (％):" -#: ../plug-ins/common/file-gih.c:941 +#: ../plug-ins/common/file-gih.c:943 msgid "Pixels" msgstr "ピクセル" -#: ../plug-ins/common/file-gih.c:946 +#: ../plug-ins/common/file-gih.c:948 msgid "Cell size:" msgstr "セルサイズ:" -#: ../plug-ins/common/file-gih.c:958 +#: ../plug-ins/common/file-gih.c:960 msgid "Number of cells:" msgstr "セル数:" -#: ../plug-ins/common/file-gih.c:983 +#: ../plug-ins/common/file-gih.c:985 msgid " Rows of " msgstr " 行 " -#: ../plug-ins/common/file-gih.c:995 +#: ../plug-ins/common/file-gih.c:997 msgid " Columns on each layer" msgstr " 列 (各レイヤー)" -#: ../plug-ins/common/file-gih.c:999 +#: ../plug-ins/common/file-gih.c:1001 msgid " (Width Mismatch!) " msgstr " (幅が一致しません) " -#: ../plug-ins/common/file-gih.c:1003 +#: ../plug-ins/common/file-gih.c:1005 msgid " (Height Mismatch!) " msgstr " (高さが一致しません) " -#: ../plug-ins/common/file-gih.c:1008 +#: ../plug-ins/common/file-gih.c:1010 msgid "Display as:" msgstr "表示方法:" -#: ../plug-ins/common/file-gih.c:1017 +#: ../plug-ins/common/file-gih.c:1019 msgid "Dimension:" msgstr "次元:" -#: ../plug-ins/common/file-gih.c:1092 +#: ../plug-ins/common/file-gih.c:1094 msgid "Ranks:" msgstr "並び:" @@ -3553,24 +3614,24 @@ msgstr "セル間隔を指定します。" msgid "JPEG 2000 image" msgstr "JPEG 2000 画像" -#: ../plug-ins/common/file-jp2-load.c:212 +#: ../plug-ins/common/file-jp2-load.c:214 #, c-format msgid "Couldn't decode '%s'." msgstr "'%s' をデコードできません。" -#: ../plug-ins/common/file-jp2-load.c:235 +#: ../plug-ins/common/file-jp2-load.c:237 #, c-format msgid "The image '%s' is in grayscale but does not contain any gray component." msgstr "" "画像 '%s' の色空間はグレースケールですが、グレーのコンポーネントが含まれてい" "ません。" -#: ../plug-ins/common/file-jp2-load.c:261 +#: ../plug-ins/common/file-jp2-load.c:263 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." msgstr "画像 '%s' の色空間は RGB ですが、コンポーネントの一部が欠けています。" -#: ../plug-ins/common/file-jp2-load.c:287 +#: ../plug-ins/common/file-jp2-load.c:289 #, c-format msgid "" "The image '%s' is in the CIEXYZ color space, but there is no code in place " @@ -3579,7 +3640,7 @@ msgstr "" "画像 '%s' の色空間は CIEXYZ ですが、RGB 変換用コードが適切な位置に見当たりま" "せん。" -#: ../plug-ins/common/file-jp2-load.c:294 +#: ../plug-ins/common/file-jp2-load.c:296 #, c-format msgid "" "The image '%s' is in the CIELAB color space, but there is no code in place " @@ -3588,7 +3649,7 @@ msgstr "" "画像 '%s' の色空間は CIELAB ですが、RGB 変換用コードが適切な位置に見当たりま" "せん。" -#: ../plug-ins/common/file-jp2-load.c:301 +#: ../plug-ins/common/file-jp2-load.c:303 #, c-format msgid "" "The image '%s' is in the YCbCr color space, but there is no code in place to " @@ -3597,12 +3658,12 @@ msgstr "" "画像 '%s' の色空間は YCbCr ですが、RGB 変換用コードが適切な位置に見当たりませ" "ん。" -#: ../plug-ins/common/file-jp2-load.c:309 +#: ../plug-ins/common/file-jp2-load.c:311 #, c-format msgid "The image '%s' is in an unknown color space." msgstr "画像 '%s' の色空間が不明です。" -#: ../plug-ins/common/file-jp2-load.c:323 +#: ../plug-ins/common/file-jp2-load.c:325 #, c-format msgid "" "Image component %d of image '%s' does not have the same size as the image. " @@ -3611,13 +3672,13 @@ msgstr "" "'%2$s' の %1$d 番目のコンポーネントのサイズが画像サイズと異なっていますが、こ" "の形式は現在サポートされません。" -#: ../plug-ins/common/file-jp2-load.c:334 +#: ../plug-ins/common/file-jp2-load.c:336 #, c-format msgid "Image component %d of image '%s' does not have both a hstep and vstep." msgstr "" "画像 '%2$s' の %1$d 番目のコンポーネントに hstep または vstep がありません。" -#: ../plug-ins/common/file-jp2-load.c:343 +#: ../plug-ins/common/file-jp2-load.c:345 #, c-format msgid "" "Image component %d of image '%s' is signed. This is currently not supported." @@ -3627,7 +3688,7 @@ msgstr "" #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1902 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1903 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "透明度を劣化させずに保存できませんでした。不透明で保存します。" @@ -3660,7 +3721,7 @@ msgid "Save creation time" msgstr "作成日時を保存" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1951 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1952 msgid "PNG" msgstr "PNG" @@ -3748,12 +3809,12 @@ msgstr "MNG 動画" msgid "GIMP pattern" msgstr "GIMP パターン" -#: ../plug-ins/common/file-pat.c:378 +#: ../plug-ins/common/file-pat.c:380 #, c-format msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "パターンファイル '%s' に不正な UTF-8 文字列があります。" -#: ../plug-ins/common/file-pat.c:553 +#: ../plug-ins/common/file-pat.c:555 msgid "Pattern" msgstr "パターン" @@ -3761,72 +3822,72 @@ msgstr "パターン" msgid "ZSoft PCX image" msgstr "ZSoft PCX 画像" -#: ../plug-ins/common/file-pcx.c:372 +#: ../plug-ins/common/file-pcx.c:373 #, c-format msgid "Could not read header from '%s'" msgstr "'%s' からヘッダーが読めません" -#: ../plug-ins/common/file-pcx.c:383 +#: ../plug-ins/common/file-pcx.c:384 #, c-format msgid "'%s' is not a PCX file" msgstr "'%s' はPCXファイルではありません" -#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:636 +#: ../plug-ins/common/file-pcx.c:398 ../plug-ins/file-bmp/bmp-read.c:669 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "画像の幅 (%d) が無効またはサポートされない値です" -#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:642 +#: ../plug-ins/common/file-pcx.c:404 ../plug-ins/file-bmp/bmp-read.c:675 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" msgstr "画像の高さ (%d) が無効またはサポートされない値です" -#: ../plug-ins/common/file-pcx.c:409 +#: ../plug-ins/common/file-pcx.c:410 msgid "Invalid number of bytes per line in PCX header" msgstr "PCX ヘッダーの 1 ラインあたりのバイト数が不適切です" -#: ../plug-ins/common/file-pcx.c:417 +#: ../plug-ins/common/file-pcx.c:418 #, c-format msgid "Image dimensions too large: width %d x height %d" msgstr "画像寸法 (幅 %d x 高さ %d) は大きすぎます" -#: ../plug-ins/common/file-pcx.c:466 +#: ../plug-ins/common/file-pcx.c:467 msgid "Unusual PCX flavour, giving up" msgstr "異常な PCX につき、お手上げです" -#: ../plug-ins/common/file-pcx.c:685 +#: ../plug-ins/common/file-pcx.c:686 #, c-format msgid "Invalid X offset: %d" msgstr "Xオフセット値 (%d) は無効な値です" -#: ../plug-ins/common/file-pcx.c:691 +#: ../plug-ins/common/file-pcx.c:692 #, c-format msgid "Invalid Y offset: %d" msgstr "Yオフセット値 (%d) は無効な値です" -#: ../plug-ins/common/file-pcx.c:697 +#: ../plug-ins/common/file-pcx.c:698 #, c-format msgid "Right border out of bounds (must be < %d): %d" msgstr "" -"右の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければい" +"右の境界がはみ出ています。 設定値は '%2$d' ですが '%1$d' より小さくなければい" "けません" -#: ../plug-ins/common/file-pcx.c:704 +#: ../plug-ins/common/file-pcx.c:705 #, c-format msgid "Bottom border out of bounds (must be < %d): %d" msgstr "" -"下の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければい" +"下の境界がはみ出ています。 設定値は '%2$d' ですが '%1$d' より小さくなければい" "けません" -#: ../plug-ins/common/file-pcx.c:769 +#: ../plug-ins/common/file-pcx.c:770 #, c-format msgid "Writing to file '%s' failed: %s" msgstr "ファイル '%s' の書き込みに失敗しました。 %s" #: ../plug-ins/common/file-pdf-load.c:300 -#: ../plug-ins/common/file-pdf-save.c:289 +#: ../plug-ins/common/file-pdf-save.c:290 msgid "Portable Document Format" msgstr "PDF 形式" @@ -3843,7 +3904,7 @@ msgstr "" msgid "%s-%s" msgstr "%s-%s" -#: ../plug-ins/common/file-pdf-load.c:897 ../plug-ins/common/file-ps.c:1102 +#: ../plug-ins/common/file-pdf-load.c:897 ../plug-ins/common/file-ps.c:1105 #, c-format msgid "%s-pages" msgstr "%s-ページ" @@ -3852,8 +3913,8 @@ msgstr "%s-ページ" msgid "Import from PDF" msgstr "PDF ドキュメントから画像にインポート" -#: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2962 -#: ../plug-ins/common/file-tiff-load.c:483 +#: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2965 +#: ../plug-ins/common/file-tiff-load.c:491 msgid "_Import" msgstr "インポート(_I)" @@ -3885,15 +3946,15 @@ msgstr "なめらかに(_A)" msgid "pixels/%a" msgstr "ピクセル/%a" -#: ../plug-ins/common/file-pdf-save.c:304 +#: ../plug-ins/common/file-pdf-save.c:305 msgid "_Create multipage PDF..." msgstr "PDF (複数ページ)の生成(_C)..." -#: ../plug-ins/common/file-pdf-save.c:401 +#: ../plug-ins/common/file-pdf-save.c:412 msgid "You must select a file to save!" msgstr "保存するファイルを選択してください" -#: ../plug-ins/common/file-pdf-save.c:410 +#: ../plug-ins/common/file-pdf-save.c:422 #, c-format msgid "" "An error occured while creating the PDF file:\n" @@ -3906,49 +3967,49 @@ msgstr "" "ファイル名が正しいか、ファイルを作成する場所が書き込み可能かどうか確認してく" "ださい。" -#: ../plug-ins/common/file-pdf-save.c:733 -#: ../plug-ins/common/file-pdf-save.c:850 +#: ../plug-ins/common/file-pdf-save.c:746 +#: ../plug-ins/common/file-pdf-save.c:863 msgid "Omit hidden layers and layers with zero opacity" msgstr "不可視レイヤーと不透明度ゼロのレイヤーは保存しない" -#: ../plug-ins/common/file-pdf-save.c:737 -#: ../plug-ins/common/file-pdf-save.c:854 +#: ../plug-ins/common/file-pdf-save.c:750 +#: ../plug-ins/common/file-pdf-save.c:867 msgid "Convert bitmaps to vector graphics where possible" msgstr "可能ならばビットマップをベクターグラフィックスに変換する" -#: ../plug-ins/common/file-pdf-save.c:741 -#: ../plug-ins/common/file-pdf-save.c:858 +#: ../plug-ins/common/file-pdf-save.c:754 +#: ../plug-ins/common/file-pdf-save.c:871 msgid "Apply layer masks before saving" msgstr "保存前にレイヤーマスクを適用する" -#: ../plug-ins/common/file-pdf-save.c:744 -#: ../plug-ins/common/file-pdf-save.c:861 +#: ../plug-ins/common/file-pdf-save.c:757 +#: ../plug-ins/common/file-pdf-save.c:874 msgid "Keeping the masks will not change the output" msgstr "" "レイヤーマスクを保持したままの場合、レイヤーマスクはエクスポート結果に反映さ" "れません" -#: ../plug-ins/common/file-pdf-save.c:797 +#: ../plug-ins/common/file-pdf-save.c:810 msgid "Save to:" msgstr "保存場所とファイル名:" -#: ../plug-ins/common/file-pdf-save.c:801 +#: ../plug-ins/common/file-pdf-save.c:814 msgid "Browse..." msgstr "参照..." -#: ../plug-ins/common/file-pdf-save.c:802 +#: ../plug-ins/common/file-pdf-save.c:815 msgid "Multipage PDF export" msgstr "PDF (複数ページ) の生成" -#: ../plug-ins/common/file-pdf-save.c:835 +#: ../plug-ins/common/file-pdf-save.c:848 msgid "Remove the selected pages" msgstr "選択したページを削除" -#: ../plug-ins/common/file-pdf-save.c:845 +#: ../plug-ins/common/file-pdf-save.c:858 msgid "Add this image" msgstr "この画像を追加" -#: ../plug-ins/common/file-pdf-save.c:958 +#: ../plug-ins/common/file-pdf-save.c:971 msgid "Error! In order to save the file, at least one image should be added!" msgstr "エラー発生! ファイルを保存するには画像を追加する必要があります。" @@ -3961,32 +4022,32 @@ msgstr "Alias Pix 画像" msgid "PNG image" msgstr "PNG 画像" -#: ../plug-ins/common/file-png.c:644 +#: ../plug-ins/common/file-png.c:645 #, c-format msgid "Error loading PNG file: %s" msgstr "PNG形式ファイル読み込み時にエラーが発生しました。 %s" -#: ../plug-ins/common/file-png.c:732 +#: ../plug-ins/common/file-png.c:733 #, c-format msgid "Error creating PNG read struct while saving '%s'." msgstr "'%s' 保存中に PNG read struct 作成でエラーが発生しました。" -#: ../plug-ins/common/file-png.c:742 +#: ../plug-ins/common/file-png.c:743 #, c-format msgid "Error while reading '%s'. File corrupted?" msgstr "'%s' の読み込み中にエラー。ファイルが壊れている?" -#: ../plug-ins/common/file-png.c:871 +#: ../plug-ins/common/file-png.c:872 #, c-format msgid "Unknown color model in PNG file '%s'." msgstr "PNG ファイル '%s' で未知のカラーモデル。" -#: ../plug-ins/common/file-png.c:882 +#: ../plug-ins/common/file-png.c:883 #, c-format msgid "Could not create new image for '%s': %s" msgstr "新しい画像 '%s' が生成できませんでした。%s" -#: ../plug-ins/common/file-png.c:936 +#: ../plug-ins/common/file-png.c:937 msgid "" "The PNG file specifies an offset that caused the layer to be positioned " "outside the image." @@ -3995,21 +4056,21 @@ msgstr "" "れています。" # # ダイアログのタイトル -#: ../plug-ins/common/file-png.c:1238 +#: ../plug-ins/common/file-png.c:1239 msgid "Apply PNG Offset" msgstr "オフセットの適用" # # ボタンのラベル -#: ../plug-ins/common/file-png.c:1242 +#: ../plug-ins/common/file-png.c:1243 msgid "Ignore PNG offset" msgstr "無視" # # ボタンのラベル -#: ../plug-ins/common/file-png.c:1243 +#: ../plug-ins/common/file-png.c:1244 msgid "Apply PNG offset to layer" msgstr "適用" -#: ../plug-ins/common/file-png.c:1267 +#: ../plug-ins/common/file-png.c:1268 #, c-format msgid "" "The PNG image you are importing specifies an offset of %d, %d. Do you want " @@ -4018,24 +4079,24 @@ msgstr "" "インポートする PNG 画像にはオフセット (%d, %d) が設定されています。オフセット" "をレイヤーに適用しますか?" -#: ../plug-ins/common/file-png.c:1335 +#: ../plug-ins/common/file-png.c:1336 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "'%s' 保存中に PNG Write struct 作成でエラーが発生しました。" -#: ../plug-ins/common/file-png.c:1345 +#: ../plug-ins/common/file-png.c:1346 #, c-format msgid "Error while saving '%s'. Could not save image." msgstr "'%s' の保存中にエラー。画像が保存できませんでした。" -#: ../plug-ins/common/file-png.c:1968 +#: ../plug-ins/common/file-png.c:1969 #, c-format msgid "Error loading UI file '%s': %s" msgstr "" "UI ファイル '%s' 読み込み時にエラーが発生しました。\n" "%s" -#: ../plug-ins/common/file-png.c:1969 +#: ../plug-ins/common/file-png.c:1970 msgid "Unknown error" msgstr "不明なエラーです" @@ -4059,58 +4120,58 @@ msgstr "PGM 画像" msgid "PPM image" msgstr "PPM 画像" -#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550 -#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570 -#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "ファイルが途中で切れています" -#: ../plug-ins/common/file-pnm.c:530 +#: ../plug-ins/common/file-pnm.c:532 msgid "Invalid file." msgstr "不正なファイルです" -#: ../plug-ins/common/file-pnm.c:544 +#: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." msgstr "サポートされない形式のファイルです。" -#: ../plug-ins/common/file-pnm.c:553 +#: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." msgstr "不正な X 解像度です" -#: ../plug-ins/common/file-pnm.c:555 +#: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "画像の幅が GIMP で扱える範囲を超えています" -#: ../plug-ins/common/file-pnm.c:562 +#: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." msgstr "不正な Y 解像度です" -#: ../plug-ins/common/file-pnm.c:564 +#: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." msgstr "画像の高さが GIMP で扱える範囲を超えています" -#: ../plug-ins/common/file-pnm.c:574 +#: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." msgstr "サポートしていない最大値です。" -#: ../plug-ins/common/file-pnm.c:814 +#: ../plug-ins/common/file-pnm.c:816 msgid "Error reading file." msgstr "ファイル読み込み中にエラーが発生しました。" -#: ../plug-ins/common/file-pnm.c:1219 +#: ../plug-ins/common/file-pnm.c:1221 msgid "PNM" msgstr "PNM 形式" #. file save type -#: ../plug-ins/common/file-pnm.c:1222 +#: ../plug-ins/common/file-pnm.c:1224 msgid "Data formatting" msgstr "データフォーマット" -#: ../plug-ins/common/file-pnm.c:1226 +#: ../plug-ins/common/file-pnm.c:1228 msgid "Raw" msgstr "Raw" -#: ../plug-ins/common/file-pnm.c:1227 +#: ../plug-ins/common/file-pnm.c:1229 msgid "ASCII" msgstr "ASCII" @@ -4126,127 +4187,127 @@ msgstr "EPS 形式" msgid "PDF document" msgstr "PDF ドキュメント" -#: ../plug-ins/common/file-ps.c:1027 +#: ../plug-ins/common/file-ps.c:1030 #, c-format msgid "Could not interpret Postscript file '%s'" msgstr "PostScript ドキュメント '%s' を解釈できませんでした" -#: ../plug-ins/common/file-ps.c:1169 +#: ../plug-ins/common/file-ps.c:1172 #, c-format msgid "PostScript save cannot handle images with alpha channels" msgstr "PostScript 形式による保存はアルファチャンネルを取り扱えません" -#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:999 +#: ../plug-ins/common/file-ps.c:1807 ../plug-ins/common/file-tiff-load.c:1012 #, c-format msgid "Page %d" msgstr "%d ページ" -#: ../plug-ins/common/file-ps.c:2469 ../plug-ins/common/file-ps.c:2600 -#: ../plug-ins/common/file-ps.c:2749 ../plug-ins/common/file-ps.c:2873 -#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1610 -#: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:973 +#: ../plug-ins/common/file-ps.c:2472 ../plug-ins/common/file-ps.c:2603 +#: ../plug-ins/common/file-ps.c:2752 ../plug-ins/common/file-ps.c:2876 +#: ../plug-ins/common/file-sunras.c:1506 ../plug-ins/common/file-sunras.c:1612 +#: ../plug-ins/file-fits/fits.c:852 ../plug-ins/file-fits/fits.c:975 msgid "Write error occurred" msgstr "書き込みエラーが発生しました" -#: ../plug-ins/common/file-ps.c:2957 +#: ../plug-ins/common/file-ps.c:2960 msgid "Import from PostScript" msgstr "PostScript ドキュメントから画像にインポート" #. Rendering -#: ../plug-ins/common/file-ps.c:3001 +#: ../plug-ins/common/file-ps.c:3004 msgid "Rendering" msgstr "解像度とサイズ" #. Resolution -#: ../plug-ins/common/file-ps.c:3017 ../plug-ins/common/file-svg.c:911 +#: ../plug-ins/common/file-ps.c:3020 ../plug-ins/common/file-svg.c:911 #: ../plug-ins/common/file-wmf.c:692 msgid "Resolution:" msgstr "解像度:" -#: ../plug-ins/common/file-ps.c:3056 +#: ../plug-ins/common/file-ps.c:3059 msgid "Pages:" msgstr "ページ:" -#: ../plug-ins/common/file-ps.c:3063 +#: ../plug-ins/common/file-ps.c:3066 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "読み込むページ番号 (例: 1-4 あるいは 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3068 ../plug-ins/common/sphere-designer.c:2657 +#: ../plug-ins/common/file-ps.c:3071 ../plug-ins/common/sphere-designer.c:2657 msgid "Layers" msgstr "レイヤー" -#: ../plug-ins/common/file-ps.c:3071 +#: ../plug-ins/common/file-ps.c:3074 msgid "Images" msgstr "画像" -#: ../plug-ins/common/file-ps.c:3074 +#: ../plug-ins/common/file-ps.c:3077 msgid "Open as" msgstr "新規に開く" -#: ../plug-ins/common/file-ps.c:3078 +#: ../plug-ins/common/file-ps.c:3081 msgid "Try Bounding Box" msgstr "境界枠を調べる" #. Colouring -#: ../plug-ins/common/file-ps.c:3091 +#: ../plug-ins/common/file-ps.c:3094 msgid "Coloring" msgstr "色の設定" -#: ../plug-ins/common/file-ps.c:3095 +#: ../plug-ins/common/file-ps.c:3098 msgid "B/W" msgstr "モノクロ 2 階調" # 「色」とすべき箇所と「カラー」とすべき箇所（あるいはその他の表記）が衝突している -#: ../plug-ins/common/file-ps.c:3097 ../plug-ins/common/file-xpm.c:479 +#: ../plug-ins/common/file-ps.c:3100 ../plug-ins/common/file-xpm.c:480 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:212 msgid "Color" msgstr "カラー" -#: ../plug-ins/common/file-ps.c:3098 ../plug-ins/file-fits/fits.c:1032 +#: ../plug-ins/common/file-ps.c:3101 ../plug-ins/file-fits/fits.c:1034 msgid "Automatic" msgstr "自動" -#: ../plug-ins/common/file-ps.c:3109 +#: ../plug-ins/common/file-ps.c:3112 msgid "Text antialiasing" msgstr "" "テキストの\n" "アンチエイリアス" -#: ../plug-ins/common/file-ps.c:3113 ../plug-ins/common/file-ps.c:3125 +#: ../plug-ins/common/file-ps.c:3116 ../plug-ins/common/file-ps.c:3128 msgctxt "antialiasing" msgid "None" msgstr "しない" -#: ../plug-ins/common/file-ps.c:3114 ../plug-ins/common/file-ps.c:3126 +#: ../plug-ins/common/file-ps.c:3117 ../plug-ins/common/file-ps.c:3129 msgid "Weak" msgstr "少し" -#: ../plug-ins/common/file-ps.c:3115 ../plug-ins/common/file-ps.c:3127 +#: ../plug-ins/common/file-ps.c:3118 ../plug-ins/common/file-ps.c:3130 msgid "Strong" msgstr "強く" -#: ../plug-ins/common/file-ps.c:3121 +#: ../plug-ins/common/file-ps.c:3124 msgid "Graphic antialiasing" msgstr "" "グラフィックの\n" "アンチエイリアス" -#: ../plug-ins/common/file-ps.c:3199 +#: ../plug-ins/common/file-ps.c:3202 msgid "PostScript" msgstr "PostScript" #. Image Size -#: ../plug-ins/common/file-ps.c:3216 +#: ../plug-ins/common/file-ps.c:3219 msgid "Image Size" msgstr "画像サイズ" -#: ../plug-ins/common/file-ps.c:3265 +#: ../plug-ins/common/file-ps.c:3268 msgid "_Keep aspect ratio" msgstr "縦横比を維持する(_K)" -#: ../plug-ins/common/file-ps.c:3271 +#: ../plug-ins/common/file-ps.c:3274 msgid "" "When toggled, the resulting image will be scaled to fit into the given size " "without changing the aspect ratio." @@ -4255,42 +4316,42 @@ msgstr "" "されて出力されます。" #. Unit -#: ../plug-ins/common/file-ps.c:3281 +#: ../plug-ins/common/file-ps.c:3284 msgid "Unit" msgstr "単位" -#: ../plug-ins/common/file-ps.c:3285 +#: ../plug-ins/common/file-ps.c:3288 msgid "_Inch" msgstr "インチ(_I)" -#: ../plug-ins/common/file-ps.c:3286 +#: ../plug-ins/common/file-ps.c:3289 msgid "_Millimeter" msgstr "ミリメートル(_M)" #. Rotation -#: ../plug-ins/common/file-ps.c:3297 +#: ../plug-ins/common/file-ps.c:3300 #: ../plug-ins/map-object/map-object-ui.c:989 msgid "Rotation" msgstr "回転" #. Format -#: ../plug-ins/common/file-ps.c:3312 +#: ../plug-ins/common/file-ps.c:3315 msgid "Output" msgstr "出力" -#: ../plug-ins/common/file-ps.c:3318 +#: ../plug-ins/common/file-ps.c:3321 msgid "_PostScript level 2" msgstr "_PostScript レベル 2" -#: ../plug-ins/common/file-ps.c:3327 +#: ../plug-ins/common/file-ps.c:3330 msgid "_Encapsulated PostScript" msgstr "_EPS 形式" -#: ../plug-ins/common/file-ps.c:3336 +#: ../plug-ins/common/file-ps.c:3339 msgid "P_review" msgstr "プレビュー(_R)" -#: ../plug-ins/common/file-ps.c:3358 +#: ../plug-ins/common/file-ps.c:3361 msgid "Preview _size:" msgstr "プレビューサイズ(_S):" @@ -4408,26 +4469,26 @@ msgstr "インデックスパレット型" msgid "SUN Rasterfile image" msgstr "SUN-raster ファイル画像" -#: ../plug-ins/common/file-sunras.c:402 +#: ../plug-ins/common/file-sunras.c:404 #, c-format msgid "Could not open '%s' as SUN-raster-file" msgstr "SUN-raster ファイル形式で '%s' が開けません" -#: ../plug-ins/common/file-sunras.c:412 +#: ../plug-ins/common/file-sunras.c:414 msgid "The type of this SUN-rasterfile is not supported" msgstr "この形式の SUN-raster ファイルは使用できません" -#: ../plug-ins/common/file-sunras.c:441 +#: ../plug-ins/common/file-sunras.c:443 #, c-format msgid "Could not read color entries from '%s'" msgstr "'%s' から色情報が読み込めません" -#: ../plug-ins/common/file-sunras.c:450 +#: ../plug-ins/common/file-sunras.c:452 msgid "Type of colormap not supported" msgstr "このカラーマップ形式は使用できません" -#: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827 -#: ../plug-ins/common/file-xwd.c:489 +#: ../plug-ins/common/file-sunras.c:459 ../plug-ins/common/file-xbm.c:828 +#: ../plug-ins/common/file-xwd.c:493 #, c-format msgid "" "'%s':\n" @@ -4436,8 +4497,8 @@ msgstr "" "'%s':\n" "画像の幅が指定されていません" -#: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834 -#: ../plug-ins/common/file-xwd.c:499 +#: ../plug-ins/common/file-sunras.c:467 ../plug-ins/common/file-xbm.c:835 +#: ../plug-ins/common/file-xwd.c:503 #, c-format msgid "" "'%s':\n" @@ -4446,8 +4507,8 @@ msgstr "" "'%s':\n" "画像の幅がGIMPで扱える範囲を超えています" -#: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841 -#: ../plug-ins/common/file-xwd.c:508 +#: ../plug-ins/common/file-sunras.c:475 ../plug-ins/common/file-xbm.c:842 +#: ../plug-ins/common/file-xwd.c:512 #, c-format msgid "" "'%s':\n" @@ -4456,8 +4517,8 @@ msgstr "" "'%s':\n" "画像の高さが指定されていません" -#: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848 -#: ../plug-ins/common/file-xwd.c:517 +#: ../plug-ins/common/file-sunras.c:483 ../plug-ins/common/file-xbm.c:849 +#: ../plug-ins/common/file-xwd.c:521 #, c-format msgid "" "'%s':\n" @@ -4466,37 +4527,37 @@ msgstr "" "'%s':\n" "画像の高さがGIMPで扱える範囲を超えています" -#: ../plug-ins/common/file-sunras.c:520 +#: ../plug-ins/common/file-sunras.c:522 msgid "This image depth is not supported" msgstr "この色深度は使用できません" -#: ../plug-ins/common/file-sunras.c:544 +#: ../plug-ins/common/file-sunras.c:546 #, c-format msgid "SUNRAS save cannot handle images with alpha channels" msgstr "SUNRAS による保存はアルファチャンネルを持った画像を取り扱えません" -#: ../plug-ins/common/file-sunras.c:555 +#: ../plug-ins/common/file-sunras.c:557 msgid "Can't operate on unknown image types" msgstr "不明な画像種は扱えません" -#: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175 -#: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351 -#: ../plug-ins/common/file-xwd.c:1357 ../plug-ins/common/file-xwd.c:1458 -#: ../plug-ins/common/file-xwd.c:1616 ../plug-ins/common/file-xwd.c:1817 -#: ../plug-ins/common/file-xwd.c:2069 ../plug-ins/file-fits/fits.c:698 +#: ../plug-ins/common/file-sunras.c:1086 ../plug-ins/common/file-sunras.c:1177 +#: ../plug-ins/common/file-sunras.c:1258 ../plug-ins/common/file-sunras.c:1353 +#: ../plug-ins/common/file-xwd.c:1363 ../plug-ins/common/file-xwd.c:1464 +#: ../plug-ins/common/file-xwd.c:1622 ../plug-ins/common/file-xwd.c:1834 +#: ../plug-ins/common/file-xwd.c:2097 ../plug-ins/file-fits/fits.c:700 msgid "EOF encountered on reading" msgstr "読み込み中に EOF が現れた" -#: ../plug-ins/common/file-sunras.c:1627 +#: ../plug-ins/common/file-sunras.c:1629 msgid "SUNRAS" msgstr "SUNRAS 形式" #. file save type -#: ../plug-ins/common/file-sunras.c:1630 +#: ../plug-ins/common/file-sunras.c:1632 msgid "Data Formatting" msgstr "データフォーマット" -#: ../plug-ins/common/file-sunras.c:1634 +#: ../plug-ins/common/file-sunras.c:1636 msgid "RunLength Encoded" msgstr "RLE エンコード" @@ -4574,67 +4635,67 @@ msgstr "インポートしたパスを統合" msgid "TarGA image" msgstr "TarGA 画像" -#: ../plug-ins/common/file-tga.c:455 +#: ../plug-ins/common/file-tga.c:456 #, c-format msgid "Cannot read footer from '%s'" msgstr "'%s' からフッターが読めません" -#: ../plug-ins/common/file-tga.c:473 +#: ../plug-ins/common/file-tga.c:474 #, c-format msgid "Cannot read extension from '%s'" msgstr "'%s' から拡張が読めません" -#: ../plug-ins/common/file-tga.c:485 +#: ../plug-ins/common/file-tga.c:486 #, c-format msgid "Cannot read header from '%s'" msgstr "'%s' からヘッダーを読み込めません" -#: ../plug-ins/common/file-tga.c:1372 +#: ../plug-ins/common/file-tga.c:1381 msgid "TGA" msgstr "TGA 形式" #. rle -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1390 msgid "_RLE compression" msgstr "RLE 圧縮(_R)" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1404 msgid "Or_igin:" msgstr "ビットマップ起点(_I):" -#: ../plug-ins/common/file-tga.c:1399 +#: ../plug-ins/common/file-tga.c:1408 msgid "Bottom left" msgstr "左下" -#: ../plug-ins/common/file-tga.c:1400 +#: ../plug-ins/common/file-tga.c:1409 msgid "Top left" msgstr "左上" -#: ../plug-ins/common/file-tiff-load.c:240 -#: ../plug-ins/common/file-tiff-save.c:183 -#: ../plug-ins/common/file-tiff-save.c:200 +#: ../plug-ins/common/file-tiff-load.c:243 +#: ../plug-ins/common/file-tiff-save.c:186 +#: ../plug-ins/common/file-tiff-save.c:203 msgid "TIFF image" msgstr "TIFF 画像" -#: ../plug-ins/common/file-tiff-load.c:310 +#: ../plug-ins/common/file-tiff-load.c:297 #, c-format msgid "TIFF '%s' does not contain any directories" msgstr "TIFF 形式ファイル '%s' は、ディレクトリを含んでいません" -#: ../plug-ins/common/file-tiff-load.c:478 +#: ../plug-ins/common/file-tiff-load.c:486 msgid "Import from TIFF" msgstr "TIFF からインポート" -#: ../plug-ins/common/file-tiff-load.c:780 +#: ../plug-ins/common/file-tiff-load.c:818 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-of-%d-pages" -#: ../plug-ins/common/file-tiff-load.c:1015 +#: ../plug-ins/common/file-tiff-load.c:1028 msgid "TIFF Channel" msgstr "TIFF チャンネル" -#: ../plug-ins/common/file-tiff-load.c:1024 +#: ../plug-ins/common/file-tiff-load.c:1037 #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" @@ -4647,7 +4708,7 @@ msgstr "" "えないので 8 bit /チャンネルに変換します。この変換によりカラー情報の一部が失" "われます。" -#: ../plug-ins/common/file-tiff-save.c:888 +#: ../plug-ins/common/file-tiff-save.c:912 msgid "" "The TIFF format only supports comments in\n" "7bit ASCII encoding. No comment is saved." @@ -4655,48 +4716,48 @@ msgstr "" "TIFF フォーマットでは 7bit ASCII エンコードのコメントしか\n" "サポートされません。コメントは保存されませんでした。" -#: ../plug-ins/common/file-tiff-save.c:1062 +#: ../plug-ins/common/file-tiff-save.c:1085 msgid "TIFF" msgstr "TIFF 形式" #. compression -#: ../plug-ins/common/file-tiff-save.c:1070 +#: ../plug-ins/common/file-tiff-save.c:1093 msgid "Compression" msgstr "圧縮方法" -#: ../plug-ins/common/file-tiff-save.c:1074 +#: ../plug-ins/common/file-tiff-save.c:1097 msgid "_None" msgstr "圧縮しない(_N)" -#: ../plug-ins/common/file-tiff-save.c:1075 +#: ../plug-ins/common/file-tiff-save.c:1098 msgid "_LZW" msgstr "LZW(_L)" -#: ../plug-ins/common/file-tiff-save.c:1076 +#: ../plug-ins/common/file-tiff-save.c:1099 msgid "_Pack Bits" msgstr "Pack Bits(_P)" -#: ../plug-ins/common/file-tiff-save.c:1077 +#: ../plug-ins/common/file-tiff-save.c:1100 msgid "_Deflate" msgstr "Deflate(_D)" -#: ../plug-ins/common/file-tiff-save.c:1078 +#: ../plug-ins/common/file-tiff-save.c:1101 msgid "_JPEG" msgstr "JPEG(_J)" -#: ../plug-ins/common/file-tiff-save.c:1079 +#: ../plug-ins/common/file-tiff-save.c:1102 msgid "CCITT Group _3 fax" msgstr "CCITT Group 3 fax(_3)" -#: ../plug-ins/common/file-tiff-save.c:1080 +#: ../plug-ins/common/file-tiff-save.c:1103 msgid "CCITT Group _4 fax" msgstr "CCITT Group 4 fax(_4)" -#: ../plug-ins/common/file-tiff-save.c:1102 +#: ../plug-ins/common/file-tiff-save.c:1125 msgid "Save _color values from transparent pixels" msgstr "透明ピクセルの色の値を保存する(_C)" -#: ../plug-ins/common/file-tiff-save.c:1118 ../plug-ins/common/file-xbm.c:1235 +#: ../plug-ins/common/file-tiff-save.c:1141 ../plug-ins/common/file-xbm.c:1236 msgid "Comment:" msgstr "コメント:" @@ -4729,7 +4790,7 @@ msgstr "描画した WMF" msgid "X BitMap image" msgstr "X ビットマップイメージ" -#: ../plug-ins/common/file-xbm.c:820 +#: ../plug-ins/common/file-xbm.c:821 #, c-format msgid "" "'%s':\n" @@ -4738,7 +4799,7 @@ msgstr "" "'%s':\n" "ヘッダーが読み込めません (ftell == %ld)" -#: ../plug-ins/common/file-xbm.c:855 +#: ../plug-ins/common/file-xbm.c:856 #, c-format msgid "" "'%s':\n" @@ -4748,7 +4809,7 @@ msgstr "" "画像の種類が指定されていません" #. The image is not black-and-white. -#: ../plug-ins/common/file-xbm.c:999 +#: ../plug-ins/common/file-xbm.c:1000 msgid "" "The image which you are trying to save as an XBM contains more than two " "colors.\n" @@ -4759,7 +4820,7 @@ msgstr "" "\n" "保存する前に白黒 (1-bit) インデックス画像に変換してください。" -#: ../plug-ins/common/file-xbm.c:1010 +#: ../plug-ins/common/file-xbm.c:1011 msgid "" "You cannot save a cursor mask for an image\n" "which has no alpha channel." @@ -4767,56 +4828,56 @@ msgstr "" "アルファチャンネルを持たない画像では\n" "カーソルマスクを保存できません。" -#: ../plug-ins/common/file-xbm.c:1188 +#: ../plug-ins/common/file-xbm.c:1189 msgid "XBM" msgstr "XBM 形式" #. parameter settings -#: ../plug-ins/common/file-xbm.c:1191 +#: ../plug-ins/common/file-xbm.c:1192 msgid "XBM Options" msgstr "XBM オプション" #. X10 format -#: ../plug-ins/common/file-xbm.c:1201 +#: ../plug-ins/common/file-xbm.c:1202 msgid "_X10 format bitmap" msgstr "_X10 形式ビットマップ" -#: ../plug-ins/common/file-xbm.c:1221 +#: ../plug-ins/common/file-xbm.c:1222 msgid "_Identifier prefix:" msgstr "識別子プレフィックス(_I):" #. hotspot toggle -#: ../plug-ins/common/file-xbm.c:1243 +#: ../plug-ins/common/file-xbm.c:1244 msgid "_Write hot spot values" msgstr "ホットスポットの値を書き込む(_W)" -#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1089 +#: ../plug-ins/common/file-xbm.c:1267 ../plug-ins/common/file-xmc.c:1083 msgid "Hot spot _X:" msgstr "ホットスポット X(_X):" -#: ../plug-ins/common/file-xbm.c:1276 +#: ../plug-ins/common/file-xbm.c:1277 msgid "Hot spot _Y:" msgstr "ホットスポット Y(_Y):" #. mask file -#: ../plug-ins/common/file-xbm.c:1283 +#: ../plug-ins/common/file-xbm.c:1284 msgid "Mask File" msgstr "マスクファイル" -#: ../plug-ins/common/file-xbm.c:1293 +#: ../plug-ins/common/file-xbm.c:1294 msgid "W_rite extra mask file" msgstr "外部マスクファイルに記述(_R)" -#: ../plug-ins/common/file-xbm.c:1306 +#: ../plug-ins/common/file-xbm.c:1307 msgid "_Mask file extension:" msgstr "マスクファイル拡張子(_M):" -#: ../plug-ins/common/file-xmc.c:333 ../plug-ins/common/file-xmc.c:373 -#: ../plug-ins/common/file-xmc.c:1052 +#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 +#: ../plug-ins/common/file-xmc.c:1046 msgid "X11 Mouse Cursor" msgstr "X11 マウスカーソル" -#: ../plug-ins/common/file-xmc.c:481 +#: ../plug-ins/common/file-xmc.c:473 #, c-format msgid "" "Cannot set the hot spot!\n" @@ -4825,37 +4886,37 @@ msgstr "" "ホットスポットを設定できません。\n" "すべてのレイヤーが交差するように、レイヤーを調整してください。" -#: ../plug-ins/common/file-xmc.c:670 +#: ../plug-ins/common/file-xmc.c:664 #, c-format msgid "'%s' is not a valid X cursor." msgstr "'%s' は有効な X カーソルではありません。" -#: ../plug-ins/common/file-xmc.c:686 +#: ../plug-ins/common/file-xmc.c:680 #, c-format msgid "Frame %d of '%s' is too wide for an X cursor." msgstr "'%2$s' の第 %1$d フレームの幅は X カーソルには大き過ぎます。" -#: ../plug-ins/common/file-xmc.c:693 +#: ../plug-ins/common/file-xmc.c:687 #, c-format msgid "Frame %d of '%s' is too high for an X cursor." msgstr "'%2$s' の第 %1$d フレームの高さは X カーソルには大き過ぎます。" -#: ../plug-ins/common/file-xmc.c:896 +#: ../plug-ins/common/file-xmc.c:890 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "\"%s\" にイメージチャンクがありません。" -#: ../plug-ins/common/file-xmc.c:938 +#: ../plug-ins/common/file-xmc.c:932 #, c-format msgid "'%s' is too wide for an X cursor." msgstr "'%s' の幅は X カーソルには大き過ぎます。" -#: ../plug-ins/common/file-xmc.c:945 +#: ../plug-ins/common/file-xmc.c:939 #, c-format msgid "'%s' is too high for an X cursor." msgstr "'%s' の高さは X カーソルには大き過ぎます。" -#: ../plug-ins/common/file-xmc.c:1015 +#: ../plug-ins/common/file-xmc.c:1009 #, c-format msgid "A read error occurred." msgstr "読み込みエラーが発生しました。" @@ -4863,26 +4924,26 @@ msgstr "読み込みエラーが発生しました。" #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1057 +#: ../plug-ins/common/file-xmc.c:1051 msgid "XMC Options" msgstr "XMC オプション" -#: ../plug-ins/common/file-xmc.c:1085 +#: ../plug-ins/common/file-xmc.c:1079 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "" "ホットスポットの x 座標を指定します。ホットスポット初期値は左上 (0,0) です。" -#: ../plug-ins/common/file-xmc.c:1103 +#: ../plug-ins/common/file-xmc.c:1097 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "" "ホットスポットの y 座標を指定します。ホットスポット初期値は、左上 (0,0) で" "す。" -#: ../plug-ins/common/file-xmc.c:1114 +#: ../plug-ins/common/file-xmc.c:1108 msgid "_Auto-Crop all frames." msgstr "すべてのフレームの自動切り抜き(_A)" -#: ../plug-ins/common/file-xmc.c:1127 +#: ../plug-ins/common/file-xmc.c:1121 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4895,7 +4956,7 @@ msgstr "" "保存後のカーソルを他のアプリケーションで編集するつもりならば、この設定はオフ" "のままにしてください。" -#: ../plug-ins/common/file-xmc.c:1150 +#: ../plug-ins/common/file-xmc.c:1144 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4911,56 +4972,56 @@ msgstr "" "theme-size\" の値に基づいて使用するシーケンスを決定する際に使用される値であ" "り、実際の寸法 (幅と高さ) との関連性はありません。" -#: ../plug-ins/common/file-xmc.c:1167 +#: ../plug-ins/common/file-xmc.c:1161 msgid "_Use this value only for a frame which size is not specified." msgstr "サイズ未指定のフレームにのみ、この値を適用する(_U)" -#: ../plug-ins/common/file-xmc.c:1170 +#: ../plug-ins/common/file-xmc.c:1164 msgid "_Replace the size of all frames even if it is specified." msgstr "サイズ指定済のものを含めた全フレームにこの値を適用する(_R)" -#: ../plug-ins/common/file-xmc.c:1204 +#: ../plug-ins/common/file-xmc.c:1198 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "フレーム切り替えまでの時間を指定します。単位はミリ秒です。" -#: ../plug-ins/common/file-xmc.c:1207 +#: ../plug-ins/common/file-xmc.c:1201 msgid "_Delay:" msgstr "ディレイ(_D):" -#: ../plug-ins/common/file-xmc.c:1212 +#: ../plug-ins/common/file-xmc.c:1206 msgid "_Use this value only for a frame which delay is not specified." msgstr "ディレイ未指定のフレームにのみ、この値を適用する(_U)" -#: ../plug-ins/common/file-xmc.c:1215 +#: ../plug-ins/common/file-xmc.c:1209 msgid "_Replace the delay of all frames even if it is specified." msgstr "ディレイ指定済のものを含め全フレームにこの値を適用する(_R)" -#: ../plug-ins/common/file-xmc.c:1240 +#: ../plug-ins/common/file-xmc.c:1234 msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" "著作権情報の 65535 字 (バイト) を越える部分は字数制限により削除されました。" -#: ../plug-ins/common/file-xmc.c:1250 +#: ../plug-ins/common/file-xmc.c:1244 msgid "Enter copyright information." msgstr "著作権に関する情報を入力します。" -#: ../plug-ins/common/file-xmc.c:1252 +#: ../plug-ins/common/file-xmc.c:1246 msgid "_Copyright:" msgstr "著作権(_C):" -#: ../plug-ins/common/file-xmc.c:1268 +#: ../plug-ins/common/file-xmc.c:1262 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" "ライセンス情報の 65535字 (バイト) を越える部分は字数制限により削除されまし" "た。" -#: ../plug-ins/common/file-xmc.c:1278 +#: ../plug-ins/common/file-xmc.c:1272 msgid "Enter license information." msgstr "ライセンスに関する情報を入力します。" -#: ../plug-ins/common/file-xmc.c:1280 +#: ../plug-ins/common/file-xmc.c:1274 msgid "_License:" msgstr "ライセンス(_L):" @@ -4969,41 +5030,41 @@ msgstr "ライセンス(_L):" #. #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". -#: ../plug-ins/common/file-xmc.c:1287 +#: ../plug-ins/common/file-xmc.c:1281 msgid "_Other:" msgstr "その他(_O):" -#: ../plug-ins/common/file-xmc.c:1321 +#: ../plug-ins/common/file-xmc.c:1315 msgid "Enter other comment if you want." msgstr "その他のコメントを入力します。" -#: ../plug-ins/common/file-xmc.c:1371 +#: ../plug-ins/common/file-xmc.c:1365 #, c-format msgid "Comment is limited to %d characters." msgstr "コメントの字数は、 %d 字 (半角英数文字換算) までです。" -#: ../plug-ins/common/file-xmc.c:1489 +#: ../plug-ins/common/file-xmc.c:1483 #, c-format msgid "This plug-in can only handle RGBA image files with 8bit color depth." msgstr "" "このプラグインは、色深度が 8 ビットの RGBA 画像ファイルしか扱えません。" -#: ../plug-ins/common/file-xmc.c:1507 +#: ../plug-ins/common/file-xmc.c:1501 #, c-format msgid "Frame '%s' is too wide. Please reduce to no more than %dpx." msgstr "フレーム '%s' の幅が大きすぎます。(%d ピクセル以下にしてください。)" -#: ../plug-ins/common/file-xmc.c:1514 +#: ../plug-ins/common/file-xmc.c:1508 #, c-format msgid "Frame '%s' is too high. Please reduce to no more than %dpx." msgstr "フレーム '%s' の高さが大きすぎます。(%d ピクセル以下にしてください。)" -#: ../plug-ins/common/file-xmc.c:1521 +#: ../plug-ins/common/file-xmc.c:1515 #, c-format msgid "Width and/or height of frame '%s' is zero!" msgstr "フレーム '%s' の幅または高さ (または両方とも) がゼロです。" -#: ../plug-ins/common/file-xmc.c:1561 +#: ../plug-ins/common/file-xmc.c:1555 #, c-format msgid "" "Cannot save the cursor because the hot spot is not on frame '%s'.\n" @@ -5015,7 +5076,7 @@ msgstr "" "ホットスポットの位置を変更するか、レイヤーの位置を調整するか、[すべてのフレー" "ムの自動切り抜き] をオフにして保存し直してください。" -#: ../plug-ins/common/file-xmc.c:1718 +#: ../plug-ins/common/file-xmc.c:1712 #, c-format msgid "" "Your cursor was successfully saved but it contains one or more frames whose " @@ -5026,7 +5087,7 @@ msgstr "" "より大きく設定されているフレームを含んでいます。\n" "環境によってはスクリーンを混乱させるかもしれません。" -#: ../plug-ins/common/file-xmc.c:1725 +#: ../plug-ins/common/file-xmc.c:1719 msgid "" "Your cursor was successfully saved but it contains one or more frames whose " "nominal size is not supported by GNOME settings.\n" @@ -5039,7 +5100,7 @@ msgstr "" "は [サイズ指定済のものを含めた全フレームにこの値を適用する] を指定して保存し" "直してください。" -#: ../plug-ins/common/file-xmc.c:1962 +#: ../plug-ins/common/file-xmc.c:1956 #, c-format msgid "" "The parasite \"%s\" is too long for an X cursor comment. It was cut off to " @@ -5049,7 +5110,7 @@ msgstr "" "されました。" #. translators: the %i is *always* 8 here -#: ../plug-ins/common/file-xmc.c:2165 +#: ../plug-ins/common/file-xmc.c:2159 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -5062,37 +5123,37 @@ msgstr "" msgid "X PixMap image" msgstr "X PixMap 画像" -#: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:775 +#: ../plug-ins/common/file-xpm.c:364 ../plug-ins/common/file-xpm.c:776 #, c-format msgid "Error opening file '%s'" msgstr "ファイル '%s' のオープン中にエラー" -#: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:781 +#: ../plug-ins/common/file-xpm.c:370 ../plug-ins/common/file-xpm.c:782 msgid "XPM file invalid" msgstr "XPM ファイルが無効です" -#: ../plug-ins/common/file-xpm.c:807 +#: ../plug-ins/common/file-xpm.c:808 msgid "XPM" msgstr "XPM 形式" -#: ../plug-ins/common/file-xpm.c:817 +#: ../plug-ins/common/file-xpm.c:818 msgid "_Alpha threshold:" msgstr "アルファしきい値(_A):" -#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298 +#: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 msgid "X window dump" msgstr "X ウィンドウダンプ" -#: ../plug-ins/common/file-xwd.c:442 +#: ../plug-ins/common/file-xwd.c:446 #, c-format msgid "Could not read XWD header from '%s'" msgstr "'%s' から XWD ヘッダーが読めません" -#: ../plug-ins/common/file-xwd.c:480 +#: ../plug-ins/common/file-xwd.c:484 msgid "Can't read color entries" msgstr "色情報が読み込めません" -#: ../plug-ins/common/file-xwd.c:575 +#: ../plug-ins/common/file-xwd.c:581 #, c-format msgid "" "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " @@ -5101,15 +5162,20 @@ msgstr "" "XWD ファイル '%s' のヘッダーの指定 (形式: %d, 深度: %d, ピクセル当たりのビッ" "ト数: %d) は、現在は利用できません。" -#: ../plug-ins/common/file-xwd.c:598 +#: ../plug-ins/common/file-xwd.c:604 msgid "Cannot save images with alpha channels." msgstr "アルファチャンネルを持った画像は保存できません。" -#: ../plug-ins/common/file-xwd.c:2198 +#: ../plug-ins/common/file-xwd.c:1694 ../plug-ins/common/file-xwd.c:1932 +#, c-format +msgid "XWD-file %s is corrupt." +msgstr "XWD ファイル %s は壊れています" + +#: ../plug-ins/common/file-xwd.c:2226 msgid "Error during writing indexed/gray image" msgstr "インデックス/グレースケール画像保存中のエラー" -#: ../plug-ins/common/file-xwd.c:2294 +#: ../plug-ins/common/file-xwd.c:2322 msgid "Error during writing rgb image" msgstr "RGB 画像保存中のエラー" @@ -5273,7 +5339,7 @@ msgstr "彩度を下げる:" #: ../plug-ins/common/filter-pack.c:233 ../plug-ins/common/filter-pack.c:532 msgid "Current:" -msgstr "現在" +msgstr "現在:" #: ../plug-ins/common/filter-pack.c:317 msgid "Interactively modify the image colors" @@ -5770,150 +5836,150 @@ msgstr "それぞれのピースの端はまっすぐ" msgid "Each piece has curved sides" msgstr "それぞれのピースの端が丸めてある" -#: ../plug-ins/common/lcms.c:218 +#: ../plug-ins/common/lcms.c:229 msgid "Set a color profile on the image" msgstr "" "ICCカラープロファイルを画像に指定します。この操作では色の変換は行われません。" -#: ../plug-ins/common/lcms.c:225 +#: ../plug-ins/common/lcms.c:236 msgid "_Assign Color Profile..." msgstr "カラープロファイルの指定(_A)..." -#: ../plug-ins/common/lcms.c:241 +#: ../plug-ins/common/lcms.c:252 msgid "Assign default RGB Profile" msgstr "既定の RGB プロファイルを指定" -#: ../plug-ins/common/lcms.c:248 +#: ../plug-ins/common/lcms.c:259 msgid "Apply a color profile on the image" msgstr "現在のカラープロファイルから ICCカラープロファイルに変換します" -#: ../plug-ins/common/lcms.c:258 +#: ../plug-ins/common/lcms.c:269 msgid "_Convert to Color Profile..." msgstr "カラープロファイルの変換(_C)..." -#: ../plug-ins/common/lcms.c:276 +#: ../plug-ins/common/lcms.c:287 msgid "Convert to default RGB Profile" msgstr "既定の RGB プロファイルに変換" -#: ../plug-ins/common/lcms.c:290 +#: ../plug-ins/common/lcms.c:301 msgid "Image Color Profile Information" msgstr "画像のカラープロファイル情報" -#: ../plug-ins/common/lcms.c:304 +#: ../plug-ins/common/lcms.c:315 msgid "Color Profile Information" msgstr "カラープロファイル情報" -#: ../plug-ins/common/lcms.c:572 +#: ../plug-ins/common/lcms.c:656 #, c-format msgid "Color profile '%s' is not for RGB color space." msgstr "" "カラープロファイル '%s' は、RGB カラースペース用のプロファイルではありません" -#: ../plug-ins/common/lcms.c:679 +#: ../plug-ins/common/lcms.c:763 msgid "Default RGB working space" msgstr "既定の RGB 作業用スペース" -#: ../plug-ins/common/lcms.c:775 +#: ../plug-ins/common/lcms.c:865 msgid "" "Data attached as 'icc-profile' does not appear to be an ICC color profile" msgstr "" "'icc-profile' として付加されたデータは、ICCカラープロファイルのようではありま" "せん" -#: ../plug-ins/common/lcms.c:825 +#: ../plug-ins/common/lcms.c:915 #, c-format msgid "'%s' does not appear to be an ICC color profile" msgstr "ファイル '%s' は、ICCカラープロファイルではなさそうです" #. ICC color profile conversion -#: ../plug-ins/common/lcms.c:885 +#: ../plug-ins/common/lcms.c:975 #, c-format msgid "Converting from '%s' to '%s'" msgstr "%s から %s へ変換しています..." -#: ../plug-ins/common/lcms.c:1129 +#: ../plug-ins/common/lcms.c:1248 #, c-format msgid "Could not load ICC profile from '%s'" msgstr "'%s' から ICCカラープロファイルが読み込めません" # 実際の表示では、このメッセージの後に改行が入りカラープロファイル名が表示される。 # 「次の」を加えコロンを無くしたほうがダイアログ表示として体裁が良い。 -#: ../plug-ins/common/lcms.c:1151 +#: ../plug-ins/common/lcms.c:1270 #, c-format msgid "The image '%s' has an embedded color profile:" msgstr "画像 '%s' には次のカラープロファイルが埋め込まれています。" -#: ../plug-ins/common/lcms.c:1195 +#: ../plug-ins/common/lcms.c:1314 #, c-format msgid "Convert the image to the RGB working space (%s)?" msgstr "この画像のプロファイルを RGB 作業用スペース (%s) に変換しますか？" -#: ../plug-ins/common/lcms.c:1226 +#: ../plug-ins/common/lcms.c:1345 msgid "Convert to RGB working space?" msgstr "RGB 作業用スペースに変換しますか？" -#: ../plug-ins/common/lcms.c:1231 +#: ../plug-ins/common/lcms.c:1350 msgid "_Keep" msgstr "変換しない(_K)" -#: ../plug-ins/common/lcms.c:1236 +#: ../plug-ins/common/lcms.c:1355 msgid "_Convert" msgstr "変換(_C)" -#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436 +#: ../plug-ins/common/lcms.c:1383 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "次回から確認しない(_D)" -#: ../plug-ins/common/lcms.c:1328 +#: ../plug-ins/common/lcms.c:1450 msgid "Select destination profile" msgstr "カラープロファイルの選択" -#: ../plug-ins/common/lcms.c:1355 +#: ../plug-ins/common/lcms.c:1477 msgid "All files (*.*)" msgstr "すべてのファイル (*.*)" -#: ../plug-ins/common/lcms.c:1360 +#: ../plug-ins/common/lcms.c:1482 msgid "ICC color profile (*.icc, *.icm)" msgstr "ICC カラープロファイル(*.icc, *.icm)" -#: ../plug-ins/common/lcms.c:1403 +#: ../plug-ins/common/lcms.c:1526 #, c-format msgid "RGB workspace (%s)" msgstr "作業用スペース (%s)" -#: ../plug-ins/common/lcms.c:1453 +#: ../plug-ins/common/lcms.c:1576 msgid "Convert to ICC Color Profile" msgstr "ICC カラープロファイルに変換" -#: ../plug-ins/common/lcms.c:1454 +#: ../plug-ins/common/lcms.c:1577 msgid "Assign ICC Color Profile" msgstr "ICC カラープロファイルの指定" -#: ../plug-ins/common/lcms.c:1462 +#: ../plug-ins/common/lcms.c:1585 msgid "_Assign" msgstr "指定(_A)" -#: ../plug-ins/common/lcms.c:1480 +#: ../plug-ins/common/lcms.c:1603 msgid "Current Color Profile" msgstr "現在のカラープロファイル" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1618 msgid "Convert to" msgstr "変換後のカラープロファイル" -#: ../plug-ins/common/lcms.c:1495 +#: ../plug-ins/common/lcms.c:1618 msgid "Assign" msgstr "指定するカラープロファイル" -#: ../plug-ins/common/lcms.c:1519 +#: ../plug-ins/common/lcms.c:1642 msgid "_Rendering Intent:" msgstr "レンダリングインテント(_R):" -#: ../plug-ins/common/lcms.c:1535 +#: ../plug-ins/common/lcms.c:1658 msgid "_Black Point Compensation" msgstr "黒点を補正する(_B)" -#: ../plug-ins/common/lcms.c:1577 +#: ../plug-ins/common/lcms.c:1700 msgid "Destination profile is not for RGB color space." msgstr "指定のプロファイルは、RGBカラースペース用ではありません" @@ -6089,90 +6155,90 @@ msgstr "最大値チャンネルを残す(_H)" msgid "Ho_ld the minimal channels" msgstr "最小値チャンネルを残す(_L)" -#: ../plug-ins/common/mosaic.c:359 +#: ../plug-ins/common/mosaic.c:363 msgid "Convert the image into irregular tiles" msgstr "" "画像をモザイク画 (不揃いなタイルを寄せ集めて作られた画) のように変換します" # 「モザイク」から「モザイク画」に変更 # - 「ピクセル化」を「モザイク処理」に変更したので、それとの曖昧さを回避するため -#: ../plug-ins/common/mosaic.c:364 +#: ../plug-ins/common/mosaic.c:368 msgid "_Mosaic..." msgstr "モザイク画(_M)..." #. progress bar for gradient finding -#: ../plug-ins/common/mosaic.c:505 +#: ../plug-ins/common/mosaic.c:509 msgid "Finding edges" msgstr "輪郭を探しています" #. Progress bar for rendering tiles -#: ../plug-ins/common/mosaic.c:557 +#: ../plug-ins/common/mosaic.c:561 msgid "Rendering tiles" msgstr "タイルを描画しています" # 「モザイク」から「モザイク画」に変更 # - 「ピクセル化」を「モザイク処理」に変更したので、それとの曖昧さを回避するため -#: ../plug-ins/common/mosaic.c:590 +#: ../plug-ins/common/mosaic.c:594 msgid "Mosaic" msgstr "モザイク画" -#: ../plug-ins/common/mosaic.c:631 +#: ../plug-ins/common/mosaic.c:635 msgid "Squares" msgstr "四角形" -#: ../plug-ins/common/mosaic.c:632 +#: ../plug-ins/common/mosaic.c:636 msgid "Hexagons" msgstr "六角形" -#: ../plug-ins/common/mosaic.c:633 +#: ../plug-ins/common/mosaic.c:637 msgid "Octagons & squares" msgstr "八角形と四角形" -#: ../plug-ins/common/mosaic.c:634 +#: ../plug-ins/common/mosaic.c:638 msgid "Triangles" msgstr "三角形" -#: ../plug-ins/common/mosaic.c:642 +#: ../plug-ins/common/mosaic.c:646 msgid "_Tiling primitives:" msgstr "タイルの形状(_T):" -#: ../plug-ins/common/mosaic.c:650 +#: ../plug-ins/common/mosaic.c:654 msgid "Tile _size:" msgstr "タイルサイズ(_S):" -#: ../plug-ins/common/mosaic.c:662 ../plug-ins/common/tile-glass.c:304 +#: ../plug-ins/common/mosaic.c:666 ../plug-ins/common/tile-glass.c:304 msgid "Tile _height:" msgstr "タイル高(_H):" -#: ../plug-ins/common/mosaic.c:675 +#: ../plug-ins/common/mosaic.c:679 msgid "Til_e spacing:" msgstr "タイル間隔(_E):" -#: ../plug-ins/common/mosaic.c:687 +#: ../plug-ins/common/mosaic.c:691 msgid "Tile _neatness:" msgstr "タイル均整度(_N):" -#: ../plug-ins/common/mosaic.c:700 +#: ../plug-ins/common/mosaic.c:704 msgid "Light _direction:" msgstr "光の方向(_D):" -#: ../plug-ins/common/mosaic.c:712 +#: ../plug-ins/common/mosaic.c:716 msgid "Color _variation:" msgstr "色の種類(_V):" -#: ../plug-ins/common/mosaic.c:741 +#: ../plug-ins/common/mosaic.c:745 msgid "Co_lor averaging" msgstr "色の平均を取る(_L)" -#: ../plug-ins/common/mosaic.c:754 +#: ../plug-ins/common/mosaic.c:758 msgid "Allo_w tile splitting" msgstr "タイル分割を許可する(_W)" -#: ../plug-ins/common/mosaic.c:767 +#: ../plug-ins/common/mosaic.c:771 msgid "_Pitted surfaces" msgstr "へこんだ表面(_P)" -#: ../plug-ins/common/mosaic.c:780 +#: ../plug-ins/common/mosaic.c:784 msgid "_FG/BG lighting" msgstr "前景/背景 光源(_F)" @@ -6825,7 +6891,7 @@ msgstr "赤目除去" # 「閾（しきい）」が読めない、またはディスプレイ上で識別できない人がいる可能性があるため、敢えて「しきい値」とした #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -6996,83 +7062,83 @@ msgstr "サンプルを解析しています" msgid "Remap colorized" msgstr "色を置き換えています..." -#: ../plug-ins/common/screenshot.c:240 +#: ../plug-ins/common/screenshot.c:250 msgid "Create an image from an area of the screen" msgstr "スクリーンのすべて (または一部) で画像を生成します" -#: ../plug-ins/common/screenshot.c:253 +#: ../plug-ins/common/screenshot.c:272 msgid "_Screenshot..." msgstr "スクリーンショット(_S)..." -#: ../plug-ins/common/screenshot.c:418 +#: ../plug-ins/common/screenshot.c:445 msgid "Error selecting the window" msgstr "ウィンドウ選択中にエラーが発生しました。" -#: ../plug-ins/common/screenshot.c:786 +#: ../plug-ins/common/screenshot.c:813 msgid "Importing screenshot" msgstr "スクリーンショットを取り込んでいます..." -#: ../plug-ins/common/screenshot.c:812 ../plug-ins/common/screenshot.c:1085 +#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 msgid "Screenshot" msgstr "スクリーンショット" -#: ../plug-ins/common/screenshot.c:853 +#: ../plug-ins/common/screenshot.c:880 msgid "Mouse Pointer" msgstr "マウスポインター" -#: ../plug-ins/common/screenshot.c:972 +#: ../plug-ins/common/screenshot.c:1014 msgid "Specified window not found" msgstr "ウィンドウが指定されていません" -#: ../plug-ins/common/screenshot.c:1094 +#: ../plug-ins/common/screenshot.c:1213 msgid "S_nap" msgstr "スナップ(_N)" -#: ../plug-ins/common/screenshot.c:1124 +#: ../plug-ins/common/screenshot.c:1243 msgid "After the delay, the screenshot is taken." msgstr "指定した待ち時間の後にスクリーンショットが取り込まれます" -#: ../plug-ins/common/screenshot.c:1126 +#: ../plug-ins/common/screenshot.c:1245 msgid "" "After the delay, drag your mouse to select the region for the screenshot." msgstr "待ち時間経過後に取り込みたい範囲をドラッグしてください" -#: ../plug-ins/common/screenshot.c:1129 +#: ../plug-ins/common/screenshot.c:1248 msgid "At the end of the delay, click in a window to snap it." msgstr "待ち時間経過後に取り込みたいウィンドウをクリックしてください" #. Area -#: ../plug-ins/common/screenshot.c:1135 +#: ../plug-ins/common/screenshot.c:1254 msgid "Area" msgstr "取り込む範囲" -#: ../plug-ins/common/screenshot.c:1146 +#: ../plug-ins/common/screenshot.c:1265 msgid "Take a screenshot of a single _window" msgstr "単一ウィンドウ(_W)" -#: ../plug-ins/common/screenshot.c:1165 +#: ../plug-ins/common/screenshot.c:1284 msgid "Include window _decoration" msgstr "ウィンドウのデコレーションも含める(_D)" -#: ../plug-ins/common/screenshot.c:1185 +#: ../plug-ins/common/screenshot.c:1304 msgid "Take a screenshot of the entire _screen" msgstr "画面全体(_S)" -#: ../plug-ins/common/screenshot.c:1204 +#: ../plug-ins/common/screenshot.c:1323 msgid "Include _mouse pointer" msgstr "マウスポインターを含める(_M)" -#: ../plug-ins/common/screenshot.c:1225 +#: ../plug-ins/common/screenshot.c:1344 msgid "Select a _region to grab" msgstr "指定した範囲(_R)" #. Delay -#: ../plug-ins/common/screenshot.c:1240 +#: ../plug-ins/common/screenshot.c:1359 msgid "Delay" msgstr "取り込むまでの待ち時間" #. this is the unit label of a spinbutton -#: ../plug-ins/common/screenshot.c:1262 +#: ../plug-ins/common/screenshot.c:1381 msgid "seconds" msgstr "秒後に取り込み" @@ -7975,11 +8041,11 @@ msgstr "画像をシャープにします。最も良く使われる方法です msgid "_Unsharp Mask..." msgstr "アンシャープマスク(_U)..." -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "混ぜ合わせています" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "アンシャープマスク" @@ -8271,7 +8337,7 @@ msgstr "回り込み" msgid "Smear" msgstr "ぼかす" -#: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1020 +#: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1022 #: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1497 msgid "Black" msgstr "黒" @@ -8626,37 +8692,45 @@ msgstr "強さ(_S):" msgid "Higher values increase the magnitude of the effect" msgstr "値を大きくすると効果が大きくなります" -#: ../plug-ins/file-bmp/bmp-read.c:85 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "不正なカラーマップです" -#: ../plug-ins/file-bmp/bmp-read.c:169 ../plug-ins/file-bmp/bmp-read.c:180 -#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196 -#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:416 -#: ../plug-ins/file-bmp/bmp-read.c:437 ../plug-ins/file-bmp/bmp-read.c:448 -#: ../plug-ins/file-bmp/bmp-read.c:456 ../plug-ins/file-bmp/bmp-read.c:464 -#: ../plug-ins/file-bmp/bmp-read.c:476 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:232 +#: ../plug-ins/file-bmp/bmp-read.c:239 ../plug-ins/file-bmp/bmp-read.c:248 +#: ../plug-ins/file-bmp/bmp-read.c:263 ../plug-ins/file-bmp/bmp-read.c:445 +#: ../plug-ins/file-bmp/bmp-read.c:466 ../plug-ins/file-bmp/bmp-read.c:477 +#: ../plug-ins/file-bmp/bmp-read.c:485 ../plug-ins/file-bmp/bmp-read.c:493 +#: ../plug-ins/file-bmp/bmp-read.c:505 #, c-format msgid "'%s' is not a valid BMP file" msgstr "'%s' は正常な BMP ファイルではありません" -#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252 -#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345 -#: ../plug-ins/file-bmp/bmp-read.c:395 +#: ../plug-ins/file-bmp/bmp-read.c:277 ../plug-ins/file-bmp/bmp-read.c:304 +#: ../plug-ins/file-bmp/bmp-read.c:332 ../plug-ins/file-bmp/bmp-read.c:361 +#: ../plug-ins/file-bmp/bmp-read.c:391 ../plug-ins/file-bmp/bmp-read.c:425 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "'%s' から BMP ファイルヘッダー読み込み中にエラー発生" -#: ../plug-ins/file-bmp/bmp-read.c:588 +# TODO: 4:BI_ALPHABITFIELDS のサポート追加可能性あり。 ソースコード要注視。 +#: ../plug-ins/file-bmp/bmp-read.c:350 +#, c-format +msgid "Unsupported compression (%lu) in BMP file from '%s'" +msgstr "" +"ビットマップ画像ファイル %2$s の圧縮方式 (%1$lu) はサポート外です。\n" +"(0:BI_RGB, 1:BI_RLE8, 2:BI_RLE4, 3:BI_BITFIELDS のみサポート)" + +#: ../plug-ins/file-bmp/bmp-read.c:621 msgid "Unrecognized or invalid BMP compression format." msgstr "不明または無効な BMP 圧縮形式です" -#: ../plug-ins/file-bmp/bmp-read.c:630 +#: ../plug-ins/file-bmp/bmp-read.c:663 msgid "Unsupported or invalid bitdepth." msgstr "非対応または無効なビット深度です" -#: ../plug-ins/file-bmp/bmp-read.c:818 ../plug-ins/file-bmp/bmp-read.c:859 -#: ../plug-ins/file-bmp/bmp-read.c:909 +#: ../plug-ins/file-bmp/bmp-read.c:815 ../plug-ins/file-bmp/bmp-read.c:856 +#: ../plug-ins/file-bmp/bmp-read.c:906 msgid "The bitmap ends unexpectedly." msgstr "ビットマップ画像が途中で途切れています" @@ -8669,20 +8743,20 @@ msgid "Alpha channel will be ignored." msgstr "アルファチャンネルは無視されます" #. Run-Length Encoded -#: ../plug-ins/file-bmp/bmp-write.c:861 +#: ../plug-ins/file-bmp/bmp-write.c:864 msgid "_Run-Length Encoded" msgstr "RLE エンコード(_R)" #. Compatibility Options -#: ../plug-ins/file-bmp/bmp-write.c:874 +#: ../plug-ins/file-bmp/bmp-write.c:877 msgid "Co_mpatibility Options" msgstr "互換性のオプション(_M)" -#: ../plug-ins/file-bmp/bmp-write.c:884 +#: ../plug-ins/file-bmp/bmp-write.c:887 msgid "_Do not write color space information" msgstr "色空間の情報を書き込まない(_D)" -#: ../plug-ins/file-bmp/bmp-write.c:886 +#: ../plug-ins/file-bmp/bmp-write.c:889 msgid "" "Some applications can not read BMP images that include color space " "information. GIMP writes color space information by default. Enabling this " @@ -8693,19 +8767,19 @@ msgstr "" "ファイルへ書き込みますが、この設定をオンにした場合は書き込みません。" #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:902 ../plug-ins/file-jpeg/jpeg-save.c:901 +#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:924 msgid "_Advanced Options" msgstr "詳細設定(_A)" -#: ../plug-ins/file-bmp/bmp-write.c:917 +#: ../plug-ins/file-bmp/bmp-write.c:920 msgid "16 bits" msgstr "16 ビット" -#: ../plug-ins/file-bmp/bmp-write.c:953 +#: ../plug-ins/file-bmp/bmp-write.c:956 msgid "24 bits" msgstr "24 ビット" -#: ../plug-ins/file-bmp/bmp-write.c:970 +#: ../plug-ins/file-bmp/bmp-write.c:973 msgid "32 bits" msgstr "32 ビット" @@ -8713,19 +8787,19 @@ msgstr "32 ビット" msgid "Windows BMP image" msgstr "Windows BMP 画像" -#: ../plug-ins/file-compressor/file-compressor.c:162 +#: ../plug-ins/file-compressor/file-compressor.c:166 msgid "gzip archive" msgstr "gzip アーカイブ" -#: ../plug-ins/file-compressor/file-compressor.c:181 +#: ../plug-ins/file-compressor/file-compressor.c:185 msgid "bzip archive" msgstr "bzip アーカイブ" -#: ../plug-ins/file-compressor/file-compressor.c:388 +#: ../plug-ins/file-compressor/file-compressor.c:392 msgid "No sensible file extension, saving as compressed XCF." msgstr "拡張子が判別できません。 gzip 圧縮した xcf ファイルとして保存します。" -#: ../plug-ins/file-compressor/file-compressor.c:444 +#: ../plug-ins/file-compressor/file-compressor.c:448 msgid "No sensible file extension, attempting to load with file magic." msgstr "拡張子が判別できません。 file magic を使用して読み込みます。" @@ -8737,44 +8811,44 @@ msgstr "G3 fax 画像" msgid "Flexible Image Transport System" msgstr "Flexible Image Transport System" -#: ../plug-ins/file-fits/fits.c:368 +#: ../plug-ins/file-fits/fits.c:370 msgid "Error during open of FITS file" msgstr "FITS ファイルを開く際にエラーが発生しました。" -#: ../plug-ins/file-fits/fits.c:374 +#: ../plug-ins/file-fits/fits.c:376 msgid "FITS file keeps no displayable images" msgstr "FITS ファイル中に表示可能な画像がありません" -#: ../plug-ins/file-fits/fits.c:455 +#: ../plug-ins/file-fits/fits.c:457 msgid "FITS save cannot handle images with alpha channels" msgstr "FITS による保存はアルファチャンネルを持った画像を取り扱えません" -#: ../plug-ins/file-fits/fits.c:992 +#: ../plug-ins/file-fits/fits.c:994 msgid "Load FITS File" msgstr "FITS ファイル読込" -#: ../plug-ins/file-fits/fits.c:1016 +#: ../plug-ins/file-fits/fits.c:1018 msgid "Replacement for undefined pixels" msgstr "未定義のピクセルを置き換える色" -#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1323 +#: ../plug-ins/file-fits/fits.c:1023 ../plug-ins/gfig/gfig-dialog.c:1323 #: ../plug-ins/gfig/gfig-dialog.c:1498 msgid "White" msgstr "白" -#: ../plug-ins/file-fits/fits.c:1028 +#: ../plug-ins/file-fits/fits.c:1030 msgid "Pixel value scaling" msgstr "ピクセル値スケーリング" -#: ../plug-ins/file-fits/fits.c:1033 +#: ../plug-ins/file-fits/fits.c:1035 msgid "By DATAMIN/DATAMAX" msgstr "DATAMIN/DATAMAX で" -#: ../plug-ins/file-fits/fits.c:1040 +#: ../plug-ins/file-fits/fits.c:1042 msgid "Image Composing" msgstr "画像構成" -#: ../plug-ins/file-fits/fits.c:1044 +#: ../plug-ins/file-fits/fits.c:1046 msgctxt "composing" msgid "None" msgstr "なし" @@ -8783,30 +8857,30 @@ msgstr "なし" msgid "AutoDesk FLIC animation" msgstr "AutoDesk FLIC 動画" -#: ../plug-ins/file-fli/fli-gimp.c:561 +#: ../plug-ins/file-fli/fli-gimp.c:563 #, c-format msgid "Frame (%i)" msgstr "フレーム (%i)" -#: ../plug-ins/file-fli/fli-gimp.c:714 +#: ../plug-ins/file-fli/fli-gimp.c:716 msgid "Sorry, I can save only INDEXED and GRAY images." msgstr "インデックスもしくはグレースケール画像しか保存できません。" -#: ../plug-ins/file-fli/fli-gimp.c:847 +#: ../plug-ins/file-fli/fli-gimp.c:849 msgid "GFLI 1.3 - Load framestack" msgstr "GFLI 1.3 - フレームスタックの読み込み" -#: ../plug-ins/file-fli/fli-gimp.c:876 ../plug-ins/file-fli/fli-gimp.c:932 +#: ../plug-ins/file-fli/fli-gimp.c:878 ../plug-ins/file-fli/fli-gimp.c:934 msgctxt "frame-range" msgid "From:" msgstr "開始フレーム:" -#: ../plug-ins/file-fli/fli-gimp.c:885 ../plug-ins/file-fli/fli-gimp.c:941 +#: ../plug-ins/file-fli/fli-gimp.c:887 ../plug-ins/file-fli/fli-gimp.c:943 msgctxt "frame-range" msgid "To:" msgstr "終了フレーム:" -#: ../plug-ins/file-fli/fli-gimp.c:915 +#: ../plug-ins/file-fli/fli-gimp.c:917 msgid "GFLI 1.3" msgstr "GFLI 1.3" @@ -8857,7 +8931,7 @@ msgstr "圧縮(PNG)" msgid "Icon #%i" msgstr "アイコン #%i" -#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:691 +#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:696 #: ../plug-ins/file-psd/psd-thumb-load.c:84 #, c-format msgid "Opening thumbnail for '%s'" @@ -8885,80 +8959,81 @@ msgstr "" msgid "Would you like GIMP to rotate it into the standard orientation?" msgstr "(プレビューのように) 元の向きで開きますか？" -#: ../plug-ins/file-jpeg/jpeg-load.c:247 +#: ../plug-ins/file-jpeg/jpeg-load.c:252 msgid "JPEG preview" msgstr "JPEG プレビュー" -#: ../plug-ins/file-jpeg/jpeg-save.c:206 +#: ../plug-ins/file-jpeg/jpeg-save.c:215 #, c-format msgid "File size: %s" msgstr "ファイルサイズ: %s " -#: ../plug-ins/file-jpeg/jpeg-save.c:690 -msgid "Calculating file size..." -msgstr "ファイルサイズを計算しています..." - -#: ../plug-ins/file-jpeg/jpeg-save.c:782 ../plug-ins/file-jpeg/jpeg-save.c:877 +#: ../plug-ins/file-jpeg/jpeg-save.c:225 ../plug-ins/file-jpeg/jpeg-save.c:233 +#: ../plug-ins/file-jpeg/jpeg-save.c:805 ../plug-ins/file-jpeg/jpeg-save.c:900 msgid "File size: unknown" msgstr "ファイルサイズ: 不明" -#: ../plug-ins/file-jpeg/jpeg-save.c:840 +#: ../plug-ins/file-jpeg/jpeg-save.c:713 +msgid "Calculating file size..." +msgstr "ファイルサイズを計算しています..." + +#: ../plug-ins/file-jpeg/jpeg-save.c:863 msgid "JPEG" msgstr "JPEG 形式" -#: ../plug-ins/file-jpeg/jpeg-save.c:863 +#: ../plug-ins/file-jpeg/jpeg-save.c:886 msgid "_Quality:" msgstr "品質(_Q):" -#: ../plug-ins/file-jpeg/jpeg-save.c:867 +#: ../plug-ins/file-jpeg/jpeg-save.c:890 msgid "JPEG quality parameter" msgstr "JPEG 品質パラメーター" -#: ../plug-ins/file-jpeg/jpeg-save.c:886 +#: ../plug-ins/file-jpeg/jpeg-save.c:909 msgid "Enable preview to obtain the file size." msgstr "ファイル容量のプレビューを有効にします。" -#: ../plug-ins/file-jpeg/jpeg-save.c:889 +#: ../plug-ins/file-jpeg/jpeg-save.c:912 msgid "Sho_w preview in image window" msgstr "画像ウィンドウでプレビュー(_W)" -#: ../plug-ins/file-jpeg/jpeg-save.c:930 +#: ../plug-ins/file-jpeg/jpeg-save.c:953 msgid "S_moothing:" msgstr "スムージング(_M):" -#: ../plug-ins/file-jpeg/jpeg-save.c:943 +#: ../plug-ins/file-jpeg/jpeg-save.c:966 msgid "Interval (MCU rows):" msgstr "間隔 (MCU 数):" -#: ../plug-ins/file-jpeg/jpeg-save.c:960 +#: ../plug-ins/file-jpeg/jpeg-save.c:983 msgid "Use _restart markers" msgstr "リスタートマーカー(_R)" -#: ../plug-ins/file-jpeg/jpeg-save.c:976 +#: ../plug-ins/file-jpeg/jpeg-save.c:999 msgid "_Optimize" msgstr "最適化(_O)" -#: ../plug-ins/file-jpeg/jpeg-save.c:990 +#: ../plug-ins/file-jpeg/jpeg-save.c:1013 msgid "_Progressive" msgstr "プログレッシブ(_P)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1006 +#: ../plug-ins/file-jpeg/jpeg-save.c:1029 msgid "Save _EXIF data" msgstr "EXIF データの保存(_E)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1023 +#: ../plug-ins/file-jpeg/jpeg-save.c:1046 msgid "Save _thumbnail" msgstr "サムネイルの保存(_T)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1040 +#: ../plug-ins/file-jpeg/jpeg-save.c:1063 msgid "Save _XMP data" msgstr "XMP データの保存(_X)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1055 +#: ../plug-ins/file-jpeg/jpeg-save.c:1081 msgid "_Use quality settings from original image" msgstr "原画の品位設定を使用(_U)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1061 +#: ../plug-ins/file-jpeg/jpeg-save.c:1087 msgid "" "If the original image was loaded from a JPEG file using non-standard quality " "settings (quantization tables), enable this option to get almost the same " @@ -8969,53 +9044,53 @@ msgstr "" "イズで保存できます" #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1085 +#: ../plug-ins/file-jpeg/jpeg-save.c:1111 msgid "Su_bsampling:" msgstr "サブサンプリング(_B):" -#: ../plug-ins/file-jpeg/jpeg-save.c:1092 +#: ../plug-ins/file-jpeg/jpeg-save.c:1118 msgid "4:4:4 (best quality)" msgstr "4:4:4 (最高品質)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1094 +#: ../plug-ins/file-jpeg/jpeg-save.c:1120 msgid "4:2:2 horizontal (chroma halved)" msgstr "4:2:2 水平 (1/2 クロマ)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1096 +#: ../plug-ins/file-jpeg/jpeg-save.c:1122 msgid "4:2:2 vertical (chroma halved)" msgstr "4:2:2 垂直 (1/2 クロマ)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1098 +#: ../plug-ins/file-jpeg/jpeg-save.c:1124 msgid "4:2:0 (chroma quartered)" msgstr "4:2:0 (1/4 クロマ)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1128 +#: ../plug-ins/file-jpeg/jpeg-save.c:1154 msgid "_DCT method:" msgstr "DCT 変換方法(_D):" -#: ../plug-ins/file-jpeg/jpeg-save.c:1134 +#: ../plug-ins/file-jpeg/jpeg-save.c:1160 msgid "Fast Integer" msgstr "高速整数" -#: ../plug-ins/file-jpeg/jpeg-save.c:1135 +#: ../plug-ins/file-jpeg/jpeg-save.c:1161 msgid "Integer" msgstr "整数" -#: ../plug-ins/file-jpeg/jpeg-save.c:1136 +#: ../plug-ins/file-jpeg/jpeg-save.c:1162 msgid "Floating-Point" msgstr "浮動小数" -#: ../plug-ins/file-jpeg/jpeg-save.c:1152 +#: ../plug-ins/file-jpeg/jpeg-save.c:1178 msgid "Comment" msgstr "コメント" -#: ../plug-ins/file-jpeg/jpeg-save.c:1189 +#: ../plug-ins/file-jpeg/jpeg-save.c:1215 #: ../plug-ins/ui/plug-in-file-png.ui.h:11 msgid "_Load Defaults" msgstr "既定値の読み込み(_L)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1198 +#: ../plug-ins/file-jpeg/jpeg-save.c:1224 msgid "Sa_ve Defaults" msgstr "既定値として保存(_V)" @@ -9023,7 +9098,7 @@ msgstr "既定値として保存(_V)" msgid "JPEG image" msgstr "JPEG 画像" -#: ../plug-ins/file-jpeg/jpeg.c:303 +#: ../plug-ins/file-jpeg/jpeg.c:305 msgid "Export Preview" msgstr "エクスポートプレビュー" @@ -9063,7 +9138,7 @@ msgstr "カラーモード %s はサポートされていません" #: ../plug-ins/file-psd/psd-load.c:349 #, c-format msgid "Unsupported bit depth: %d" -msgstr "サポートされないビット深度です: %d bit" +msgstr "サポートされないビット深度 (%d bit) です。" #: ../plug-ins/file-psd/psd-load.c:383 ../plug-ins/file-psd/psd-load.c:393 #: ../plug-ins/file-psd/psd-load.c:625 ../plug-ins/file-psd/psd-load.c:834 @@ -9125,7 +9200,7 @@ msgstr "チャンネルサイズは無効またはサポートされない値で msgid "Photoshop image" msgstr "Photoshop 画像" -#: ../plug-ins/file-psd/psd-save.c:374 +#: ../plug-ins/file-psd/psd-save.c:375 #, c-format msgid "" "Unable to save layer with mode '%s'. Either the PSD file format or the save " @@ -9135,11 +9210,11 @@ msgstr "" "トしない) ので保存できません。このレイヤーモードを '標準' モードに換えて保存" "します。" -#: ../plug-ins/file-psd/psd-save.c:634 +#: ../plug-ins/file-psd/psd-save.c:635 msgid "Error: Can't convert GIMP base imagetype to PSD mode" msgstr "GIMP の画像タイプを PSD のモードに変換できません" -#: ../plug-ins/file-psd/psd-save.c:1622 +#: ../plug-ins/file-psd/psd-save.c:1623 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images that are " @@ -9148,7 +9223,7 @@ msgstr "" "'%s' を保存できません。 PSD 形式は、幅または高さが 30,000 ピクセルを超える画" "像をサポートしていません。" -#: ../plug-ins/file-psd/psd-save.c:1637 +#: ../plug-ins/file-psd/psd-save.c:1638 #, c-format msgid "" "Unable to save '%s'. The PSD file format does not support images with " @@ -9165,48 +9240,48 @@ msgstr "ファイルが途中で切れています" msgid "Silicon Graphics IRIS image" msgstr "Silicon Graphics IRIS 画像" -#: ../plug-ins/file-sgi/sgi.c:325 +#: ../plug-ins/file-sgi/sgi.c:327 #, c-format msgid "Could not open '%s' for reading." msgstr "'%s' を読み込み用に開けません" -#: ../plug-ins/file-sgi/sgi.c:343 +#: ../plug-ins/file-sgi/sgi.c:345 #, c-format msgid "Invalid width: %hu" msgstr "画像の幅 (%hu) は無効な値です。" -#: ../plug-ins/file-sgi/sgi.c:350 +#: ../plug-ins/file-sgi/sgi.c:352 #, c-format msgid "Invalid height: %hu" msgstr "画像の高さ (%hu) は無効な値です。" -#: ../plug-ins/file-sgi/sgi.c:357 +#: ../plug-ins/file-sgi/sgi.c:359 #, c-format msgid "Invalid number of channels: %hu" msgstr "チャンネル数 (%hu) は無効な値です" -#: ../plug-ins/file-sgi/sgi.c:571 +#: ../plug-ins/file-sgi/sgi.c:573 #, c-format msgid "Could not open '%s' for writing." msgstr "'%s' を書き込み用に開けません。" -#: ../plug-ins/file-sgi/sgi.c:652 +#: ../plug-ins/file-sgi/sgi.c:654 msgid "SGI" msgstr "SGI 形式" -#: ../plug-ins/file-sgi/sgi.c:654 +#: ../plug-ins/file-sgi/sgi.c:656 msgid "Compression type" msgstr "圧縮形式" -#: ../plug-ins/file-sgi/sgi.c:658 +#: ../plug-ins/file-sgi/sgi.c:660 msgid "No compression" msgstr "圧縮なし" -#: ../plug-ins/file-sgi/sgi.c:660 +#: ../plug-ins/file-sgi/sgi.c:662 msgid "RLE compression" msgstr "RLE 圧縮" -#: ../plug-ins/file-sgi/sgi.c:662 +#: ../plug-ins/file-sgi/sgi.c:664 msgid "" "Aggressive RLE\n" "(not supported by SGI)" @@ -9298,6 +9373,11 @@ msgstr "容量不明の画像データをダウンロードしています" msgid "URI" msgstr "URI" +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +msgid "Failed to save to temporary file '%s'" +msgstr "一時ファイル %s の保存に失敗しました" + #: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 msgid "GIMP compressed XJT image" msgstr "GIMP 圧縮 XJT 画像" @@ -11129,7 +11209,7 @@ msgstr "グラデーションフレアの削除" #: ../plug-ins/gradient-flare/gradient-flare.c:3277 #, c-format msgid "not found %s in gflares_list" -msgstr "%s が gflares_list 中に見付かりません" +msgstr "%s が gflares_list 中に見つかりません" #: ../plug-ins/gradient-flare/gradient-flare.c:3318 msgid "Gradient Flare Editor" @@ -11530,11 +11610,14 @@ msgid "Transformation %s" msgstr "変換 %s" #: ../plug-ins/ifs-compose/ifs-compose.c:2413 +#: ../plug-ins/metadata/interface.c:507 ../plug-ins/metadata/interface.c:517 msgid "Save failed" msgstr "保存失敗" #: ../plug-ins/ifs-compose/ifs-compose.c:2496 #: ../plug-ins/ifs-compose/ifs-compose.c:2509 +#: ../plug-ins/metadata/interface.c:413 ../plug-ins/metadata/interface.c:423 +#: ../plug-ins/metadata/interface.c:497 msgid "Open failed" msgstr "オープン失敗" @@ -12285,6 +12368,7 @@ msgid "Default _URL:" msgstr "デフォルト _URL:" #: ../plug-ins/imagemap/imap_settings.c:107 +#: ../plug-ins/metadata/interface.c:247 msgid "_Description:" msgstr "説明(_D):" @@ -12921,6 +13005,92 @@ msgstr "迷路(_M)..." msgid "Drawing maze" msgstr "迷路を描いています" +#: ../plug-ins/metadata/interface.c:110 +msgid "Property" +msgstr "属性" + +#: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 +msgid "Description" +msgstr "説明" + +#: ../plug-ins/metadata/interface.c:222 +msgid "Image _title:" +msgstr "画像のタイトル(_T):" + +#: ../plug-ins/metadata/interface.c:231 +msgid "_Author:" +msgstr "作者(_A):" + +#: ../plug-ins/metadata/interface.c:256 +msgid "Description _writer:" +msgstr "説明の著者(_W):" + +#: ../plug-ins/metadata/interface.c:272 +msgid "_Keywords:" +msgstr "キーワード(_K):" + +#. FIXME: add entries, cross-link with XMP model +#: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 +#: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 +msgid "Empty" +msgstr "何もありません" + +#: ../plug-ins/metadata/interface.c:286 +msgid "Copyright" +msgstr "著作権表示:" + +#: ../plug-ins/metadata/interface.c:298 +msgid "Origin" +msgstr "原画" + +#: ../plug-ins/metadata/interface.c:310 +msgid "Camera 1" +msgstr "カメラ 1" + +#: ../plug-ins/metadata/interface.c:322 +msgid "Camera 2" +msgstr "カメラ 2" + +#: ../plug-ins/metadata/interface.c:337 +msgid "Thumbnail" +msgstr "サムネイル" + +#: ../plug-ins/metadata/interface.c:356 +msgid "Advanced" +msgstr "詳細" + +#: ../plug-ins/metadata/interface.c:447 +msgid "Import XMP from File" +msgstr "XMP をファイルからインポート" + +#: ../plug-ins/metadata/interface.c:498 +msgid "Cannot create file" +msgstr "ファイルが作成できませんでした" + +#: ../plug-ins/metadata/interface.c:508 +msgid "Some error occurred while saving" +msgstr "保存中にエラー発生" + +#: ../plug-ins/metadata/interface.c:518 +msgid "Could not close the file" +msgstr "ファイルがクローズできませんでした" + +#: ../plug-ins/metadata/interface.c:540 +msgid "Export XMP to File" +msgstr "XMP をファイルにエクスポート" + +#: ../plug-ins/metadata/interface.c:607 +msgid "Image Properties" +msgstr "画像属性" + +#: ../plug-ins/metadata/interface.c:611 +msgid "_Import XMP..." +msgstr "XMP 読み込み(_I)..." + +#: ../plug-ins/metadata/interface.c:612 +msgid "_Export XMP..." +msgstr "XMP 書き出し(_E)..." + #: ../plug-ins/metadata/metadata.c:185 msgid "View and edit metadata (EXIF, IPTC, XMP)" msgstr "EXIF、IPTC、XMP 形式ファイルのメタデータの閲覧と編集を行います" @@ -12974,20 +13144,20 @@ msgstr "ここで要素 (<%s>) を入れ子にすることはできません" msgid "End of element <%s> not expected in this context" msgstr "ここで要素 <%s> が終了するのは変です" -#: ../plug-ins/metadata/xmp-parse.c:1140 +#: ../plug-ins/metadata/xmp-parse.c:1139 #, c-format msgid "The current element (<%s>) cannot contain text" msgstr "この要素 (<%s>) にはテキストを含められません" -#: ../plug-ins/metadata/xmp-parse.c:1165 +#: ../plug-ins/metadata/xmp-parse.c:1164 msgid "XMP packets must start with " msgstr "XMP パケットは で始まらなければなりません" -#: ../plug-ins/metadata/xmp-parse.c:1179 +#: ../plug-ins/metadata/xmp-parse.c:1178 msgid "XMP packets must end with " msgstr "XMP パケットは で終わらなければなりません" -#: ../plug-ins/metadata/xmp-parse.c:1192 +#: ../plug-ins/metadata/xmp-parse.c:1191 msgid "XMP cannot contain XML comments or processing instructions" msgstr "XMP には XML のコメントや処理命令を含められません" @@ -13102,23 +13272,31 @@ msgstr "垂直" msgid "Both" msgstr "両方" -#: ../plug-ins/print/print.c:89 +#: ../plug-ins/print/print.c:107 msgid "Print the image" msgstr "画像を印刷します" -#: ../plug-ins/print/print.c:94 +#: ../plug-ins/print/print.c:112 msgid "_Print..." msgstr "印刷(_P)..." -#: ../plug-ins/print/print.c:216 +#: ../plug-ins/print/print.c:124 +msgid "Adjust page size and orientation for printing" +msgstr "印刷用紙のサイズと向きを設定します" + +#: ../plug-ins/print/print.c:130 +msgid "Page Set_up" +msgstr "ページ設定(_U)" + +#: ../plug-ins/print/print.c:275 msgid "Image Settings" msgstr "画像の設定" -#: ../plug-ins/print/print.c:267 +#: ../plug-ins/print/print.c:373 msgid "An error occurred while trying to print:" msgstr "印刷準備中にエラーが発生しました。" -#: ../plug-ins/print/print.c:294 +#: ../plug-ins/print/print.c:400 msgid "Printing" msgstr "印刷しています" @@ -13184,23 +13362,6 @@ msgstr "スクリーンショット(_S)..." msgid "No data captured" msgstr "何も取り込まれませんでした" -#~ msgid "Adjust page size and orientation for printing" -#~ msgstr "印刷用紙のサイズと向きを設定します" - -#~ msgid "Page Set_up" -#~ msgstr "ページ設定(_U)" - -#~ msgid "" -#~ "Error starting Ghostscript. Make sure that Ghostscript is installed and - " -#~ "if necessary - use the environment variable GS_PROG to tell GIMP about " -#~ "its location.\n" -#~ "(%s)" -#~ msgstr "" -#~ "Ghostscript 起動時にエラーが発生しました。\n" -#~ "Ghostscript がインストールされているか確認し、必要ならば環境変数 " -#~ "'GS_PROG' に Ghostscript へのパスを設定してください。\n" -#~ "(%s)" - #~ msgid "The width of frame %d of '%s' is too big for X cursor." #~ msgstr "'%2$s' の 第 %1$d フレームの幅は X カーソルには大き過ぎます。" @@ -14106,8 +14267,8 @@ msgstr "何も取り込まれませんでした" #~ "A less-obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox." #~ "org / 1998-2000" #~ msgstr "" -#~ "ちょっと古い Adam D. Moss の作品 / adam@gimp.org / adam@foxbox.org / 1998-" -#~ "2000" +#~ "ちょっと古い Adam D. Moss の作品 / adam@gimp.org / adam@foxbox.org / " +#~ "1998-2000" #~ msgid "Gee-_Zoom" #~ msgstr "Gee-ズーム(_Z)" @@ -17322,8 +17483,7 @@ msgstr "何も取り込まれませんでした" #, fuzzy #~ msgid "" #~ "fractalexplorer-path misconfigured - the following folders were not found:" -#~ msgstr "" -#~ "fractalexplorer-path が不正です - 以下のディレクトリが見付かりません" +#~ msgstr "fractalexplorer-path が不正です - 以下のディレクトリが見つかりません" #~ msgid "Enable Tooltips" #~ msgstr "簡易説明を表示する" @@ -17354,7 +17514,7 @@ msgstr "何も取り込まれませんでした" #, fuzzy #~ msgid "gfig-path misconfigured - the following folders were not found:" -#~ msgstr "gfig-path は未設定です - 次のディレクトリが見付かりませんでした" +#~ msgstr "gfig-path は未設定です - 次のディレクトリが見つかりませんでした" #~ msgid "Show Tooltips" #~ msgstr "簡易説明を表示する" @@ -19784,66 +19944,6 @@ msgstr "何も取り込まれませんでした" #~ msgid "Copying IFS to image (%d/%d)" #~ msgstr "IFS を画像にコピーしています (%d/%d)" -#~ msgid "Property" -#~ msgstr "属性" - -#~ msgid "Description" -#~ msgstr "説明" - -#~ msgid "Image _title:" -#~ msgstr "画像のタイトル(_T):" - -#~ msgid "_Author:" -#~ msgstr "作者(_A):" - -#~ msgid "Description _writer:" -#~ msgstr "説明の著者(_W):" - -#~ msgid "Empty" -#~ msgstr "何もありません" - -#~ msgid "Copyright" -#~ msgstr "著作権表示:" - -#~ msgid "Camera 1" -#~ msgstr "カメラ 1" - -#~ msgid "Camera 2" -#~ msgstr "カメラ 2" - -#~ msgid "Thumbnail" -#~ msgstr "サムネイル" - -#~ msgid "Advanced" -#~ msgstr "詳細" - -#~ msgid "Import XMP from File" -#~ msgstr "XMP をファイルからインポート" - -#~ msgid "Cannot create file" -#~ msgstr "ファイルが作成できませんでした" - -#~ msgid "Some error occurred while saving" -#~ msgstr "保存中にエラー発生" - -#~ msgid "Could not close the file" -#~ msgstr "ファイルがクローズできませんでした" - -#~ msgid "Export XMP to File" -#~ msgstr "XMP をファイルにエクスポート" - -#~ msgid "Image Properties" -#~ msgstr "画像属性" - -#~ msgid "_Import XMP..." -#~ msgstr "XMP 読み込み(_I)..." - -#~ msgid "_Export XMP..." -#~ msgstr "XMP 書き出し(_E)..." - -#~ msgid "Dither algorithm:" -#~ msgstr "ディザーリングアルゴリズム:" - #~ msgid "Right border:" #~ msgstr "右縁:" diff --git a/po-plug-ins/lt.po b/po-plug-ins/lt.po index ca047df3b5..3696929e1b 100644 --- a/po-plug-ins/lt.po +++ b/po-plug-ins/lt.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: GIMP plug-ins HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-07 23:31+0000\n" -"PO-Revision-Date: 2013-03-17 20:09+0200\n" +"POT-Creation-Date: 2013-09-13 16:09+0000\n" +"PO-Revision-Date: 2013-09-13 22:27+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -23,126 +23,122 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Gtranslator 2.91.6\n" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:118 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" msgstr "Originalus" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:136 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:138 msgid "Rotated" msgstr "Pasuktas" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:154 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:156 msgid "Continuous update" msgstr "Nuolatinis atnaujinimas" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:167 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:169 msgid "Area:" msgstr "Sritis:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:171 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 msgid "Entire Layer" msgstr "Visas sluoksnis" #. Create selection -#: ../plug-ins/color-rotate/color-rotate-dialog.c:172 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:174 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "Pažymėjimas" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:173 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:175 msgid "Context" msgstr "Kontekstas" #. spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:297 -#| msgid "From:" +#: ../plug-ins/color-rotate/color-rotate-dialog.c:299 msgctxt "color-range" msgid "From:" msgstr "Nuo:" #. spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:323 -#| msgid "To:" +#: ../plug-ins/color-rotate/color-rotate-dialog.c:326 msgctxt "color-range" msgid "To:" msgstr "Iki:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:375 -#| msgid "From:" +#: ../plug-ins/color-rotate/color-rotate-dialog.c:377 msgctxt "color-rotate" msgid "From:" msgstr "Nuo:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:376 -#| msgid "To:" +#: ../plug-ins/color-rotate/color-rotate-dialog.c:378 msgctxt "color-rotate" msgid "To:" msgstr "Iki:" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:416 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:418 #: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Pilka" #. Gray: Circle: Spinbutton 1 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:464 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:466 msgid "Hue:" msgstr "Atspalvis:" #. Gray: Circle: Spinbutton 2 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:491 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:553 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:493 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:555 msgid "Saturation:" msgstr "Sodrumas:" #. * Gray: Operation-Mode * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:511 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:513 msgid "Gray Mode" msgstr "Pilkumo veiksena" #. Gray: Operation-Mode: two radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:520 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:522 msgid "Treat as this" msgstr "Laikyti šia" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:532 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:534 msgid "Change to this" msgstr "Pakeisti į šią" #. * Gray: What is gray? * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:545 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:547 msgid "Gray Threshold" msgstr "Pilkumo slenkstis" #. * Misc: Used unit selection * -#: ../plug-ins/color-rotate/color-rotate-dialog.c:585 -#: ../plug-ins/color-rotate/color-rotate-dialog.c:695 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:587 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:697 msgid "Units" msgstr "Vienetai" #. Misc: Used unit selection: 3 radio buttons -#: ../plug-ins/color-rotate/color-rotate-dialog.c:594 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:596 msgid "Radians" msgstr "Radianai" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:606 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:608 msgid "Radians/Pi" msgstr "Radianai/Pi" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:618 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:620 msgid "Degrees" msgstr "Laipsniai" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:649 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:651 msgid "Rotate Colors" msgstr "Pasukti spalvas" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:689 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:691 msgid "Main Options" msgstr "Pagrindinės parinktys" -#: ../plug-ins/color-rotate/color-rotate-dialog.c:692 +#: ../plug-ins/color-rotate/color-rotate-dialog.c:694 msgid "Gray Options" msgstr "Pilkumo parinktys" @@ -287,98 +283,97 @@ msgstr "_RGB spalvų modelis" msgid "_HSL color model" msgstr "_HSL spalvų modelis" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "Lygiuoti visus matomus paveikslėlio sluoksnius" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "Lygiuoti _matomus sluoksnius..." -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "Nepakanka lygiuojamų sluoksnių." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Lygiuoti matomus sluoksnius" -#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455 -#| msgid "None" +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "Nėra" -#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Surinkti" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Užpildyti (iš kairės į dešinę" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Užpildyti (iš dešinės į kairę)" -#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Kibti prie tinklelio" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "_Horizontalus stilius:" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Kairys kraštas" -#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Centras" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Dešinys kraštas" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "Ho_rizontalus pagrindas:" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Užpildyti (iš viršaus į apačią)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Užpildyti (iš apačios į viršų)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "_Vertikalus stilius:" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Viršutinis kraštas" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Apatinis kraštas" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "Ver_tikalus pagrindas:" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "_Tinklelio dydis:" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "_Ignoruoti apatinį sluoksnį, net jei jis matomas" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "_Naudoti (nematomą) apatinį sluoksnį kaip pagrindą" @@ -498,7 +493,6 @@ msgid "%d fps" msgstr "%d kps" #: ../plug-ins/common/animation-play.c:674 -#| msgid "Default frame delay:" msgid "Default framerate" msgstr "Numatytasis kadrų dažnis" @@ -617,14 +611,14 @@ msgstr "_Vertikali" #: ../plug-ins/common/file-gif-load.c:943 #: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 #: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:583 +#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:585 #: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:1005 +#: ../plug-ins/common/file-tga.c:1072 ../plug-ins/common/file-tiff-load.c:1010 #: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:391 ../plug-ins/file-bmp/bmp-read.c:658 -#: ../plug-ins/file-faxg3/faxg3.c:474 ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:255 ../plug-ins/file-jpeg/jpeg-load.c:819 +#: ../plug-ins/file-bmp/bmp-read.c:677 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:255 +#: ../plug-ins/file-jpeg/jpeg-load.c:819 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 #: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 #: ../plug-ins/gfig/gfig-dialog.c:1321 @@ -743,19 +737,16 @@ msgid "Blur Type" msgstr "Suliejimo tipas" #: ../plug-ins/common/blur-motion.c:1050 -#| msgid "_Linear" msgctxt "blur-type" msgid "_Linear" msgstr "_Tiesinis" #: ../plug-ins/common/blur-motion.c:1051 -#| msgid "_Radial" msgctxt "blur-type" msgid "_Radial" msgstr "_Radialinis" #: ../plug-ins/common/blur-motion.c:1052 -#| msgid "_Zoom" msgctxt "blur-type" msgid "_Zoom" msgstr "_Mastelis" @@ -805,7 +796,7 @@ msgstr "Paprastas suliejimas, greitas bet nelabai stiprus" msgid "_Blur" msgstr "_Suliejimas" -#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Suliejama" @@ -1025,7 +1016,7 @@ msgstr "Įkelti kanalų maišytuvo parametrus" #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 -#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:892 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 #: ../plug-ins/common/file-cel.c:296 ../plug-ins/common/file-cel.c:348 #: ../plug-ins/common/file-cel.c:579 ../plug-ins/common/file-dicom.c:340 #: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355 @@ -1033,7 +1024,7 @@ msgstr "Įkelti kanalų maišytuvo parametrus" #: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 #: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756 -#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1014 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1014 #: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717 #: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 @@ -1041,7 +1032,7 @@ msgstr "Įkelti kanalų maišytuvo parametrus" #: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:655 #: ../plug-ins/common/file-xmc.c:840 ../plug-ins/common/file-xwd.c:435 #: ../plug-ins/common/sphere-designer.c:2010 -#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:229 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 #: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 #: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 @@ -1064,17 +1055,17 @@ msgid "Save Channel Mixer Settings" msgstr "Išsaugoti kanalų maišytuvo parametrus" #: ../plug-ins/common/channel-mixer.c:1058 -#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:840 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 #: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407 -#: ../plug-ins/common/file-dicom.c:1351 ../plug-ins/common/file-gbr.c:663 -#: ../plug-ins/common/file-gif-save.c:782 ../plug-ins/common/file-gih.c:1258 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258 #: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 #: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 #: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526 -#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1010 +#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1012 #: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591 #: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565 -#: ../plug-ins/common/file-tga.c:1171 ../plug-ins/common/file-tiff-save.c:708 +#: ../plug-ins/common/file-tga.c:1179 ../plug-ins/common/file-tiff-save.c:708 #: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1447 #: ../plug-ins/common/file-xwd.c:623 ../plug-ins/common/sphere-designer.c:2121 #: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:476 @@ -1174,7 +1165,6 @@ msgid "sin^p, stepped" msgstr "sin^p, pakopinė" #: ../plug-ins/common/cml-explorer.c:166 -#| msgid "None" msgctxt "cml-composition" msgid "None" msgstr "Nėra" @@ -1667,7 +1657,6 @@ msgid "Color to Alpha" msgstr "Spalva į alfą" #: ../plug-ins/common/color-to-alpha.c:411 -#| msgid "From:" msgctxt "color-to-alpha" msgid "From:" msgstr "Nuo:" @@ -2151,35 +2140,35 @@ msgstr "Kanalai" msgid "Remove empty borders from the image" msgstr "Pašalinti tuščius paveikslėlio rėmelius" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "_Automatiškai apkirpti paveikslėlį" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "Pašalinti tuščius sluoksnio rėmelius" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "_Automatiškai apkirpti sluoksnį" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "Apkerpama" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "Automatiškai atkirpti nenaudojamą erdvę nuo kraštų ir vidurio" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "_Kruopštus apkirpimas" -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Kruopštus apkirpimas" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "Nėra ko apkirpti." @@ -2211,42 +2200,41 @@ msgstr "_Naudoti fono spalvą" msgid "Cubistic transformation" msgstr "Kubistinė transformacija" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "Sulenkti paveikslėlį naudojant dvi kontrolines kreives" -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "_Sulenkimas kreivėmis..." -#: ../plug-ins/common/curve-bend.c:684 ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." msgstr "" "Gali veikti tik sluoksniuose (tačiau buvo iškviesta kanalui arba kaukei)." -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "Negali veikti sluoksniuose su kaukėmis." -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "Negali veikti tuščiuose pažymėjimuose." -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format -#| msgid "Error while reading '%s'. File corrupted?" msgid "Error while reading '%s': %s" msgstr "Klaida skaitant „%s“: %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 ../plug-ins/common/curve-bend.c:2956 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "Kreivės linkis" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 +#: ../plug-ins/common/curve-bend.c:1261 #: ../plug-ins/gimpressionist/orientmap.c:590 #: ../plug-ins/gimpressionist/sizemap.c:459 #: ../plug-ins/print/print-page-layout.c:175 @@ -2254,116 +2242,116 @@ msgid "Preview" msgstr "Peržiūra" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "_Peržiūrėti kartą" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "A_utomatinė peržiūra" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 ../plug-ins/common/ripple.c:523 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 #: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "Parinktys" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "Pas_ukti:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "Išl_yginimas" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:729 #: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "_Glotninimas" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "Dirbti kopi_joje" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "Modifikuoti kreives" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "Krašto kreivė" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "_Viršutinio" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "_Apatinio" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "Kreivės tipas" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "L_ygi" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "_Laisva" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "_Kopijuoti" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "Kopijuoti aktyvią kreivę į kitą kraštą" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "_Veidrodis" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "Veidrodiniu principu atspindėti aktyvią kreivę į kitą kraštą" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "S_ukeisti" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "Sukeisti dvi kreives" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "Atstatyti aktyvią kreivę" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "Įkelti kreives iš failo" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "Išsaugoti kreives į failą" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "Įkelti kreivių taškus iš failo" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "Išsaugoti kreivių taškus į failą" @@ -2647,9 +2635,9 @@ msgstr "_Prisitaikantis" msgid "R_ecursive" msgstr "R_ekursinis" -#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:734 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 #: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2867,11 +2855,11 @@ msgstr "_Neonas..." msgid "Neon" msgstr "Neonas" -#: ../plug-ins/common/edge-neon.c:696 +#: ../plug-ins/common/edge-neon.c:697 msgid "Neon Detection" msgstr "Neono aptikimas" -#: ../plug-ins/common/edge-neon.c:749 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "_Kiekis:" @@ -3011,7 +2999,6 @@ msgstr "ASCII menas" #. Create the actual window. #: ../plug-ins/common/file-aa.c:349 -#| msgid "Texture" msgid "Text" msgstr "Tekstas" @@ -3030,7 +3017,6 @@ msgstr "Įkelti KISS paletę" #: ../plug-ins/common/file-cel.c:308 ../plug-ins/common/file-cel.c:363 #: ../plug-ins/common/file-cel.c:383 #, c-format -#| msgid "Error while reading '%s'. File corrupted?" msgid "EOF or error while reading image header" msgstr "EOF arba klaida skaitant paveikslėlio antraštę" @@ -3043,13 +3029,13 @@ msgstr "EOF arba klaida skaitant paveikslėlio antraštę" #: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 #: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 #: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:499 +#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:501 #: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716 #: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 #: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 #: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:667 #: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:526 -#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:213 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 #: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 #: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 @@ -3059,7 +3045,6 @@ msgstr "Atveriama „%s“" #: ../plug-ins/common/file-cel.c:391 #, c-format -#| msgid "'%s' is not a PCX file" msgid "is not a CEL image file" msgstr "nėra CEL paveikslėlio failas" @@ -3085,7 +3070,6 @@ msgstr "Negalima sukurti naujo paveikslėlio" #: ../plug-ins/common/file-cel.c:470 ../plug-ins/common/file-cel.c:505 #: ../plug-ins/common/file-cel.c:530 #, c-format -#| msgid "Error while reading '%s'. File corrupted?" msgid "EOF or error while reading image data" msgstr "EOF arba klaida skaitant paveikslėlio duomenis" @@ -3101,7 +3085,6 @@ msgstr "„%s“: EOF arba klaida skaitant paletės antraštę" #: ../plug-ins/common/file-cel.c:650 #, c-format -#| msgid "'%s' is not a PCX file" msgid "'%s': is not a KCF palette file" msgstr "„%s“: nėra KCF paletės failas" @@ -3112,7 +3095,6 @@ msgstr "„%s“: netinkama bpp vertė paletėje: %hhu" #: ../plug-ins/common/file-cel.c:668 #, c-format -#| msgid "Number of colors:" msgid "'%s': illegal number of colors: %u" msgstr "„%s“: netinkamas spalvų skaičius: %u" @@ -3125,12 +3107,12 @@ msgstr "„%s“: EOF arba klaida skaitant paletės duomenis" #. init the progress meter #. And let's begin the progress #: ../plug-ins/common/file-cel.c:777 ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:789 ../plug-ins/common/file-gih.c:1263 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1263 #: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 #: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1015 +#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1017 #: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1176 ../plug-ins/common/file-tiff-save.c:716 +#: ../plug-ins/common/file-tga.c:1184 ../plug-ins/common/file-tiff-save.c:716 #: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1452 #: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:628 #: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:481 @@ -3146,7 +3128,6 @@ msgid "C source code" msgstr "C pradinis kodas" #: ../plug-ins/common/file-csource.c:701 -#| msgid "Source 1:" msgid "C-Source" msgstr "C kodas" @@ -3214,12 +3195,12 @@ msgstr "Digital Imaging and Communications in Medicine paveikslėlis" msgid "'%s' is not a DICOM file." msgstr "„%s“ yra ne DICOM paveikslėlis." -#: ../plug-ins/common/file-dicom.c:1319 ../plug-ins/common/file-pcx.c:676 -#: ../plug-ins/common/file-pnm.c:1000 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676 +#: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "Negalima išsaugoti paveikslėlių su alfa kanalu." -#: ../plug-ins/common/file-dicom.c:1334 ../plug-ins/common/file-ps.c:1180 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180 #: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613 #: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." @@ -3259,7 +3240,6 @@ msgid "GIMP brushes are either GRAYSCALE or RGBA" msgstr "GIMP teptukai yra GRAYSCALE arba RGBA" #: ../plug-ins/common/file-gbr.c:770 -#| msgid "_Brush" msgid "Brush" msgstr "Teptukas" @@ -3316,12 +3296,12 @@ msgstr "" "GIF: Nedokumentuotas GIF komponavimo tipas %d nepalaikomas. Gali būti, kad " "animacija bus nerodoma arba išsisaugos nekorektiškai." -#: ../plug-ins/common/file-gif-save.c:468 +#: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." msgstr "" "Nepavyko paprastai sumažinti spalvų kiekio. Išsaugoma kaip nepermatomas." -#: ../plug-ins/common/file-gif-save.c:583 +#: ../plug-ins/common/file-gif-save.c:591 #, c-format msgid "" "Unable to save '%s'. The GIF file format does not support images that are " @@ -3330,7 +3310,7 @@ msgstr "" "Nepavyko išsaugoti „%s“. GIF failo formatas nepalaiko paveikslėlių, kurių " "ilgis arba plotis didesnis nei %d pikselių." -#: ../plug-ins/common/file-gif-save.c:694 +#: ../plug-ins/common/file-gif-save.c:704 msgid "" "The GIF format only supports comments in 7bit ASCII encoding. No comment is " "saved." @@ -3338,18 +3318,18 @@ msgstr "" "GIF formatas palaiko tik 7 bitų ASCII koduotės komentarus. Komentaras " "neišsaugotas." -#: ../plug-ins/common/file-gif-save.c:753 +#: ../plug-ins/common/file-gif-save.c:763 msgid "" "Cannot save RGB color images. Convert to indexed color or grayscale first." msgstr "" "Negalima išsaugoti RGB spalvų paveikslėlių. Pirma konvertuokite į indeksuotą " "spalvą arba pilkumo atspalvius." -#: ../plug-ins/common/file-gif-save.c:931 +#: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." msgstr "Įterpta delsa siekiant išvengti CPU resursus ryjančios animacijos." -#: ../plug-ins/common/file-gif-save.c:972 +#: ../plug-ins/common/file-gif-save.c:982 msgid "" "The image you are trying to save as a GIF contains layers which extend " "beyond the actual borders of the image." @@ -3357,7 +3337,7 @@ msgstr "" "Paveikslėlyje, kurį bandote išsaugoti kaip GIF yra sluoksniai išeinantys už " "paveikslėlio kraštų." -#: ../plug-ins/common/file-gif-save.c:989 +#: ../plug-ins/common/file-gif-save.c:999 msgid "" "The GIF file format does not allow this. You may choose whether to crop all " "of the layers to the image borders, or cancel this save." @@ -3365,13 +3345,12 @@ msgstr "" "GIF failo formatas to neleidžia. Galite pasirinkti arba apkirpti visus " "sluoksnius iki paveikslėlio kraštų arba atšaukti šį saugojimą." -#: ../plug-ins/common/file-gif-save.c:1125 +#: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" msgstr "GIF" -#: ../plug-ins/common/file-gif-save.c:1133 +#: ../plug-ins/common/file-gif-save.c:1143 #, c-format -#| msgid "Error loading desktop file '%s': %s" msgid "" "Error loading UI file '%s':\n" "%s" @@ -3379,19 +3358,19 @@ msgstr "" "Klaida įkeliant sąsajos failą „%s“:\n" "%s" -#: ../plug-ins/common/file-gif-save.c:1187 +#: ../plug-ins/common/file-gif-save.c:1197 msgid "I don't care" msgstr "Man nesvarbu" -#: ../plug-ins/common/file-gif-save.c:1189 +#: ../plug-ins/common/file-gif-save.c:1199 msgid "Cumulative layers (combine)" msgstr "Sudėtiniai sluoksniai (kombinuoti)" -#: ../plug-ins/common/file-gif-save.c:1191 +#: ../plug-ins/common/file-gif-save.c:1201 msgid "One frame per layer (replace)" msgstr "Viename sluoksnyje vienas kadras (pakeisti)" -#: ../plug-ins/common/file-gif-save.c:1208 +#: ../plug-ins/common/file-gif-save.c:1218 msgid "" "You can only export as animation when the image has more than one layer. The " "image you are trying to export only has one layer." @@ -3399,12 +3378,12 @@ msgstr "" "Galite eksportuoti kaip animaciją tik kai paveikslėlis turi daugiau nei " "vieną sluoksnį. Jūsų eksportuojamas paveikslėlis turi tik vieną sluoksnį." -#: ../plug-ins/common/file-gif-save.c:2312 +#: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." msgstr "Klaida rašant išvesties failą." #. translators: the %d is *always* 240 here -#: ../plug-ins/common/file-gif-save.c:2385 +#: ../plug-ins/common/file-gif-save.c:2395 #, c-format msgid "The default comment is limited to %d characters." msgstr "Numatytasis komentaras yra ribojamas iki %d simbolių." @@ -3426,7 +3405,6 @@ msgid "Couldn't load one brush in the pipe, giving up." msgstr "Nepavyko įkelti vieno teptuko konvejeryje, pasiduodu." #: ../plug-ins/common/file-gih.c:857 -#| msgid "Save as Brush Pipe" msgid "Brush Pipe" msgstr "Teptukų konvejeris" @@ -3591,7 +3569,6 @@ msgid "Cell-_padding:" msgstr "Langelius užpildanti erdvė:" #: ../plug-ins/common/file-html-table.c:619 -#| msgid "The amount of cellpadding." msgid "The amount of cell padding." msgstr "Langelius užpildančios erdvės dydis." @@ -3600,18 +3577,15 @@ msgid "Cell-_spacing:" msgstr "Erdvė tarp langelių:" #: ../plug-ins/common/file-html-table.c:632 -#| msgid "The amount of cellspacing." msgid "The amount of cell spacing." msgstr "Erdvės aplink langelius dydis." #: ../plug-ins/common/file-jp2-load.c:96 -#| msgid "JPEG image" msgid "JPEG 2000 image" msgstr "JPEG 2000 paveikslėlis" #: ../plug-ins/common/file-jp2-load.c:212 #, c-format -#| msgid "Could not interpret '%s'" msgid "Couldn't decode '%s'." msgstr "Nepavyko dekoduoti „%s“" @@ -3655,7 +3629,6 @@ msgstr "" #: ../plug-ins/common/file-jp2-load.c:309 #, c-format -#| msgid "The image '%s' has an embedded color profile:" msgid "The image '%s' is in an unknown color space." msgstr "Paveikslėlis „%s“ yra nežinomoje spalvų srityje." @@ -3689,7 +3662,6 @@ msgstr "" "nepermatomumas." #: ../plug-ins/common/file-mng.c:1335 -#| msgid "PNG" msgid "MNG" msgstr "MNG" @@ -3812,7 +3784,6 @@ msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Netinkama UTF-8 eilutė rašto faile „%s“." #: ../plug-ins/common/file-pat.c:553 -#| msgid "Pattern fill" msgid "Pattern" msgstr "Raštas" @@ -3830,13 +3801,13 @@ msgstr "Nepavyko perskaityti antraštės iš „%s“" msgid "'%s' is not a PCX file" msgstr "„%s“ nėra PCX failas" -#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:647 +#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:666 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Nepalaikomas arba netinkamas paveikslėlio plotis: %d" -#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:653 +#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:672 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -3848,7 +3819,6 @@ msgstr "Netinkamas baitų eilutėje skaičius PCX antraštėje" #: ../plug-ins/common/file-pcx.c:417 #, c-format -#| msgid "Image dimensions: %d × %d" msgid "Image dimensions too large: width %d x height %d" msgstr "Paveikslėlio matmenys per didelis: plotis %d x aukštis %d" @@ -3889,7 +3859,6 @@ msgstr "Portable Document Format" #: ../plug-ins/common/file-pdf-load.c:548 #: ../plug-ins/common/file-pdf-load.c:567 #, c-format -#| msgid "Could not write '%s': %s" msgid "Could not load '%s': %s" msgstr "Nepavyko įkelti „%s“: %s" @@ -3930,7 +3899,6 @@ msgstr "_Raiška:" #. Antialiasing #: ../plug-ins/common/file-pdf-load.c:1182 -#| msgid "_Antialiasing" msgid "Use _Anti-aliasing" msgstr "Naudoti _glotninimą" @@ -3942,7 +3910,6 @@ msgid "pixels/%a" msgstr "taškeliai/%a" #: ../plug-ins/common/file-pdf-save.c:305 -#| msgid "Create Guides..." msgid "_Create multipage PDF..." msgstr "Su_kurti daugelio puslapių PDF..." @@ -3984,12 +3951,10 @@ msgid "Keeping the masks will not change the output" msgstr "Kaukių išlaikymas nepakeis išvesties" #: ../plug-ins/common/file-pdf-save.c:810 -#| msgid "Separate to:" msgid "Save to:" msgstr "Įrašyti į:" #: ../plug-ins/common/file-pdf-save.c:814 -#| msgid "_RGB Noise..." msgid "Browse..." msgstr "Naršyti..." @@ -3998,12 +3963,10 @@ msgid "Multipage PDF export" msgstr "Daugelio puslapių PDF eksportas" #: ../plug-ins/common/file-pdf-save.c:848 -#| msgid "Deletes the selected Preset" msgid "Remove the selected pages" msgstr "Pašalinti pasirinktus puslapius" #: ../plug-ins/common/file-pdf-save.c:858 -#| msgid "Alias Pix image" msgid "Add this image" msgstr "Pridėti šį paveikslėlį" @@ -4043,7 +4006,6 @@ msgstr "PNG faile „%s“ yra nežinomas spalvų modelis." #: ../plug-ins/common/file-png.c:882 #, c-format -#| msgid "Could not create working folder '%s': %s" msgid "Could not create new image for '%s': %s" msgstr "Nepavyko sukurti naujo paveikslėlio „%s“: %s" @@ -4058,7 +4020,6 @@ msgid "Apply PNG Offset" msgstr "Pritaikyti PNG poslinkį" #: ../plug-ins/common/file-png.c:1242 -#| msgid "_Hole offset:" msgid "Ignore PNG offset" msgstr "Nepaisyti PNG poslinkio" @@ -4087,12 +4048,10 @@ msgstr "Klaida saugant „%s“. Paveikslėlio išsaugoti nepavyko." #: ../plug-ins/common/file-png.c:1968 #, c-format -#| msgid "Error loading desktop file '%s': %s" msgid "Error loading UI file '%s': %s" msgstr "Klaida įkeliant sąsajos failą „%s“: %s" #: ../plug-ins/common/file-png.c:1969 -#| msgid "Unknown reason" msgid "Unknown error" msgstr "Nežinoma klaida" @@ -4116,60 +4075,58 @@ msgstr "PGM paveikslėlis" msgid "PPM image" msgstr "PPM paveikslėlis" -#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550 -#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570 -#: ../plug-ins/common/file-pnm.c:656 ../plug-ins/common/file-pnm.c:738 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "Priešlaikinė failo pabaiga." -#: ../plug-ins/common/file-pnm.c:530 +#: ../plug-ins/common/file-pnm.c:532 msgid "Invalid file." msgstr "Netinkamas failas." -#: ../plug-ins/common/file-pnm.c:544 +#: ../plug-ins/common/file-pnm.c:546 msgid "File not in a supported format." msgstr "Failas nepalaikomo formato." -#: ../plug-ins/common/file-pnm.c:553 +#: ../plug-ins/common/file-pnm.c:555 msgid "Invalid X resolution." msgstr "Netinkama X raiška." -#: ../plug-ins/common/file-pnm.c:555 +#: ../plug-ins/common/file-pnm.c:557 msgid "Image width is larger than GIMP can handle." msgstr "Paveikslėlio plotis yra didesnis, negu GIMP gali apdoroti." -#: ../plug-ins/common/file-pnm.c:562 +#: ../plug-ins/common/file-pnm.c:564 msgid "Invalid Y resolution." msgstr "Netinkama Y raiška." -#: ../plug-ins/common/file-pnm.c:564 +#: ../plug-ins/common/file-pnm.c:566 msgid "Image height is larger than GIMP can handle." msgstr "Paveikslėlio aukštis yra didesnis, nei GIMP gali apdoroti." -#: ../plug-ins/common/file-pnm.c:574 +#: ../plug-ins/common/file-pnm.c:576 msgid "Unsupported maximum value." msgstr "Nepalaikoma didžiausia galima reikšmė." -#: ../plug-ins/common/file-pnm.c:814 +#: ../plug-ins/common/file-pnm.c:816 msgid "Error reading file." msgstr "Klaida skaitant failą." -#: ../plug-ins/common/file-pnm.c:1219 -#| msgid "PNG" +#: ../plug-ins/common/file-pnm.c:1221 msgid "PNM" msgstr "PNM" #. file save type -#: ../plug-ins/common/file-pnm.c:1222 +#: ../plug-ins/common/file-pnm.c:1224 msgid "Data formatting" msgstr "Duomenų formavimas" -#: ../plug-ins/common/file-pnm.c:1226 +#: ../plug-ins/common/file-pnm.c:1228 msgid "Raw" msgstr "Neapdorotas" -#: ../plug-ins/common/file-pnm.c:1227 -#| msgid "ASCII art" +#: ../plug-ins/common/file-pnm.c:1229 msgid "ASCII" msgstr "ASCII" @@ -4187,7 +4144,6 @@ msgstr "PDF dokumentas" #: ../plug-ins/common/file-ps.c:1027 #, c-format -#| msgid "Could not interpret '%s'" msgid "Could not interpret Postscript file '%s'" msgstr "Nepavyko interpretuoti Postscript failo „%s“" @@ -4196,7 +4152,7 @@ msgstr "Nepavyko interpretuoti Postscript failo „%s“" msgid "PostScript save cannot handle images with alpha channels" msgstr "Į PostScript negalima išsaugti paveikslėlių turinčių alfa kanalą" -#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1007 +#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1012 #, c-format msgid "Page %d" msgstr "%d puslapis" @@ -4272,7 +4228,6 @@ msgid "Text antialiasing" msgstr "Teksto glotninimas" #: ../plug-ins/common/file-ps.c:3113 ../plug-ins/common/file-ps.c:3125 -#| msgid "None" msgctxt "antialiasing" msgid "None" msgstr "Nėra" @@ -4290,7 +4245,6 @@ msgid "Graphic antialiasing" msgstr "Grafinis glotninimas" #: ../plug-ins/common/file-ps.c:3199 -#| msgid "Save as PostScript" msgid "PostScript" msgstr "PostScript" @@ -4365,7 +4319,6 @@ msgid "Data Compression" msgstr "Duomenų glaudinimas" #: ../plug-ins/common/file-psp.c:647 -#| msgid "None" msgctxt "compression" msgid "None" msgstr "Nėra" @@ -4443,7 +4396,6 @@ msgid "Pal_ette File:" msgstr "Pal_etės failas:" #: ../plug-ins/common/file-raw.c:1233 -#| msgid "Raw Image Save" msgid "Raw Image" msgstr "Neapdorotas paveikslėlis" @@ -4547,7 +4499,6 @@ msgid "EOF encountered on reading" msgstr "Skaitant aptikta EOF žyma" #: ../plug-ins/common/file-sunras.c:1627 -#| msgid "Save as SUNRAS" msgid "SUNRAS" msgstr "SUNRAS" @@ -4648,28 +4599,27 @@ msgstr "Nepavyko perskaityti „%s“ plėtinio" #: ../plug-ins/common/file-tga.c:485 #, c-format -#| msgid "Could not read header from '%s'" msgid "Cannot read header from '%s'" msgstr "Nepavyko perskaityti antraštės iš „%s“" -#: ../plug-ins/common/file-tga.c:1372 +#: ../plug-ins/common/file-tga.c:1380 msgid "TGA" msgstr "TGA" #. rle -#: ../plug-ins/common/file-tga.c:1381 +#: ../plug-ins/common/file-tga.c:1389 msgid "_RLE compression" msgstr "_RLE glaudinimas" -#: ../plug-ins/common/file-tga.c:1395 +#: ../plug-ins/common/file-tga.c:1403 msgid "Or_igin:" msgstr "P_radžia:" -#: ../plug-ins/common/file-tga.c:1399 +#: ../plug-ins/common/file-tga.c:1407 msgid "Bottom left" msgstr "Apačioje kairėje" -#: ../plug-ins/common/file-tga.c:1400 +#: ../plug-ins/common/file-tga.c:1408 msgid "Top left" msgstr "Viršuje kairėje" @@ -4688,16 +4638,16 @@ msgstr "TIFF „%s“ nėra jokių aplankų" msgid "Import from TIFF" msgstr "Importuoti iš TIFF" -#: ../plug-ins/common/file-tiff-load.c:788 +#: ../plug-ins/common/file-tiff-load.c:818 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-iš-%d-puslapių" -#: ../plug-ins/common/file-tiff-load.c:1023 +#: ../plug-ins/common/file-tiff-load.c:1028 msgid "TIFF Channel" msgstr "TIFF kanalas" -#: ../plug-ins/common/file-tiff-load.c:1032 +#: ../plug-ins/common/file-tiff-load.c:1037 #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" @@ -4892,7 +4842,6 @@ msgstr "" #: ../plug-ins/common/file-xmc.c:662 #, c-format -#| msgid "'%s' is not a valid BMP file" msgid "'%s' is not a valid X cursor." msgstr "„%s“ nėra tinkamas X žymiklis." @@ -4923,7 +4872,6 @@ msgstr "„%s“ yra per aukštas X žymikliui." #: ../plug-ins/common/file-xmc.c:1007 #, c-format -#| msgid "Write error occurred" msgid "A read error occurred." msgstr "Įvyko skaitymo klaida." @@ -4931,7 +4879,6 @@ msgstr "Įvyko skaitymo klaida." #. * parameter settings #. #: ../plug-ins/common/file-xmc.c:1049 -#| msgid "XBM Options" msgid "XMC Options" msgstr "XMC parinktys" @@ -4994,7 +4941,6 @@ msgstr "" "piešiamas." #: ../plug-ins/common/file-xmc.c:1199 -#| msgid "Delay" msgid "_Delay:" msgstr "_Delsa:" @@ -5016,7 +4962,6 @@ msgid "Enter copyright information." msgstr "Įveskite autorinių teisių informaciją." #: ../plug-ins/common/file-xmc.c:1244 -#| msgid "_Top-right" msgid "_Copyright:" msgstr "_Autorinės teisės:" @@ -5039,7 +4984,6 @@ msgstr "_Licencija:" #. We use gtk_text_view for "Other" while "Copyright" & "License" is entered #. * in gtk_entry because We want allow '\n' for "Other". #: ../plug-ins/common/file-xmc.c:1279 -#| msgid "O_thers" msgid "_Other:" msgstr "_Kita:" @@ -5049,7 +4993,6 @@ msgstr "Jei norite, įveskite kitus komentarus." #: ../plug-ins/common/file-xmc.c:1363 #, c-format -#| msgid "The default comment is limited to %d characters." msgid "Comment is limited to %d characters." msgstr "Komentaras yra ribojamas iki %d simbolių." @@ -5177,7 +5120,6 @@ msgstr "Negalima išsaugoti paveikslėlių su alfa kanalais." #: ../plug-ins/common/file-xwd.c:1692 ../plug-ins/common/file-xwd.c:1930 #, c-format -#| msgid "The file is corrupt!" msgid "XWD-file %s is corrupt." msgstr "XWD failas %s sugadintas." @@ -5561,7 +5503,6 @@ msgstr "Tinklelis" #. attach labels #: ../plug-ins/common/grid.c:719 -#| msgid "Horizontal" msgid "" "Horizontal\n" "Lines" @@ -5570,7 +5511,6 @@ msgstr "" "linijos" #: ../plug-ins/common/grid.c:721 -#| msgid "Vertical" msgid "" "Vertical\n" "Lines" @@ -6114,13 +6054,11 @@ msgid "_Filename:" msgstr "_Failo pavadinimas:" #: ../plug-ins/common/mail.c:456 -#| msgid "_To:" msgctxt "email-address" msgid "_To:" msgstr "_Kam:" #: ../plug-ins/common/mail.c:470 -#| msgid "_From:" msgctxt "email-address" msgid "_From:" msgstr "_Nuo:" @@ -6886,7 +6824,7 @@ msgid "Red Eye Removal" msgstr "Raudonų akių pašalinimas" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -7934,9 +7872,6 @@ msgid "Symbol" msgstr "Simbolis" #: ../plug-ins/common/unit-editor.c:104 -#| msgid "" -#| "The unit's symbol if it has one (e.g. \"'\" for inches). The unit's " -#| "abbreviation is used if doesn't have a symbol." msgid "" "The unit's symbol if it has one (e.g. \" for inches). The unit's " "abbreviation is used if doesn't have a symbol." @@ -8036,11 +7971,11 @@ msgstr "Naudingiausias paveikslėlio paryškinimo metodas" msgid "_Unsharp Mask..." msgstr "_Atryškinimo kaukė..." -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Sujungiama" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Atryškinimo kaukė" @@ -8451,12 +8386,10 @@ msgid "The operating system is out of memory or resources." msgstr "Operacinei sistemai trūksta atminties ar resursų." #: ../plug-ins/common/web-browser.c:138 -#| msgid "Specified layer %d not found" msgid "The specified file was not found." msgstr "Nurodytas failas nerastas." #: ../plug-ins/common/web-browser.c:141 -#| msgid "Specified layer %d not found" msgid "The specified path was not found." msgstr "Nurodytas kelias nerastas." @@ -8468,7 +8401,6 @@ msgstr "" "paveikslėlyje)." #: ../plug-ins/common/web-browser.c:147 -#| msgid "Save the current settings to the specified file" msgid "The operating system denied access to the specified file." msgstr "Operacinė sistema neleido prieiti prie nurodyto failo." @@ -8489,7 +8421,6 @@ msgid "The DDE transaction timed out." msgstr "Baigėsi DDE tranzakcijos laikas." #: ../plug-ins/common/web-browser.c:162 -#| msgid "Specified window not found" msgid "The specified DLL was not found." msgstr "Nurodytas DLL nerastas." @@ -8498,7 +8429,6 @@ msgid "There is no application associated with the given file name extension." msgstr "Nėra programos, susietos su nurodytu failo pavadinimo plėtiniu." #: ../plug-ins/common/web-browser.c:168 -#| msgid "There are not enough layers to align." msgid "There was not enough memory to complete the operation." msgstr "Veiksmui atlikti nepakako atminties." @@ -8507,33 +8437,27 @@ msgid "A sharing violation occurred." msgstr "Įvyko bendrinimo pažeidimas." #: ../plug-ins/common/web-browser.c:174 -#| msgid "Microsoft Windows icon" msgid "Unknown Microsoft Windows error." msgstr "Nežinoma Microsoft Windows klaida." #: ../plug-ins/common/web-browser.c:177 #, c-format -#| msgid "Failed to open GFlare file '%s': %s" msgid "Failed to open '%s': %s" msgstr "Nepavyko atverti „%s“: %s" #: ../plug-ins/common/web-page.c:98 -#| msgid "Create an image of a textured sphere" msgid "Create an image of a webpage" msgstr "Sukurti internetinio puslapio paveikslėlį" #: ../plug-ins/common/web-page.c:104 -#| msgid "From paper" msgid "From _Webpage..." msgstr "Iš _internetinio puslapio..." #: ../plug-ins/common/web-page.c:233 -#| msgid "Create rectangle" msgid "Create from webpage" msgstr "Sukurti iš internetinio puslapio" #: ../plug-ins/common/web-page.c:238 -#| msgid "Create" msgid "_Create" msgstr "Su_kurti" @@ -8547,7 +8471,6 @@ msgid "Width (pixels):" msgstr "Plotis (taškeliais):" #: ../plug-ins/common/web-page.c:308 -#| msgid "Step size:" msgid "Font size:" msgstr "Šrifto dydis:" @@ -8556,18 +8479,15 @@ msgid "Huge" msgstr "Milžiniškas" #: ../plug-ins/common/web-page.c:316 -#| msgid "Target" msgid "Large" msgstr "Didelis" #: ../plug-ins/common/web-page.c:317 -#| msgid "Default" msgctxt "web-page" msgid "Default" msgstr "Numatytasis" #: ../plug-ins/common/web-page.c:318 -#| msgid "Small Tiles" msgid "Small" msgstr "Mažas" @@ -8577,15 +8497,11 @@ msgstr "Miniatiūrinis" #: ../plug-ins/common/web-page.c:443 #, c-format -#| msgid "" -#| "'%s':\n" -#| "No image width specified" msgid "No URL was specified" msgstr "Nenurodytas URL plotis" #: ../plug-ins/common/web-page.c:510 #, c-format -#| msgid "Downloading image (%s of %s)" msgid "Downloading webpage '%s'" msgstr "Parsiunčiamas internetinis puslapis „%s“" @@ -8696,43 +8612,42 @@ msgstr "_Stiprumas:" msgid "Higher values increase the magnitude of the effect" msgstr "Didesnės reikšmės padidina efekto stiprumą" -#: ../plug-ins/file-bmp/bmp-read.c:86 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "Netinkama spalvų paletė" -#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:181 -#: ../plug-ins/file-bmp/bmp-read.c:188 ../plug-ins/file-bmp/bmp-read.c:197 -#: ../plug-ins/file-bmp/bmp-read.c:212 ../plug-ins/file-bmp/bmp-read.c:427 -#: ../plug-ins/file-bmp/bmp-read.c:448 ../plug-ins/file-bmp/bmp-read.c:459 -#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:475 -#: ../plug-ins/file-bmp/bmp-read.c:487 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:233 +#: ../plug-ins/file-bmp/bmp-read.c:240 ../plug-ins/file-bmp/bmp-read.c:249 +#: ../plug-ins/file-bmp/bmp-read.c:264 ../plug-ins/file-bmp/bmp-read.c:446 +#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:478 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:494 +#: ../plug-ins/file-bmp/bmp-read.c:506 #, c-format msgid "'%s' is not a valid BMP file" msgstr "„%s“ nėra tinkamas BMP failas" -#: ../plug-ins/file-bmp/bmp-read.c:226 ../plug-ins/file-bmp/bmp-read.c:253 -#: ../plug-ins/file-bmp/bmp-read.c:281 ../plug-ins/file-bmp/bmp-read.c:356 -#: ../plug-ins/file-bmp/bmp-read.c:406 +#: ../plug-ins/file-bmp/bmp-read.c:278 ../plug-ins/file-bmp/bmp-read.c:305 +#: ../plug-ins/file-bmp/bmp-read.c:333 ../plug-ins/file-bmp/bmp-read.c:362 +#: ../plug-ins/file-bmp/bmp-read.c:392 ../plug-ins/file-bmp/bmp-read.c:426 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "Klaida skaitant „%s“ BMP failo antraštę" -#: ../plug-ins/file-bmp/bmp-read.c:345 +#: ../plug-ins/file-bmp/bmp-read.c:351 #, c-format -#| msgid "Unsupported compression mode: %d" msgid "Unsupported compression (%lu) in BMP file from '%s'" msgstr "Nepalaikomas BPM failo glaudinimas (%lu) iš „%s“" -#: ../plug-ins/file-bmp/bmp-read.c:599 +#: ../plug-ins/file-bmp/bmp-read.c:618 msgid "Unrecognized or invalid BMP compression format." msgstr "Neatpažintas arba netinkamas BMP glaudinimo formatas." -#: ../plug-ins/file-bmp/bmp-read.c:641 +#: ../plug-ins/file-bmp/bmp-read.c:660 msgid "Unsupported or invalid bitdepth." msgstr "Nepalaikomas arba netinkamas bitų gylis." -#: ../plug-ins/file-bmp/bmp-read.c:829 ../plug-ins/file-bmp/bmp-read.c:870 -#: ../plug-ins/file-bmp/bmp-read.c:920 +#: ../plug-ins/file-bmp/bmp-read.c:812 ../plug-ins/file-bmp/bmp-read.c:853 +#: ../plug-ins/file-bmp/bmp-read.c:903 msgid "The bitmap ends unexpectedly." msgstr "Bitų planas netikėtai baigiasi." @@ -8752,7 +8667,6 @@ msgstr "_Run-Length užkoduotas" #. Compatibility Options #: ../plug-ins/file-bmp/bmp-write.c:877 -#| msgid "Table Options" msgid "Co_mpatibility Options" msgstr "_Suderinamumo parinktys" @@ -8855,7 +8769,6 @@ msgid "Image Composing" msgstr "Paveikslėlio komponavimas" #: ../plug-ins/file-fits/fits.c:1044 -#| msgid "None" msgctxt "composing" msgid "None" msgstr "Nėra" @@ -8878,13 +8791,11 @@ msgid "GFLI 1.3 - Load framestack" msgstr "GFLI 1.3 – Įkelti kadrus" #: ../plug-ins/file-fli/fli-gimp.c:876 ../plug-ins/file-fli/fli-gimp.c:932 -#| msgid "From:" msgctxt "frame-range" msgid "From:" msgstr "Nuo:" #: ../plug-ins/file-fli/fli-gimp.c:885 ../plug-ins/file-fli/fli-gimp.c:941 -#| msgid "To:" msgctxt "frame-range" msgid "To:" msgstr "Iki:" @@ -8894,7 +8805,6 @@ msgid "GFLI 1.3" msgstr "GFLI 1.3" #: ../plug-ins/file-ico/ico-dialog.c:53 -#| msgid "Save as Windows Icon" msgid "Windows Icon" msgstr "Windows piktograma" @@ -8972,7 +8882,6 @@ msgstr "JPEG peržiūra" #: ../plug-ins/file-jpeg/jpeg-save.c:206 #, c-format -#| msgid "_Tile size:" msgid "File size: %s" msgstr "Failo dydis: %s" @@ -8985,7 +8894,6 @@ msgid "File size: unknown" msgstr "Failo dydis: nežinomas" #: ../plug-ins/file-jpeg/jpeg-save.c:840 -#| msgid "_JPEG" msgid "JPEG" msgstr "JPEG" @@ -9057,7 +8965,6 @@ msgid "Su_bsampling:" msgstr "Po_imtis:" #: ../plug-ins/file-jpeg/jpeg-save.c:1095 -#| msgid "1x1,1x1,1x1 (best quality)" msgid "4:4:4 (best quality)" msgstr "4:4:4 (geriausia kokybė)" @@ -9114,16 +9021,11 @@ msgstr "Eksportavimo peržiūra" #: ../plug-ins/file-psd/psd-load.c:214 #: ../plug-ins/file-psd/psd-thumb-load.c:130 #, c-format -#| msgid "" -#| "Error loading PSD file:\n" -#| "\n" -#| "%s" msgid "Error loading PSD file: %s" msgstr "Klaida įkeliant PSD failą: %s" #: ../plug-ins/file-psd/psd-load.c:269 #, c-format -#| msgid "Not a valid photoshop document file" msgid "Not a valid Photoshop document file" msgstr "Netinkamas Photoshop dokumento failas" @@ -9139,7 +9041,6 @@ msgstr "Faile per daug kanalų: %d" #: ../plug-ins/file-psd/psd-load.c:310 #, c-format -#| msgid "Unsupported or invalid image width: %d" msgid "Unsupported or invalid image size: %dx%d" msgstr "Nepalaikomas arba netinkamas paveikslėlio dydis: %dx%d" @@ -9176,25 +9077,21 @@ msgstr "Nepalaikomas arba netinkamas sluoksnio plotis: %d" #: ../plug-ins/file-psd/psd-load.c:579 #, c-format -#| msgid "Unsupported or invalid layer width: %d" msgid "Unsupported or invalid layer size: %dx%d" msgstr "Nepalaikomas arba netinkamas sluoksnio dydis: %dx%d" #: ../plug-ins/file-psd/psd-load.c:763 #, c-format -#| msgid "Unsupported or invalid layer height: %d" msgid "Unsupported or invalid layer mask height: %d" msgstr "Nepalaikomas arba netinkamas kaukės aukštis: %d" #: ../plug-ins/file-psd/psd-load.c:771 #, c-format -#| msgid "Unsupported or invalid layer width: %d" msgid "Unsupported or invalid layer mask width: %d" msgstr "Nepalaikomas arba netinkamas kaukės plotis: %d" #: ../plug-ins/file-psd/psd-load.c:780 #, c-format -#| msgid "Unsupported or invalid layer width: %d" msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Nepalaikomas arba netinkamas kaukės dydis: %dx%d" @@ -9209,7 +9106,6 @@ msgstr "Papildoma" #: ../plug-ins/file-psd/psd-load.c:1881 #, c-format -#| msgid "Unsupported or invalid bitdepth." msgid "Unsupported or invalid channel size" msgstr "Nepalaikomas arba netinkamas kanalo dydis" @@ -9265,13 +9161,11 @@ msgstr "Nepavyko atverti „%s“ skaitymui." #: ../plug-ins/file-sgi/sgi.c:343 #, c-format -#| msgid "Invalid X offset: %d" msgid "Invalid width: %hu" msgstr "Netinkamas plotis: %hu" #: ../plug-ins/file-sgi/sgi.c:350 #, c-format -#| msgid "Invalid X offset: %d" msgid "Invalid height: %hu" msgstr "Netinkamas aukštis: %hu" @@ -9349,7 +9243,6 @@ msgstr "Atsiunčiama %s paveikslėlio duomenų" #: ../plug-ins/file-uri/uri-backend-libcurl.c:244 #, c-format -#| msgid "Opening '%s' for reading resulted in HTTP response code: %d" msgid "Opening '%s' for reading resulted in %s response code: %ld" msgstr "Atveriant „%s“ skaitymui gautas %s atsako kodas: %ld" @@ -9394,6 +9287,12 @@ msgstr "Atsiunčiamas nežinomas kiekis paveikslėlio duomenų" msgid "URI" msgstr "URI" +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +#| msgid "Failed to save PPM file '%s': %s" +msgid "Failed to save to temporary file '%s'" +msgstr "Nepavyko įrašyti laikinojo failo „%s“" + #: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 msgid "GIMP compressed XJT image" msgstr "GIMP suglaudintas XJT paveikslėlis" @@ -9672,7 +9571,6 @@ msgstr "" "įrašą kaip, pvz., (%s \"%s\")." #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:562 -#| msgid "_Fractal Explorer..." msgid "Fractal Explorer" msgstr "Fraktalų tyrinėtojas" @@ -9843,7 +9741,6 @@ msgstr "Sinusas" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1001 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1042 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1083 -#| msgid "None" msgctxt "color-function" msgid "None" msgstr "Nėra" @@ -10872,7 +10769,6 @@ msgid "_Size" msgstr "_Dydis" #: ../plug-ins/gimpressionist/size.c:108 -#| msgid "Sp_ike points:" msgid "Size variants:" msgstr "Dydžio variantai:" @@ -11001,7 +10897,6 @@ msgid "_GIF comment:" msgstr "_GIF komentaras:" #: ../plug-ins/ui/plug-in-file-gif.ui.h:3 -#| msgid "MNG animation" msgid "As _animation" msgstr "Kaip _animacija" @@ -12123,12 +12018,10 @@ msgid "Preferences" msgstr "Nustatymai" #: ../plug-ins/imagemap/imap_menu.c:169 -#| msgid "Move to Front" msgid "Move Area to Front" msgstr "Perkelti sritį į priekį" #: ../plug-ins/imagemap/imap_menu.c:171 -#| msgid "Move to Front" msgid "Move Area to Bottom" msgstr "Perkelti sritį žemyn" @@ -12305,7 +12198,6 @@ msgid "Selected:" msgstr "Pasirinkta:" #: ../plug-ins/imagemap/imap_preferences.c:442 -#| msgid "Iterations:" msgid "Interaction:" msgstr "Susikirtimas:" @@ -12472,7 +12364,6 @@ msgid "Color:" msgstr "Spalva:" #: ../plug-ins/lighting/lighting-ui.c:418 -#| msgid "None" msgctxt "light-source" msgid "None" msgstr "Nėra" @@ -12779,12 +12670,10 @@ msgid "Create new image" msgstr "Sukurti naują paveikslėlį" #: ../plug-ins/map-object/map-object-ui.c:483 -#| msgid "Create _new layer" msgid "Create new layer" msgstr "Sukurti naują sluoksnį" #: ../plug-ins/map-object/map-object-ui.c:494 -#| msgid "Create a new image when applying filter" msgid "Create a new layer when applying filter" msgstr "Pritaikant filtrą sukurti naują sluoksnį" @@ -12951,12 +12840,10 @@ msgid "Map to Object" msgstr "Piešti į objektą" #: ../plug-ins/map-object/map-object-ui.c:1375 -#| msgid "Show preview _wireframe" msgid "Show _wireframe" msgstr "Rodyti _karkasą" #: ../plug-ins/map-object/map-object-ui.c:1384 -#| msgid "Recompute preview image" msgid "Update preview _live" msgstr "Atnaujinti peržiūros pa_veikslėlį" @@ -13019,32 +12906,26 @@ msgid "Drawing maze" msgstr "Piešiamas labirintas" #: ../plug-ins/metadata/interface.c:110 -#| msgid "Properties" msgid "Property" msgstr "Savybė" #: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 -#| msgid "Description:" msgid "Description" msgstr "Aprašymas" #: ../plug-ins/metadata/interface.c:222 -#| msgid "Image _height:" msgid "Image _title:" msgstr "Paveikslėlio _pavadinimas:" #: ../plug-ins/metadata/interface.c:231 -#| msgid "Aut_hor:" msgid "_Author:" msgstr "_Autorius:" #: ../plug-ins/metadata/interface.c:256 -#| msgid "Description:" msgid "Description _writer:" msgstr "Aprašymo au_torius:" #: ../plug-ins/metadata/interface.c:272 -#| msgid "_Password:" msgid "_Keywords:" msgstr "_Raktažodžiai:" @@ -13055,72 +12936,58 @@ msgid "Empty" msgstr "Tuščia" #: ../plug-ins/metadata/interface.c:286 -#| msgid "_Top-right" msgid "Copyright" msgstr "Autorinės teisės" #: ../plug-ins/metadata/interface.c:298 -#| msgid "Original" msgid "Origin" msgstr "Originalas" #: ../plug-ins/metadata/interface.c:310 -#| msgid "C_amera" msgid "Camera 1" msgstr "Kamera 1" #: ../plug-ins/metadata/interface.c:322 -#| msgid "C_amera" msgid "Camera 2" msgstr "Kamera 2" #: ../plug-ins/metadata/interface.c:337 -#| msgid "Save _thumbnail" msgid "Thumbnail" msgstr "Miniatiūra" #: ../plug-ins/metadata/interface.c:356 -#| msgid "_Advanced" msgid "Advanced" msgstr "Sudėtingiau" #: ../plug-ins/metadata/interface.c:447 -#| msgid "Import from PDF" msgid "Import XMP from File" msgstr "Importuoti XMP iš failo" #: ../plug-ins/metadata/interface.c:498 -#| msgid "Can't create a new image" msgid "Cannot create file" msgstr "Nepavyksta sukurti failo" #: ../plug-ins/metadata/interface.c:508 -#| msgid "An error occurred while trying to print:" msgid "Some error occurred while saving" msgstr "Bandant įrašyti įvyko klaida" #: ../plug-ins/metadata/interface.c:518 -#| msgid "Couldn't save file:" msgid "Could not close the file" msgstr "Nepavyko užverti failo" #: ../plug-ins/metadata/interface.c:540 -#| msgid "Export Preview" msgid "Export XMP to File" msgstr "Eksportuoti XMP į failą" #: ../plug-ins/metadata/interface.c:607 -#| msgid "Properties" msgid "Image Properties" msgstr "Paveikslėlio savybės" #: ../plug-ins/metadata/interface.c:611 -#| msgid "_Import" msgid "_Import XMP..." msgstr "_Importuoti XMP..." #: ../plug-ins/metadata/interface.c:612 -#| msgid "CML _Explorer..." msgid "_Export XMP..." msgstr "_Eksportuoti XMP..." @@ -13129,7 +12996,6 @@ msgid "View and edit metadata (EXIF, IPTC, XMP)" msgstr "Rodyti ir keisti metaduomenis (EXIF, IPTC, XMP)" #: ../plug-ins/metadata/metadata.c:194 -#| msgid "Properties" msgid "Propert_ies" msgstr "Savy_bės" @@ -13290,7 +13156,6 @@ msgstr "C_entras:" #. if and how to center the image on the page #: ../plug-ins/print/print-page-layout.c:477 -#| msgid "None" msgctxt "center-mode" msgid "None" msgstr "Nėra" @@ -13396,4 +13261,3 @@ msgstr "_Ekrano nuotrauką..." #: ../plug-ins/win-snap/winsnap.c:1149 msgid "No data captured" msgstr "Duomenų nenufotografuota" - diff --git a/po-plug-ins/ru.po b/po-plug-ins/ru.po index 3bb4783e0e..95c76d3fd9 100644 --- a/po-plug-ins/ru.po +++ b/po-plug-ins/ru.po @@ -11,15 +11,18 @@ msgid "" msgstr "" "Project-Id-Version: GIMP Plug-Ins 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 11:18+0400\n" -"PO-Revision-Date: 2013-01-28 09:37+0300\n" +"POT-Creation-Date: 2013-08-17 14:23+0300\n" +"PO-Revision-Date: 2013-08-17 14:24+0300\n" "Last-Translator: Александр Прокудин \n" "Language-Team: русский \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"%100>=20) ? 1: 2);\n" +"X-Generator: Poedit 1.5.4\n" #: ../plug-ins/color-rotate/color-rotate-dialog.c:120 msgid "Original" @@ -43,8 +46,7 @@ msgstr "Весь слой" #. Create selection #: ../plug-ins/color-rotate/color-rotate-dialog.c:174 -#: ../plug-ins/common/film.c:965 -#: ../plug-ins/imagemap/imap_selection.c:339 +#: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:339 #: ../plug-ins/selection-to-path/selection-to-path.c:434 msgid "Selection" msgstr "Выделение" @@ -76,8 +78,7 @@ msgid "To:" msgstr "Конечное положение" #: ../plug-ins/color-rotate/color-rotate-dialog.c:418 -#: ../plug-ins/common/file-ps.c:3096 -#: ../plug-ins/imagemap/imap_menu.c:213 +#: ../plug-ins/common/file-ps.c:3096 ../plug-ins/imagemap/imap_menu.c:213 msgid "Gray" msgstr "Серый" @@ -259,23 +260,19 @@ msgstr "Чужое отображение: преобразование" msgid "Alien Map" msgstr "Чужое отображение" -#: ../plug-ins/common/alien-map.c:442 -#: ../plug-ins/common/alien-map.c:466 +#: ../plug-ins/common/alien-map.c:442 ../plug-ins/common/alien-map.c:466 #: ../plug-ins/common/alien-map.c:490 msgid "Number of cycles covering full value range" msgstr "Количество циклов, покрывающее все возможные значения" -#: ../plug-ins/common/alien-map.c:454 -#: ../plug-ins/common/alien-map.c:478 +#: ../plug-ins/common/alien-map.c:454 ../plug-ins/common/alien-map.c:478 #: ../plug-ins/common/alien-map.c:502 msgid "Phase angle, range 0-360" msgstr "Угол от 0 до 360" #. Propagate Mode -#: ../plug-ins/common/alien-map.c:516 -#: ../plug-ins/common/hot.c:613 -#: ../plug-ins/common/value-propagate.c:1121 -#: ../plug-ins/common/waves.c:279 +#: ../plug-ins/common/alien-map.c:516 ../plug-ins/common/hot.c:613 +#: ../plug-ins/common/value-propagate.c:1121 ../plug-ins/common/waves.c:279 msgid "Mode" msgstr "Режим" @@ -287,107 +284,105 @@ msgstr "_Цветовая модель RGB" msgid "_HSL color model" msgstr "Цветовая _модель HSL" -#: ../plug-ins/common/align-layers.c:128 +#: ../plug-ins/common/align-layers.c:158 msgid "Align all visible layers of the image" msgstr "Выровнять все видимые слои изображения" -#: ../plug-ins/common/align-layers.c:133 +#: ../plug-ins/common/align-layers.c:163 msgid "Align Visi_ble Layers..." msgstr "В_ыровнять видимые слои..." -#: ../plug-ins/common/align-layers.c:173 +#: ../plug-ins/common/align-layers.c:207 msgid "There are not enough layers to align." msgstr "Недостаточно слоев для выравнивания." -#: ../plug-ins/common/align-layers.c:400 +#: ../plug-ins/common/align-layers.c:627 msgid "Align Visible Layers" msgstr "Выровнять видимые слои" -#: ../plug-ins/common/align-layers.c:424 -#: ../plug-ins/common/align-layers.c:455 +#: ../plug-ins/common/align-layers.c:651 ../plug-ins/common/align-layers.c:682 msgctxt "align-style" msgid "None" msgstr "Ничего не делать" -#: ../plug-ins/common/align-layers.c:425 -#: ../plug-ins/common/align-layers.c:456 +#: ../plug-ins/common/align-layers.c:652 ../plug-ins/common/align-layers.c:683 msgid "Collect" msgstr "Собрать" -#: ../plug-ins/common/align-layers.c:426 +#: ../plug-ins/common/align-layers.c:653 msgid "Fill (left to right)" msgstr "Заполнить (слева направо)" -#: ../plug-ins/common/align-layers.c:427 +#: ../plug-ins/common/align-layers.c:654 msgid "Fill (right to left)" msgstr "Заполнить (справа налево)" -#: ../plug-ins/common/align-layers.c:428 -#: ../plug-ins/common/align-layers.c:459 +#: ../plug-ins/common/align-layers.c:655 ../plug-ins/common/align-layers.c:686 msgid "Snap to grid" msgstr "Прилипать к сетке" -#: ../plug-ins/common/align-layers.c:437 +#: ../plug-ins/common/align-layers.c:664 msgid "_Horizontal style:" msgstr "Действие по _горизонтали:" -#: ../plug-ins/common/align-layers.c:441 +#: ../plug-ins/common/align-layers.c:668 msgid "Left edge" msgstr "Левый край" -#: ../plug-ins/common/align-layers.c:442 -#: ../plug-ins/common/align-layers.c:472 +#: ../plug-ins/common/align-layers.c:669 ../plug-ins/common/align-layers.c:699 #: ../plug-ins/gradient-flare/gradient-flare.c:2712 msgid "Center" msgstr "Центр" -#: ../plug-ins/common/align-layers.c:443 +#: ../plug-ins/common/align-layers.c:670 msgid "Right edge" msgstr "Правый край" -#: ../plug-ins/common/align-layers.c:452 +#: ../plug-ins/common/align-layers.c:679 msgid "Ho_rizontal base:" msgstr "Горизонтальное о_снование:" -#: ../plug-ins/common/align-layers.c:457 +#: ../plug-ins/common/align-layers.c:684 msgid "Fill (top to bottom)" msgstr "Заполнить (сверху вниз)" -#: ../plug-ins/common/align-layers.c:458 +#: ../plug-ins/common/align-layers.c:685 msgid "Fill (bottom to top)" msgstr "Заполнить (снизу вверх)" -#: ../plug-ins/common/align-layers.c:468 +#: ../plug-ins/common/align-layers.c:695 msgid "_Vertical style:" msgstr "Действие по _вертикали:" -#: ../plug-ins/common/align-layers.c:471 +#: ../plug-ins/common/align-layers.c:698 msgid "Top edge" msgstr "Верхний край" -#: ../plug-ins/common/align-layers.c:473 +#: ../plug-ins/common/align-layers.c:700 msgid "Bottom edge" msgstr "Нижний край" -#: ../plug-ins/common/align-layers.c:482 +#: ../plug-ins/common/align-layers.c:709 msgid "Ver_tical base:" msgstr "В_ертикальное основание:" -#: ../plug-ins/common/align-layers.c:486 +#: ../plug-ins/common/align-layers.c:713 msgid "_Grid size:" msgstr "Размер _сетки:" -#: ../plug-ins/common/align-layers.c:495 +#: ../plug-ins/common/align-layers.c:722 msgid "_Ignore the bottom layer even if visible" msgstr "И_гнорировать нижний слой даже если он видим" -#: ../plug-ins/common/align-layers.c:505 +#: ../plug-ins/common/align-layers.c:732 msgid "_Use the (invisible) bottom layer as the base" msgstr "_Использовать (невидимый) нижний слой как основание" #: ../plug-ins/common/animation-optimize.c:132 msgid "Modify image to reduce size when saved as GIF animation" -msgstr "Изменяет изображение так, чтобы уменьшить размер файла для сохранения анимации в формате GIF" +msgstr "" +"Изменяет изображение так, чтобы уменьшить размер файла для сохранения " +"анимации в формате GIF" #: ../plug-ins/common/animation-optimize.c:144 msgid "Optimize (for _GIF)" @@ -552,8 +547,7 @@ msgstr "Применить холст" #. ***************************************************** #. radio buttons for choosing LEFT or RIGHT #. ************************************************* -#: ../plug-ins/common/apply-canvas.c:1293 -#: ../plug-ins/common/wind.c:943 +#: ../plug-ins/common/apply-canvas.c:1293 ../plug-ins/common/wind.c:943 #: ../plug-ins/lighting/lighting-ui.c:520 msgid "Direction" msgstr "Направление" @@ -574,10 +568,8 @@ msgstr "С_низу слева" msgid "Bottom-_right" msgstr "Снизу с_права" -#: ../plug-ins/common/apply-canvas.c:1325 -#: ../plug-ins/common/bump-map.c:922 -#: ../plug-ins/common/emboss.c:525 -#: ../plug-ins/common/fractal-trace.c:797 +#: ../plug-ins/common/apply-canvas.c:1325 ../plug-ins/common/bump-map.c:922 +#: ../plug-ins/common/emboss.c:525 ../plug-ins/common/fractal-trace.c:797 #: ../plug-ins/map-object/map-object-ui.c:527 msgid "_Depth:" msgstr "_Глубина:" @@ -599,68 +591,47 @@ msgid "Blinds" msgstr "Жалюзи" #. Orientation toggle box -#: ../plug-ins/common/blinds.c:258 -#: ../plug-ins/common/ripple.c:557 +#: ../plug-ins/common/blinds.c:258 ../plug-ins/common/ripple.c:557 msgid "Orientation" msgstr "Ориентация" -#: ../plug-ins/common/blinds.c:262 -#: ../plug-ins/common/ripple.c:561 -#: ../plug-ins/common/tile-small.c:434 -#: ../plug-ins/pagecurl/pagecurl.c:537 +#: ../plug-ins/common/blinds.c:262 ../plug-ins/common/ripple.c:561 +#: ../plug-ins/common/tile-small.c:434 ../plug-ins/pagecurl/pagecurl.c:537 msgid "_Horizontal" msgstr "По _горизонтали" -#: ../plug-ins/common/blinds.c:265 -#: ../plug-ins/common/ripple.c:564 -#: ../plug-ins/common/tile-small.c:444 -#: ../plug-ins/pagecurl/pagecurl.c:536 +#: ../plug-ins/common/blinds.c:265 ../plug-ins/common/ripple.c:564 +#: ../plug-ins/common/tile-small.c:444 ../plug-ins/pagecurl/pagecurl.c:536 msgid "_Vertical" msgstr "По _вертикали" #. #. * Create the "background" layer to hold the image... #. -#: ../plug-ins/common/blinds.c:279 -#: ../plug-ins/common/compose.c:936 -#: ../plug-ins/common/decompose.c:729 -#: ../plug-ins/common/file-cel.c:441 -#: ../plug-ins/common/file-cel.c:444 -#: ../plug-ins/common/file-dicom.c:612 +#: ../plug-ins/common/blinds.c:279 ../plug-ins/common/compose.c:936 +#: ../plug-ins/common/decompose.c:729 ../plug-ins/common/file-cel.c:441 +#: ../plug-ins/common/file-cel.c:444 ../plug-ins/common/file-dicom.c:612 #: ../plug-ins/common/file-gif-load.c:943 -#: ../plug-ins/common/file-jp2-load.c:354 -#: ../plug-ins/common/file-pcx.c:425 -#: ../plug-ins/common/file-pcx.c:431 -#: ../plug-ins/common/file-pix.c:382 -#: ../plug-ins/common/file-png.c:891 -#: ../plug-ins/common/file-pnm.c:585 -#: ../plug-ins/common/file-raw.c:763 -#: ../plug-ins/common/file-sunras.c:977 -#: ../plug-ins/common/file-tga.c:1072 -#: ../plug-ins/common/file-tiff-load.c:1010 -#: ../plug-ins/common/file-xbm.c:897 -#: ../plug-ins/common/film.c:745 -#: ../plug-ins/common/smooth-palette.c:257 -#: ../plug-ins/common/tile.c:262 -#: ../plug-ins/file-bmp/bmp-read.c:391 -#: ../plug-ins/file-bmp/bmp-read.c:658 -#: ../plug-ins/file-faxg3/faxg3.c:474 -#: ../plug-ins/file-fits/fits.c:530 -#: ../plug-ins/file-jpeg/jpeg-load.c:255 +#: ../plug-ins/common/file-jp2-load.c:354 ../plug-ins/common/file-pcx.c:425 +#: ../plug-ins/common/file-pcx.c:431 ../plug-ins/common/file-pix.c:382 +#: ../plug-ins/common/file-png.c:891 ../plug-ins/common/file-pnm.c:585 +#: ../plug-ins/common/file-raw.c:763 ../plug-ins/common/file-sunras.c:977 +#: ../plug-ins/common/file-tga.c:1072 ../plug-ins/common/file-tiff-load.c:1010 +#: ../plug-ins/common/file-xbm.c:897 ../plug-ins/common/film.c:745 +#: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:262 +#: ../plug-ins/file-bmp/bmp-read.c:677 ../plug-ins/file-faxg3/faxg3.c:474 +#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:255 #: ../plug-ins/file-jpeg/jpeg-load.c:819 #: ../plug-ins/file-psd/psd-image-res-load.c:1001 -#: ../plug-ins/file-psd/psd-load.c:1637 -#: ../plug-ins/file-sgi/sgi.c:407 +#: ../plug-ins/file-psd/psd-load.c:1637 ../plug-ins/file-sgi/sgi.c:407 #: ../plug-ins/gfig/gfig-dialog.c:1321 #: ../plug-ins/gimpressionist/general.c:139 -#: ../plug-ins/map-object/map-object-apply.c:252 -#: ../plug-ins/twain/twain.c:567 +#: ../plug-ins/map-object/map-object-apply.c:252 ../plug-ins/twain/twain.c:567 #: ../plug-ins/win-snap/winsnap.c:1162 msgid "Background" msgstr "Фон" -#: ../plug-ins/common/blinds.c:283 -#: ../plug-ins/common/fractal-trace.c:739 +#: ../plug-ins/common/blinds.c:283 ../plug-ins/common/fractal-trace.c:739 #: ../plug-ins/common/tile-paper.c:385 msgid "_Transparent" msgstr "П_розрачный" @@ -675,7 +646,8 @@ msgstr "_Число сегментов:" #: ../plug-ins/common/blur-gauss-selective.c:104 msgid "Blur neighboring pixels, but only in low-contrast areas" -msgstr "Размыть стоящие рядом точки, но только на участках с небольшим контрастом" +msgstr "" +"Размыть стоящие рядом точки, но только на участках с небольшим контрастом" #: ../plug-ins/common/blur-gauss-selective.c:115 msgid "_Selective Gaussian Blur..." @@ -687,16 +659,11 @@ msgid "Selective Gaussian Blur" msgstr "Выборочное Гауссово размывание" #: ../plug-ins/common/blur-gauss-selective.c:211 -#: ../plug-ins/common/blur-gauss.c:448 -#: ../plug-ins/common/cartoon.c:232 -#: ../plug-ins/common/edge-dog.c:269 -#: ../plug-ins/common/edge-neon.c:228 -#: ../plug-ins/common/edge-sobel.c:212 -#: ../plug-ins/common/photocopy.c:244 -#: ../plug-ins/common/pixelize.c:293 -#: ../plug-ins/common/softglow.c:224 -#: ../plug-ins/file-sgi/sgi.c:558 -#: ../plug-ins/file-xjt/xjt.c:1687 +#: ../plug-ins/common/blur-gauss.c:448 ../plug-ins/common/cartoon.c:232 +#: ../plug-ins/common/edge-dog.c:269 ../plug-ins/common/edge-neon.c:228 +#: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244 +#: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224 +#: ../plug-ins/file-sgi/sgi.c:558 ../plug-ins/file-xjt/xjt.c:1687 #: ../plug-ins/gradient-flare/gradient-flare.c:966 msgid "Cannot operate on indexed color images." msgstr "Невозможно использовать для работы с индексированными изображениями" @@ -717,15 +684,12 @@ msgstr "Наиболее простой способ размыть изобра msgid "_Gaussian Blur..." msgstr "_Гауссово размывание..." -#: ../plug-ins/common/blur-gauss.c:179 -#: ../plug-ins/common/blur-gauss.c:199 -#: ../plug-ins/common/blur-gauss.c:219 -#: ../plug-ins/common/blur-gauss.c:239 +#: ../plug-ins/common/blur-gauss.c:179 ../plug-ins/common/blur-gauss.c:199 +#: ../plug-ins/common/blur-gauss.c:219 ../plug-ins/common/blur-gauss.c:239 msgid "Apply a gaussian blur" msgstr "Применить Гауссово размывание" -#: ../plug-ins/common/blur-gauss.c:428 -#: ../plug-ins/common/blur-gauss.c:478 +#: ../plug-ins/common/blur-gauss.c:428 ../plug-ins/common/blur-gauss.c:478 msgid "Gaussian Blur" msgstr "Гауссово размывание" @@ -734,14 +698,12 @@ msgstr "Гауссово размывание" msgid "Blur Radius" msgstr "Радиус размывания" -#: ../plug-ins/common/blur-gauss.c:523 -#: ../plug-ins/common/jigsaw.c:2435 +#: ../plug-ins/common/blur-gauss.c:523 ../plug-ins/common/jigsaw.c:2435 #: ../plug-ins/common/noise-spread.c:385 msgid "_Horizontal:" msgstr "По _горизонтали:" -#: ../plug-ins/common/blur-gauss.c:527 -#: ../plug-ins/common/jigsaw.c:2452 +#: ../plug-ins/common/blur-gauss.c:527 ../plug-ins/common/jigsaw.c:2452 #: ../plug-ins/common/noise-spread.c:389 msgid "_Vertical:" msgstr "По _вертикали:" @@ -758,13 +720,11 @@ msgstr "_IIR" msgid "_RLE" msgstr "_RLE" -#: ../plug-ins/common/blur-motion.c:157 -#: ../plug-ins/common/blur-motion.c:171 +#: ../plug-ins/common/blur-motion.c:157 ../plug-ins/common/blur-motion.c:171 msgid "Simulate movement using directional blur" msgstr "Имитирует движение, используя размывание" -#: ../plug-ins/common/blur-motion.c:164 -#: ../plug-ins/common/blur-motion.c:177 +#: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177 msgid "_Motion Blur..." msgstr "Р_азмывание движением..." @@ -799,20 +759,16 @@ msgstr "_Наезд камерой" msgid "Blur Center" msgstr "Центр размывания" -#: ../plug-ins/common/blur-motion.c:1095 -#: ../plug-ins/common/lens-flare.c:764 -#: ../plug-ins/common/nova.c:454 -#: ../plug-ins/common/tile-paper.c:283 +#: ../plug-ins/common/blur-motion.c:1095 ../plug-ins/common/lens-flare.c:764 +#: ../plug-ins/common/nova.c:454 ../plug-ins/common/tile-paper.c:283 #: ../plug-ins/flame/flame.c:1250 #: ../plug-ins/gradient-flare/gradient-flare.c:2724 #: ../plug-ins/lighting/lighting-ui.c:479 msgid "_X:" msgstr "_X:" -#: ../plug-ins/common/blur-motion.c:1100 -#: ../plug-ins/common/lens-flare.c:769 -#: ../plug-ins/common/nova.c:459 -#: ../plug-ins/common/tile-paper.c:292 +#: ../plug-ins/common/blur-motion.c:1100 ../plug-ins/common/lens-flare.c:769 +#: ../plug-ins/common/nova.c:459 ../plug-ins/common/tile-paper.c:292 #: ../plug-ins/flame/flame.c:1264 #: ../plug-ins/gradient-flare/gradient-flare.c:2728 #: ../plug-ins/lighting/lighting-ui.c:494 @@ -832,8 +788,7 @@ msgstr "Параметры размывания" msgid "L_ength:" msgstr "_Длина:" -#: ../plug-ins/common/blur-motion.c:1139 -#: ../plug-ins/common/newsprint.c:992 +#: ../plug-ins/common/blur-motion.c:1139 ../plug-ins/common/newsprint.c:992 msgid "_Angle:" msgstr "_Угол:" @@ -845,14 +800,15 @@ msgstr "Простое размывание, быстрое, но не силь msgid "_Blur" msgstr "_Размывание" -#: ../plug-ins/common/blur.c:177 -#: ../plug-ins/common/unsharp-mask.c:582 +#: ../plug-ins/common/blur.c:177 ../plug-ins/common/unsharp-mask.c:589 msgid "Blurring" msgstr "Применяется размывание" #: ../plug-ins/common/border-average.c:99 msgid "Set foreground to the average color of the image border" -msgstr "Установить цвет переднего плана в значение, равное усредненному значению цвета границы изображения" +msgstr "" +"Установить цвет переднего плана в значение, равное усредненному значению " +"цвета границы изображения" #: ../plug-ins/common/border-average.c:104 msgid "_Border Average..." @@ -905,20 +861,17 @@ msgid "_Bump map:" msgstr "_Карта рельефа:" #. Map type menu -#: ../plug-ins/common/bump-map.c:841 -#: ../plug-ins/flame/flame.c:747 +#: ../plug-ins/common/bump-map.c:841 ../plug-ins/flame/flame.c:747 #: ../plug-ins/lighting/lighting-ui.c:845 msgid "Linear" msgstr "Линейный" -#: ../plug-ins/common/bump-map.c:842 -#: ../plug-ins/flame/flame.c:749 +#: ../plug-ins/common/bump-map.c:842 ../plug-ins/flame/flame.c:749 #: ../plug-ins/lighting/lighting-ui.c:848 msgid "Spherical" msgstr "Сферический" -#: ../plug-ins/common/bump-map.c:843 -#: ../plug-ins/flame/flame.c:748 +#: ../plug-ins/common/bump-map.c:843 ../plug-ins/flame/flame.c:748 #: ../plug-ins/lighting/lighting-ui.c:847 msgid "Sinusoidal" msgstr "Синусоидальный" @@ -942,8 +895,7 @@ msgstr "_Инвертировать рельеф" msgid "_Tile bumpmap" msgstr "_Повторяющийся рельеф" -#: ../plug-ins/common/bump-map.c:898 -#: ../plug-ins/common/emboss.c:501 +#: ../plug-ins/common/bump-map.c:898 ../plug-ins/common/emboss.c:501 msgid "_Azimuth:" msgstr "_Азимут:" @@ -951,18 +903,19 @@ msgstr "_Азимут:" msgid "_Elevation:" msgstr "_Возвышение:" -#: ../plug-ins/common/bump-map.c:936 -#: ../plug-ins/common/file-ps.c:3250 +#: ../plug-ins/common/bump-map.c:936 ../plug-ins/common/file-ps.c:3250 msgid "_X offset:" msgstr "_Смещение по X:" -#: ../plug-ins/common/bump-map.c:939 -#: ../plug-ins/common/bump-map.c:953 -msgid "The offset can be adjusted by dragging the preview using the middle mouse button." -msgstr "Смещение можно установить при помощи средней кнопки мыши, перемещая изображение предварительного просмотра." +#: ../plug-ins/common/bump-map.c:939 ../plug-ins/common/bump-map.c:953 +msgid "" +"The offset can be adjusted by dragging the preview using the middle mouse " +"button." +msgstr "" +"Смещение можно установить при помощи средней кнопки мыши, перемещая " +"изображение предварительного просмотра." -#: ../plug-ins/common/bump-map.c:950 -#: ../plug-ins/common/file-ps.c:3259 +#: ../plug-ins/common/bump-map.c:950 ../plug-ins/common/file-ps.c:3259 msgid "_Y offset:" msgstr "См_ещение по Y:" @@ -986,8 +939,7 @@ msgstr "_Комикс..." msgid "Cartoon" msgstr "Комикс" -#: ../plug-ins/common/cartoon.c:847 -#: ../plug-ins/common/photocopy.c:878 +#: ../plug-ins/common/cartoon.c:847 ../plug-ins/common/photocopy.c:878 msgid "_Mask radius:" msgstr "_Радиус маски:" @@ -1016,59 +968,44 @@ msgid "O_utput channel:" msgstr "К_анал вывода:" #. Redmode radio frame -#: ../plug-ins/common/channel-mixer.c:539 -#: ../plug-ins/common/decompose.c:174 +#: ../plug-ins/common/channel-mixer.c:539 ../plug-ins/common/decompose.c:174 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:993 msgid "Red" msgstr "Красный" #. Greenmode radio frame -#: ../plug-ins/common/channel-mixer.c:544 -#: ../plug-ins/common/decompose.c:175 +#: ../plug-ins/common/channel-mixer.c:544 ../plug-ins/common/decompose.c:175 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1034 msgid "Green" msgstr "Зеленый" #. Bluemode radio frame -#: ../plug-ins/common/channel-mixer.c:549 -#: ../plug-ins/common/decompose.c:176 +#: ../plug-ins/common/channel-mixer.c:549 ../plug-ins/common/decompose.c:176 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1075 msgid "Blue" msgstr "Синий" #: ../plug-ins/common/channel-mixer.c:584 -#: ../plug-ins/common/color-exchange.c:412 -#: ../plug-ins/common/compose.c:190 -#: ../plug-ins/common/compose.c:201 -#: ../plug-ins/common/diffraction.c:506 -#: ../plug-ins/common/diffraction.c:544 -#: ../plug-ins/common/diffraction.c:582 -#: ../plug-ins/common/noise-rgb.c:533 -#: ../plug-ins/common/noise-rgb.c:540 +#: ../plug-ins/common/color-exchange.c:412 ../plug-ins/common/compose.c:190 +#: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:506 +#: ../plug-ins/common/diffraction.c:544 ../plug-ins/common/diffraction.c:582 +#: ../plug-ins/common/noise-rgb.c:533 ../plug-ins/common/noise-rgb.c:540 msgid "_Red:" msgstr "_Красный:" #: ../plug-ins/common/channel-mixer.c:602 -#: ../plug-ins/common/color-exchange.c:468 -#: ../plug-ins/common/compose.c:191 -#: ../plug-ins/common/compose.c:202 -#: ../plug-ins/common/diffraction.c:515 -#: ../plug-ins/common/diffraction.c:553 -#: ../plug-ins/common/diffraction.c:591 -#: ../plug-ins/common/noise-rgb.c:534 -#: ../plug-ins/common/noise-rgb.c:541 +#: ../plug-ins/common/color-exchange.c:468 ../plug-ins/common/compose.c:191 +#: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:515 +#: ../plug-ins/common/diffraction.c:553 ../plug-ins/common/diffraction.c:591 +#: ../plug-ins/common/noise-rgb.c:534 ../plug-ins/common/noise-rgb.c:541 msgid "_Green:" msgstr "_Зеленый:" #: ../plug-ins/common/channel-mixer.c:621 -#: ../plug-ins/common/color-exchange.c:524 -#: ../plug-ins/common/compose.c:192 -#: ../plug-ins/common/compose.c:203 -#: ../plug-ins/common/diffraction.c:524 -#: ../plug-ins/common/diffraction.c:562 -#: ../plug-ins/common/diffraction.c:600 -#: ../plug-ins/common/noise-rgb.c:535 -#: ../plug-ins/common/noise-rgb.c:542 +#: ../plug-ins/common/color-exchange.c:524 ../plug-ins/common/compose.c:192 +#: ../plug-ins/common/compose.c:203 ../plug-ins/common/diffraction.c:524 +#: ../plug-ins/common/diffraction.c:562 ../plug-ins/common/diffraction.c:600 +#: ../plug-ins/common/noise-rgb.c:535 ../plug-ins/common/noise-rgb.c:542 msgid "_Blue:" msgstr "С_иний:" @@ -1086,56 +1023,34 @@ msgstr "Загрузить установки микшера каналов" #. stat error (file does not exist) #: ../plug-ins/common/channel-mixer.c:980 -#: ../plug-ins/common/cml-explorer.c:2208 -#: ../plug-ins/common/curve-bend.c:892 -#: ../plug-ins/common/file-cel.c:296 -#: ../plug-ins/common/file-cel.c:348 -#: ../plug-ins/common/file-cel.c:579 -#: ../plug-ins/common/file-dicom.c:340 -#: ../plug-ins/common/file-gbr.c:368 -#: ../plug-ins/common/file-gif-load.c:355 -#: ../plug-ins/common/file-gih.c:640 -#: ../plug-ins/common/file-jp2-load.c:194 -#: ../plug-ins/common/file-jp2-load.c:203 -#: ../plug-ins/common/file-mng.c:1156 -#: ../plug-ins/common/file-pat.c:337 -#: ../plug-ins/common/file-pcx.c:361 -#: ../plug-ins/common/file-pix.c:343 -#: ../plug-ins/common/file-png.c:756 -#: ../plug-ins/common/file-pnm.c:496 -#: ../plug-ins/common/file-ps.c:1014 -#: ../plug-ins/common/file-ps.c:2910 -#: ../plug-ins/common/file-psp.c:1717 -#: ../plug-ins/common/file-raw.c:256 -#: ../plug-ins/common/file-raw.c:711 -#: ../plug-ins/common/file-sunras.c:391 -#: ../plug-ins/common/file-svg.c:333 -#: ../plug-ins/common/file-svg.c:713 -#: ../plug-ins/common/file-tga.c:442 -#: ../plug-ins/common/file-xbm.c:737 -#: ../plug-ins/common/file-xmc.c:655 -#: ../plug-ins/common/file-xmc.c:840 -#: ../plug-ins/common/file-xwd.c:435 +#: ../plug-ins/common/cml-explorer.c:2208 ../plug-ins/common/curve-bend.c:891 +#: ../plug-ins/common/file-cel.c:296 ../plug-ins/common/file-cel.c:348 +#: ../plug-ins/common/file-cel.c:579 ../plug-ins/common/file-dicom.c:340 +#: ../plug-ins/common/file-gbr.c:368 ../plug-ins/common/file-gif-load.c:355 +#: ../plug-ins/common/file-gih.c:640 ../plug-ins/common/file-jp2-load.c:194 +#: ../plug-ins/common/file-jp2-load.c:203 ../plug-ins/common/file-mng.c:1156 +#: ../plug-ins/common/file-pat.c:337 ../plug-ins/common/file-pcx.c:361 +#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:756 +#: ../plug-ins/common/file-pnm.c:496 ../plug-ins/common/file-ps.c:1014 +#: ../plug-ins/common/file-ps.c:2910 ../plug-ins/common/file-psp.c:1717 +#: ../plug-ins/common/file-raw.c:256 ../plug-ins/common/file-raw.c:711 +#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333 +#: ../plug-ins/common/file-svg.c:713 ../plug-ins/common/file-tga.c:442 +#: ../plug-ins/common/file-xbm.c:737 ../plug-ins/common/file-xmc.c:655 +#: ../plug-ins/common/file-xmc.c:840 ../plug-ins/common/file-xwd.c:435 #: ../plug-ins/common/sphere-designer.c:2010 -#: ../plug-ins/file-bmp/bmp-read.c:154 -#: ../plug-ins/file-faxg3/faxg3.c:229 -#: ../plug-ins/file-fits/fits.c:358 -#: ../plug-ins/file-fli/fli-gimp.c:459 -#: ../plug-ins/file-fli/fli-gimp.c:496 -#: ../plug-ins/file-ico/ico-load.c:651 -#: ../plug-ins/file-ico/ico-load.c:729 -#: ../plug-ins/file-jpeg/jpeg-load.c:117 -#: ../plug-ins/file-jpeg/jpeg-load.c:889 -#: ../plug-ins/file-psd/psd-load.c:130 +#: ../plug-ins/file-bmp/bmp-read.c:206 ../plug-ins/file-faxg3/faxg3.c:229 +#: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:459 +#: ../plug-ins/file-fli/fli-gimp.c:496 ../plug-ins/file-ico/ico-load.c:651 +#: ../plug-ins/file-ico/ico-load.c:729 ../plug-ins/file-jpeg/jpeg-load.c:117 +#: ../plug-ins/file-jpeg/jpeg-load.c:889 ../plug-ins/file-psd/psd-load.c:130 #: ../plug-ins/file-psd/psd-thumb-load.c:79 #: ../plug-ins/file-uri/uri-backend-libcurl.c:193 -#: ../plug-ins/file-xjt/xjt.c:2529 -#: ../plug-ins/file-xjt/xjt.c:2537 +#: ../plug-ins/file-xjt/xjt.c:2529 ../plug-ins/file-xjt/xjt.c:2537 #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1865 #: ../plug-ins/fractal-explorer/fractal-explorer.c:923 -#: ../plug-ins/gfig/gfig.c:433 -#: ../plug-ins/help/gimphelplocale.c:222 +#: ../plug-ins/gfig/gfig.c:433 ../plug-ins/help/gimphelplocale.c:222 #: ../plug-ins/help/gimphelplocale.c:238 #: ../plug-ins/lighting/lighting-ui.c:1367 #, c-format @@ -1147,45 +1062,27 @@ msgid "Save Channel Mixer Settings" msgstr "Сохранить установки микшера каналов" #: ../plug-ins/common/channel-mixer.c:1058 -#: ../plug-ins/common/cml-explorer.c:2035 -#: ../plug-ins/common/curve-bend.c:840 -#: ../plug-ins/common/file-cel.c:772 -#: ../plug-ins/common/file-csource.c:407 -#: ../plug-ins/common/file-dicom.c:1351 -#: ../plug-ins/common/file-gbr.c:663 -#: ../plug-ins/common/file-gif-save.c:792 -#: ../plug-ins/common/file-gih.c:1258 -#: ../plug-ins/common/file-html-table.c:236 -#: ../plug-ins/common/file-mng.c:649 -#: ../plug-ins/common/file-mng.c:984 -#: ../plug-ins/common/file-pat.c:486 -#: ../plug-ins/common/file-pcx.c:712 -#: ../plug-ins/common/file-pix.c:526 -#: ../plug-ins/common/file-png.c:1358 -#: ../plug-ins/common/file-pnm.c:1012 -#: ../plug-ins/common/file-ps.c:1190 -#: ../plug-ins/common/file-raw.c:591 -#: ../plug-ins/common/file-raw.c:619 -#: ../plug-ins/common/file-sunras.c:565 -#: ../plug-ins/common/file-tga.c:1179 -#: ../plug-ins/common/file-tiff-save.c:708 -#: ../plug-ins/common/file-xbm.c:1036 -#: ../plug-ins/common/file-xmc.c:1447 -#: ../plug-ins/common/file-xwd.c:623 -#: ../plug-ins/common/sphere-designer.c:2121 -#: ../plug-ins/file-bmp/bmp-write.c:309 -#: ../plug-ins/file-fits/fits.c:476 -#: ../plug-ins/file-fli/fli-gimp.c:750 -#: ../plug-ins/file-ico/ico-save.c:1007 -#: ../plug-ins/file-jpeg/jpeg-save.c:332 -#: ../plug-ins/file-psd/psd-save.c:1652 +#: ../plug-ins/common/cml-explorer.c:2035 ../plug-ins/common/curve-bend.c:839 +#: ../plug-ins/common/file-cel.c:772 ../plug-ins/common/file-csource.c:407 +#: ../plug-ins/common/file-dicom.c:1371 ../plug-ins/common/file-gbr.c:663 +#: ../plug-ins/common/file-gif-save.c:792 ../plug-ins/common/file-gih.c:1258 +#: ../plug-ins/common/file-html-table.c:236 ../plug-ins/common/file-mng.c:649 +#: ../plug-ins/common/file-mng.c:984 ../plug-ins/common/file-pat.c:486 +#: ../plug-ins/common/file-pcx.c:712 ../plug-ins/common/file-pix.c:526 +#: ../plug-ins/common/file-png.c:1358 ../plug-ins/common/file-pnm.c:1012 +#: ../plug-ins/common/file-ps.c:1190 ../plug-ins/common/file-raw.c:591 +#: ../plug-ins/common/file-raw.c:619 ../plug-ins/common/file-sunras.c:565 +#: ../plug-ins/common/file-tga.c:1179 ../plug-ins/common/file-tiff-save.c:708 +#: ../plug-ins/common/file-xbm.c:1036 ../plug-ins/common/file-xmc.c:1447 +#: ../plug-ins/common/file-xwd.c:623 ../plug-ins/common/sphere-designer.c:2121 +#: ../plug-ins/file-bmp/bmp-write.c:309 ../plug-ins/file-fits/fits.c:476 +#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1007 +#: ../plug-ins/file-jpeg/jpeg-save.c:332 ../plug-ins/file-psd/psd-save.c:1652 #: ../plug-ins/file-uri/uri-backend-libcurl.c:166 -#: ../plug-ins/file-xjt/xjt.c:1276 -#: ../plug-ins/file-xjt/xjt.c:1715 +#: ../plug-ins/file-xjt/xjt.c:1276 ../plug-ins/file-xjt/xjt.c:1715 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1548 -#: ../plug-ins/gfig/gfig.c:797 -#: ../plug-ins/ifs-compose/ifs-compose.c:2408 +#: ../plug-ins/gfig/gfig.c:797 ../plug-ins/ifs-compose/ifs-compose.c:2408 #: ../plug-ins/lighting/lighting-ui.c:1223 #, c-format msgid "Could not open '%s' for writing: %s" @@ -1213,8 +1110,7 @@ msgstr "Создание шахматной доски" msgid "Checkerboard" msgstr "Шахматная доска" -#: ../plug-ins/common/checkerboard.c:413 -#: ../plug-ins/common/file-xmc.c:1154 +#: ../plug-ins/common/checkerboard.c:413 ../plug-ins/common/file-xmc.c:1154 #: ../plug-ins/gimpressionist/sizemap.c:510 msgid "_Size:" msgstr "_Размер:" @@ -1336,8 +1232,7 @@ msgstr "Мин. (x-d, -), (x < 0.5)" msgid "Min (x-d, -), (0.5 < x)" msgstr "Мин. (x-d, -), (0.5 < x)" -#: ../plug-ins/common/cml-explorer.c:200 -#: ../plug-ins/common/file-sunras.c:1635 +#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1635 msgid "Standard" msgstr "Обычный" @@ -1417,26 +1312,22 @@ msgstr "Случайное из зерна" msgid "Randoms from seed (shared)" msgstr "Случайное из зерна (shared)" -#: ../plug-ins/common/cml-explorer.c:300 -#: ../plug-ins/common/cml-explorer.c:308 +#: ../plug-ins/common/cml-explorer.c:300 ../plug-ins/common/cml-explorer.c:308 #: ../plug-ins/common/decompose.c:188 #: ../plug-ins/gimpressionist/orientation.c:179 #: ../plug-ins/gimpressionist/size.c:182 msgid "Hue" msgstr "Тон" -#: ../plug-ins/common/cml-explorer.c:301 -#: ../plug-ins/common/cml-explorer.c:309 +#: ../plug-ins/common/cml-explorer.c:301 ../plug-ins/common/cml-explorer.c:309 #: ../plug-ins/common/decompose.c:189 msgid "Saturation" msgstr "Насыщенность" -#: ../plug-ins/common/cml-explorer.c:302 -#: ../plug-ins/common/cml-explorer.c:310 +#: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310 #: ../plug-ins/common/decompose.c:190 #: ../plug-ins/gimpressionist/orientation.c:155 -#: ../plug-ins/gimpressionist/size.c:158 -#: ../plug-ins/metadata/interface.c:144 +#: ../plug-ins/gimpressionist/size.c:158 ../plug-ins/metadata/interface.c:144 msgid "Value" msgstr "Яркость" @@ -1472,8 +1363,7 @@ msgstr "Фикс.зерно" msgid "Random Seed" msgstr "Случайное зерно" -#: ../plug-ins/common/cml-explorer.c:1293 -#: ../plug-ins/common/filter-pack.c:702 +#: ../plug-ins/common/cml-explorer.c:1293 ../plug-ins/common/filter-pack.c:702 #: ../plug-ins/common/van-gogh-lic.c:675 msgid "_Hue" msgstr "_Тон" @@ -1482,8 +1372,7 @@ msgstr "_Тон" msgid "Sat_uration" msgstr "_Насыщенность" -#: ../plug-ins/common/cml-explorer.c:1301 -#: ../plug-ins/common/filter-pack.c:710 +#: ../plug-ins/common/cml-explorer.c:1301 ../plug-ins/common/filter-pack.c:710 msgid "_Value" msgstr "_Яркость" @@ -1511,8 +1400,7 @@ msgstr "Начало смещения:" msgid "Seed of Random (only for \"From Seed\" Modes)" msgstr "Случайное зерно (только для режима «из зерна»)" -#: ../plug-ins/common/cml-explorer.c:1377 -#: ../plug-ins/maze/maze-dialog.c:251 +#: ../plug-ins/common/cml-explorer.c:1377 ../plug-ins/maze/maze-dialog.c:251 msgid "Seed:" msgstr "Зерно:" @@ -1523,10 +1411,14 @@ msgstr "Переключиться в «из зерна» с последним #: ../plug-ins/common/cml-explorer.c:1402 msgid "" "\"Fix seed\" button is an alias of me.\n" -"The same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero." +"The same seed produces the same image, if (1) the widths of images are same " +"(this is the reason why image on drawable is different from preview), and " +"(2) all mutation rates equal to zero." msgstr "" "Кнопка «Фиксировать зерно» выполняет ту же функцию.\n" -"Одинаковые зерна производят одинаковые изображения, если (1) ширина изображений одинакова (по этой причине изображение и его предпросмотр различаются) и (2) скорости всех мутаций равны 0." +"Одинаковые зерна производят одинаковые изображения, если (1) ширина " +"изображений одинакова (по этой причине изображение и его предпросмотр " +"различаются) и (2) скорости всех мутаций равны 0." #: ../plug-ins/common/cml-explorer.c:1410 msgid "O_thers" @@ -1655,7 +1547,8 @@ msgstr "" #: ../plug-ins/common/cml-explorer.c:2241 #, c-format msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer." -msgstr "Внимание: '%s' является файлом параметров для более новой версии CML Explorer" +msgstr "" +"Внимание: '%s' является файлом параметров для более новой версии CML Explorer" #: ../plug-ins/common/cml-explorer.c:2304 msgid "Error: failed to load parameters" @@ -1859,49 +1752,46 @@ msgid "Rearrange Colormap" msgstr "Перестроить цветовую карту" #: ../plug-ins/common/colormap-remap.c:700 -msgid "Drag and drop colors to rearrange the colormap. The numbers shown are the original indices. Right-click for a menu with sort options." -msgstr "Используйте функцию drag-n-drop чтобы перераспределить карту. Номерам обозначается оригинальный индекс цвета. Меню сортировки цветов вызывается правой кнопкой мыши." +msgid "" +"Drag and drop colors to rearrange the colormap. The numbers shown are the " +"original indices. Right-click for a menu with sort options." +msgstr "" +"Используйте функцию drag-n-drop чтобы перераспределить карту. Номерам " +"обозначается оригинальный индекс цвета. Меню сортировки цветов вызывается " +"правой кнопкой мыши." -#: ../plug-ins/common/compose.c:189 -#: ../plug-ins/common/decompose.c:170 +#: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170 #: ../plug-ins/common/file-raw.c:1100 msgid "RGB" msgstr "RGB" -#: ../plug-ins/common/compose.c:200 -#: ../plug-ins/common/decompose.c:178 +#: ../plug-ins/common/compose.c:200 ../plug-ins/common/decompose.c:178 msgid "RGBA" msgstr "RGBA" -#: ../plug-ins/common/compose.c:204 -#: ../plug-ins/common/noise-rgb.c:528 +#: ../plug-ins/common/compose.c:204 ../plug-ins/common/noise-rgb.c:528 #: ../plug-ins/common/noise-rgb.c:543 msgid "_Alpha:" msgstr "Альфа:" -#: ../plug-ins/common/compose.c:211 -#: ../plug-ins/common/decompose.c:184 +#: ../plug-ins/common/compose.c:211 ../plug-ins/common/decompose.c:184 msgid "HSV" msgstr "HSV" -#: ../plug-ins/common/compose.c:212 -#: ../plug-ins/common/compose.c:220 +#: ../plug-ins/common/compose.c:212 ../plug-ins/common/compose.c:220 msgid "_Hue:" msgstr "_Тон:" -#: ../plug-ins/common/compose.c:213 -#: ../plug-ins/common/compose.c:221 +#: ../plug-ins/common/compose.c:213 ../plug-ins/common/compose.c:221 #: ../plug-ins/common/noise-hsv.c:425 msgid "_Saturation:" msgstr "Насыщенность:" -#: ../plug-ins/common/compose.c:214 -#: ../plug-ins/common/noise-hsv.c:437 +#: ../plug-ins/common/compose.c:214 ../plug-ins/common/noise-hsv.c:437 msgid "_Value:" msgstr "Яркость:" -#: ../plug-ins/common/compose.c:219 -#: ../plug-ins/common/decompose.c:193 +#: ../plug-ins/common/compose.c:219 ../plug-ins/common/decompose.c:193 msgid "HSL" msgstr "HSL" @@ -1909,28 +1799,23 @@ msgstr "HSL" msgid "_Lightness:" msgstr "Осветл_ение:" -#: ../plug-ins/common/compose.c:227 -#: ../plug-ins/common/decompose.c:202 +#: ../plug-ins/common/compose.c:227 ../plug-ins/common/decompose.c:202 msgid "CMY" msgstr "CMY" -#: ../plug-ins/common/compose.c:228 -#: ../plug-ins/common/compose.c:236 +#: ../plug-ins/common/compose.c:228 ../plug-ins/common/compose.c:236 msgid "_Cyan:" msgstr "_Голубой:" -#: ../plug-ins/common/compose.c:229 -#: ../plug-ins/common/compose.c:237 +#: ../plug-ins/common/compose.c:229 ../plug-ins/common/compose.c:237 msgid "_Magenta:" msgstr "_Пурпурный:" -#: ../plug-ins/common/compose.c:230 -#: ../plug-ins/common/compose.c:238 +#: ../plug-ins/common/compose.c:230 ../plug-ins/common/compose.c:238 msgid "_Yellow:" msgstr "_Желтый:" -#: ../plug-ins/common/compose.c:235 -#: ../plug-ins/common/decompose.c:211 +#: ../plug-ins/common/compose.c:235 ../plug-ins/common/decompose.c:211 msgid "CMYK" msgstr "CMYK" @@ -1938,8 +1823,7 @@ msgstr "CMYK" msgid "_Black:" msgstr "_Черный:" -#: ../plug-ins/common/compose.c:243 -#: ../plug-ins/common/decompose.c:224 +#: ../plug-ins/common/compose.c:243 ../plug-ins/common/decompose.c:224 msgid "LAB" msgstr "LAB" @@ -1993,7 +1877,9 @@ msgstr "Redness_cr709f:" #: ../plug-ins/common/compose.c:404 msgid "Create an image using multiple gray images as color channels" -msgstr "Создать новое изображение, используя изображения в режиме «Градации серого» в качестве каналов" +msgstr "" +"Создать новое изображение, используя изображения в режиме «Градации серого» " +"в качестве каналов" #: ../plug-ins/common/compose.c:410 msgid "C_ompose..." @@ -2008,8 +1894,12 @@ msgid "R_ecompose" msgstr "_Воссоединить" #: ../plug-ins/common/compose.c:488 -msgid "You can only run 'Recompose' if the active image was originally produced by 'Decompose'." -msgstr "Функция «Воссоединить» доступна только для тех изображений, которые созданы с помощью фильтра «Разобрать»'." +msgid "" +"You can only run 'Recompose' if the active image was originally produced by " +"'Decompose'." +msgstr "" +"Функция «Воссоединить» доступна только для тех изображений, которые созданы " +"с помощью фильтра «Разобрать»'." #: ../plug-ins/common/compose.c:512 msgid "Error scanning 'decompose-data' parasite: too few layers found" @@ -2024,13 +1914,11 @@ msgstr "Не удалось получить слои изображения %d" msgid "Composing" msgstr "Сборка" -#: ../plug-ins/common/compose.c:697 -#: ../plug-ins/common/compose.c:1731 +#: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1731 msgid "At least one image is needed to compose" msgstr "Для сборки необходимо по крайней мере одно изображение" -#: ../plug-ins/common/compose.c:708 -#: ../plug-ins/common/compose.c:722 +#: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:722 #, c-format msgid "Specified layer %d not found" msgstr "Слой %d не найден" @@ -2065,8 +1953,7 @@ msgstr "Собрать" msgid "Compose Channels" msgstr "Собрать каналы" -#: ../plug-ins/common/compose.c:1521 -#: ../plug-ins/common/decompose.c:1528 +#: ../plug-ins/common/compose.c:1521 ../plug-ins/common/decompose.c:1528 msgid "Color _model:" msgstr "Цветовая _модель:" @@ -2199,10 +2086,8 @@ msgid "E_xtend" msgstr "_Расширить" #: ../plug-ins/common/convolution-matrix.c:74 -#: ../plug-ins/common/displace.c:477 -#: ../plug-ins/common/edge.c:700 -#: ../plug-ins/common/fractal-trace.c:737 -#: ../plug-ins/common/ripple.c:585 +#: ../plug-ins/common/displace.c:477 ../plug-ins/common/edge.c:700 +#: ../plug-ins/common/fractal-trace.c:737 ../plug-ins/common/ripple.c:585 msgid "_Wrap" msgstr "З_авернуть" @@ -2239,8 +2124,7 @@ msgid "D_ivisor:" msgstr "Делитель:" #: ../plug-ins/common/convolution-matrix.c:1001 -#: ../plug-ins/common/depth-merge.c:775 -#: ../plug-ins/common/file-raw.c:1121 +#: ../plug-ins/common/depth-merge.c:775 ../plug-ins/common/file-raw.c:1121 msgid "O_ffset:" msgstr "Смещение:" @@ -2264,41 +2148,42 @@ msgstr "Каналы" msgid "Remove empty borders from the image" msgstr "Удалить пустые области на границе изображения" -#: ../plug-ins/common/crop-auto.c:89 +#: ../plug-ins/common/crop-auto.c:94 msgid "Autocrop Imag_e" msgstr "_Автокадрировать изображение" -#: ../plug-ins/common/crop-auto.c:98 +#: ../plug-ins/common/crop-auto.c:103 msgid "Remove empty borders from the layer" msgstr "Удалить пустые области на границе слоя" -#: ../plug-ins/common/crop-auto.c:103 +#: ../plug-ins/common/crop-auto.c:108 msgid "Autocrop Lay_er" msgstr "Автокадрировать _слой" -#: ../plug-ins/common/crop-auto.c:150 +#: ../plug-ins/common/crop-auto.c:155 msgid "Cropping" msgstr "Кадрирование" -#: ../plug-ins/common/crop-zealous.c:84 +#: ../plug-ins/common/crop-zealous.c:68 msgid "Autocrop unused space from edges and middle" msgstr "Автоматическое кадрирование неиспользуемого пространства" -#: ../plug-ins/common/crop-zealous.c:89 +#: ../plug-ins/common/crop-zealous.c:73 msgid "_Zealous Crop" msgstr "Усердное кадрирование" -#: ../plug-ins/common/crop-zealous.c:137 +#: ../plug-ins/common/crop-zealous.c:121 msgid "Zealous cropping" msgstr "Усердное кадрирование" -#: ../plug-ins/common/crop-zealous.c:238 +#: ../plug-ins/common/crop-zealous.c:252 msgid "Nothing to crop." msgstr "Нечего кадрировать." #: ../plug-ins/common/cubism.c:150 msgid "Convert the image into randomly rotated square blobs" -msgstr "Преобразует изображение в квадратные блоки, повернутые случайным образом" +msgstr "" +"Преобразует изображение в квадратные блоки, повернутые случайным образом" #: ../plug-ins/common/cubism.c:155 msgid "_Cubism..." @@ -2324,42 +2209,41 @@ msgstr "_Использовать цвет фона" msgid "Cubistic transformation" msgstr "Кубистическое преобразование" -#: ../plug-ins/common/curve-bend.c:527 +#: ../plug-ins/common/curve-bend.c:526 msgid "Bend the image using two control curves" msgstr "Изогнуть изображение, используя две направляющие кривые" -#: ../plug-ins/common/curve-bend.c:548 +#: ../plug-ins/common/curve-bend.c:547 msgid "_Curve Bend..." msgstr "_Изгиб по кривой..." -#: ../plug-ins/common/curve-bend.c:684 -#: ../plug-ins/common/edge-dog.c:178 +#: ../plug-ins/common/curve-bend.c:683 ../plug-ins/common/edge-dog.c:178 msgid "Can operate on layers only (but was called on channel or mask)." -msgstr "Эта операция действует только на слоях (а был вызван на канале или маске)" +msgstr "" +"Эта операция действует только на слоях (а был вызван на канале или маске)" -#: ../plug-ins/common/curve-bend.c:694 +#: ../plug-ins/common/curve-bend.c:693 msgid "Cannot operate on layers with masks." msgstr "Невозможно использовать в слоях с маской" -#: ../plug-ins/common/curve-bend.c:706 +#: ../plug-ins/common/curve-bend.c:705 msgid "Cannot operate on empty selections." msgstr "Невозможно выполнить действия с пустым выделением" -#: ../plug-ins/common/curve-bend.c:902 +#: ../plug-ins/common/curve-bend.c:901 #, c-format msgid "Error while reading '%s': %s" msgstr "Ошибка при чтении '%s'. %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1225 -#: ../plug-ins/common/curve-bend.c:2956 +#: ../plug-ins/common/curve-bend.c:1224 ../plug-ins/common/curve-bend.c:2955 msgid "Curve Bend" msgstr "Изгиб по кривой" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1262 +#: ../plug-ins/common/curve-bend.c:1261 #: ../plug-ins/gimpressionist/orientmap.c:590 #: ../plug-ins/gimpressionist/sizemap.c:459 #: ../plug-ins/print/print-page-layout.c:175 @@ -2367,172 +2251,159 @@ msgid "Preview" msgstr "Просмотр" #. The preview button -#: ../plug-ins/common/curve-bend.c:1291 +#: ../plug-ins/common/curve-bend.c:1290 msgid "_Preview Once" msgstr "_Просмотреть" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1300 +#: ../plug-ins/common/curve-bend.c:1299 msgid "Automatic pre_view" msgstr "_Автообновление просмотра" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1310 -#: ../plug-ins/common/ripple.c:523 +#: ../plug-ins/common/curve-bend.c:1309 ../plug-ins/common/ripple.c:523 #: ../plug-ins/gfig/gfig-dialog.c:1243 msgid "Options" msgstr "Параметры" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1324 +#: ../plug-ins/common/curve-bend.c:1323 msgid "Rotat_e:" msgstr "_Вращение:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1343 +#: ../plug-ins/common/curve-bend.c:1342 msgid "Smoo_thing" msgstr "С_глаживание изображения" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1353 -#: ../plug-ins/common/mosaic.c:729 -#: ../plug-ins/common/qbist.c:858 -#: ../plug-ins/common/ripple.c:532 +#: ../plug-ins/common/curve-bend.c:1352 ../plug-ins/common/mosaic.c:729 +#: ../plug-ins/common/qbist.c:858 ../plug-ins/common/ripple.c:532 msgid "_Antialiasing" msgstr "Сглаживание _края" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1362 msgid "Work on cop_y" msgstr "_Работать с копией" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1373 +#: ../plug-ins/common/curve-bend.c:1372 msgid "Modify Curves" msgstr "Корректирующие кривые" -#: ../plug-ins/common/curve-bend.c:1401 +#: ../plug-ins/common/curve-bend.c:1400 msgid "Curve for Border" msgstr "Кривая для края:" -#: ../plug-ins/common/curve-bend.c:1405 +#: ../plug-ins/common/curve-bend.c:1404 msgid "_Upper" msgstr "В_ерхнего" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1405 msgid "_Lower" msgstr "_Нижнего" -#: ../plug-ins/common/curve-bend.c:1416 +#: ../plug-ins/common/curve-bend.c:1415 msgid "Curve Type" msgstr "Тип кривой:" -#: ../plug-ins/common/curve-bend.c:1420 +#: ../plug-ins/common/curve-bend.c:1419 msgid "Smoot_h" msgstr "Гл_адкая" -#: ../plug-ins/common/curve-bend.c:1421 +#: ../plug-ins/common/curve-bend.c:1420 msgid "_Free" msgstr "_Свободная" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1436 +#: ../plug-ins/common/curve-bend.c:1435 msgid "_Copy" msgstr "Ско_пировать" -#: ../plug-ins/common/curve-bend.c:1441 +#: ../plug-ins/common/curve-bend.c:1440 msgid "Copy the active curve to the other border" msgstr "Скопировать активную кривую на другой край" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1448 +#: ../plug-ins/common/curve-bend.c:1447 msgid "_Mirror" msgstr "Отра_зить" -#: ../plug-ins/common/curve-bend.c:1453 +#: ../plug-ins/common/curve-bend.c:1452 msgid "Mirror the active curve to the other border" msgstr "Зеркально отразить активную кривую на другой край" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1461 +#: ../plug-ins/common/curve-bend.c:1460 msgid "S_wap" msgstr "Перестав_ить" -#: ../plug-ins/common/curve-bend.c:1466 +#: ../plug-ins/common/curve-bend.c:1465 msgid "Swap the two curves" msgstr "Переставить две кривые" -#: ../plug-ins/common/curve-bend.c:1478 +#: ../plug-ins/common/curve-bend.c:1477 msgid "Reset the active curve" msgstr "Сбросить активную кривую" -#: ../plug-ins/common/curve-bend.c:1495 +#: ../plug-ins/common/curve-bend.c:1494 msgid "Load the curves from a file" msgstr "Загрузить кривые из файла" -#: ../plug-ins/common/curve-bend.c:1507 +#: ../plug-ins/common/curve-bend.c:1506 msgid "Save the curves to a file" msgstr "Сохранить кривые в файле" -#: ../plug-ins/common/curve-bend.c:2063 +#: ../plug-ins/common/curve-bend.c:2062 msgid "Load Curve Points from File" msgstr "Загрузить точки кривой из файла" -#: ../plug-ins/common/curve-bend.c:2098 +#: ../plug-ins/common/curve-bend.c:2097 msgid "Save Curve Points to File" msgstr "Сохранить точки кривой в файле" -#: ../plug-ins/common/decompose.c:170 -#: ../plug-ins/common/decompose.c:174 +#: ../plug-ins/common/decompose.c:170 ../plug-ins/common/decompose.c:174 #: ../plug-ins/common/decompose.c:178 msgid "red" msgstr "красный" -#: ../plug-ins/common/decompose.c:171 -#: ../plug-ins/common/decompose.c:175 +#: ../plug-ins/common/decompose.c:171 ../plug-ins/common/decompose.c:175 #: ../plug-ins/common/decompose.c:179 msgid "green" msgstr "зеленый" -#: ../plug-ins/common/decompose.c:172 -#: ../plug-ins/common/decompose.c:176 +#: ../plug-ins/common/decompose.c:172 ../plug-ins/common/decompose.c:176 #: ../plug-ins/common/decompose.c:180 msgid "blue" msgstr "синий" -#: ../plug-ins/common/decompose.c:181 -#: ../plug-ins/common/decompose.c:221 +#: ../plug-ins/common/decompose.c:181 ../plug-ins/common/decompose.c:221 msgid "alpha" msgstr "альфа-канал" -#: ../plug-ins/common/decompose.c:184 -#: ../plug-ins/common/decompose.c:188 +#: ../plug-ins/common/decompose.c:184 ../plug-ins/common/decompose.c:188 msgid "hue" msgstr "тон" -#: ../plug-ins/common/decompose.c:185 -#: ../plug-ins/common/decompose.c:189 +#: ../plug-ins/common/decompose.c:185 ../plug-ins/common/decompose.c:189 msgid "saturation" msgstr "насыщенность" -#: ../plug-ins/common/decompose.c:186 -#: ../plug-ins/common/decompose.c:190 +#: ../plug-ins/common/decompose.c:186 ../plug-ins/common/decompose.c:190 msgid "value" msgstr "яркость" -#: ../plug-ins/common/decompose.c:193 -#: ../plug-ins/common/decompose.c:197 +#: ../plug-ins/common/decompose.c:193 ../plug-ins/common/decompose.c:197 msgid "hue_l" msgstr "hue_l" -#: ../plug-ins/common/decompose.c:194 -#: ../plug-ins/common/decompose.c:198 +#: ../plug-ins/common/decompose.c:194 ../plug-ins/common/decompose.c:198 msgid "saturation_l" msgstr "saturation_l" -#: ../plug-ins/common/decompose.c:195 -#: ../plug-ins/common/decompose.c:199 +#: ../plug-ins/common/decompose.c:195 ../plug-ins/common/decompose.c:199 msgid "lightness" msgstr "lightness" @@ -2548,18 +2419,15 @@ msgstr "Насыщенность (HSL)" msgid "Lightness" msgstr "Яркость" -#: ../plug-ins/common/decompose.c:202 -#: ../plug-ins/common/decompose.c:206 +#: ../plug-ins/common/decompose.c:202 ../plug-ins/common/decompose.c:206 msgid "cyan" msgstr "голубой" -#: ../plug-ins/common/decompose.c:203 -#: ../plug-ins/common/decompose.c:207 +#: ../plug-ins/common/decompose.c:203 ../plug-ins/common/decompose.c:207 msgid "magenta" msgstr "пурпурный" -#: ../plug-ins/common/decompose.c:204 -#: ../plug-ins/common/decompose.c:208 +#: ../plug-ins/common/decompose.c:204 ../plug-ins/common/decompose.c:208 msgid "yellow" msgstr "желтый" @@ -2575,18 +2443,15 @@ msgstr "Пурпурный" msgid "Yellow" msgstr "Желтый" -#: ../plug-ins/common/decompose.c:211 -#: ../plug-ins/common/decompose.c:216 +#: ../plug-ins/common/decompose.c:211 ../plug-ins/common/decompose.c:216 msgid "cyan-k" msgstr "голубой_k" -#: ../plug-ins/common/decompose.c:212 -#: ../plug-ins/common/decompose.c:217 +#: ../plug-ins/common/decompose.c:212 ../plug-ins/common/decompose.c:217 msgid "magenta-k" msgstr "пурпурный_k" -#: ../plug-ins/common/decompose.c:213 -#: ../plug-ins/common/decompose.c:218 +#: ../plug-ins/common/decompose.c:213 ../plug-ins/common/decompose.c:218 msgid "yellow-k" msgstr "желтый_k" @@ -2658,13 +2523,11 @@ msgstr "blueness-cb709f" msgid "redness-cr709f" msgstr "redness-cr709f" -#: ../plug-ins/common/decompose.c:312 -#: ../plug-ins/common/decompose.c:326 +#: ../plug-ins/common/decompose.c:312 ../plug-ins/common/decompose.c:326 msgid "Decompose an image into separate colorspace components" msgstr "Разобрать изображение на отдельные цветовые составляющие" -#: ../plug-ins/common/decompose.c:318 -#: ../plug-ins/common/decompose.c:336 +#: ../plug-ins/common/decompose.c:318 ../plug-ins/common/decompose.c:336 msgid "_Decompose..." msgstr "_Разобрать..." @@ -2689,8 +2552,13 @@ msgid "_Foreground as registration color" msgstr "П_ередний план как цвет приводки" #: ../plug-ins/common/decompose.c:1575 -msgid "Pixels in the foreground color will appear black in all output images. This can be used for things like crop marks that have to show up on all channels." -msgstr "Пикселы цвета переднего плана будут чёрными на всех создаваемых изображениях. Это может быть полезно для создания меток под обрез, видимых во всех каналах." +msgid "" +"Pixels in the foreground color will appear black in all output images. This " +"can be used for things like crop marks that have to show up on all channels." +msgstr "" +"Пикселы цвета переднего плана будут чёрными на всех создаваемых " +"изображениях. Это может быть полезно для создания меток под обрез, видимых " +"во всех каналах." #: ../plug-ins/common/deinterlace.c:91 msgid "Fix images where every other row is missing" @@ -2700,8 +2568,7 @@ msgstr "Исправить изображения с каждым вторым msgid "_Deinterlace..." msgstr "_Убрать чересстрочность..." -#: ../plug-ins/common/deinterlace.c:157 -#: ../plug-ins/common/deinterlace.c:323 +#: ../plug-ins/common/deinterlace.c:157 ../plug-ins/common/deinterlace.c:323 msgid "Deinterlace" msgstr "Убрать чересстрочность" @@ -2733,8 +2600,7 @@ msgstr "Объединение глубин" msgid "Source 1:" msgstr "Источник 1:" -#: ../plug-ins/common/depth-merge.c:718 -#: ../plug-ins/common/depth-merge.c:748 +#: ../plug-ins/common/depth-merge.c:718 ../plug-ins/common/depth-merge.c:748 msgid "Depth map:" msgstr "Карта глубин:" @@ -2762,8 +2628,7 @@ msgstr "Удалить из изображения шум, создаваемы msgid "Des_peckle..." msgstr "Удалить _пятна..." -#: ../plug-ins/common/despeckle.c:441 -#: ../plug-ins/common/despeckle.c:872 +#: ../plug-ins/common/despeckle.c:441 ../plug-ins/common/despeckle.c:872 msgid "Despeckle" msgstr "Удаление пятен" @@ -2779,12 +2644,9 @@ msgstr "_Адаптивное" msgid "R_ecursive" msgstr "_Рекурсивное" -#: ../plug-ins/common/despeckle.c:510 -#: ../plug-ins/common/edge-neon.c:735 -#: ../plug-ins/common/nl-filter.c:1091 -#: ../plug-ins/common/nova.c:362 -#: ../plug-ins/common/unsharp-mask.c:865 -#: ../plug-ins/common/whirl-pinch.c:591 +#: ../plug-ins/common/despeckle.c:510 ../plug-ins/common/edge-neon.c:735 +#: ../plug-ins/common/nl-filter.c:1091 ../plug-ins/common/nova.c:362 +#: ../plug-ins/common/unsharp-mask.c:872 ../plug-ins/common/whirl-pinch.c:591 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" @@ -2814,14 +2676,10 @@ msgstr "Удаление штрихов" msgid "Destripe" msgstr "Удаление штрихов" -#: ../plug-ins/common/destripe.c:476 -#: ../plug-ins/common/file-html-table.c:584 -#: ../plug-ins/common/file-ps.c:3034 -#: ../plug-ins/common/file-ps.c:3232 -#: ../plug-ins/common/file-raw.c:1134 -#: ../plug-ins/common/smooth-palette.c:437 -#: ../plug-ins/common/tile-paper.c:303 -#: ../plug-ins/common/tile.c:428 +#: ../plug-ins/common/destripe.c:476 ../plug-ins/common/file-html-table.c:584 +#: ../plug-ins/common/file-ps.c:3034 ../plug-ins/common/file-ps.c:3232 +#: ../plug-ins/common/file-raw.c:1134 ../plug-ins/common/smooth-palette.c:437 +#: ../plug-ins/common/tile-paper.c:303 ../plug-ins/common/tile.c:428 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:401 #: ../plug-ins/print/print-page-layout.c:280 @@ -2865,8 +2723,7 @@ msgstr "Контуры" msgid "Sharp Edges" msgstr "Резкие края" -#: ../plug-ins/common/diffraction.c:620 -#: ../plug-ins/common/softglow.c:685 +#: ../plug-ins/common/diffraction.c:620 ../plug-ins/common/softglow.c:685 #: ../plug-ins/flame/flame.c:1080 msgid "_Brightness:" msgstr "_Яркость:" @@ -2941,17 +2798,13 @@ msgstr "_Полярный" msgid "Edge Behavior" msgstr "Край" -#: ../plug-ins/common/displace.c:479 -#: ../plug-ins/common/edge.c:713 -#: ../plug-ins/common/ripple.c:586 -#: ../plug-ins/common/waves.c:283 +#: ../plug-ins/common/displace.c:479 ../plug-ins/common/edge.c:713 +#: ../plug-ins/common/ripple.c:586 ../plug-ins/common/waves.c:283 msgid "_Smear" msgstr "_Размыть" -#: ../plug-ins/common/displace.c:481 -#: ../plug-ins/common/edge.c:726 -#: ../plug-ins/common/fractal-trace.c:741 -#: ../plug-ins/common/newsprint.c:389 +#: ../plug-ins/common/displace.c:481 ../plug-ins/common/edge.c:726 +#: ../plug-ins/common/fractal-trace.c:741 ../plug-ins/common/newsprint.c:389 msgid "_Black" msgstr "_Черный" @@ -2963,8 +2816,7 @@ msgstr "Обводит контуры изображения с учетом т msgid "_Difference of Gaussians..." msgstr "_Разница по Гауссу..." -#: ../plug-ins/common/edge-dog.c:245 -#: ../plug-ins/common/edge-dog.c:302 +#: ../plug-ins/common/edge-dog.c:245 ../plug-ins/common/edge-dog.c:302 msgid "DoG Edge Detect" msgstr "Выделение края" @@ -2980,8 +2832,7 @@ msgstr "_Радиус 1:" msgid "R_adius 2:" msgstr "Р_адиус 2:" -#: ../plug-ins/common/edge-dog.c:373 -#: ../plug-ins/gimpressionist/paper.c:166 +#: ../plug-ins/common/edge-dog.c:373 ../plug-ins/gimpressionist/paper.c:166 msgid "_Invert" msgstr "_Инвертировать" @@ -2993,8 +2844,7 @@ msgstr "Выделение края с высоким разрешением" msgid "_Laplace" msgstr "_Лаплас" -#: ../plug-ins/common/edge-laplace.c:243 -#: ../plug-ins/common/edge.c:664 +#: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:664 msgid "Laplace" msgstr "Лаплас" @@ -3018,8 +2868,7 @@ msgstr "Неон" msgid "Neon Detection" msgstr "Выделение края — неон" -#: ../plug-ins/common/edge-neon.c:750 -#: ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:750 ../plug-ins/common/unsharp-mask.c:885 msgid "_Amount:" msgstr "_Величина:" @@ -3075,8 +2924,7 @@ msgstr "Собел" msgid "Prewitt compass" msgstr "По Превитту" -#: ../plug-ins/common/edge.c:661 -#: ../plug-ins/common/sinus.c:905 +#: ../plug-ins/common/edge.c:661 ../plug-ins/common/sinus.c:905 msgid "Gradient" msgstr "Градиент" @@ -3104,8 +2952,7 @@ msgstr "Придать изображению вид барельефа" msgid "_Emboss..." msgstr "_Барельеф..." -#: ../plug-ins/common/emboss.c:385 -#: ../plug-ins/common/emboss.c:447 +#: ../plug-ins/common/emboss.c:385 ../plug-ins/common/emboss.c:447 msgid "Emboss" msgstr "Барельеф" @@ -3141,16 +2988,11 @@ msgstr "Гравировка" msgid "Engrave" msgstr "Гравировка" -#: ../plug-ins/common/engrave.c:245 -#: ../plug-ins/common/file-html-table.c:600 -#: ../plug-ins/common/file-ps.c:3044 -#: ../plug-ins/common/file-ps.c:3241 -#: ../plug-ins/common/file-raw.c:1147 -#: ../plug-ins/common/film.c:1002 -#: ../plug-ins/common/smooth-palette.c:442 -#: ../plug-ins/common/tile-paper.c:314 -#: ../plug-ins/common/tile.c:432 -#: ../plug-ins/imagemap/imap_cmd_guides.c:174 +#: ../plug-ins/common/engrave.c:245 ../plug-ins/common/file-html-table.c:600 +#: ../plug-ins/common/file-ps.c:3044 ../plug-ins/common/file-ps.c:3241 +#: ../plug-ins/common/file-raw.c:1147 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/smooth-palette.c:442 ../plug-ins/common/tile-paper.c:314 +#: ../plug-ins/common/tile.c:432 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:408 #: ../plug-ins/print/print-page-layout.c:282 msgid "_Height:" @@ -3173,8 +3015,7 @@ msgstr "Текст" msgid "_Format:" msgstr "_Формат:" -#: ../plug-ins/common/file-cel.c:114 -#: ../plug-ins/common/file-cel.c:132 +#: ../plug-ins/common/file-cel.c:114 ../plug-ins/common/file-cel.c:132 msgid "KISS CEL" msgstr "KISS CEL" @@ -3182,47 +3023,31 @@ msgstr "KISS CEL" msgid "Load KISS Palette" msgstr "Загрузка палитры KISS" -#: ../plug-ins/common/file-cel.c:308 -#: ../plug-ins/common/file-cel.c:363 +#: ../plug-ins/common/file-cel.c:308 ../plug-ins/common/file-cel.c:363 #: ../plug-ins/common/file-cel.c:383 -#, fuzzy, c-format +#, c-format msgid "EOF or error while reading image header" -msgstr "Ошибка при чтении '%s'. %s" +msgstr "Конец файла или ошибка при чтении заголовка изображения" #. max. rows allocated #. column, highest column ever used #. -1 assume fsel is not available (and not attached to any drawable) #. -1 assume there is no floating selection -#: ../plug-ins/common/file-cel.c:353 -#: ../plug-ins/common/file-dicom.c:345 -#: ../plug-ins/common/file-gbr.c:373 -#: ../plug-ins/common/file-gif-load.c:360 -#: ../plug-ins/common/file-gih.c:645 -#: ../plug-ins/common/file-jp2-load.c:187 -#: ../plug-ins/common/file-pat.c:342 -#: ../plug-ins/common/file-pcx.c:366 -#: ../plug-ins/common/file-pdf-load.c:861 -#: ../plug-ins/common/file-pix.c:348 -#: ../plug-ins/common/file-png.c:763 -#: ../plug-ins/common/file-pnm.c:501 -#: ../plug-ins/common/file-ps.c:1020 -#: ../plug-ins/common/file-raw.c:716 -#: ../plug-ins/common/file-sunras.c:487 -#: ../plug-ins/common/file-tga.c:447 -#: ../plug-ins/common/file-tiff-load.c:611 -#: ../plug-ins/common/file-wmf.c:994 -#: ../plug-ins/common/file-xbm.c:742 -#: ../plug-ins/common/file-xmc.c:667 -#: ../plug-ins/common/file-xpm.c:352 -#: ../plug-ins/common/file-xwd.c:526 -#: ../plug-ins/file-bmp/bmp-read.c:159 -#: ../plug-ins/file-faxg3/faxg3.c:213 -#: ../plug-ins/file-fli/fli-gimp.c:501 -#: ../plug-ins/file-ico/ico-load.c:644 -#: ../plug-ins/file-jpeg/jpeg-load.c:123 -#: ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:330 -#: ../plug-ins/file-xjt/xjt.c:3333 +#: ../plug-ins/common/file-cel.c:353 ../plug-ins/common/file-dicom.c:345 +#: ../plug-ins/common/file-gbr.c:373 ../plug-ins/common/file-gif-load.c:360 +#: ../plug-ins/common/file-gih.c:645 ../plug-ins/common/file-jp2-load.c:187 +#: ../plug-ins/common/file-pat.c:342 ../plug-ins/common/file-pcx.c:366 +#: ../plug-ins/common/file-pdf-load.c:861 ../plug-ins/common/file-pix.c:348 +#: ../plug-ins/common/file-png.c:763 ../plug-ins/common/file-pnm.c:501 +#: ../plug-ins/common/file-ps.c:1020 ../plug-ins/common/file-raw.c:716 +#: ../plug-ins/common/file-sunras.c:487 ../plug-ins/common/file-tga.c:447 +#: ../plug-ins/common/file-tiff-load.c:611 ../plug-ins/common/file-wmf.c:994 +#: ../plug-ins/common/file-xbm.c:742 ../plug-ins/common/file-xmc.c:667 +#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:526 +#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-faxg3/faxg3.c:213 +#: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:644 +#: ../plug-ins/file-jpeg/jpeg-load.c:123 ../plug-ins/file-psd/psd-load.c:135 +#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3333 #, c-format msgid "Opening '%s'" msgstr "Открывается \"%s\"" @@ -3235,35 +3060,37 @@ msgstr "не является файлом в формате CEL" #: ../plug-ins/common/file-cel.c:405 #, c-format msgid "illegal bpp value in image: %hhu" -msgstr "" +msgstr "Некорректное значение bpp в изображении: %hhu" #: ../plug-ins/common/file-cel.c:419 #, c-format -msgid "illegal image dimensions: width: %d, horizontal offset: %d, height: %d, vertical offset: %d" +msgid "" +"illegal image dimensions: width: %d, horizontal offset: %d, height: %d, " +"vertical offset: %d" msgstr "" +"Некорректные размеры изображения: ширина: %d, горизонтальное смещение: %d, " +"высота: %d, вертикальное смещение: %d" #: ../plug-ins/common/file-cel.c:432 #, c-format msgid "Can't create a new image" msgstr "Невозможно создать новое изображение" -#: ../plug-ins/common/file-cel.c:470 -#: ../plug-ins/common/file-cel.c:505 +#: ../plug-ins/common/file-cel.c:470 ../plug-ins/common/file-cel.c:505 #: ../plug-ins/common/file-cel.c:530 -#, fuzzy, c-format +#, c-format msgid "EOF or error while reading image data" -msgstr "Ошибка при чтении '%s'. %s" +msgstr "Конец файла или ошибка при чтении данных изображения" #: ../plug-ins/common/file-cel.c:547 #, c-format msgid "Unsupported bit depth (%d)!" msgstr "Неподдерживаемое число цветов (%d)!" -#: ../plug-ins/common/file-cel.c:629 -#: ../plug-ins/common/file-cel.c:641 +#: ../plug-ins/common/file-cel.c:629 ../plug-ins/common/file-cel.c:641 #, c-format msgid "'%s': EOF or error while reading palette header" -msgstr "" +msgstr "'%s': конец файла или ошибка при чтении заголовка палитры" #: ../plug-ins/common/file-cel.c:650 #, c-format @@ -3273,48 +3100,34 @@ msgstr "'%s' не является файлом палитр в формате K #: ../plug-ins/common/file-cel.c:659 #, c-format msgid "'%s': illegal bpp value in palette: %hhu" -msgstr "" +msgstr "'%s': некорректное значение битов на пиксел в палитре: %hhu" #: ../plug-ins/common/file-cel.c:668 #, c-format msgid "'%s': illegal number of colors: %u" msgstr "'%s': некорректное количество цветов: %u" -#: ../plug-ins/common/file-cel.c:683 -#: ../plug-ins/common/file-cel.c:700 +#: ../plug-ins/common/file-cel.c:683 ../plug-ins/common/file-cel.c:700 #: ../plug-ins/common/file-cel.c:720 #, c-format msgid "'%s': EOF or error while reading palette data" -msgstr "" +msgstr "'%s': конец файла или ошибка при чтении данных палитры" #. init the progress meter #. And let's begin the progress -#: ../plug-ins/common/file-cel.c:777 -#: ../plug-ins/common/file-gbr.c:668 -#: ../plug-ins/common/file-gif-save.c:799 -#: ../plug-ins/common/file-gih.c:1263 -#: ../plug-ins/common/file-html-table.c:257 -#: ../plug-ins/common/file-pat.c:491 -#: ../plug-ins/common/file-pcx.c:644 -#: ../plug-ins/common/file-pix.c:531 -#: ../plug-ins/common/file-png.c:1365 -#: ../plug-ins/common/file-pnm.c:1017 -#: ../plug-ins/common/file-ps.c:1195 -#: ../plug-ins/common/file-sunras.c:570 -#: ../plug-ins/common/file-tga.c:1184 -#: ../plug-ins/common/file-tiff-save.c:716 -#: ../plug-ins/common/file-xbm.c:1041 -#: ../plug-ins/common/file-xmc.c:1452 -#: ../plug-ins/common/file-xpm.c:638 -#: ../plug-ins/common/file-xwd.c:628 -#: ../plug-ins/file-bmp/bmp-write.c:320 -#: ../plug-ins/file-fits/fits.c:481 -#: ../plug-ins/file-fli/fli-gimp.c:718 -#: ../plug-ins/file-ico/ico-save.c:1001 -#: ../plug-ins/file-jpeg/jpeg-save.c:289 -#: ../plug-ins/file-psd/psd-save.c:1657 -#: ../plug-ins/file-sgi/sgi.c:576 -#: ../plug-ins/file-xjt/xjt.c:1696 +#: ../plug-ins/common/file-cel.c:777 ../plug-ins/common/file-gbr.c:668 +#: ../plug-ins/common/file-gif-save.c:799 ../plug-ins/common/file-gih.c:1263 +#: ../plug-ins/common/file-html-table.c:257 ../plug-ins/common/file-pat.c:491 +#: ../plug-ins/common/file-pcx.c:644 ../plug-ins/common/file-pix.c:531 +#: ../plug-ins/common/file-png.c:1365 ../plug-ins/common/file-pnm.c:1017 +#: ../plug-ins/common/file-ps.c:1195 ../plug-ins/common/file-sunras.c:570 +#: ../plug-ins/common/file-tga.c:1184 ../plug-ins/common/file-tiff-save.c:716 +#: ../plug-ins/common/file-xbm.c:1041 ../plug-ins/common/file-xmc.c:1452 +#: ../plug-ins/common/file-xpm.c:638 ../plug-ins/common/file-xwd.c:628 +#: ../plug-ins/file-bmp/bmp-write.c:320 ../plug-ins/file-fits/fits.c:481 +#: ../plug-ins/file-fli/fli-gimp.c:718 ../plug-ins/file-ico/ico-save.c:1001 +#: ../plug-ins/file-jpeg/jpeg-save.c:289 ../plug-ins/file-psd/psd-save.c:1657 +#: ../plug-ins/file-sgi/sgi.c:576 ../plug-ins/file-xjt/xjt.c:1696 #, c-format msgid "Saving '%s'" msgstr "Сохранение \"%s\"" @@ -3393,34 +3206,28 @@ msgstr "" "\"%s\"\n" "не является файлом DICOM" -#: ../plug-ins/common/file-dicom.c:1319 -#: ../plug-ins/common/file-pcx.c:676 +#: ../plug-ins/common/file-dicom.c:1339 ../plug-ins/common/file-pcx.c:676 #: ../plug-ins/common/file-pnm.c:1002 msgid "Cannot save images with alpha channel." msgstr "Невозможно сохранить изображения с альфа-каналом." -#: ../plug-ins/common/file-dicom.c:1334 -#: ../plug-ins/common/file-ps.c:1180 -#: ../plug-ins/common/file-ps.c:1212 -#: ../plug-ins/common/file-xwd.c:613 -#: ../plug-ins/file-fits/fits.c:466 -#: ../plug-ins/file-xjt/xjt.c:1691 +#: ../plug-ins/common/file-dicom.c:1354 ../plug-ins/common/file-ps.c:1180 +#: ../plug-ins/common/file-ps.c:1212 ../plug-ins/common/file-xwd.c:613 +#: ../plug-ins/file-fits/fits.c:466 ../plug-ins/file-xjt/xjt.c:1691 msgid "Cannot operate on unknown image types." msgstr "Невозможно выполнить действия с изображением неизвестного типа" -#: ../plug-ins/common/file-gbr.c:154 -#: ../plug-ins/common/file-gbr.c:175 +#: ../plug-ins/common/file-gbr.c:154 ../plug-ins/common/file-gbr.c:175 msgid "GIMP brush" msgstr "Кисть GIMP" -#: ../plug-ins/common/file-gbr.c:399 -#: ../plug-ins/common/file-pat.c:418 +#: ../plug-ins/common/file-gbr.c:399 ../plug-ins/common/file-pat.c:418 #, c-format msgid "Invalid header data in '%s': width=%lu, height=%lu, bytes=%lu" -msgstr "Неправильные данные заголовка в '%s': ширина=%lu, высота=%lu, байтов=%lu" +msgstr "" +"Неправильные данные заголовка в '%s': ширина=%lu, высота=%lu, байтов=%lu" -#: ../plug-ins/common/file-gbr.c:423 -#: ../plug-ins/common/file-gbr.c:435 +#: ../plug-ins/common/file-gbr.c:423 ../plug-ins/common/file-gbr.c:435 msgid "Unsupported brush format" msgstr "Неподдерживаемый формат кисти" @@ -3434,8 +3241,7 @@ msgstr "Ошибка в файле кисти GIMP \"%s\"" msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Ошибочная строка UTF-8 в файле кисти '%s'" -#: ../plug-ins/common/file-gbr.c:461 -#: ../plug-ins/common/file-gih.c:487 +#: ../plug-ins/common/file-gbr.c:461 ../plug-ins/common/file-gih.c:487 #: ../plug-ins/common/file-gih.c:1137 #: ../plug-ins/gradient-flare/gradient-flare.c:3064 msgid "Unnamed" @@ -3450,15 +3256,12 @@ msgid "Brush" msgstr "Кисть" #. attach labels -#: ../plug-ins/common/file-gbr.c:784 -#: ../plug-ins/common/grid.c:792 +#: ../plug-ins/common/file-gbr.c:784 ../plug-ins/common/grid.c:792 msgid "Spacing:" msgstr "Интервал: " -#: ../plug-ins/common/file-gbr.c:795 -#: ../plug-ins/common/file-gih.c:888 -#: ../plug-ins/common/file-pat.c:568 -#: ../plug-ins/gimpressionist/presets.c:666 +#: ../plug-ins/common/file-gbr.c:795 ../plug-ins/common/file-gih.c:888 +#: ../plug-ins/common/file-pat.c:568 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Описание:" @@ -3485,8 +3288,7 @@ msgstr "Фон (%d%s)" msgid "Opening '%s' (frame %d)" msgstr "Открывается '%s' (кадр %d)" -#: ../plug-ins/common/file-gif-load.c:997 -#: ../plug-ins/common/iwarp.c:792 +#: ../plug-ins/common/file-gif-load.c:997 ../plug-ins/common/iwarp.c:792 #: ../plug-ins/common/iwarp.c:827 #, c-format msgid "Frame %d" @@ -3499,8 +3301,12 @@ msgstr "Кадр %d (%d%s)" #: ../plug-ins/common/file-gif-load.c:1030 #, c-format -msgid "GIF: Undocumented GIF composite type %d is not handled. Animation might not play or re-save perfectly." -msgstr "GIF: Недокументированный тип композиции %d. Возможно, анимация не будет работать или не сохранится корректно." +msgid "" +"GIF: Undocumented GIF composite type %d is not handled. Animation might not " +"play or re-save perfectly." +msgstr "" +"GIF: Недокументированный тип композиции %d. Возможно, анимация не будет " +"работать или не сохранится корректно." #: ../plug-ins/common/file-gif-save.c:476 msgid "Couldn't simply reduce colors further. Saving as opaque." @@ -3510,30 +3316,49 @@ msgstr "" #: ../plug-ins/common/file-gif-save.c:591 #, c-format -msgid "Unable to save '%s'. The GIF file format does not support images that are more than %d pixels wide or tall." -msgstr "Невозможно сохранить '%s'. Формат GIF не поддерживает изображения больше %d пикселов в длину или ширину." +msgid "" +"Unable to save '%s'. The GIF file format does not support images that are " +"more than %d pixels wide or tall." +msgstr "" +"Невозможно сохранить '%s'. Формат GIF не поддерживает изображения больше %d " +"пикселов в длину или ширину." #: ../plug-ins/common/file-gif-save.c:704 -msgid "The GIF format only supports comments in 7bit ASCII encoding. No comment is saved." +msgid "" +"The GIF format only supports comments in 7bit ASCII encoding. No comment is " +"saved." msgstr "" "Формат GIF поддерживает комментарии только в\n" "7-разрядном ASCII. Комментарий не сохранён." #: ../plug-ins/common/file-gif-save.c:763 -msgid "Cannot save RGB color images. Convert to indexed color or grayscale first." -msgstr "Невозможно сохранить изображение в формате RGB. Преобразуйте его в индексированный формат или в градации серого." +msgid "" +"Cannot save RGB color images. Convert to indexed color or grayscale first." +msgstr "" +"Невозможно сохранить изображение в формате RGB. Преобразуйте его в " +"индексированный формат или в градации серого." #: ../plug-ins/common/file-gif-save.c:941 msgid "Delay inserted to prevent evil CPU-sucking animation." -msgstr "Задержка встроена для предотвращения перенагрузки процессора сложной анимацией" +msgstr "" +"Задержка встроена для предотвращения перенагрузки процессора сложной " +"анимацией" #: ../plug-ins/common/file-gif-save.c:982 -msgid "The image you are trying to save as a GIF contains layers which extend beyond the actual borders of the image." -msgstr "Изображение, которое вы пытаетесь сохранить как GIF содержит слои, выходящие за действительные границы изображения." +msgid "" +"The image you are trying to save as a GIF contains layers which extend " +"beyond the actual borders of the image." +msgstr "" +"Изображение, которое вы пытаетесь сохранить как GIF содержит слои, выходящие " +"за действительные границы изображения." #: ../plug-ins/common/file-gif-save.c:999 -msgid "The GIF file format does not allow this. You may choose whether to crop all of the layers to the image borders, or cancel this save." -msgstr "Это недопустимо в GIF. Вы можете или обрезать все слои по границе изображения, или отменить это сохранение." +msgid "" +"The GIF file format does not allow this. You may choose whether to crop all " +"of the layers to the image borders, or cancel this save." +msgstr "" +"Это недопустимо в GIF. Вы можете или обрезать все слои по границе " +"изображения, или отменить это сохранение." #: ../plug-ins/common/file-gif-save.c:1135 msgid "GIF" @@ -3561,8 +3386,12 @@ msgid "One frame per layer (replace)" msgstr "Один кадр на слой (замена)" #: ../plug-ins/common/file-gif-save.c:1218 -msgid "You can only export as animation when the image has more than one layer. The image you are trying to export only has one layer." -msgstr "Экспорт анимации возможен лишь при наличии более чем одного слоя. В этом изображении слой всего один." +msgid "" +"You can only export as animation when the image has more than one layer. The " +"image you are trying to export only has one layer." +msgstr "" +"Экспорт анимации возможен лишь при наличии более чем одного слоя. В этом " +"изображении слой всего один." #: ../plug-ins/common/file-gif-save.c:2322 msgid "Error writing output file." @@ -3574,8 +3403,7 @@ msgstr "Ошибка при записи в файл вывода." msgid "The default comment is limited to %d characters." msgstr "Комментарий по умолчанию ограничен длиной в %d символов." -#: ../plug-ins/common/file-gih.c:209 -#: ../plug-ins/common/file-gih.c:230 +#: ../plug-ins/common/file-gih.c:209 ../plug-ins/common/file-gih.c:230 msgid "GIMP brush (animated)" msgstr "Кисть GIMP (анимированная)" @@ -3672,8 +3500,12 @@ msgid "_Generate full HTML document" msgstr "Создать полный документ HTML" #: ../plug-ins/common/file-html-table.c:457 -msgid "If checked GTM will output a full HTML document with , , etc. tags instead of just the table html." -msgstr "Если отмечено, то в документ будут добавлены тэги , и другие, а не только те которые относятся к таблице." +msgid "" +"If checked GTM will output a full HTML document with , , etc. " +"tags instead of just the table html." +msgstr "" +"Если отмечено, то в документ будут добавлены тэги , и другие, а " +"не только те которые относятся к таблице." #. HTML Table Creation Options #: ../plug-ins/common/file-html-table.c:470 @@ -3685,16 +3517,26 @@ msgid "_Use cellspan" msgstr "Использовать cellspan" #: ../plug-ins/common/file-html-table.c:484 -msgid "If checked GTM will replace any rectangular sections of identically colored blocks with one large cell with ROWSPAN and COLSPAN values." -msgstr "Если отмечено, GTM будет заменять любые прямоугольные секции одинаково окрашенных блоков на одну большую ячейку со значениями ROWSPAN и COLSPAN." +msgid "" +"If checked GTM will replace any rectangular sections of identically colored " +"blocks with one large cell with ROWSPAN and COLSPAN values." +msgstr "" +"Если отмечено, GTM будет заменять любые прямоугольные секции одинаково " +"окрашенных блоков на одну большую ячейку со значениями ROWSPAN и COLSPAN." #: ../plug-ins/common/file-html-table.c:493 msgid "Co_mpress TD tags" msgstr "Сжимать TD-тэги" #: ../plug-ins/common/file-html-table.c:499 -msgid "Checking this tag will cause GTM to leave no whitespace between the TD tags and the cellcontent. This is only necessary for pixel level positioning control." -msgstr "Отметка в этой графе заставит GTM удалять пробелы между TD-тэгами и содержимым ячейки. Это необходимо только для регулирования положения на уровне точек растра." +msgid "" +"Checking this tag will cause GTM to leave no whitespace between the TD tags " +"and the cellcontent. This is only necessary for pixel level positioning " +"control." +msgstr "" +"Отметка в этой графе заставит GTM удалять пробелы между TD-тэгами и " +"содержимым ячейки. Это необходимо только для регулирования положения на " +"уровне точек растра." #: ../plug-ins/common/file-html-table.c:509 msgid "C_aption" @@ -3769,27 +3611,42 @@ msgstr "Не удалось декодировать '%s'." #: ../plug-ins/common/file-jp2-load.c:235 #, c-format msgid "The image '%s' is in grayscale but does not contain any gray component." -msgstr "Изображение '%s' использует градации серого, но не содержит серый компонент." +msgstr "" +"Изображение '%s' использует градации серого, но не содержит серый компонент." #: ../plug-ins/common/file-jp2-load.c:261 #, c-format msgid "The image '%s' is in RGB, but is missing some of the components." -msgstr "Изображение '%s' использует цветовое пространство RGB, но некоторые его компоненты отсутствуют." +msgstr "" +"Изображение '%s' использует цветовое пространство RGB, но некоторые его " +"компоненты отсутствуют." #: ../plug-ins/common/file-jp2-load.c:287 #, c-format -msgid "The image '%s' is in the CIEXYZ color space, but there is no code in place to convert it to RGB." -msgstr "Изображение '%s' использует цветовое пространство CIE XYZ, которое пока что невозможно преобразовать в RGB." +msgid "" +"The image '%s' is in the CIEXYZ color space, but there is no code in place " +"to convert it to RGB." +msgstr "" +"Изображение '%s' использует цветовое пространство CIE XYZ, которое пока что " +"невозможно преобразовать в RGB." #: ../plug-ins/common/file-jp2-load.c:294 #, c-format -msgid "The image '%s' is in the CIELAB color space, but there is no code in place to convert it to RGB." -msgstr "Изображение '%s' использует цветовое пространство CIE LAB, которое пока что невозможно преобразовать в RGB." +msgid "" +"The image '%s' is in the CIELAB color space, but there is no code in place " +"to convert it to RGB." +msgstr "" +"Изображение '%s' использует цветовое пространство CIE LAB, которое пока что " +"невозможно преобразовать в RGB." #: ../plug-ins/common/file-jp2-load.c:301 #, c-format -msgid "The image '%s' is in the YCbCr color space, but there is no code in place to convert it to RGB." -msgstr "Изображение '%s' использует цветовое пространство YCbCr, которое пока что невозможно преобразовать в RGB." +msgid "" +"The image '%s' is in the YCbCr color space, but there is no code in place to " +"convert it to RGB." +msgstr "" +"Изображение '%s' использует цветовое пространство YCbCr, которое пока что " +"невозможно преобразовать в RGB." #: ../plug-ins/common/file-jp2-load.c:309 #, c-format @@ -3798,8 +3655,12 @@ msgstr "Изображение '%s' использует неизвестное #: ../plug-ins/common/file-jp2-load.c:323 #, c-format -msgid "Image component %d of image '%s' does not have the same size as the image. This is currently not supported." -msgstr "Размер компонента %d изображения '%s' отличается от размера изображения. Это пока что не поддерживается." +msgid "" +"Image component %d of image '%s' does not have the same size as the image. " +"This is currently not supported." +msgstr "" +"Размер компонента %d изображения '%s' отличается от размера изображения. Это " +"пока что не поддерживается." #: ../plug-ins/common/file-jp2-load.c:334 #, c-format @@ -3808,13 +3669,13 @@ msgstr "У компонента %d изображения '%s' нет ни hstep #: ../plug-ins/common/file-jp2-load.c:343 #, c-format -msgid "Image component %d of image '%s' is signed. This is currently not supported." +msgid "" +"Image component %d of image '%s' is signed. This is currently not supported." msgstr "" #. Inform the user that we couldn't losslessly save the #. * transparency & just use the full palette -#: ../plug-ins/common/file-mng.c:534 -#: ../plug-ins/common/file-png.c:1902 +#: ../plug-ins/common/file-mng.c:534 ../plug-ins/common/file-png.c:1902 msgid "Couldn't losslessly save transparency, saving opacity instead." msgstr "" "Невозможно сохранить прозрачность,\n" @@ -3836,8 +3697,7 @@ msgstr "Черезстрочность" msgid "Save background color" msgstr "Сохранить цвет фона" -#: ../plug-ins/common/file-mng.c:1371 -#: ../plug-ins/ui/plug-in-file-png.ui.h:3 +#: ../plug-ins/common/file-mng.c:1371 ../plug-ins/ui/plug-in-file-png.ui.h:3 msgid "Save gamma" msgstr "Сохранить гамму" @@ -3850,8 +3710,7 @@ msgid "Save creation time" msgstr "Сохранить время создания" #. Dialog init -#: ../plug-ins/common/file-mng.c:1411 -#: ../plug-ins/common/file-png.c:1951 +#: ../plug-ins/common/file-mng.c:1411 ../plug-ins/common/file-png.c:1951 msgid "PNG" msgstr "PNG" @@ -3895,8 +3754,7 @@ msgstr "Кадры:" msgid "PNG compression level:" msgstr "Степень сжатия PNG:" -#: ../plug-ins/common/file-mng.c:1465 -#: ../plug-ins/ui/plug-in-file-png.ui.h:10 +#: ../plug-ins/common/file-mng.c:1465 ../plug-ins/ui/plug-in-file-png.ui.h:10 msgid "Choose a high compression level for small file size" msgstr "Выберите большую степень сжатия для получения файла меньшего размера" @@ -3920,21 +3778,23 @@ msgstr "Цикл" msgid "Default frame delay:" msgstr "Задержка кадра по умолчанию:" -#: ../plug-ins/common/file-mng.c:1542 -#: ../plug-ins/ui/plug-in-file-gif.ui.h:7 +#: ../plug-ins/common/file-mng.c:1542 ../plug-ins/ui/plug-in-file-gif.ui.h:7 msgid "milliseconds" msgstr "миллисекунд" #: ../plug-ins/common/file-mng.c:1555 -msgid "These options are only available when the exported image has more than one layer. The image you are exporting only has one layer." -msgstr "Эти параметры доступны только при экспорте многослойного изображения. В экспортируемом изображении только один слой." +msgid "" +"These options are only available when the exported image has more than one " +"layer. The image you are exporting only has one layer." +msgstr "" +"Эти параметры доступны только при экспорте многослойного изображения. В " +"экспортируемом изображении только один слой." #: ../plug-ins/common/file-mng.c:1608 msgid "MNG animation" msgstr "Параметры MNG" -#: ../plug-ins/common/file-pat.c:123 -#: ../plug-ins/common/file-pat.c:145 +#: ../plug-ins/common/file-pat.c:123 ../plug-ins/common/file-pat.c:145 msgid "GIMP pattern" msgstr "Текстура GIMP" @@ -3947,8 +3807,7 @@ msgstr "Ошибочная строка UTF-8 в файле текстуры '%s msgid "Pattern" msgstr "Текстура" -#: ../plug-ins/common/file-pcx.c:133 -#: ../plug-ins/common/file-pcx.c:152 +#: ../plug-ins/common/file-pcx.c:133 ../plug-ins/common/file-pcx.c:152 msgid "ZSoft PCX image" msgstr "Изображение ZSoft PCX" @@ -3962,15 +3821,13 @@ msgstr "Невозможно прочесть заголовок из '%s'" msgid "'%s' is not a PCX file" msgstr "'%s' не является файлом PCX" -#: ../plug-ins/common/file-pcx.c:397 -#: ../plug-ins/file-bmp/bmp-read.c:647 +#: ../plug-ins/common/file-pcx.c:397 ../plug-ins/file-bmp/bmp-read.c:666 #: ../plug-ins/file-psd/psd-load.c:301 #, c-format msgid "Unsupported or invalid image width: %d" msgstr "Неподдерживаемая ширина изображения: %d" -#: ../plug-ins/common/file-pcx.c:403 -#: ../plug-ins/file-bmp/bmp-read.c:653 +#: ../plug-ins/common/file-pcx.c:403 ../plug-ins/file-bmp/bmp-read.c:672 #: ../plug-ins/file-psd/psd-load.c:293 #, c-format msgid "Unsupported or invalid image height: %d" @@ -4002,12 +3859,14 @@ msgstr "Некорректное смещение по Y: %d" #: ../plug-ins/common/file-pcx.c:697 #, c-format msgid "Right border out of bounds (must be < %d): %d" -msgstr "Правая граница находится за допустимыми пределами (должна быть < %d): %d" +msgstr "" +"Правая граница находится за допустимыми пределами (должна быть < %d): %d" #: ../plug-ins/common/file-pcx.c:704 #, c-format msgid "Bottom border out of bounds (must be < %d): %d" -msgstr "Нижняя граница находится за допустимыми пределами (должна быть < %d): %d" +msgstr "" +"Нижняя граница находится за допустимыми пределами (должна быть < %d): %d" #: ../plug-ins/common/file-pcx.c:769 #, c-format @@ -4030,8 +3889,7 @@ msgstr "Не удалось загрузить '%s': %s" msgid "%s-%s" msgstr "%s-%s" -#: ../plug-ins/common/file-pdf-load.c:897 -#: ../plug-ins/common/file-ps.c:1102 +#: ../plug-ins/common/file-pdf-load.c:897 ../plug-ins/common/file-ps.c:1102 #, c-format msgid "%s-pages" msgstr "%s-страниц" @@ -4040,15 +3898,14 @@ msgstr "%s-страниц" msgid "Import from PDF" msgstr "Импорт из PDF" -#: ../plug-ins/common/file-pdf-load.c:1093 -#: ../plug-ins/common/file-ps.c:2962 +#: ../plug-ins/common/file-pdf-load.c:1093 ../plug-ins/common/file-ps.c:2962 #: ../plug-ins/common/file-tiff-load.c:491 msgid "_Import" msgstr "_Импортировать" #: ../plug-ins/common/file-pdf-load.c:1126 msgid "Error getting number of pages from the given PDF file." -msgstr "" +msgstr "Произошла ошибка при получении числа страниц в файле PDF." #: ../plug-ins/common/file-pdf-load.c:1168 msgid "_Width (pixels):" @@ -4068,10 +3925,8 @@ msgid "Use _Anti-aliasing" msgstr "_Использовать сглаживание" #: ../plug-ins/common/file-pdf-load.c:1460 -#: ../plug-ins/common/file-pdf-load.c:1461 -#: ../plug-ins/common/file-svg.c:917 -#: ../plug-ins/common/file-wmf.c:698 -#: ../plug-ins/print/print-page-layout.c:301 +#: ../plug-ins/common/file-pdf-load.c:1461 ../plug-ins/common/file-svg.c:917 +#: ../plug-ins/common/file-wmf.c:698 ../plug-ins/print/print-page-layout.c:301 #, c-format msgid "pixels/%a" msgstr "точек растра/%a" @@ -4089,8 +3944,12 @@ msgstr "Необходимо указать имя файла для сохра msgid "" "An error occured while creating the PDF file:\n" "%s\n" -"Make sure you entered a valid filename and that the selected location isn't read only!" +"Make sure you entered a valid filename and that the selected location isn't " +"read only!" msgstr "" +"Произошла ошибка при создании файла PDF:\n" +"%s\n" +"Убедитесь, что правильно ввели имя файла, а папка доступна для записи." #: ../plug-ins/common/file-pdf-save.c:746 #: ../plug-ins/common/file-pdf-save.c:863 @@ -4136,15 +3995,12 @@ msgstr "Добавить это изображение" msgid "Error! In order to save the file, at least one image should be added!" msgstr "Для сохранения файла нужно добавить хотя бы одно изображение." -#: ../plug-ins/common/file-pix.c:142 -#: ../plug-ins/common/file-pix.c:159 +#: ../plug-ins/common/file-pix.c:142 ../plug-ins/common/file-pix.c:159 msgid "Alias Pix image" msgstr "Изображение Alias Pix" -#: ../plug-ins/common/file-png.c:279 -#: ../plug-ins/common/file-png.c:300 -#: ../plug-ins/common/file-png.c:320 -#: ../plug-ins/common/file-png.c:337 +#: ../plug-ins/common/file-png.c:279 ../plug-ins/common/file-png.c:300 +#: ../plug-ins/common/file-png.c:320 ../plug-ins/common/file-png.c:337 msgid "PNG image" msgstr "Изображение PNG" @@ -4157,6 +4013,7 @@ msgstr "Ошибка при открытии файла PNG: %s" #, c-format msgid "Error creating PNG read struct while saving '%s'." msgstr "" +"В ходе сохранения '%s' произошла ошибка при создании класса чтения в PNG." #: ../plug-ins/common/file-png.c:742 #, c-format @@ -4174,8 +4031,12 @@ msgid "Could not create new image for '%s': %s" msgstr "Не удалось создать новое изображение для '%s': %s" #: ../plug-ins/common/file-png.c:936 -msgid "The PNG file specifies an offset that caused the layer to be positioned outside the image." -msgstr "В файле формата PNG указано смещение, которое располагает слой за пределами изображения." +msgid "" +"The PNG file specifies an offset that caused the layer to be positioned " +"outside the image." +msgstr "" +"В файле формата PNG указано смещение, которое располагает слой за пределами " +"изображения." #: ../plug-ins/common/file-png.c:1238 msgid "Apply PNG Offset" @@ -4191,13 +4052,18 @@ msgstr "Применить смещение PNG к слою" #: ../plug-ins/common/file-png.c:1267 #, c-format -msgid "The PNG image you are importing specifies an offset of %d, %d. Do you want to apply this offset to the layer?" -msgstr "Импортируемое изображение PNG содержит смещение на %d, %d. Вы хотите применить его к слою?" +msgid "" +"The PNG image you are importing specifies an offset of %d, %d. Do you want " +"to apply this offset to the layer?" +msgstr "" +"Импортируемое изображение PNG содержит смещение на %d, %d. Вы хотите " +"применить его к слою?" #: ../plug-ins/common/file-png.c:1335 #, c-format msgid "Error creating PNG write struct while saving '%s'." msgstr "" +"В ходе сохранения '%s' произошла ошибка при создании класса записи в PNG." #: ../plug-ins/common/file-png.c:1345 #, c-format @@ -4233,12 +4099,9 @@ msgstr "Изображение PGM" msgid "PPM image" msgstr "Изображение PPM" -#: ../plug-ins/common/file-pnm.c:530 -#: ../plug-ins/common/file-pnm.c:552 -#: ../plug-ins/common/file-pnm.c:561 -#: ../plug-ins/common/file-pnm.c:572 -#: ../plug-ins/common/file-pnm.c:658 -#: ../plug-ins/common/file-pnm.c:740 +#: ../plug-ins/common/file-pnm.c:530 ../plug-ins/common/file-pnm.c:552 +#: ../plug-ins/common/file-pnm.c:561 ../plug-ins/common/file-pnm.c:572 +#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:740 msgid "Premature end of file." msgstr "Преждевременный конец файла." @@ -4291,13 +4154,11 @@ msgstr "Необработанный" msgid "ASCII" msgstr "Текстовый (ASCII)" -#: ../plug-ins/common/file-ps.c:579 -#: ../plug-ins/common/file-ps.c:671 +#: ../plug-ins/common/file-ps.c:579 ../plug-ins/common/file-ps.c:671 msgid "PostScript document" msgstr "Документ PostScript" -#: ../plug-ins/common/file-ps.c:598 -#: ../plug-ins/common/file-ps.c:687 +#: ../plug-ins/common/file-ps.c:598 ../plug-ins/common/file-ps.c:687 msgid "Encapsulated PostScript image" msgstr "Encapsulated PostScript" @@ -4315,20 +4176,15 @@ msgstr "Не удалось интерпретировать файл Postscript msgid "PostScript save cannot handle images with alpha channels" msgstr "Изображение с альфа-каналами невозможно сохранить как PostScript" -#: ../plug-ins/common/file-ps.c:1804 -#: ../plug-ins/common/file-tiff-load.c:1012 +#: ../plug-ins/common/file-ps.c:1804 ../plug-ins/common/file-tiff-load.c:1012 #, c-format msgid "Page %d" msgstr "Страница %d" -#: ../plug-ins/common/file-ps.c:2469 -#: ../plug-ins/common/file-ps.c:2600 -#: ../plug-ins/common/file-ps.c:2749 -#: ../plug-ins/common/file-ps.c:2873 -#: ../plug-ins/common/file-sunras.c:1504 -#: ../plug-ins/common/file-sunras.c:1610 -#: ../plug-ins/file-fits/fits.c:850 -#: ../plug-ins/file-fits/fits.c:973 +#: ../plug-ins/common/file-ps.c:2469 ../plug-ins/common/file-ps.c:2600 +#: ../plug-ins/common/file-ps.c:2749 ../plug-ins/common/file-ps.c:2873 +#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1610 +#: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:973 msgid "Write error occurred" msgstr "Возникла ошибка записи" @@ -4342,8 +4198,7 @@ msgid "Rendering" msgstr "Визуализация" #. Resolution -#: ../plug-ins/common/file-ps.c:3017 -#: ../plug-ins/common/file-svg.c:911 +#: ../plug-ins/common/file-ps.c:3017 ../plug-ins/common/file-svg.c:911 #: ../plug-ins/common/file-wmf.c:692 msgid "Resolution:" msgstr "Разрешение:" @@ -4356,8 +4211,7 @@ msgstr "Страницы:" msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)" msgstr "Страницы для загрузки (напр.: 1-4 или 1,3,5-7)" -#: ../plug-ins/common/file-ps.c:3068 -#: ../plug-ins/common/sphere-designer.c:2657 +#: ../plug-ins/common/file-ps.c:3068 ../plug-ins/common/sphere-designer.c:2657 msgid "Layers" msgstr "Слои" @@ -4382,16 +4236,14 @@ msgstr "Окрашивание" msgid "B/W" msgstr "Ч/Б" -#: ../plug-ins/common/file-ps.c:3097 -#: ../plug-ins/common/file-xpm.c:479 +#: ../plug-ins/common/file-ps.c:3097 ../plug-ins/common/file-xpm.c:479 #: ../plug-ins/gimpressionist/color.c:65 #: ../plug-ins/gimpressionist/general.c:169 #: ../plug-ins/imagemap/imap_menu.c:212 msgid "Color" msgstr "Цвет" -#: ../plug-ins/common/file-ps.c:3098 -#: ../plug-ins/file-fits/fits.c:1032 +#: ../plug-ins/common/file-ps.c:3098 ../plug-ins/file-fits/fits.c:1032 msgid "Automatic" msgstr "Автоматически" @@ -4399,20 +4251,16 @@ msgstr "Автоматически" msgid "Text antialiasing" msgstr "Сглаживание текста" -#: ../plug-ins/common/file-ps.c:3113 -#: ../plug-ins/common/file-ps.c:3125 -#, fuzzy +#: ../plug-ins/common/file-ps.c:3113 ../plug-ins/common/file-ps.c:3125 msgctxt "antialiasing" msgid "None" msgstr "Нет" -#: ../plug-ins/common/file-ps.c:3114 -#: ../plug-ins/common/file-ps.c:3126 +#: ../plug-ins/common/file-ps.c:3114 ../plug-ins/common/file-ps.c:3126 msgid "Weak" msgstr "Слабое" -#: ../plug-ins/common/file-ps.c:3115 -#: ../plug-ins/common/file-ps.c:3127 +#: ../plug-ins/common/file-ps.c:3115 ../plug-ins/common/file-ps.c:3127 msgid "Strong" msgstr "Сильное" @@ -4434,8 +4282,12 @@ msgid "_Keep aspect ratio" msgstr "Сохранить пропорции" #: ../plug-ins/common/file-ps.c:3271 -msgid "When toggled, the resulting image will be scaled to fit into the given size without changing the aspect ratio." -msgstr "Если выбрано, итоговое изображение будет масштабироваться до заполнения заданного размера без изменения пропорций." +msgid "" +"When toggled, the resulting image will be scaled to fit into the given size " +"without changing the aspect ratio." +msgstr "" +"Если выбрано, итоговое изображение будет масштабироваться до заполнения " +"заданного размера без изменения пропорций." #. Unit #: ../plug-ins/common/file-ps.c:3281 @@ -4477,8 +4329,7 @@ msgstr "Просмотр" msgid "Preview _size:" msgstr "Размер просмотра:" -#: ../plug-ins/common/file-psp.c:599 -#: ../plug-ins/common/file-psp.c:623 +#: ../plug-ins/common/file-psp.c:599 ../plug-ins/common/file-psp.c:623 msgid "Paint Shop Pro image" msgstr "Изображение Paint Shop Pro" @@ -4492,7 +4343,6 @@ msgid "Data Compression" msgstr "Сжатие данных" #: ../plug-ins/common/file-psp.c:647 -#, fuzzy msgctxt "compression" msgid "None" msgstr "Нет" @@ -4505,8 +4355,7 @@ msgstr "RLE" msgid "LZ77" msgstr "LZ77" -#: ../plug-ins/common/file-raw.c:187 -#: ../plug-ins/common/file-raw.c:202 +#: ../plug-ins/common/file-raw.c:187 ../plug-ins/common/file-raw.c:202 msgid "Raw image data" msgstr "Raw Image Data" @@ -4546,13 +4395,11 @@ msgstr "Тип изображения:" msgid "Palette" msgstr "Палитра" -#: ../plug-ins/common/file-raw.c:1170 -#: ../plug-ins/common/file-raw.c:1255 +#: ../plug-ins/common/file-raw.c:1170 ../plug-ins/common/file-raw.c:1255 msgid "R, G, B (normal)" msgstr "R, G, B (normal)" -#: ../plug-ins/common/file-raw.c:1171 -#: ../plug-ins/common/file-raw.c:1257 +#: ../plug-ins/common/file-raw.c:1171 ../plug-ins/common/file-raw.c:1257 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (BMP-стиль)" @@ -4592,8 +4439,7 @@ msgstr "Planar (RRR,GGG,BBB)" msgid "Indexed Palette Type" msgstr "Тип индексированной палитры" -#: ../plug-ins/common/file-sunras.c:217 -#: ../plug-ins/common/file-sunras.c:237 +#: ../plug-ins/common/file-sunras.c:217 ../plug-ins/common/file-sunras.c:237 msgid "SUN Rasterfile image" msgstr "Изображение SUN Rasterfile" @@ -4615,8 +4461,7 @@ msgstr "Невозможно прочесть цветовые записи из msgid "Type of colormap not supported" msgstr "Не поддерживается тип цветовой карты" -#: ../plug-ins/common/file-sunras.c:457 -#: ../plug-ins/common/file-xbm.c:827 +#: ../plug-ins/common/file-sunras.c:457 ../plug-ins/common/file-xbm.c:827 #: ../plug-ins/common/file-xwd.c:491 #, c-format msgid "" @@ -4626,8 +4471,7 @@ msgstr "" "\"%s\":\n" "не указано изображение" -#: ../plug-ins/common/file-sunras.c:465 -#: ../plug-ins/common/file-xbm.c:834 +#: ../plug-ins/common/file-sunras.c:465 ../plug-ins/common/file-xbm.c:834 #: ../plug-ins/common/file-xwd.c:501 #, c-format msgid "" @@ -4637,8 +4481,7 @@ msgstr "" "'%s':\n" "GIMP не справится с изображением такой ширины" -#: ../plug-ins/common/file-sunras.c:473 -#: ../plug-ins/common/file-xbm.c:841 +#: ../plug-ins/common/file-sunras.c:473 ../plug-ins/common/file-xbm.c:841 #: ../plug-ins/common/file-xwd.c:510 #, c-format msgid "" @@ -4648,8 +4491,7 @@ msgstr "" "\"%s\":\n" "высота изображения не указана" -#: ../plug-ins/common/file-sunras.c:481 -#: ../plug-ins/common/file-xbm.c:848 +#: ../plug-ins/common/file-sunras.c:481 ../plug-ins/common/file-xbm.c:848 #: ../plug-ins/common/file-xwd.c:519 #, c-format msgid "" @@ -4672,16 +4514,11 @@ msgstr "Невозможно сохранить как SUNRAS изображен msgid "Can't operate on unknown image types" msgstr "Невозможно выполнять действия с изображением неизвестного типа" -#: ../plug-ins/common/file-sunras.c:1084 -#: ../plug-ins/common/file-sunras.c:1175 -#: ../plug-ins/common/file-sunras.c:1256 -#: ../plug-ins/common/file-sunras.c:1351 -#: ../plug-ins/common/file-xwd.c:1361 -#: ../plug-ins/common/file-xwd.c:1462 -#: ../plug-ins/common/file-xwd.c:1620 -#: ../plug-ins/common/file-xwd.c:1832 -#: ../plug-ins/common/file-xwd.c:2095 -#: ../plug-ins/file-fits/fits.c:698 +#: ../plug-ins/common/file-sunras.c:1084 ../plug-ins/common/file-sunras.c:1175 +#: ../plug-ins/common/file-sunras.c:1256 ../plug-ins/common/file-sunras.c:1351 +#: ../plug-ins/common/file-xwd.c:1361 ../plug-ins/common/file-xwd.c:1462 +#: ../plug-ins/common/file-xwd.c:1620 ../plug-ins/common/file-xwd.c:1832 +#: ../plug-ins/common/file-xwd.c:2095 ../plug-ins/file-fits/fits.c:698 msgid "EOF encountered on reading" msgstr "При чтении обнаружен конец файла" @@ -4702,8 +4539,7 @@ msgstr "Кодирование RLE" msgid "SVG image" msgstr "Изображение SVG" -#: ../plug-ins/common/file-svg.c:335 -#: ../plug-ins/common/file-svg.c:715 +#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:715 msgid "Unknown reason" msgstr "Неизвестная причина" @@ -4715,8 +4551,7 @@ msgstr "Визуализация SVG" msgid "Rendered SVG" msgstr "Визуализованный SVG" -#: ../plug-ins/common/file-svg.c:549 -#: ../plug-ins/common/file-wmf.c:358 +#: ../plug-ins/common/file-svg.c:549 ../plug-ins/common/file-wmf.c:358 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -4735,29 +4570,24 @@ msgid "Render Scalable Vector Graphics" msgstr "Создать Scalable Vector Graphics" #. Width and Height -#: ../plug-ins/common/file-svg.c:790 -#: ../plug-ins/common/file-wmf.c:571 +#: ../plug-ins/common/file-svg.c:790 ../plug-ins/common/file-wmf.c:571 #: ../plug-ins/common/grid.c:726 msgid "Width:" msgstr "Ширина:" -#: ../plug-ins/common/file-svg.c:796 -#: ../plug-ins/common/file-wmf.c:577 +#: ../plug-ins/common/file-svg.c:796 ../plug-ins/common/file-wmf.c:577 msgid "Height:" msgstr "Высота:" -#: ../plug-ins/common/file-svg.c:870 -#: ../plug-ins/common/file-wmf.c:651 +#: ../plug-ins/common/file-svg.c:870 ../plug-ins/common/file-wmf.c:651 msgid "_X ratio:" msgstr "_Масштаб по X:" -#: ../plug-ins/common/file-svg.c:892 -#: ../plug-ins/common/file-wmf.c:673 +#: ../plug-ins/common/file-svg.c:892 ../plug-ins/common/file-wmf.c:673 msgid "_Y ratio:" msgstr "М_асштаб по Y:" -#: ../plug-ins/common/file-svg.c:906 -#: ../plug-ins/common/file-wmf.c:687 +#: ../plug-ins/common/file-svg.c:906 ../plug-ins/common/file-wmf.c:687 msgid "Constrain aspect ratio" msgstr "Фиксированное соотношение сторон" @@ -4767,15 +4597,17 @@ msgid "Import _paths" msgstr "Импорт _контуров" #: ../plug-ins/common/file-svg.c:944 -msgid "Import path elements of the SVG so they can be used with the GIMP path tool" -msgstr "Импортировать элементы контура из SVG, так чтобы они могли быть использованы инструментом \"Контур\"" +msgid "" +"Import path elements of the SVG so they can be used with the GIMP path tool" +msgstr "" +"Импортировать элементы контура из SVG, так чтобы они могли быть использованы " +"инструментом \"Контур\"" #: ../plug-ins/common/file-svg.c:952 msgid "Merge imported paths" msgstr "Объединить импортированные контуры" -#: ../plug-ins/common/file-tga.c:245 -#: ../plug-ins/common/file-tga.c:264 +#: ../plug-ins/common/file-tga.c:245 ../plug-ins/common/file-tga.c:264 msgid "TarGA image" msgstr "Изображение TarGA" @@ -4843,7 +4675,9 @@ msgstr "Канал TIFF" #: ../plug-ins/file-psd/psd-load.c:333 msgid "" "Warning:\n" -"The image you are loading has 16 bits per channel. GIMP can only handle 8 bit, so it will be converted for you. Information will be lost because of this conversion." +"The image you are loading has 16 bits per channel. GIMP can only handle 8 " +"bit, so it will be converted for you. Information will be lost because of " +"this conversion." msgstr "" "Предупреждение:\n" "Изображение, которое вы собираетесь загрузить,\n" @@ -4901,8 +4735,7 @@ msgstr "CCITT Group _4 fax" msgid "Save _color values from transparent pixels" msgstr "Сохранить значения цвета _прозрачных точек" -#: ../plug-ins/common/file-tiff-save.c:1139 -#: ../plug-ins/common/file-xbm.c:1235 +#: ../plug-ins/common/file-tiff-save.c:1139 ../plug-ins/common/file-xbm.c:1235 msgid "Comment:" msgstr "Комментарий:" @@ -4931,8 +4764,7 @@ msgstr "Не удалось открыть \"%s\" для чтения" msgid "Rendered WMF" msgstr "Созданный WMF" -#: ../plug-ins/common/file-xbm.c:177 -#: ../plug-ins/common/file-xbm.c:195 +#: ../plug-ins/common/file-xbm.c:177 ../plug-ins/common/file-xbm.c:195 msgid "X BitMap image" msgstr "Изображение X BitMap" @@ -4957,7 +4789,8 @@ msgstr "" #. The image is not black-and-white. #: ../plug-ins/common/file-xbm.c:999 msgid "" -"The image which you are trying to save as an XBM contains more than two colors.\n" +"The image which you are trying to save as an XBM contains more than two " +"colors.\n" "\n" "Please convert it to a black and white (1-bit) indexed image and try again." msgstr "" @@ -4998,8 +4831,7 @@ msgstr "Префикс идентификатора:" msgid "_Write hot spot values" msgstr "Записать значения \"горячих точек\"" -#: ../plug-ins/common/file-xbm.c:1266 -#: ../plug-ins/common/file-xmc.c:1081 +#: ../plug-ins/common/file-xbm.c:1266 ../plug-ins/common/file-xmc.c:1081 msgid "Hot spot _X:" msgstr "«Горячая точка» X:" @@ -5020,8 +4852,7 @@ msgstr "Записать дополнительный файл маски" msgid "_Mask file extension:" msgstr "Расширение файла маски:" -#: ../plug-ins/common/file-xmc.c:331 -#: ../plug-ins/common/file-xmc.c:369 +#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:369 #: ../plug-ins/common/file-xmc.c:1044 msgid "X11 Mouse Cursor" msgstr "Указатель мыши X11" @@ -5053,7 +4884,7 @@ msgstr "Кадр '%d' из '%s' слишком высок для указате #: ../plug-ins/common/file-xmc.c:888 #, c-format msgid "there is no image chunk in \"%s\"." -msgstr "" +msgstr "В \"%s\" нет растрового фрагмента." #: ../plug-ins/common/file-xmc.c:930 #, c-format @@ -5080,10 +4911,14 @@ msgstr "Параметры XMC" #: ../plug-ins/common/file-xmc.c:1077 msgid "Enter the X coordinate of the hot spot. The origin is top left corner." msgstr "" +"Введите координату X горячей точки. Начало координат находится в левом " +"верхнем углу." #: ../plug-ins/common/file-xmc.c:1095 msgid "Enter the Y coordinate of the hot spot. The origin is top left corner." msgstr "" +"Введите координату Y горячей точки. Начало координат находится в левом " +"верхнем углу." #: ../plug-ins/common/file-xmc.c:1106 msgid "_Auto-Crop all frames." @@ -5092,16 +4927,25 @@ msgstr "_Автокадрировать все кадры" #: ../plug-ins/common/file-xmc.c:1119 msgid "" "Remove the empty borders of all frames.\n" -"This reduces the file size and may fix the problem that some large cursors disorder the screen.\n" +"This reduces the file size and may fix the problem that some large cursors " +"disorder the screen.\n" "Uncheck if you plan to edit the exported cursor using other programs." msgstr "" +"Удалите пустые края во всех кадрах.\n" +"Этим вы уменьшите размер файла и сможете исправить ошибку, при которой " +"некоторые большие курсоры искажают данные на экране.\n" +"Снимите флажок, если собираетесь изменять экспортированный курсор в других " +"программах." #: ../plug-ins/common/file-xmc.c:1142 msgid "" "Choose the nominal size of frames.\n" -"If you don't have plans to make multi-sized cursor, or you have no idea, leave it \"32px\".\n" +"If you don't have plans to make multi-sized cursor, or you have no idea, " +"leave it \"32px\".\n" "Nominal size has no relation with the actual size (width or height).\n" -"It is only used to determine which frame depends on which animation sequence, and which sequence is used based on the value of \"gtk-cursor-theme-size\"." +"It is only used to determine which frame depends on which animation " +"sequence, and which sequence is used based on the value of \"gtk-cursor-" +"theme-size\"." msgstr "" #: ../plug-ins/common/file-xmc.c:1159 @@ -5114,7 +4958,7 @@ msgstr "_Заменить размер всех кадров, даже если #: ../plug-ins/common/file-xmc.c:1196 msgid "Enter time span in milliseconds in which each frame is rendered." -msgstr "" +msgstr "Введите длительность отрисовки каждого фрейма в миллисекундах" #: ../plug-ins/common/file-xmc.c:1199 msgid "_Delay:" @@ -5122,15 +4966,19 @@ msgstr "_Задержка:" #: ../plug-ins/common/file-xmc.c:1204 msgid "_Use this value only for a frame which delay is not specified." -msgstr "И_спользовать это значение только для кадра, чья длительность не указана" +msgstr "" +"И_спользовать это значение только для кадра, чья длительность не указана" #: ../plug-ins/common/file-xmc.c:1207 msgid "_Replace the delay of all frames even if it is specified." msgstr "З_аменить длительность всех кадров, даже если она уже указана" #: ../plug-ins/common/file-xmc.c:1232 -msgid "The part of copyright information that exceeded 65535 characters was removed." -msgstr "Была удалена.часть информации об авторском праве, выходящая за пределы 65535 символов." +msgid "" +"The part of copyright information that exceeded 65535 characters was removed." +msgstr "" +"Была удалена.часть информации об авторском праве, выходящая за пределы 65535 " +"символов." #: ../plug-ins/common/file-xmc.c:1242 msgid "Enter copyright information." @@ -5141,8 +4989,11 @@ msgid "_Copyright:" msgstr "_Авторские права:" #: ../plug-ins/common/file-xmc.c:1260 -msgid "The part of license information that exceeded 65535 characters was removed." -msgstr "Была удалена.часть информации об лицензии, выходящая за пределы 65535 символов." +msgid "" +"The part of license information that exceeded 65535 characters was removed." +msgstr "" +"Была удалена.часть информации об лицензии, выходящая за пределы 65535 " +"символов." #: ../plug-ins/common/file-xmc.c:1270 msgid "Enter license information." @@ -5173,7 +5024,9 @@ msgstr "Комментарий ограничен %d символами." #: ../plug-ins/common/file-xmc.c:1481 #, c-format msgid "This plug-in can only handle RGBA image files with 8bit color depth." -msgstr "Этот модуль работает только с изображениями RGBA с 8 разрядами на цветовой канал." +msgstr "" +"Этот модуль работает только с изображениями RGBA с 8 разрядами на цветовой " +"канал." #: ../plug-ins/common/file-xmc.c:1499 #, c-format @@ -5191,54 +5044,71 @@ msgid "Width and/or height of frame '%s' is zero!" msgstr "Ширина и/или высота кадра '%s' равны нулю!" #: ../plug-ins/common/file-xmc.c:1553 -#, fuzzy, c-format +#, c-format msgid "" "Cannot save the cursor because the hot spot is not on frame '%s'.\n" -"Try to change the hot spot position, layer geometry or save without auto-crop." +"Try to change the hot spot position, layer geometry or save without auto-" +"crop." msgstr "" -"Не удалось сохранить курсор, потому что горячая точка не находится в '%s'.\n" -"Попробуйте изменить положение горячей точки, геометрию слоя или сохраните без автокадрирования." +"Не удалось сохранить курсор, потому что горячая точка не находится в кадре " +"'%s'.\n" +"Попробуйте изменить положение горячей точки, геометрию слоя или сохраните " +"без автокадрирования." #: ../plug-ins/common/file-xmc.c:1710 #, c-format msgid "" -"Your cursor was successfully saved but it contains one or more frames whose width or height is more than %ipx.\n" +"Your cursor was successfully saved but it contains one or more frames whose " +"width or height is more than %ipx.\n" "It will clutter the screen in some environments." msgstr "" +"Ваш курсор успешно сохранён, но содержит один или более кадров с шириной или " +"высотой больше %ipx.\n" +"В некоторых рабочих окружениях это может приводить к видимым ошибкам " +"отрисовки." #: ../plug-ins/common/file-xmc.c:1717 -#, fuzzy msgid "" -"Your cursor was successfully saved but it contains one or more frames whose nominal size is not supported by GNOME settings.\n" -"You can satisfy it by checking \"Replace the size of all frames...\" in the save dialog, or your cursor may not appear in GNOME settings." +"Your cursor was successfully saved but it contains one or more frames whose " +"nominal size is not supported by GNOME settings.\n" +"You can satisfy it by checking \"Replace the size of all frames...\" in the " +"save dialog, or your cursor may not appear in GNOME settings." msgstr "" -"Курсор был успешно сохранен, но размер некоторых его кадров не поддерживается апплетом gnome-appearance-properties.\n" -"Вы можете исправить это, включив функцию «Заменить размер всех кадров...» в диалоге сохранения. В противном случае курсор не появится в апплете настройки внешнего вида рабочей среды." +"Курсор был успешно сохранен, но размер некоторых его кадров не " +"поддерживается в параметрах GNOME.\n" +"Вы можете исправить это, включив функцию «Заменить размер всех кадров...» в " +"диалоге сохранения. В противном случае курсор не появится в апплете " +"настройки внешнего вида рабочей среды." #: ../plug-ins/common/file-xmc.c:1954 #, c-format -msgid "The parasite \"%s\" is too long for an X cursor comment. It was cut off to fit." +msgid "" +"The parasite \"%s\" is too long for an X cursor comment. It was cut off to " +"fit." msgstr "" +"Паразит \"%s\" оказался слишком длинным для комментария к курсору X и был " +"отрезан, чтобы уместиться." #. translators: the %i is *always* 8 here #: ../plug-ins/common/file-xmc.c:2157 #, c-format -msgid "Sorry, this plug-in cannot handle a cursor which contains over %i different nominal sizes." -msgstr "Это расширение не может иметь дело с курсором, имеющим более %i разных номинальных размеров." +msgid "" +"Sorry, this plug-in cannot handle a cursor which contains over %i different " +"nominal sizes." +msgstr "" +"Это расширение не может иметь дело с курсором, имеющим более %i разных " +"номинальных размеров." -#: ../plug-ins/common/file-xpm.c:174 -#: ../plug-ins/common/file-xpm.c:199 +#: ../plug-ins/common/file-xpm.c:174 ../plug-ins/common/file-xpm.c:199 msgid "X PixMap image" msgstr "Изображение X PixMap" -#: ../plug-ins/common/file-xpm.c:363 -#: ../plug-ins/common/file-xpm.c:775 +#: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:775 #, c-format msgid "Error opening file '%s'" msgstr "Ошибка при открытии файла %s" -#: ../plug-ins/common/file-xpm.c:369 -#: ../plug-ins/common/file-xpm.c:781 +#: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:781 msgid "XPM file invalid" msgstr "Неверный файл XPM" @@ -5250,8 +5120,7 @@ msgstr "XPM" msgid "_Alpha threshold:" msgstr "Порог альфа-канала:" -#: ../plug-ins/common/file-xwd.c:280 -#: ../plug-ins/common/file-xwd.c:300 +#: ../plug-ins/common/file-xwd.c:280 ../plug-ins/common/file-xwd.c:300 msgid "X window dump" msgstr "Дамп X window" @@ -5268,7 +5137,9 @@ msgstr "невозможно прочесть цветовые записи" #: ../plug-ins/common/file-xwd.c:579 #, c-format -msgid "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is not supported." +msgid "" +"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is " +"not supported." msgstr "" "XWD-файл %s имеет формат %d, глубину %d\n" "и %d бит на пиксел.\n" @@ -5278,8 +5149,7 @@ msgstr "" msgid "Cannot save images with alpha channels." msgstr "Невозможно сохранить изображения с альфа-каналами." -#: ../plug-ins/common/file-xwd.c:1692 -#: ../plug-ins/common/file-xwd.c:1930 +#: ../plug-ins/common/file-xwd.c:1692 ../plug-ins/common/file-xwd.c:1930 #, c-format msgid "XWD-file %s is corrupt." msgstr "Файл %s в формате XWD повреждён." @@ -5304,8 +5174,7 @@ msgstr "_Фотопленка..." msgid "Composing images" msgstr "Сборка изображений" -#: ../plug-ins/common/film.c:423 -#: ../plug-ins/common/guillotine.c:215 +#: ../plug-ins/common/film.c:423 ../plug-ins/common/guillotine.c:215 #: ../plug-ins/help-browser/dialog.c:1132 msgid "Untitled" msgstr "Безымянное" @@ -5319,8 +5188,7 @@ msgid "On film:" msgstr "На плёнку:" #. Film height/colour -#: ../plug-ins/common/film.c:975 -#: ../plug-ins/common/film.c:1251 +#: ../plug-ins/common/film.c:975 ../plug-ins/common/film.c:1251 msgid "Filmstrip" msgstr "Фотопленка" @@ -5334,8 +5202,7 @@ msgstr "_Растягивать по высоте изображения" msgid "Select Film Color" msgstr "Выбрать цвет пленки" -#: ../plug-ins/common/film.c:1028 -#: ../plug-ins/common/film.c:1078 +#: ../plug-ins/common/film.c:1028 ../plug-ins/common/film.c:1078 #: ../plug-ins/common/nova.c:349 msgid "Co_lor:" msgstr "_Цвет:" @@ -5453,8 +5320,7 @@ msgstr "Насыщеннее:" msgid "Less Sat:" msgstr "Меньше насыщ.:" -#: ../plug-ins/common/filter-pack.c:233 -#: ../plug-ins/common/filter-pack.c:532 +#: ../plug-ins/common/filter-pack.c:233 ../plug-ins/common/filter-pack.c:532 msgid "Current:" msgstr "Текущее:" @@ -5490,8 +5356,7 @@ msgstr "Варианты тона" msgid "Roughness" msgstr "Шероховатость" -#: ../plug-ins/common/filter-pack.c:676 -#: ../plug-ins/common/filter-pack.c:1320 +#: ../plug-ins/common/filter-pack.c:676 ../plug-ins/common/filter-pack.c:1320 msgid "Affected Range" msgstr "Обрабатываемый диапазон" @@ -5511,8 +5376,7 @@ msgstr "Я_ркие участки:" msgid "Windows" msgstr "Окна" -#: ../plug-ins/common/filter-pack.c:706 -#: ../plug-ins/common/van-gogh-lic.c:676 +#: ../plug-ins/common/filter-pack.c:706 ../plug-ins/common/van-gogh-lic.c:676 msgid "_Saturation" msgstr "_Насыщенность" @@ -5663,8 +5527,7 @@ msgstr "_Сетка..." msgid "Drawing grid" msgstr "Рисование сетки" -#: ../plug-ins/common/grid.c:636 -#: ../plug-ins/gfig/gfig-dialog.c:1391 +#: ../plug-ins/common/grid.c:636 ../plug-ins/gfig/gfig-dialog.c:1391 #: ../plug-ins/imagemap/imap_menu.c:208 msgid "Grid" msgstr "Сетка" @@ -5728,8 +5591,7 @@ msgstr "Найти и изменить точки, которые могут о msgid "_Hot..." msgstr "«Горячие» _цвета..." -#: ../plug-ins/common/hot.c:387 -#: ../plug-ins/common/hot.c:587 +#: ../plug-ins/common/hot.c:387 ../plug-ins/common/hot.c:587 msgid "Hot" msgstr "«Горячие» цвета" @@ -5749,8 +5611,7 @@ msgstr "Уменьшить _яркость" msgid "Reduce _Saturation" msgstr "Уменьшить на_сыщенность" -#: ../plug-ins/common/hot.c:640 -#: ../plug-ins/common/waves.c:284 +#: ../plug-ins/common/hot.c:640 ../plug-ins/common/waves.c:284 msgid "_Blacken" msgstr "Сделать _чёрным" @@ -5762,8 +5623,7 @@ msgstr "Наложить многочисленные искажённые ко msgid "_Illusion..." msgstr "_Иллюзия..." -#: ../plug-ins/common/illusion.c:168 -#: ../plug-ins/common/illusion.c:350 +#: ../plug-ins/common/illusion.c:168 ../plug-ins/common/illusion.c:350 msgid "Illusion" msgstr "Иллюзия" @@ -5800,8 +5660,7 @@ msgstr "Искажается кадр %d" msgid "Ping pong" msgstr "Пинг-понг" -#: ../plug-ins/common/iwarp.c:974 -#: ../plug-ins/common/whirl-pinch.c:193 +#: ../plug-ins/common/iwarp.c:974 ../plug-ins/common/whirl-pinch.c:193 msgid "Region affected by plug-in is empty" msgstr "Область применения дополнения пуста" @@ -5877,8 +5736,7 @@ msgstr "_Макс. глубина:" msgid "Thresho_ld:" msgstr "_Порог:" -#: ../plug-ins/common/iwarp.c:1227 -#: ../plug-ins/common/sinus.c:772 +#: ../plug-ins/common/iwarp.c:1227 ../plug-ins/common/sinus.c:772 #: ../plug-ins/gradient-flare/gradient-flare.c:2868 msgid "_Settings" msgstr "_Параметры" @@ -5888,7 +5746,9 @@ msgid "IWarp" msgstr "Интерактивное искажение" #: ../plug-ins/common/iwarp.c:1324 -msgid "Click and drag in the preview to define the distortions to apply to the image." +msgid "" +"Click and drag in the preview to define the distortions to apply to the " +"image." msgstr "Нажмите и потяните, чтобы определить искажение." #: ../plug-ins/common/jigsaw.c:356 @@ -6002,7 +5862,8 @@ msgid "Default RGB working space" msgstr "Стандартный профиль RGB рабочего пространства" #: ../plug-ins/common/lcms.c:775 -msgid "Data attached as 'icc-profile' does not appear to be an ICC color profile" +msgid "" +"Data attached as 'icc-profile' does not appear to be an ICC color profile" msgstr "Данные, присоединённые как ICC-профиль, не похожи на ICC-профиль" #: ../plug-ins/common/lcms.c:825 @@ -6043,8 +5904,7 @@ msgstr "_Оставить как есть" msgid "_Convert" msgstr "_Преобразовать" -#: ../plug-ins/common/lcms.c:1264 -#: ../plug-ins/file-jpeg/jpeg-exif.c:436 +#: ../plug-ins/common/lcms.c:1264 ../plug-ins/file-jpeg/jpeg-exif.c:436 msgid "_Don't ask me again" msgstr "_Больше не спрашивать" @@ -6161,8 +6021,7 @@ msgstr "_Главная:" msgid "_Edge:" msgstr "_Край:" -#: ../plug-ins/common/lens-distortion.c:546 -#: ../plug-ins/flame/flame.c:1236 +#: ../plug-ins/common/lens-distortion.c:546 ../plug-ins/flame/flame.c:1236 msgid "_Zoom:" msgstr "_Масштаб:" @@ -6198,8 +6057,7 @@ msgstr "Отблеск линзы" msgid "Center of Flare Effect" msgstr "Центр отблеска" -#: ../plug-ins/common/lens-flare.c:785 -#: ../plug-ins/common/nova.c:475 +#: ../plug-ins/common/lens-flare.c:785 ../plug-ins/common/nova.c:475 msgid "Show _position" msgstr "_Показать позицию" @@ -6248,14 +6106,15 @@ msgstr "Не удалось запустить sendmail (%s)" #: ../plug-ins/common/max-rgb.c:90 msgid "Reduce image to pure red, green, and blue" -msgstr "Сократить диапазон цветов изображения до максимальных значений красного, зеленого и синего" +msgstr "" +"Сократить диапазон цветов изображения до максимальных значений красного, " +"зеленого и синего" #: ../plug-ins/common/max-rgb.c:95 msgid "Maxim_um RGB..." msgstr "_Максимум RGB..." -#: ../plug-ins/common/max-rgb.c:134 -#: ../plug-ins/common/noise-hsv.c:158 +#: ../plug-ins/common/max-rgb.c:134 ../plug-ins/common/noise-hsv.c:158 msgid "Can only operate on RGB drawables." msgstr "Возможна работа только с изображениями в режиме RGB." @@ -6321,8 +6180,7 @@ msgstr "_Элементы мозаики:" msgid "Tile _size:" msgstr "_Размер элемента:" -#: ../plug-ins/common/mosaic.c:662 -#: ../plug-ins/common/tile-glass.c:304 +#: ../plug-ins/common/mosaic.c:662 ../plug-ins/common/tile-glass.c:304 msgid "Tile _height:" msgstr "_Высота блока:" @@ -6366,8 +6224,7 @@ msgstr "Круг" msgid "Line" msgstr "Линия" -#: ../plug-ins/common/newsprint.c:136 -#: ../plug-ins/flame/flame.c:759 +#: ../plug-ins/common/newsprint.c:136 ../plug-ins/flame/flame.c:759 msgid "Diamond" msgstr "Ромб" @@ -6405,14 +6262,15 @@ msgstr "Яркость" #: ../plug-ins/common/newsprint.c:508 msgid "Halftone the image to give newspaper-like effect" -msgstr "Преобразует изображение в полутоновые точки, чтобы добиться эффекта газетной печати" +msgstr "" +"Преобразует изображение в полутоновые точки, чтобы добиться эффекта газетной " +"печати" #: ../plug-ins/common/newsprint.c:517 msgid "Newsprin_t..." msgstr "_Газетная бумага..." -#: ../plug-ins/common/newsprint.c:618 -#: ../plug-ins/common/newsprint.c:1179 +#: ../plug-ins/common/newsprint.c:618 ../plug-ins/common/newsprint.c:1179 msgid "Newsprint" msgstr "Газетная бумага" @@ -6472,8 +6330,7 @@ msgid "_Factory Defaults" msgstr "_По умолчанию" #. anti-alias control -#: ../plug-ins/common/newsprint.c:1434 -#: ../plug-ins/gfig/gfig-dialog.c:1293 +#: ../plug-ins/common/newsprint.c:1434 ../plug-ins/gfig/gfig-dialog.c:1293 msgid "Antialiasing" msgstr "Сглаживание" @@ -6489,8 +6346,7 @@ msgstr "Многофункциональный нелинейный фильтр msgid "_NL Filter..." msgstr "_Нелинейный фильтр..." -#: ../plug-ins/common/nl-filter.c:952 -#: ../plug-ins/common/nl-filter.c:1016 +#: ../plug-ins/common/nl-filter.c:952 ../plug-ins/common/nl-filter.c:1016 msgid "NL Filter" msgstr "Нелинейный фильтр" @@ -6522,8 +6378,7 @@ msgstr "Изменить тон, яркость и контраст точек msgid "HSV Noise..." msgstr "Шум HSV..." -#: ../plug-ins/common/noise-hsv.c:215 -#: ../plug-ins/common/noise-hsv.c:364 +#: ../plug-ins/common/noise-hsv.c:215 ../plug-ins/common/noise-hsv.c:364 msgid "HSV Noise" msgstr "Шум HSV" @@ -6616,8 +6471,7 @@ msgstr "_Корреляция шума" msgid "_Independent RGB" msgstr "_Независимые каналы RGB" -#: ../plug-ins/common/noise-rgb.c:523 -#: ../plug-ins/common/noise-rgb.c:527 +#: ../plug-ins/common/noise-rgb.c:523 ../plug-ins/common/noise-rgb.c:527 msgid "_Gray:" msgstr "_Серый:" @@ -6635,8 +6489,7 @@ msgid "_Solid Noise..." msgstr "_Сплошной шум..." #. Dialog initialization -#: ../plug-ins/common/noise-solid.c:315 -#: ../plug-ins/common/noise-solid.c:563 +#: ../plug-ins/common/noise-solid.c:315 ../plug-ins/common/noise-solid.c:563 msgid "Solid Noise" msgstr "Сплошной шум" @@ -6714,8 +6567,7 @@ msgstr "С_лучайный тон:" msgid "Center of Nova" msgstr "Центр cверхновой" -#: ../plug-ins/common/oilify.c:119 -#: ../plug-ins/common/oilify.c:134 +#: ../plug-ins/common/oilify.c:119 ../plug-ins/common/oilify.c:134 msgid "Smear colors to simulate an oil painting" msgstr "Размыть цвета так, чтобы создать эффект рисования маслом" @@ -6742,8 +6594,7 @@ msgstr "Размер маски:" msgid "Use m_ask-size map:" msgstr "Использовать к_арту размером с маску:" -#: ../plug-ins/common/oilify.c:870 -#: ../plug-ins/common/sinus.c:923 +#: ../plug-ins/common/oilify.c:870 ../plug-ins/common/sinus.c:923 msgid "_Exponent:" msgstr "_Экспонента:" @@ -6763,7 +6614,8 @@ msgstr "_Использовать алгоритм интенсивности" #: ../plug-ins/common/photocopy.c:153 msgid "Simulate color distortion produced by a copy machine" -msgstr "Создать эффект искажения цвета, имитирующий работу копировальной машины" +msgstr "" +"Создать эффект искажения цвета, имитирующий работу копировальной машины" #: ../plug-ins/common/photocopy.c:158 msgid "_Photocopy..." @@ -6773,8 +6625,7 @@ msgstr "_Фотокопия..." msgid "Photocopy" msgstr "Фотокопия" -#: ../plug-ins/common/photocopy.c:892 -#: ../plug-ins/common/sharpen.c:509 +#: ../plug-ins/common/photocopy.c:892 ../plug-ins/common/sharpen.c:509 #: ../plug-ins/common/softglow.c:699 msgid "_Sharpness:" msgstr "_Резкость:" @@ -6819,8 +6670,7 @@ msgstr "Создать случайную плазменную текстуру" msgid "_Plasma..." msgstr "_Плазма..." -#: ../plug-ins/common/plasma.c:263 -#: ../plug-ins/common/plasma.c:300 +#: ../plug-ins/common/plasma.c:263 ../plug-ins/common/plasma.c:300 msgid "Plasma" msgstr "Плазма" @@ -6928,15 +6778,21 @@ msgid "_Map backwards" msgstr "_Развернуть" #: ../plug-ins/common/polar-coords.c:665 -msgid "If checked the mapping will begin at the right side, as opposed to beginning at the left." -msgstr "Если отмечено, отображение начнется с правой стороны, в противном случае - с левой." +msgid "" +"If checked the mapping will begin at the right side, as opposed to beginning " +"at the left." +msgstr "" +"Если отмечено, отображение начнется с правой стороны, в противном случае - с " +"левой." #: ../plug-ins/common/polar-coords.c:676 msgid "Map from _top" msgstr "Отобразить с_верху" #: ../plug-ins/common/polar-coords.c:682 -msgid "If unchecked the mapping will put the bottom row in the middle and the top row on the outside. If checked it will be the opposite." +msgid "" +"If unchecked the mapping will put the bottom row in the middle and the top " +"row on the outside. If checked it will be the opposite." msgstr "" "Если не отмечено, то нижняя часть будет помещена в центр, а\n" "верхняя - на внешнюю сторону. Если отмечено - то наоборот." @@ -6946,8 +6802,12 @@ msgid "To _polar" msgstr "В _полярное" #: ../plug-ins/common/polar-coords.c:700 -msgid "If unchecked the image will be circularly mapped onto a rectangle. If checked the image will be mapped onto a circle." -msgstr "Если не отмечено, то изображение будет отображено в прямоугольник. Если отмечено – в круг." +msgid "" +"If unchecked the image will be circularly mapped onto a rectangle. If " +"checked the image will be mapped onto a circle." +msgstr "" +"Если не отмечено, то изображение будет отображено в прямоугольник. Если " +"отмечено – в круг." #: ../plug-ins/common/procedure-browser.c:83 msgid "List available procedures in the PDB" @@ -6998,8 +6858,7 @@ msgid "Red Eye Removal" msgstr "Удаление эффекта красных глаз" #: ../plug-ins/common/red-eye-removal.c:171 -#: ../plug-ins/common/unsharp-mask.c:891 -#: ../plug-ins/common/wind.c:1006 +#: ../plug-ins/common/unsharp-mask.c:898 ../plug-ins/common/wind.c:1006 #: ../plug-ins/imagemap/imap_preferences.c:455 #: ../plug-ins/map-object/map-object-ui.c:539 msgid "_Threshold:" @@ -7073,11 +6932,13 @@ msgstr "Cдвиг по _фазе:" #: ../plug-ins/common/rotate.c:408 msgid "You can not rotate the whole image if there's a selection." -msgstr "Вы не может повернуть все изображение, если в нем есть выделенная область." +msgstr "" +"Вы не может повернуть все изображение, если в нем есть выделенная область." #: ../plug-ins/common/rotate.c:415 msgid "You can not rotate the whole image if there's a floating selection." -msgstr "Вы не можете повернуть все изображение, если в нем есть плавающее выделение." +msgstr "" +"Вы не можете повернуть все изображение, если в нем есть плавающее выделение." #: ../plug-ins/common/rotate.c:426 msgid "Sorry, channels and masks can not be rotated." @@ -7185,8 +7046,7 @@ msgstr "Ошибка при выборе окна" msgid "Importing screenshot" msgstr "Импорт снимка экрана" -#: ../plug-ins/common/screenshot.c:839 -#: ../plug-ins/common/screenshot.c:1204 +#: ../plug-ins/common/screenshot.c:839 ../plug-ins/common/screenshot.c:1204 msgid "Screenshot" msgstr "Снимок экрана" @@ -7207,7 +7067,8 @@ msgid "After the delay, the screenshot is taken." msgstr "После задержки делается снимок" #: ../plug-ins/common/screenshot.c:1245 -msgid "After the delay, drag your mouse to select the region for the screenshot." +msgid "" +"After the delay, drag your mouse to select the region for the screenshot." msgstr "После задержки, переместите мышь для выделения области для снимка." #: ../plug-ins/common/screenshot.c:1248 @@ -7263,7 +7124,8 @@ msgstr "Полусведение..." #: ../plug-ins/common/sharpen.c:111 msgid "Make image sharper (less powerful than Unsharp Mask)" -msgstr "Сделать изображение более резким (менее эффективно, чем нерезкая маска)" +msgstr "" +"Сделать изображение более резким (менее эффективно, чем нерезкая маска)" #: ../plug-ins/common/sharpen.c:118 msgid "_Sharpen..." @@ -7362,8 +7224,7 @@ msgstr "_Идеальный" msgid "_Distorted" msgstr "Ис_каженный" -#: ../plug-ins/common/sinus.c:783 -#: ../plug-ins/common/sinus.c:799 +#: ../plug-ins/common/sinus.c:783 ../plug-ins/common/sinus.c:799 #: ../plug-ins/imagemap/imap_preferences.c:432 msgid "Colors" msgstr "Цвета" @@ -7631,8 +7492,7 @@ msgstr "Ящерица" msgid "Phong" msgstr "Фонг" -#: ../plug-ins/common/sphere-designer.c:298 -#: ../plug-ins/flame/flame.c:773 +#: ../plug-ins/common/sphere-designer.c:298 ../plug-ins/flame/flame.c:773 msgid "Noise" msgstr "Шум" @@ -7640,8 +7500,7 @@ msgstr "Шум" msgid "Wood" msgstr "Дерево" -#: ../plug-ins/common/sphere-designer.c:300 -#: ../plug-ins/flame/flame.c:757 +#: ../plug-ins/common/sphere-designer.c:300 ../plug-ins/flame/flame.c:757 msgid "Spiral" msgstr "Спираль" @@ -7813,14 +7672,15 @@ msgstr "Порог:" #: ../plug-ins/common/tile-glass.c:124 msgid "Simulate distortion caused by square glass tiles" -msgstr "Исказить изображение так, словно на него смотрят через квадратные стеклянные блоки" +msgstr "" +"Исказить изображение так, словно на него смотрят через квадратные стеклянные " +"блоки" #: ../plug-ins/common/tile-glass.c:130 msgid "_Glass Tile..." msgstr "_Стеклянные блоки..." -#: ../plug-ins/common/tile-glass.c:210 -#: ../plug-ins/common/tile-glass.c:250 +#: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250 msgid "Glass Tile" msgstr "Стеклянные блоки" @@ -7828,8 +7688,7 @@ msgstr "Стеклянные блоки" msgid "Tile _width:" msgstr "_Ширина блока:" -#: ../plug-ins/common/tile-paper.c:243 -#: ../plug-ins/common/tile-paper.c:557 +#: ../plug-ins/common/tile-paper.c:243 ../plug-ins/common/tile-paper.c:557 msgid "Paper Tile" msgstr "Разрез бумаги" @@ -7934,8 +7793,7 @@ msgid "Region selected for filter is empty." msgstr "Выбранная для фильтра область пуста" #. Set the tile cache size -#: ../plug-ins/common/tile-small.c:328 -#: ../plug-ins/common/tile.c:185 +#: ../plug-ins/common/tile-small.c:328 ../plug-ins/common/tile.c:185 msgid "Tiling" msgstr "Укладка черепицы" @@ -8005,16 +7863,23 @@ msgid "Saved" msgstr "Сохраненное" #: ../plug-ins/common/unit-editor.c:94 -msgid "A unit definition will only be saved before GIMP exits if this column is checked." -msgstr "Определение единицы будет сохранено только перед выходом из GIMP если столбец отмечен." +msgid "" +"A unit definition will only be saved before GIMP exits if this column is " +"checked." +msgstr "" +"Определение единицы будет сохранено только перед выходом из GIMP если " +"столбец отмечен." #: ../plug-ins/common/unit-editor.c:96 msgid "ID" msgstr "Идентификатор" #: ../plug-ins/common/unit-editor.c:96 -msgid "This string will be used to identify a unit in GIMP's configuration files." -msgstr "Строка, которая будет использоваться для идентификации единицы в конфигурационном файле GIMP." +msgid "" +"This string will be used to identify a unit in GIMP's configuration files." +msgstr "" +"Строка, которая будет использоваться для идентификации единицы в " +"конфигурационном файле GIMP." #: ../plug-ins/common/unit-editor.c:98 msgid "Factor" @@ -8029,16 +7894,26 @@ msgid "Digits" msgstr "Цифры" #: ../plug-ins/common/unit-editor.c:99 -msgid "This field is a hint for numerical input fields. It specifies how many decimal digits the input field should provide to get approximately the same accuracy as an \"inch\" input field with two decimal digits." -msgstr "Это поле — подсказка для поля числового вода. Оно указывает как много десятичных знаков в поле ввода будут давать примерно такую же точность как поле ввода «дюймов» с двумя десятичными знаками." +msgid "" +"This field is a hint for numerical input fields. It specifies how many " +"decimal digits the input field should provide to get approximately the same " +"accuracy as an \"inch\" input field with two decimal digits." +msgstr "" +"Это поле — подсказка для поля числового вода. Оно указывает как много " +"десятичных знаков в поле ввода будут давать примерно такую же точность как " +"поле ввода «дюймов» с двумя десятичными знаками." #: ../plug-ins/common/unit-editor.c:104 msgid "Symbol" msgstr "Символ" #: ../plug-ins/common/unit-editor.c:104 -msgid "The unit's symbol if it has one (e.g. \" for inches). The unit's abbreviation is used if doesn't have a symbol." -msgstr "Символ единицы, если он есть (например \" для дюймов). Используйте аббревиатуры для тех единиц, у которых нет символа." +msgid "" +"The unit's symbol if it has one (e.g. \" for inches). The unit's " +"abbreviation is used if doesn't have a symbol." +msgstr "" +"Символ единицы, если он есть (например \" для дюймов). Используйте " +"аббревиатуры для тех единиц, у которых нет символа." #: ../plug-ins/common/unit-editor.c:107 msgid "Abbreviation" @@ -8132,11 +8007,11 @@ msgstr "Наиболее удобный метод для повышения р msgid "_Unsharp Mask..." msgstr "_Нерезкая маска..." -#: ../plug-ins/common/unsharp-mask.c:684 +#: ../plug-ins/common/unsharp-mask.c:691 msgid "Merging" msgstr "Слияние" -#: ../plug-ins/common/unsharp-mask.c:828 +#: ../plug-ins/common/unsharp-mask.c:835 msgid "Unsharp Mask" msgstr "Нерезкая маска" @@ -8254,8 +8129,7 @@ msgstr "Распространение а_льфа-канала" msgid "Propagating value channel" msgstr "Распространение канала _яркости" -#: ../plug-ins/common/van-gogh-lic.c:569 -#: ../plug-ins/common/van-gogh-lic.c:644 +#: ../plug-ins/common/van-gogh-lic.c:569 ../plug-ins/common/van-gogh-lic.c:644 msgid "Van Gogh (LIC)" msgstr "Ван Гог (LIC)" @@ -8367,8 +8241,7 @@ msgstr "Создать эффект просмотра на мониторе с msgid "Vi_deo..." msgstr "_Видео..." -#: ../plug-ins/common/video.c:1886 -#: ../plug-ins/common/video.c:2017 +#: ../plug-ins/common/video.c:1886 ../plug-ins/common/video.c:2017 msgid "Video" msgstr "Видео" @@ -8430,10 +8303,8 @@ msgstr "Заворачивать" msgid "Smear" msgstr "Размазывать" -#: ../plug-ins/common/warp.c:502 -#: ../plug-ins/file-fits/fits.c:1020 -#: ../plug-ins/flame/flame.c:1174 -#: ../plug-ins/gfig/gfig-dialog.c:1497 +#: ../plug-ins/common/warp.c:502 ../plug-ins/file-fits/fits.c:1020 +#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1497 msgid "Black" msgstr "Черный" @@ -8487,8 +8358,7 @@ msgid "Vector mag:" msgstr "Длина вектора:" #. Angle -#: ../plug-ins/common/warp.c:684 -#: ../plug-ins/ifs-compose/ifs-compose.c:567 +#: ../plug-ins/common/warp.c:684 ../plug-ins/ifs-compose/ifs-compose.c:567 msgid "Angle:" msgstr "Угол:" @@ -8523,8 +8393,7 @@ msgstr "Исказить изображение волнами" msgid "_Waves..." msgstr "Во_лны..." -#: ../plug-ins/common/waves.c:249 -#: ../plug-ins/flame/flame.c:762 +#: ../plug-ins/common/waves.c:249 ../plug-ins/flame/flame.c:762 msgid "Waves" msgstr "Волны" @@ -8561,8 +8430,11 @@ msgid "The specified path was not found." msgstr "Указанное расположение не обнаружено." #: ../plug-ins/common/web-browser.c:144 -msgid "The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." +msgid "" +"The .exe file is invalid (non-Microsoft Win32 .exe or error in .exe image)." msgstr "" +"Файл .exe некорректен: либо это не файл Microsoft Win32 .exe, либо в файле ." +"exe есть ошибка." #: ../plug-ins/common/web-browser.c:147 msgid "The operating system denied access to the specified file." @@ -8570,19 +8442,19 @@ msgstr "Операционная система отказала в доступ #: ../plug-ins/common/web-browser.c:150 msgid "The file name association is incomplete or invalid." -msgstr "" +msgstr "Ассоциация с именем файла неполна или некорректна." #: ../plug-ins/common/web-browser.c:153 msgid "DDE transaction busy" -msgstr "" +msgstr "Транзакция DDE занята." #: ../plug-ins/common/web-browser.c:156 msgid "The DDE transaction failed." -msgstr "" +msgstr "Не удалось выполнить транзакцию DDE." #: ../plug-ins/common/web-browser.c:159 msgid "The DDE transaction timed out." -msgstr "" +msgstr "Время выполнения транзакции DDE истекло." #: ../plug-ins/common/web-browser.c:162 msgid "The specified DLL was not found." @@ -8630,8 +8502,7 @@ msgid "Enter location (URI):" msgstr "Введите расположение (URI):" #. entscale == Entry and Scale pair function found in pixelize.c -#: ../plug-ins/common/web-page.c:289 -#: ../plug-ins/maze/maze-dialog.c:198 +#: ../plug-ins/common/web-page.c:289 ../plug-ins/maze/maze-dialog.c:198 msgid "Width (pixels):" msgstr "Ширина (точек растра):" @@ -8769,8 +8640,7 @@ msgstr "Оба" msgid "Higher values restrict the effect to fewer areas of the image" msgstr "Повышение значений ограничивает эффект меньшими областями изображения" -#: ../plug-ins/common/wind.c:1025 -#: ../plug-ins/gimpressionist/orientmap.c:693 +#: ../plug-ins/common/wind.c:1025 ../plug-ins/gimpressionist/orientmap.c:693 msgid "_Strength:" msgstr "Сила:" @@ -8778,62 +8648,54 @@ msgstr "Сила:" msgid "Higher values increase the magnitude of the effect" msgstr "Повышение значений усиливает эффект" -#: ../plug-ins/file-bmp/bmp-read.c:86 +#: ../plug-ins/file-bmp/bmp-read.c:138 msgid "Bad colormap" msgstr "Неправильная цветовая карта" -#: ../plug-ins/file-bmp/bmp-read.c:170 -#: ../plug-ins/file-bmp/bmp-read.c:181 -#: ../plug-ins/file-bmp/bmp-read.c:188 -#: ../plug-ins/file-bmp/bmp-read.c:197 -#: ../plug-ins/file-bmp/bmp-read.c:212 -#: ../plug-ins/file-bmp/bmp-read.c:427 -#: ../plug-ins/file-bmp/bmp-read.c:448 -#: ../plug-ins/file-bmp/bmp-read.c:459 -#: ../plug-ins/file-bmp/bmp-read.c:467 -#: ../plug-ins/file-bmp/bmp-read.c:475 -#: ../plug-ins/file-bmp/bmp-read.c:487 +#: ../plug-ins/file-bmp/bmp-read.c:222 ../plug-ins/file-bmp/bmp-read.c:233 +#: ../plug-ins/file-bmp/bmp-read.c:240 ../plug-ins/file-bmp/bmp-read.c:249 +#: ../plug-ins/file-bmp/bmp-read.c:264 ../plug-ins/file-bmp/bmp-read.c:446 +#: ../plug-ins/file-bmp/bmp-read.c:467 ../plug-ins/file-bmp/bmp-read.c:478 +#: ../plug-ins/file-bmp/bmp-read.c:486 ../plug-ins/file-bmp/bmp-read.c:494 +#: ../plug-ins/file-bmp/bmp-read.c:506 #, c-format msgid "'%s' is not a valid BMP file" msgstr "\"%s\" не является корректным файлом BMP" -#: ../plug-ins/file-bmp/bmp-read.c:226 -#: ../plug-ins/file-bmp/bmp-read.c:253 -#: ../plug-ins/file-bmp/bmp-read.c:281 -#: ../plug-ins/file-bmp/bmp-read.c:356 -#: ../plug-ins/file-bmp/bmp-read.c:406 +#: ../plug-ins/file-bmp/bmp-read.c:278 ../plug-ins/file-bmp/bmp-read.c:305 +#: ../plug-ins/file-bmp/bmp-read.c:333 ../plug-ins/file-bmp/bmp-read.c:362 +#: ../plug-ins/file-bmp/bmp-read.c:392 ../plug-ins/file-bmp/bmp-read.c:426 #, c-format msgid "Error reading BMP file header from '%s'" msgstr "" "Ошибка считывания заголовка файла BMP\n" "из \"%s\"" -#: ../plug-ins/file-bmp/bmp-read.c:345 +#: ../plug-ins/file-bmp/bmp-read.c:351 #, c-format msgid "Unsupported compression (%lu) in BMP file from '%s'" msgstr "Неподдерживаемое сжатие (%lu) в файле формата BMP из '%s'" -#: ../plug-ins/file-bmp/bmp-read.c:599 +#: ../plug-ins/file-bmp/bmp-read.c:618 msgid "Unrecognized or invalid BMP compression format." msgstr "Неопознанный или неправильный формат сжатия BMP." -#: ../plug-ins/file-bmp/bmp-read.c:641 +#: ../plug-ins/file-bmp/bmp-read.c:660 msgid "Unsupported or invalid bitdepth." msgstr "Неподдерживаемая или некорректная разрядность цветового представления." -#: ../plug-ins/file-bmp/bmp-read.c:829 -#: ../plug-ins/file-bmp/bmp-read.c:870 -#: ../plug-ins/file-bmp/bmp-read.c:920 +#: ../plug-ins/file-bmp/bmp-read.c:812 ../plug-ins/file-bmp/bmp-read.c:853 +#: ../plug-ins/file-bmp/bmp-read.c:903 msgid "The bitmap ends unexpectedly." msgstr "Данные изображения неожиданно закончились." -#: ../plug-ins/file-bmp/bmp-write.c:191 -#: ../plug-ins/file-bmp/bmp-write.c:217 +#: ../plug-ins/file-bmp/bmp-write.c:191 ../plug-ins/file-bmp/bmp-write.c:217 msgid "Cannot save indexed image with transparency in BMP file format." -msgstr "Невозможно сохранить полупрозрачное индексированное изображение в файл формата BMP." +msgstr "" +"Невозможно сохранить полупрозрачное индексированное изображение в файл " +"формата BMP." -#: ../plug-ins/file-bmp/bmp-write.c:193 -#: ../plug-ins/file-bmp/bmp-write.c:219 +#: ../plug-ins/file-bmp/bmp-write.c:193 ../plug-ins/file-bmp/bmp-write.c:219 msgid "Alpha channel will be ignored." msgstr "Альфа-канал будет проигнорирован." @@ -8852,12 +8714,18 @@ msgid "_Do not write color space information" msgstr "_Не сохранять данные о цветовом пространстве" #: ../plug-ins/file-bmp/bmp-write.c:889 -msgid "Some applications can not read BMP images that include color space information. GIMP writes color space information by default. Enabling this option will cause GIMP to not write color space information to the file." -msgstr "Некоторые приложения не могут читать файлы в формате BMP, куда записана информация о цветовом пространстве. По умолчанию GIMP пишет эту информацию. После включения этой функции GIMP не запишет данные о цветовом пространстве в этот файл." +msgid "" +"Some applications can not read BMP images that include color space " +"information. GIMP writes color space information by default. Enabling this " +"option will cause GIMP to not write color space information to the file." +msgstr "" +"Некоторые приложения не могут читать файлы в формате BMP, куда записана " +"информация о цветовом пространстве. По умолчанию GIMP пишет эту информацию. " +"После включения этой функции GIMP не запишет данные о цветовом пространстве " +"в этот файл." #. Advanced Options -#: ../plug-ins/file-bmp/bmp-write.c:905 -#: ../plug-ins/file-jpeg/jpeg-save.c:901 +#: ../plug-ins/file-bmp/bmp-write.c:905 ../plug-ins/file-jpeg/jpeg-save.c:901 msgid "_Advanced Options" msgstr "_Дополнительные параметры" @@ -8873,8 +8741,7 @@ msgstr "24 разряда" msgid "32 bits" msgstr "32 разряда" -#: ../plug-ins/file-bmp/bmp.c:123 -#: ../plug-ins/file-bmp/bmp.c:142 +#: ../plug-ins/file-bmp/bmp.c:123 ../plug-ins/file-bmp/bmp.c:142 msgid "Windows BMP image" msgstr "Изображение Windows BMP" @@ -8898,8 +8765,7 @@ msgstr "Нет значимого расширения, попытка опре msgid "G3 fax image" msgstr "Факсовое изображение G3" -#: ../plug-ins/file-fits/fits.c:168 -#: ../plug-ins/file-fits/fits.c:188 +#: ../plug-ins/file-fits/fits.c:168 ../plug-ins/file-fits/fits.c:188 msgid "Flexible Image Transport System" msgstr "Flexible Image Transport System" @@ -8923,8 +8789,7 @@ msgstr "Загрузка файла в формате FITS" msgid "Replacement for undefined pixels" msgstr "Замещение для неопределенных пикселов" -#: ../plug-ins/file-fits/fits.c:1021 -#: ../plug-ins/gfig/gfig-dialog.c:1323 +#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1323 #: ../plug-ins/gfig/gfig-dialog.c:1498 msgid "White" msgstr "Белый" @@ -8942,13 +8807,11 @@ msgid "Image Composing" msgstr "Сборка изображения" #: ../plug-ins/file-fits/fits.c:1044 -#, fuzzy msgctxt "composing" msgid "None" msgstr "Нет" -#: ../plug-ins/file-fli/fli-gimp.c:166 -#: ../plug-ins/file-fli/fli-gimp.c:186 +#: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186 msgid "AutoDesk FLIC animation" msgstr "Анимация AutoDesk FLIC" @@ -8965,14 +8828,12 @@ msgstr "Можно сохранить только индексированно msgid "GFLI 1.3 - Load framestack" msgstr "GFLI 1.3 - Загрузка стопки кадров" -#: ../plug-ins/file-fli/fli-gimp.c:876 -#: ../plug-ins/file-fli/fli-gimp.c:932 +#: ../plug-ins/file-fli/fli-gimp.c:876 ../plug-ins/file-fli/fli-gimp.c:932 msgctxt "frame-range" msgid "From:" msgstr "От:" -#: ../plug-ins/file-fli/fli-gimp.c:885 -#: ../plug-ins/file-fli/fli-gimp.c:941 +#: ../plug-ins/file-fli/fli-gimp.c:885 ../plug-ins/file-fli/fli-gimp.c:941 msgctxt "frame-range" msgid "To:" msgstr "До:" @@ -8990,8 +8851,12 @@ msgid "Icon Details" msgstr "Параметры значка" #: ../plug-ins/file-ico/ico-dialog.c:93 -msgid "Large icons and compression are not supported by all programs. Older applications may not open this file correctly." -msgstr "Большие значки и сжатие не поддерживаются всеми программами. Более старые приложения могут некорректно открыть этот файл." +msgid "" +"Large icons and compression are not supported by all programs. Older " +"applications may not open this file correctly." +msgstr "" +"Большие значки и сжатие не поддерживаются всеми программами. Более старые " +"приложения могут некорректно открыть этот файл." #: ../plug-ins/file-ico/ico-dialog.c:165 msgid "1 bpp, 1-bit alpha, 2-slot palette" @@ -9023,15 +8888,13 @@ msgstr "Сжатый (PNG)" msgid "Icon #%i" msgstr "Значок #%i" -#: ../plug-ins/file-ico/ico-load.c:722 -#: ../plug-ins/file-jpeg/jpeg-load.c:691 +#: ../plug-ins/file-ico/ico-load.c:722 ../plug-ins/file-jpeg/jpeg-load.c:691 #: ../plug-ins/file-psd/psd-thumb-load.c:84 #, c-format msgid "Opening thumbnail for '%s'" msgstr "Открывается пред.просмотр для '%s'" -#: ../plug-ins/file-ico/ico.c:102 -#: ../plug-ins/file-ico/ico.c:136 +#: ../plug-ins/file-ico/ico.c:102 ../plug-ins/file-ico/ico.c:136 msgid "Microsoft Windows icon" msgstr "Значок Microsoft Windows" @@ -9064,8 +8927,7 @@ msgstr "Размер файла: %s" msgid "Calculating file size..." msgstr "Рассчитывается размер файла..." -#: ../plug-ins/file-jpeg/jpeg-save.c:782 -#: ../plug-ins/file-jpeg/jpeg-save.c:877 +#: ../plug-ins/file-jpeg/jpeg-save.c:782 ../plug-ins/file-jpeg/jpeg-save.c:877 msgid "File size: unknown" msgstr "Размер: неизвестен" @@ -9126,8 +8988,14 @@ msgid "_Use quality settings from original image" msgstr "Использовать _качественные характеристики исходного изображения" #: ../plug-ins/file-jpeg/jpeg-save.c:1064 -msgid "If the original image was loaded from a JPEG file using non-standard quality settings (quantization tables), enable this option to get almost the same quality and file size." -msgstr "Если исходное изображение было загружено из файла JPEG, в котором нестандартные параметры качества (таблицы квантования), используйте этот параметр для получения максимально схожего качества и размера файла." +msgid "" +"If the original image was loaded from a JPEG file using non-standard quality " +"settings (quantization tables), enable this option to get almost the same " +"quality and file size." +msgstr "" +"Если исходное изображение было загружено из файла JPEG, в котором " +"нестандартные параметры качества (таблицы квантования), используйте этот " +"параметр для получения максимально схожего качества и размера файла." #. Subsampling #: ../plug-ins/file-jpeg/jpeg-save.c:1088 @@ -9180,8 +9048,7 @@ msgstr "З_агрузить исходные параметры" msgid "Sa_ve Defaults" msgstr "_Запомнить эти параметры" -#: ../plug-ins/file-jpeg/jpeg.c:139 -#: ../plug-ins/file-jpeg/jpeg.c:177 +#: ../plug-ins/file-jpeg/jpeg.c:139 ../plug-ins/file-jpeg/jpeg.c:177 msgid "JPEG image" msgstr "Изображение JPEG" @@ -9225,10 +9092,8 @@ msgstr "Неподдерживаемая цветовая модель: %s" msgid "Unsupported bit depth: %d" msgstr "Неподдерживаемая разрядность на канал: %d" -#: ../plug-ins/file-psd/psd-load.c:383 -#: ../plug-ins/file-psd/psd-load.c:393 -#: ../plug-ins/file-psd/psd-load.c:625 -#: ../plug-ins/file-psd/psd-load.c:834 +#: ../plug-ins/file-psd/psd-load.c:383 ../plug-ins/file-psd/psd-load.c:393 +#: ../plug-ins/file-psd/psd-load.c:625 ../plug-ins/file-psd/psd-load.c:834 #, c-format msgid "The file is corrupt!" msgstr "Этот файл поврежден!" @@ -9268,8 +9133,7 @@ msgstr "Неподдерживаемая или некорректная шир msgid "Unsupported or invalid layer mask size: %dx%d" msgstr "Неподдерживаемый или некорректный размер маски слоя: %dx%d" -#: ../plug-ins/file-psd/psd-load.c:1231 -#: ../plug-ins/file-psd/psd-load.c:1613 +#: ../plug-ins/file-psd/psd-load.c:1231 ../plug-ins/file-psd/psd-load.c:1613 #, c-format msgid "Unsupported compression mode: %d" msgstr "Неподдерживаемый режим сжатия: %d" @@ -9283,37 +9147,49 @@ msgstr "Дополнительно" msgid "Unsupported or invalid channel size" msgstr "Неподдерживаемый или некорректный размер канала" -#: ../plug-ins/file-psd/psd-save.c:228 -#: ../plug-ins/file-psd/psd.c:113 +#: ../plug-ins/file-psd/psd-save.c:228 ../plug-ins/file-psd/psd.c:113 #: ../plug-ins/file-psd/psd.c:152 msgid "Photoshop image" msgstr "Изображение Photoshop" #: ../plug-ins/file-psd/psd-save.c:374 #, c-format -msgid "Unable to save layer with mode '%s'. Either the PSD file format or the save plug-in does not support that, using normal mode instead." -msgstr "Невозможно сохранить слой в режиме '%s'. Либо формат PSD не поддерживает его, либо расширение для сохранения данных в него. Используйте вместо него режим «Обычный»." +msgid "" +"Unable to save layer with mode '%s'. Either the PSD file format or the save " +"plug-in does not support that, using normal mode instead." +msgstr "" +"Невозможно сохранить слой в режиме '%s'. Либо формат PSD не поддерживает " +"его, либо расширение для сохранения данных в него. Используйте вместо него " +"режим «Обычный»." #: ../plug-ins/file-psd/psd-save.c:634 msgid "Error: Can't convert GIMP base imagetype to PSD mode" -msgstr "Ошибка: Невозможно преобразовать основный тип изображения GIMP в режим PSD" +msgstr "" +"Ошибка: Невозможно преобразовать основный тип изображения GIMP в режим PSD" #: ../plug-ins/file-psd/psd-save.c:1622 #, c-format -msgid "Unable to save '%s'. The PSD file format does not support images that are more than 30,000 pixels wide or tall." -msgstr "Невозможно сохранить '%s'. Формат PSD не поддерживает изображения больше 30 000 пикселов в длину или ширину." +msgid "" +"Unable to save '%s'. The PSD file format does not support images that are " +"more than 30,000 pixels wide or tall." +msgstr "" +"Невозможно сохранить '%s'. Формат PSD не поддерживает изображения больше 30 " +"000 пикселов в длину или ширину." #: ../plug-ins/file-psd/psd-save.c:1637 #, c-format -msgid "Unable to save '%s'. The PSD file format does not support images with layers that are more than 30,000 pixels wide or tall." -msgstr "Невозможно сохранить '%s'. Формат PSD не поддерживает изображения со слоями больше, чем 30 000 пикселов в длину или ширину." +msgid "" +"Unable to save '%s'. The PSD file format does not support images with " +"layers that are more than 30,000 pixels wide or tall." +msgstr "" +"Невозможно сохранить '%s'. Формат PSD не поддерживает изображения со слоями " +"больше, чем 30 000 пикселов в длину или ширину." #: ../plug-ins/file-psd/psd-util.c:50 msgid "Unexpected end of file" msgstr "Преждевременный конец файла" -#: ../plug-ins/file-sgi/sgi.c:121 -#: ../plug-ins/file-sgi/sgi.c:141 +#: ../plug-ins/file-sgi/sgi.c:121 ../plug-ins/file-sgi/sgi.c:141 msgid "Silicon Graphics IRIS image" msgstr "Изображение Silicon Graphics IRIS" @@ -9405,9 +9281,9 @@ msgid "Downloading %s of image data" msgstr "Загружается файл размером %s " #: ../plug-ins/file-uri/uri-backend-libcurl.c:244 -#, fuzzy, c-format +#, c-format msgid "Opening '%s' for reading resulted in %s response code: %ld" -msgstr "Открытие \"%s\" завершилась кодом отклика HTTP: %ld" +msgstr "Открытие \"%s\" завершилась кодом отклика %s: %ld" #: ../plug-ins/file-uri/uri-backend-wget.c:162 #: ../plug-ins/file-uri/uri-backend-wget.c:182 @@ -9446,13 +9322,16 @@ msgstr "Ошибка сети: %s" msgid "Downloading unknown amount of image data" msgstr "Загружается изображения неизвестного размера" -#: ../plug-ins/file-uri/uri.c:122 -#: ../plug-ins/file-uri/uri.c:143 +#: ../plug-ins/file-uri/uri.c:122 ../plug-ins/file-uri/uri.c:143 msgid "URI" msgstr "URI" -#: ../plug-ins/file-xjt/xjt.c:485 -#: ../plug-ins/file-xjt/xjt.c:503 +#: ../plug-ins/file-uri/uri.c:318 +#, c-format +msgid "Failed to save to temporary file '%s'" +msgstr "Не удалось сохранить временный файл '%s'" + +#: ../plug-ins/file-xjt/xjt.c:485 ../plug-ins/file-xjt/xjt.c:503 msgid "GIMP compressed XJT image" msgstr "Сжатое GIMP изображение XJT" @@ -9506,8 +9385,7 @@ msgstr "Качество:" msgid "Smoothing:" msgstr "Сглаживание:" -#: ../plug-ins/file-xjt/xjt.c:1705 -#: ../plug-ins/file-xjt/xjt.c:3343 +#: ../plug-ins/file-xjt/xjt.c:1705 ../plug-ins/file-xjt/xjt.c:3343 #, c-format msgid "Could not create working folder '%s': %s" msgstr "Невозможно создать рабочий каталог '%s': %s" @@ -9567,8 +9445,7 @@ msgstr "_Перемешать" msgid "Same" msgstr "Оставить прежнюю" -#: ../plug-ins/flame/flame.c:746 -#: ../plug-ins/gimpressionist/orientation.c:163 +#: ../plug-ins/flame/flame.c:746 ../plug-ins/gimpressionist/orientation.c:163 #: ../plug-ins/gimpressionist/size.c:166 msgid "Random" msgstr "Случайное" @@ -9581,8 +9458,7 @@ msgstr "Вихрь" msgid "Horseshoe" msgstr "Подкова" -#: ../plug-ins/flame/flame.c:752 -#: ../plug-ins/gfig/gfig-dialog.c:1479 +#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1479 msgid "Polar" msgstr "Полярность" @@ -9654,8 +9530,7 @@ msgstr "Глазий рыб" msgid "Bubble" msgstr "Пузырь" -#: ../plug-ins/flame/flame.c:772 -#: ../plug-ins/map-object/map-object-ui.c:431 +#: ../plug-ins/flame/flame.c:772 ../plug-ins/map-object/map-object-ui.c:431 msgid "Cylinder" msgstr "Цилиндр" @@ -9720,8 +9595,7 @@ msgid "C_amera" msgstr "_Камера" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:546 -#: ../plug-ins/gfig/gfig-dialog.c:275 -#: ../plug-ins/gimpressionist/utils.c:142 +#: ../plug-ins/gfig/gfig-dialog.c:275 ../plug-ins/gimpressionist/utils.c:142 #: ../plug-ins/gradient-flare/gradient-flare.c:881 #, c-format msgid "" @@ -9793,7 +9667,8 @@ msgid "Bottom:" msgstr "Низ:" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:774 -msgid "The higher the number of iterations, the more details will be calculated" +msgid "" +"The higher the number of iterations, the more details will be calculated" msgstr "Чем больше число повторов, тем больше деталей будет обсчитано" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:782 @@ -9872,7 +9747,9 @@ msgstr "Использовать loglog сглаживание" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:939 msgid "Use log log smoothing to eliminate \"banding\" in the result" -msgstr "Чтобы избежать разделения изображения на полосы, используйте параметр «Сглаживание»" +msgstr "" +"Чтобы избежать разделения изображения на полосы, используйте параметр " +"«Сглаживание»" #. Color Density frame #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:943 @@ -9905,7 +9782,6 @@ msgstr "Синус" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1001 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1042 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1083 -#, fuzzy msgctxt "color-function" msgid "None" msgstr "Нет" @@ -9925,8 +9801,12 @@ msgstr "Использовать косинусоидальную функцию #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1012 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1053 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1094 -msgid "Use linear mapping instead of any trigonometrical function for this color channel" -msgstr "Использовать линейное отображение вместо любой тригонометрической функции для этого цветового канала" +msgid "" +"Use linear mapping instead of any trigonometrical function for this color " +"channel" +msgstr "" +"Использовать линейное отображение вместо любой тригонометрической функции " +"для этого цветового канала" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1021 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1062 @@ -9937,8 +9817,12 @@ msgstr "Инверсия" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1029 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1070 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1111 -msgid "If you enable this option higher color values will be swapped with lower ones and vice versa" -msgstr "Если вы выберите этот параметр, более яркие цвета поменяются с менее яркими и наоборот" +msgid "" +"If you enable this option higher color values will be swapped with lower " +"ones and vice versa" +msgstr "" +"Если вы выберите этот параметр, более яркие цвета поменяются с менее яркими " +"и наоборот" #. Colormode toggle box #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1116 @@ -9950,8 +9834,12 @@ msgid "As specified above" msgstr "Как указано выше" #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1137 -msgid "Create a color-map with the options you specified above (color density/function). The result is visible in the preview image" -msgstr "Создать отображение цветов с указанными выше параметрами (цветовая плотность/функция). Результат демонстрируется в окне просмотра." +msgid "" +"Create a color-map with the options you specified above (color density/" +"function). The result is visible in the preview image" +msgstr "" +"Создать отображение цветов с указанными выше параметрами (цветовая плотность/" +"функция). Результат демонстрируется в окне просмотра." #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1147 msgid "Apply active gradient to final image" @@ -10072,7 +9960,8 @@ msgstr "Показать кадр линии" #: ../plug-ins/gfig/gfig-bezier.c:416 msgid "Draws lines between the control points. Only during curve creation" -msgstr "Нарисовать линию между контрольными точками. Только при создании кривой" +msgstr "" +"Нарисовать линию между контрольными точками. Только при создании кривой" #. Start building the dialog up #: ../plug-ins/gfig/gfig-dialog.c:287 @@ -10153,8 +10042,7 @@ msgstr "О_тменить" msgid "_Clear" msgstr "О_чистить" -#: ../plug-ins/gfig/gfig-dialog.c:894 -#: ../plug-ins/imagemap/imap_menu.c:208 +#: ../plug-ins/gfig/gfig-dialog.c:894 ../plug-ins/imagemap/imap_menu.c:208 msgid "_Grid" msgstr "_Сетка" @@ -10182,48 +10070,39 @@ msgstr "Показать предыдущий объект" msgid "Show next object" msgstr "Показать следующий объект" -#: ../plug-ins/gfig/gfig-dialog.c:926 -#: ../plug-ins/gfig/gfig-stock.c:52 +#: ../plug-ins/gfig/gfig-dialog.c:926 ../plug-ins/gfig/gfig-stock.c:52 msgid "Show all objects" msgstr "Показать все объекты" -#: ../plug-ins/gfig/gfig-dialog.c:932 -#: ../plug-ins/gfig/gfig-stock.c:46 +#: ../plug-ins/gfig/gfig-dialog.c:932 ../plug-ins/gfig/gfig-stock.c:46 msgid "Create line" msgstr "Создать линию" -#: ../plug-ins/gfig/gfig-dialog.c:935 -#: ../plug-ins/gfig/gfig-stock.c:50 +#: ../plug-ins/gfig/gfig-dialog.c:935 ../plug-ins/gfig/gfig-stock.c:50 msgid "Create rectangle" msgstr "Создать прямоугольник" -#: ../plug-ins/gfig/gfig-dialog.c:938 -#: ../plug-ins/gfig/gfig-stock.c:41 +#: ../plug-ins/gfig/gfig-dialog.c:938 ../plug-ins/gfig/gfig-stock.c:41 msgid "Create circle" msgstr "Создать окружность" -#: ../plug-ins/gfig/gfig-dialog.c:941 -#: ../plug-ins/gfig/gfig-stock.c:45 +#: ../plug-ins/gfig/gfig-dialog.c:941 ../plug-ins/gfig/gfig-stock.c:45 msgid "Create ellipse" msgstr "Создать эллипс" -#: ../plug-ins/gfig/gfig-dialog.c:944 -#: ../plug-ins/gfig/gfig-stock.c:43 +#: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:43 msgid "Create arc" msgstr "Создать дугу" -#: ../plug-ins/gfig/gfig-dialog.c:947 -#: ../plug-ins/gfig/gfig-stock.c:49 +#: ../plug-ins/gfig/gfig-dialog.c:947 ../plug-ins/gfig/gfig-stock.c:49 msgid "Create reg polygon" msgstr "Создать прав. многоугольник" -#: ../plug-ins/gfig/gfig-dialog.c:950 -#: ../plug-ins/gfig/gfig-stock.c:54 +#: ../plug-ins/gfig/gfig-dialog.c:950 ../plug-ins/gfig/gfig-stock.c:54 msgid "Create star" msgstr "Создать звёздочку" -#: ../plug-ins/gfig/gfig-dialog.c:953 -#: ../plug-ins/gfig/gfig-stock.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:953 ../plug-ins/gfig/gfig-stock.c:53 msgid "Create spiral" msgstr "Создать спираль" @@ -10231,28 +10110,23 @@ msgstr "Создать спираль" msgid "Create bezier curve. Shift + Button ends object creation." msgstr "Создать кривую Безье. Shift + кнопка мыши — завершение создания." -#: ../plug-ins/gfig/gfig-dialog.c:960 -#: ../plug-ins/gfig/gfig-stock.c:47 +#: ../plug-ins/gfig/gfig-dialog.c:960 ../plug-ins/gfig/gfig-stock.c:47 msgid "Move an object" msgstr "Переместить объект" -#: ../plug-ins/gfig/gfig-dialog.c:963 -#: ../plug-ins/gfig/gfig-stock.c:48 +#: ../plug-ins/gfig/gfig-dialog.c:963 ../plug-ins/gfig/gfig-stock.c:48 msgid "Move a single point" msgstr "Переместить одну точку" -#: ../plug-ins/gfig/gfig-dialog.c:966 -#: ../plug-ins/gfig/gfig-stock.c:42 +#: ../plug-ins/gfig/gfig-dialog.c:966 ../plug-ins/gfig/gfig-stock.c:42 msgid "Copy an object" msgstr "Скопировать объект" -#: ../plug-ins/gfig/gfig-dialog.c:969 -#: ../plug-ins/gfig/gfig-stock.c:44 +#: ../plug-ins/gfig/gfig-dialog.c:969 ../plug-ins/gfig/gfig-stock.c:44 msgid "Delete an object" msgstr "Удалить объект" -#: ../plug-ins/gfig/gfig-dialog.c:972 -#: ../plug-ins/gfig/gfig-stock.c:51 +#: ../plug-ins/gfig/gfig-dialog.c:972 ../plug-ins/gfig/gfig-stock.c:51 msgid "Select an object" msgstr "Выбрать объект" @@ -10282,16 +10156,19 @@ msgstr "Прозрачный" msgid "Foreground" msgstr "Передний план" -#: ../plug-ins/gfig/gfig-dialog.c:1324 -#: ../plug-ins/imagemap/imap_cmd_copy.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:1324 ../plug-ins/imagemap/imap_cmd_copy.c:53 #: ../plug-ins/imagemap/imap_cmd_copy_object.c:54 #: ../plug-ins/imagemap/imap_menu.c:159 msgid "Copy" msgstr "Скопировать" #: ../plug-ins/gfig/gfig-dialog.c:1333 -msgid "Layer background type. Copy causes the previous layer to be copied before the draw is performed." -msgstr "Тип фона слоя. «Скопировать» будет вызывать копирование предыдущего слоя перед выполнением рисования." +msgid "" +"Layer background type. Copy causes the previous layer to be copied before " +"the draw is performed." +msgstr "" +"Тип фона слоя. «Скопировать» будет вызывать копирование предыдущего слоя " +"перед выполнением рисования." #: ../plug-ins/gfig/gfig-dialog.c:1339 msgid "Background:" @@ -10317,8 +10194,7 @@ msgstr "Секторы полярной сетки:" msgid "Polar grid radius interval:" msgstr "Интервал радиусов пол. сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1478 -#: ../plug-ins/imagemap/imap_menu.c:219 +#: ../plug-ins/gfig/gfig-dialog.c:1478 ../plug-ins/imagemap/imap_menu.c:219 msgid "Rectangle" msgstr "Прямоугольник" @@ -10382,7 +10258,9 @@ msgstr "Ошибка при чтении файла" #: ../plug-ins/gfig/gfig-dobject.c:1011 msgid "Editing read-only object - you will not be able to save it" -msgstr "Правка объекта предназначенного только для чтения — вы не сможете сохранить результат" +msgstr "" +"Правка объекта предназначенного только для чтения — вы не сможете сохранить " +"результат" #: ../plug-ins/gfig/gfig-poly.c:51 msgid "Regular Polygon Number of Sides" @@ -10418,8 +10296,11 @@ msgid "_Gfig..." msgstr "Gfig..." #: ../plug-ins/gfig/gfig.c:734 -msgid "Error trying to save figure as a parasite: can't attach parasite to drawable." -msgstr "Ошибка при попытке сохранить объект как parasite: невозможно присоединить parasite к изображению." +msgid "" +"Error trying to save figure as a parasite: can't attach parasite to drawable." +msgstr "" +"Ошибка при попытке сохранить объект как parasite: невозможно присоединить " +"parasite к изображению." #: ../plug-ins/gfig/gfig.c:761 #, c-format @@ -10534,14 +10415,14 @@ msgid "Selects if to place strokes all the way out to the edges of the image" msgstr "Наносить ли рисунок на все изображение вплоть до его границ" #. Tileable checkbox -#: ../plug-ins/gimpressionist/general.c:212 -#: ../plug-ins/maze/maze-dialog.c:268 +#: ../plug-ins/gimpressionist/general.c:212 ../plug-ins/maze/maze-dialog.c:268 msgid "Tileable" msgstr "Бесшовный элемент мозаики" #: ../plug-ins/gimpressionist/general.c:216 msgid "Selects if the resulting image should be seamlessly tileable" -msgstr "Выберите, должно ли итоговое изображение быть бесшовным элементом мозаики" +msgstr "" +"Выберите, должно ли итоговое изображение быть бесшовным элементом мозаики" #: ../plug-ins/gimpressionist/general.c:221 msgid "Drop shadow" @@ -10572,8 +10453,10 @@ msgid "Shadow depth:" msgstr "Глубина тени:" #: ../plug-ins/gimpressionist/general.c:261 -msgid "The depth of the drop shadow, i.e. how far apart from the object it should be" -msgstr "Глубина падающей тени, определяет как далеко от объекта она должна быть" +msgid "" +"The depth of the drop shadow, i.e. how far apart from the object it should be" +msgstr "" +"Глубина падающей тени, определяет как далеко от объекта она должна быть" #: ../plug-ins/gimpressionist/general.c:266 msgid "Shadow blur:" @@ -10640,7 +10523,9 @@ msgid "The angle span of the first brush to create" msgstr "Угол первой создаваемой кисти" #: ../plug-ins/gimpressionist/orientation.c:156 -msgid "Let the value (brightness) of the region determine the direction of the stroke" +msgid "" +"Let the value (brightness) of the region determine the direction of the " +"stroke" msgstr "Яркость области определяет направление мазка" #: ../plug-ins/gimpressionist/orientation.c:159 @@ -10649,7 +10534,9 @@ msgid "Radius" msgstr "Радиус" #: ../plug-ins/gimpressionist/orientation.c:160 -msgid "The distance from the center of the image determines the direction of the stroke" +msgid "" +"The distance from the center of the image determines the direction of the " +"stroke" msgstr "Расстояние от центра изображения определяет направление мазка" #: ../plug-ins/gimpressionist/orientation.c:164 @@ -10686,7 +10573,8 @@ msgstr "Адаптивное" #: ../plug-ins/gimpressionist/orientation.c:184 msgid "The direction that matches the original image the closest is selected" -msgstr "Выбирается наиболее совпадающее с оригинальным изображением направление" +msgstr "" +"Выбирается наиболее совпадающее с оригинальным изображением направление" #: ../plug-ins/gimpressionist/orientation.c:191 #: ../plug-ins/gimpressionist/size.c:195 @@ -10710,8 +10598,12 @@ msgid "Vectors" msgstr "Векторы" #: ../plug-ins/gimpressionist/orientmap.c:564 -msgid "The vector-field. Left-click to move selected vector, Right-click to point it towards mouse, Middle-click to add a new vector." -msgstr "Векторное поле. Щелчок левой кнопкой перемещает выбранный вектор, щелчок правой указывает вектор, щелчок средней — добавляет новый вектор." +msgid "" +"The vector-field. Left-click to move selected vector, Right-click to point " +"it towards mouse, Middle-click to add a new vector." +msgstr "" +"Векторное поле. Щелчок левой кнопкой перемещает выбранный вектор, щелчок " +"правой указывает вектор, щелчок средней — добавляет новый вектор." #: ../plug-ins/gimpressionist/orientmap.c:588 #: ../plug-ins/gimpressionist/sizemap.c:457 @@ -10770,8 +10662,12 @@ msgid "_Voronoi" msgstr "Вороной" #: ../plug-ins/gimpressionist/orientmap.c:661 -msgid "Voronoi-mode makes only the vector closest to the given point have any influence" -msgstr "В режиме «Вороной» только ближайший к заданной точке вектор оказывает воздействие" +msgid "" +"Voronoi-mode makes only the vector closest to the given point have any " +"influence" +msgstr "" +"В режиме «Вороной» только ближайший к заданной точке вектор оказывает " +"воздействие" #: ../plug-ins/gimpressionist/orientmap.c:671 msgid "A_ngle:" @@ -10953,11 +10849,13 @@ msgid "Size depends on:" msgstr "Размер зависит от:" #: ../plug-ins/gimpressionist/size.c:159 -msgid "Let the value (brightness) of the region determine the size of the stroke" +msgid "" +"Let the value (brightness) of the region determine the size of the stroke" msgstr "Размер мазка будет определяться яркостью области" #: ../plug-ins/gimpressionist/size.c:163 -msgid "The distance from the center of the image determines the size of the stroke" +msgid "" +"The distance from the center of the image determines the size of the stroke" msgstr "Размер мазка будет определяться расстоянием от центра изображения" #: ../plug-ins/gimpressionist/size.c:167 @@ -10993,8 +10891,13 @@ msgid "Smvectors" msgstr "Sm-вектор" #: ../plug-ins/gimpressionist/sizemap.c:436 -msgid "The smvector-field. Left-click to move selected smvector, Right-click to point it towards mouse, Middle-click to add a new smvector." -msgstr "Поле sm-вектор. Щелчок левой кнопкой - перемещение выбранного sm-вектора, щелчок правой кнопкой - указание sm-вектора мышью, щелчок средней кнопкой - добавление нового sm-вектора." +msgid "" +"The smvector-field. Left-click to move selected smvector, Right-click to " +"point it towards mouse, Middle-click to add a new smvector." +msgstr "" +"Поле sm-вектор. Щелчок левой кнопкой - перемещение выбранного sm-вектора, " +"щелчок правой кнопкой - указание sm-вектора мышью, щелчок средней кнопкой - " +"добавление нового sm-вектора." #: ../plug-ins/gimpressionist/sizemap.c:480 msgid "Select previous smvector" @@ -11029,8 +10932,12 @@ msgid "St_rength exp.:" msgstr "Экспонента силы:" #: ../plug-ins/gimpressionist/sizemap.c:548 -msgid "Voronoi-mode makes only the smvector closest to the given point have any influence" -msgstr "В режиме «Вороной» только ближайший к заданной точке sm-вектор оказывает воздействие" +msgid "" +"Voronoi-mode makes only the smvector closest to the given point have any " +"influence" +msgstr "" +"В режиме «Вороной» только ближайший к заданной точке sm-вектор оказывает " +"воздействие" #: ../plug-ins/ui/plug-in-file-gif.ui.h:1 msgid "I_nterlace" @@ -11473,8 +11380,12 @@ msgid "The GIMP user manual is not available." msgstr "Руководство по GIMP недоступно" #: ../plug-ins/help/gimphelpdomain.c:187 -msgid "Please install the additional help package or use the online user manual at http://docs.gimp.org/." -msgstr "Установите пожалуйста дополнительный пакет, содержащий документацию, или воспользуйтесь сайтом http://docs.gimp.org/." +msgid "" +"Please install the additional help package or use the online user manual at " +"http://docs.gimp.org/." +msgstr "" +"Установите пожалуйста дополнительный пакет, содержащий документацию, или " +"воспользуйтесь сайтом http://docs.gimp.org/." #: ../plug-ins/help/gimphelpdomain.c:196 msgid "Perhaps you are missing GIO backends and need to install GVFS?" @@ -11654,15 +11565,13 @@ msgid "Transformation %s" msgstr "Преобразование %s" #: ../plug-ins/ifs-compose/ifs-compose.c:2413 -#: ../plug-ins/metadata/interface.c:507 -#: ../plug-ins/metadata/interface.c:517 +#: ../plug-ins/metadata/interface.c:507 ../plug-ins/metadata/interface.c:517 msgid "Save failed" msgstr "Сохранить не удалось" #: ../plug-ins/ifs-compose/ifs-compose.c:2496 #: ../plug-ins/ifs-compose/ifs-compose.c:2509 -#: ../plug-ins/metadata/interface.c:413 -#: ../plug-ins/metadata/interface.c:423 +#: ../plug-ins/metadata/interface.c:413 ../plug-ins/metadata/interface.c:423 #: ../plug-ins/metadata/interface.c:497 msgid "Open failed" msgstr "Не удалось открыть" @@ -11702,8 +11611,7 @@ msgstr "Центр _X:" #: ../plug-ins/imagemap/imap_circle.c:268 #: ../plug-ins/imagemap/imap_circle.c:275 -#: ../plug-ins/imagemap/imap_circle.c:281 -#: ../plug-ins/imagemap/imap_grid.c:249 +#: ../plug-ins/imagemap/imap_circle.c:281 ../plug-ins/imagemap/imap_grid.c:249 #: ../plug-ins/imagemap/imap_grid.c:255 #: ../plug-ins/imagemap/imap_polygon.c:505 #: ../plug-ins/imagemap/imap_polygon.c:513 @@ -11797,7 +11705,11 @@ msgid "Resulting Guide Bounds: %d,%d to %d,%d (%d areas)" msgstr "Направляющие проходят от %d,%d до %d,%d (%d секторов)" #: ../plug-ins/imagemap/imap_cmd_guides.c:143 -msgid "Guides are pre-defined rectangles covering the image. You define them by their width, height, and spacing from each other. This allows you to rapidly create the most common image map type - image collection of \"thumbnails\", suitable for navigation bars." +msgid "" +"Guides are pre-defined rectangles covering the image. You define them by " +"their width, height, and spacing from each other. This allows you to rapidly " +"create the most common image map type - image collection of \"thumbnails\", " +"suitable for navigation bars." msgstr "" "Направляющие — это прямоугольники, покрывающие\n" "изображение. Вы определяете их ширину, высоту и \n" @@ -11953,7 +11865,9 @@ msgstr "Относ_ительная ссылка" #: ../plug-ins/imagemap/imap_edit_area_info.c:279 msgid "_Target frame name/ID: (optional - used for FRAMES only)" -msgstr "Название/ID _целевого фрейма: (необязательно — используется только для фреймов)" +msgstr "" +"Название/ID _целевого фрейма: (необязательно — используется только для " +"фреймов)" #: ../plug-ins/imagemap/imap_edit_area_info.c:282 msgid "ALT te_xt: (optional)" @@ -11984,8 +11898,7 @@ msgstr "Параметры области" msgid "Area #%d Settings" msgstr "Параметры области #%d" -#: ../plug-ins/imagemap/imap_file.c:47 -#: ../plug-ins/imagemap/imap_menu.c:70 +#: ../plug-ins/imagemap/imap_file.c:47 ../plug-ins/imagemap/imap_menu.c:70 msgid "Error opening file" msgstr "Ошибка при открытии файла" @@ -12505,10 +12418,9 @@ msgid "Color:" msgstr "Цвет:" #: ../plug-ins/lighting/lighting-ui.c:418 -#, fuzzy msgctxt "light-source" msgid "None" -msgstr "Отсутствует" +msgstr "Нет" #: ../plug-ins/lighting/lighting-ui.c:419 msgid "Directional" @@ -12610,7 +12522,8 @@ msgstr "Све_чение:" #: ../plug-ins/lighting/lighting-ui.c:660 #: ../plug-ins/map-object/map-object-ui.c:778 msgid "Amount of original color to show where no direct light falls" -msgstr "Степень окрашивания собственным цветом там, куда не попадают прямые лучи" +msgstr "" +"Степень окрашивания собственным цветом там, куда не попадают прямые лучи" #: ../plug-ins/lighting/lighting-ui.c:674 msgid "_Bright:" @@ -12753,7 +12666,9 @@ msgstr "Спроецировать на цилиндр" #: ../plug-ins/map-object/map-object-main.c:188 msgid "Map the image to an object (plane, sphere, box or cylinder)" -msgstr "Спроецировать изображение на объект (плоскость, сферу, параллелепипед или цилиндр)" +msgstr "" +"Спроецировать изображение на объект (плоскость, сферу, параллелепипед или " +"цилиндр)" #: ../plug-ins/map-object/map-object-main.c:193 msgid "Map _Object..." @@ -12831,7 +12746,8 @@ msgstr "Качество сглаживания. Более высокое лу #: ../plug-ins/map-object/map-object-ui.c:547 msgid "Stop when pixel differences are smaller than this value" -msgstr "Останавливаться, когда различие между пикселами меньше, чем это значение" +msgstr "" +"Останавливаться, когда различие между пикселами меньше, чем это значение" #: ../plug-ins/map-object/map-object-ui.c:582 msgid "Point light" @@ -12876,7 +12792,8 @@ msgstr "Отражательная способность" #: ../plug-ins/map-object/map-object-ui.c:850 msgid "Higher values makes the object reflect more light (appear lighter)" -msgstr "Повышение значений делает объект отражающим больше света (кажется светлее)" +msgstr "" +"Повышение значений делает объект отражающим больше света (кажется светлее)" #: ../plug-ins/map-object/map-object-ui.c:864 msgid "Specular:" @@ -12991,7 +12908,8 @@ msgstr "Создание лабиринта с использованием ал #: ../plug-ins/maze/maze-algorithms.c:488 msgid "Constructing tileable maze using Prim's Algorithm" -msgstr "Конструирование бесшовного лабиринта с использованием алгоритма Prim..." +msgstr "" +"Конструирование бесшовного лабиринта с использованием алгоритма Prim..." #: ../plug-ins/maze/maze-dialog.c:162 msgid "Maze" @@ -13002,8 +12920,7 @@ msgstr "Лабиринт" msgid "Maze Size" msgstr "Размер лабиринта" -#: ../plug-ins/maze/maze-dialog.c:210 -#: ../plug-ins/maze/maze-dialog.c:226 +#: ../plug-ins/maze/maze-dialog.c:210 ../plug-ins/maze/maze-dialog.c:226 msgid "Pieces:" msgstr "Кусочки:" @@ -13048,8 +12965,7 @@ msgstr "Рисование лабиринта" msgid "Property" msgstr "Свойство" -#: ../plug-ins/metadata/interface.c:204 -#: ../plug-ins/metadata/interface.c:206 +#: ../plug-ins/metadata/interface.c:204 ../plug-ins/metadata/interface.c:206 msgid "Description" msgstr "Описание" @@ -13070,12 +12986,10 @@ msgid "_Keywords:" msgstr "_Ключевые слова:" #. FIXME: add entries, cross-link with XMP model -#: ../plug-ins/metadata/interface.c:284 -#: ../plug-ins/metadata/interface.c:296 -#: ../plug-ins/metadata/interface.c:308 -#: ../plug-ins/metadata/interface.c:320 +#: ../plug-ins/metadata/interface.c:284 ../plug-ins/metadata/interface.c:296 +#: ../plug-ins/metadata/interface.c:308 ../plug-ins/metadata/interface.c:320 msgid "Empty" -msgstr "" +msgstr "Пусто" #: ../plug-ins/metadata/interface.c:286 msgid "Copyright" diff --git a/po-script-fu/ru.po b/po-script-fu/ru.po index 68e7d52181..d0f35b7d44 100644 --- a/po-script-fu/ru.po +++ b/po-script-fu/ru.po @@ -11,14 +11,17 @@ msgstr "" "Project-Id-Version: GIMP Script-Fu 2.8\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-12-04 03:26+0400\n" -"PO-Revision-Date: 2013-01-28 09:45+0300\n" +"PO-Revision-Date: 2013-06-28 12:29+0300\n" "Last-Translator: Александр Прокудин \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n" +"%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.4\n" #: ../plug-ins/script-fu/script-fu-console.c:130 #: ../plug-ins/script-fu/script-fu-console.c:197 @@ -211,8 +214,12 @@ msgid "_Refresh Scripts" msgstr "_Обновить сценарии" #: ../plug-ins/script-fu/script-fu.c:357 -msgid "You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open. Please close all Script-Fu windows and try again." -msgstr "Вы не можете использовать функцию «Обновить сценарии», пока открыт диалог Script-Fu. Закройте все окна Script-Fu и попробуйте снова." +msgid "" +"You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open. " +"Please close all Script-Fu windows and try again." +msgstr "" +"Вы не можете использовать функцию «Обновить сценарии», пока открыт диалог " +"Script-Fu. Закройте все окна Script-Fu и попробуйте снова." #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1 msgid "3D _Outline..." @@ -309,8 +316,11 @@ msgid "Outline blur radius" msgstr "Радиус размывания контура" #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8 -msgid "Outline the selected region (or alpha) with a pattern and add a drop shadow" -msgstr "Очертить выделенную область (или альфа-канал) с текстурой и добавить отбрасываемую тень" +msgid "" +"Outline the selected region (or alpha) with a pattern and add a drop shadow" +msgstr "" +"Очертить выделенную область (или альфа-канал) с текстурой и добавить " +"отбрасываемую тень" #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:7 @@ -715,12 +725,20 @@ msgid "Width of gaps" msgstr "Ширина зазора" #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:1 -msgid "Add a gradient effect, a drop shadow, and a background to the selected region (or alpha)" -msgstr "Добавить эффект градиента, отбрасываемую тень и фон к выделенной области (или альфа-каналу)" +msgid "" +"Add a gradient effect, a drop shadow, and a background to the selected " +"region (or alpha)" +msgstr "" +"Добавить эффект градиента, отбрасываемую тень и фон к выделенной области " +"(или альфа-каналу)" #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:3 -msgid "Create a plain text logo with a gradient effect, a drop shadow, and a background" -msgstr "Создать логотип, состоящий из текста, градиентной заливки, отбрасываемой тени и фона" +msgid "" +"Create a plain text logo with a gradient effect, a drop shadow, and a " +"background" +msgstr "" +"Создать логотип, состоящий из текста, градиентной заливки, отбрасываемой " +"тени и фона" #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8 msgid "_Basic I..." @@ -834,8 +852,11 @@ msgid "Blend Animation needs at least three source layers" msgstr "Для сведения анимации нужно по меньшей мере три исходных слоя" #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:2 -msgid "Create intermediate layers to blend two or more layers over a background as an animation" -msgstr "Создать промежуточные слои для анимации двух и более слоёв выше фонового" +msgid "" +"Create intermediate layers to blend two or more layers over a background as " +"an animation" +msgstr "" +"Создать промежуточные слои для анимации двух и более слоёв выше фонового" #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:3 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:8 @@ -859,8 +880,12 @@ msgid "_Blend..." msgstr "_Плавный переход..." #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:1 -msgid "Add blended backgrounds, highlights, and shadows to the selected region (or alpha)" -msgstr "Добавить смешанный фон, подсветку и тени к выделенной области (или альфа-каналу)" +msgid "" +"Add blended backgrounds, highlights, and shadows to the selected region (or " +"alpha)" +msgstr "" +"Добавить смешанный фон, подсветку и тени к выделенной области (или альфа-" +"каналу)" #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3 msgid "Blen_ded..." @@ -945,8 +970,12 @@ msgid "Corona width" msgstr "Ширина короны" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5 -msgid "Create intermediate layers to produce an animated 'burn-in' transition between two layers" -msgstr "Создать промежуточные слои для перехода в виде анимированного выжигания между двумя слоями" +msgid "" +"Create intermediate layers to produce an animated 'burn-in' transition " +"between two layers" +msgstr "" +"Создать промежуточные слои для перехода в виде анимированного выжигания " +"между двумя слоями" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6 msgid "Fadeout" @@ -965,8 +994,12 @@ msgid "Speed (pixels/frame)" msgstr "Скорость (точек/кадр)" #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:11 -msgid "The Burn-In script needs two layers in total. A foreground layer with transparency and a background layer." -msgstr "Сценарию выжигания нужны ровно два слоя: слой переднего плана с альфа-каналом и фоновый слой." +msgid "" +"The Burn-In script needs two layers in total. A foreground layer with " +"transparency and a background layer." +msgstr "" +"Сценарию выжигания нужны ровно два слоя: слой переднего плана с альфа-" +"каналом и фоновый слой." #: ../plug-ins/script-fu/scripts/camo.scm.h:1 msgid "Color 1" @@ -1053,8 +1086,12 @@ msgid "Carved..." msgstr "Выгравированный текст…" #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:8 -msgid "Create a logo with text raised above or carved in to the specified background image" -msgstr "Создать логотип с текстом, приподнятым либо выгравированным в указанном фоновом изображении" +msgid "" +"Create a logo with text raised above or carved in to the specified " +"background image" +msgstr "" +"Создать логотип с текстом, приподнятым либо выгравированным в указанном " +"фоновом изображении" #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:12 msgid "Padding around text" @@ -1078,7 +1115,8 @@ msgstr "_Мел..." #: ../plug-ins/script-fu/scripts/chip-away.scm.h:1 msgid "Add a chipped woodcarving effect to the selected region (or alpha)" -msgstr "Создать эффект резьбы по дереву для выделенной области (или альфа-канала)" +msgstr "" +"Создать эффект резьбы по дереву для выделенной области (или альфа-канала)" #: ../plug-ins/script-fu/scripts/chip-away.scm.h:2 msgid "Blur amount" @@ -1113,8 +1151,12 @@ msgid "Keep background" msgstr "Сохранить фон" #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:1 -msgid "Add a chrome effect to the selected region (or alpha) using a specified (grayscale) stencil" -msgstr "Добавить в выделение (или альфа-канал) эффект хромирования при помощи указанного образца" +msgid "" +"Add a chrome effect to the selected region (or alpha) using a specified " +"(grayscale) stencil" +msgstr "" +"Добавить в выделение (или альфа-канал) эффект хромирования при помощи " +"указанного образца" #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3 msgid "Chrome" @@ -1206,8 +1248,11 @@ msgid "Effect layer" msgstr "Слой эффекта" #: ../plug-ins/script-fu/scripts/circuit.scm.h:3 -msgid "Fill the selected region (or alpha) with traces like those on a circuit board" -msgstr "Заполнить выделенную область (или альфа-канал) полосками, как на монтажной плате" +msgid "" +"Fill the selected region (or alpha) with traces like those on a circuit board" +msgstr "" +"Заполнить выделенную область (или альфа-канал) полосками, как на монтажной " +"плате" #: ../plug-ins/script-fu/scripts/circuit.scm.h:4 #: ../plug-ins/script-fu/scripts/lava.scm.h:3 @@ -1286,8 +1331,12 @@ msgid "_Coffee Stain..." msgstr "_Кофейные пятна..." #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:1 -msgid "Add a comic-book effect to the selected region (or alpha) by outlining and filling with a gradient" -msgstr "Создать эффект комикса для выделенной области, очерчивая её и заполняя градиентом" +msgid "" +"Add a comic-book effect to the selected region (or alpha) by outlining and " +"filling with a gradient" +msgstr "" +"Создать эффект комикса для выделенной области, очерчивая её и заполняя " +"градиентом" #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:3 msgid "Comic Boo_k..." @@ -1307,8 +1356,12 @@ msgid "Outline size" msgstr "Размер контура" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1 -msgid "Add a metallic effect to the selected region (or alpha) with reflections and perspective shadows" -msgstr "Добавить эффект блестящего металла к выделенной области с отражениями и тенями в перспективе" +msgid "" +"Add a metallic effect to the selected region (or alpha) with reflections and " +"perspective shadows" +msgstr "" +"Добавить эффект блестящего металла к выделенной области с отражениями и " +"тенями в перспективе" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:3 msgid "Cool _Metal..." @@ -1316,7 +1369,9 @@ msgstr "Прох_ладный металл..." #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:4 msgid "Create a metallic logo with reflections and perspective shadows" -msgstr "Создать логотип, стилизованный под металл, с отражениями и тенями в перспективе" +msgstr "" +"Создать логотип, стилизованный под металл, с отражениями и тенями в " +"перспективе" #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4 @@ -1366,9 +1421,8 @@ msgid "Spread" msgstr "Распространение" #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:7 -#, fuzzy msgid "Threshold (bigger 1<-->254 smaller)" -msgstr "Порог (От 1 до 255)" +msgstr "Порог (чем меньше значение, тем он выше)" #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:8 msgid "_Distort..." @@ -1506,8 +1560,11 @@ msgid "Black on white" msgstr "Черный на белом" #: ../plug-ins/script-fu/scripts/font-map.scm.h:3 -msgid "Create an image filled with previews of fonts matching a fontname filter" -msgstr "Создать изображение заполненное образцами символов из шрифтов, подходящих под условия поиска шрифта" +msgid "" +"Create an image filled with previews of fonts matching a fontname filter" +msgstr "" +"Создать изображение заполненное образцами символов из шрифтов, подходящих " +"под условия поиска шрифта" #: ../plug-ins/script-fu/scripts/font-map.scm.h:4 msgid "Font _size (pixels)" @@ -1542,8 +1599,12 @@ msgid "_Text" msgstr "_Текст" #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:1 -msgid "Add a frost effect to the selected region (or alpha) with an added drop shadow" -msgstr "Добавить эффект заморозки к выделенной области (или альфа-каналу) и отбросить тень" +msgid "" +"Add a frost effect to the selected region (or alpha) with an added drop " +"shadow" +msgstr "" +"Добавить эффект заморозки к выделенной области (или альфа-каналу) и " +"отбросить тень" #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:3 msgid "Create frozen logo with an added drop shadow" @@ -1640,8 +1701,12 @@ msgid "_Working with Digital Camera Photos" msgstr "Работа с цифровым _фото" #: ../plug-ins/script-fu/scripts/glossy.scm.h:1 -msgid "Add gradients, patterns, shadows, and bump maps to the selected region (or alpha)" -msgstr "Добавить градиенты, текстуры, тени и рельефы к выделенной области (или альфа-каналу)" +msgid "" +"Add gradients, patterns, shadows, and bump maps to the selected region (or " +"alpha)" +msgstr "" +"Добавить градиенты, текстуры, тени и рельефы к выделенной области (или альфа-" +"каналу)" #: ../plug-ins/script-fu/scripts/glossy.scm.h:3 msgid "Blend gradient (outline)" @@ -1698,7 +1763,9 @@ msgstr "Использовать наложение текстур" #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:1 msgid "Add a glowing hot metal effect to the selected region (or alpha)" -msgstr "Добавить эффект переливающегося расплавленного метала к выделению (или альфа-каналу)" +msgstr "" +"Добавить эффект переливающегося расплавленного метала к выделению (или альфа-" +"каналу)" #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:3 msgid "Create a logo that looks like glowing hot metal" @@ -1710,7 +1777,8 @@ msgstr "_Горячее свечение..." #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:1 msgid "Add a shiny look and bevel effect to the selected region (or alpha)" -msgstr "Добавить сверкания и скосить углы в выделенной области (или альфа-канале)" +msgstr "" +"Добавить сверкания и скосить углы в выделенной области (или альфа-канале)" #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:3 msgid "Bevel height (sharpness)" @@ -1740,7 +1808,9 @@ msgstr "Заказной _градиент..." #: ../plug-ins/script-fu/scripts/grid-system.scm.h:1 #: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:1 -msgid "Draw a grid as specified by the lists of X and Y locations using the current brush" +msgid "" +"Draw a grid as specified by the lists of X and Y locations using the current " +"brush" msgstr "Нарисовать текущей кистью сетку по экстремумам выделения" #: ../plug-ins/script-fu/scripts/grid-system.scm.h:2 @@ -1761,7 +1831,9 @@ msgstr "Создать из _выделения" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:1 msgid "Add a guide at the position specified as a percentage of the image size" -msgstr "Добавить направляющую к положению, заданному в процентах от размера изображения" +msgstr "" +"Добавить направляющую к положению, заданному в процентах от размера " +"изображения" #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:2 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:2 @@ -1862,8 +1934,11 @@ msgstr "_Лава..." #: ../plug-ins/script-fu/scripts/line-nova.scm.h:1 #, fuzzy -msgid "Fill a layer with rays emanating outward from its center using the foreground color" -msgstr "Заполнить слой лучами, исходящими от центра, используя цвет переднего плана" +msgid "" +"Fill a layer with rays emanating outward from its center using the " +"foreground color" +msgstr "" +"Заполнить слой лучами, исходящими от центра, используя цвет переднего плана" #: ../plug-ins/script-fu/scripts/line-nova.scm.h:2 msgid "Line _Nova..." @@ -1986,11 +2061,15 @@ msgid "_Old Photo..." msgstr "С_тарое фото..." #: ../plug-ins/script-fu/scripts/palette-export.scm.h:1 -msgid "All characters in the name are either white-spaces or characters which can not appear in filenames." +msgid "" +"All characters in the name are either white-spaces or characters which can " +"not appear in filenames." msgstr "" #: ../plug-ins/script-fu/scripts/palette-export.scm.h:2 -msgid "Export the active palette as a CSS stylesheet with the color entry name as their class name, and the color itself as the color attribute" +msgid "" +"Export the active palette as a CSS stylesheet with the color entry name as " +"their class name, and the color itself as the color attribute" msgstr "" #: ../plug-ins/script-fu/scripts/palette-export.scm.h:3 @@ -2011,15 +2090,21 @@ msgstr "Папка для сохранения файла" #: ../plug-ins/script-fu/scripts/palette-export.scm.h:7 msgid "The filename you entered is not a suitable name for a file." -msgstr "" +msgstr "Имя, введённое вами в качестве имени файла, не подходит." #: ../plug-ins/script-fu/scripts/palette-export.scm.h:8 -msgid "The name of the file to create (if a file with this name already exist, it will be replaced)" +msgid "" +"The name of the file to create (if a file with this name already exist, it " +"will be replaced)" msgstr "Имя создаваемого файла (существующий будет заменён)" #: ../plug-ins/script-fu/scripts/palette-export.scm.h:9 -msgid "Write all the colors in a palette to a text file, one hexadecimal value per line (no names)" +msgid "" +"Write all the colors in a palette to a text file, one hexadecimal value per " +"line (no names)" msgstr "" +"Записать все цвета палитры в текстовый файл, по одному шестиричному значению " +"на строку (без названий)" #: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:1 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:1 @@ -2184,7 +2269,8 @@ msgid "Black" msgstr "Заполнять чёрным" #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:2 -msgid "Create a multi-layer image by adding a ripple effect to the current image" +msgid "" +"Create a multi-layer image by adding a ripple effect to the current image" msgstr "Создать многослойное изображение, добавляя эффект ряби к текущему" #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3 @@ -2225,12 +2311,13 @@ msgid "Edge radius" msgstr "Радиус края" #: ../plug-ins/script-fu/scripts/round-corners.scm.h:5 -msgid "Round the corners of an image and optionally add a drop-shadow and background" +msgid "" +"Round the corners of an image and optionally add a drop-shadow and background" msgstr "Скруглить углы и, по желанию, добавить отбрасываемые тени и фон" #: ../plug-ins/script-fu/scripts/round-corners.scm.h:9 msgid "_Round Corners..." -msgstr "С_кругленные уголы..." +msgstr "С_кругленные углы..." #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:1 msgid "Change the colormap of an image to the colors in a specified palette." @@ -2338,7 +2425,8 @@ msgid "_Spinning Globe..." msgstr "Вращающийся _шар..." #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1 -msgid "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" +msgid "" +"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer" msgstr "Рисование спирографов, эпитрохоид и кривых Лиссажу в активном слое" #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2 @@ -2500,7 +2588,9 @@ msgstr "_Вихрь..." #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:1 msgid "Add a Trace of Particles effect to the selected region (or alpha)" -msgstr "Добавить эффект разлетающихся частичек к выделенной области (или альфа-каналу)" +msgstr "" +"Добавить эффект разлетающихся частичек к выделенной области (или альфа-" +"каналу)" #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:3 msgid "Base color" @@ -2531,7 +2621,8 @@ msgid "Antialias" msgstr "Сглаживание" #: ../plug-ins/script-fu/scripts/text-circle.scm.h:2 -msgid "Create a logo by rendering the specified text along the perimeter of a circle" +msgid "" +"Create a logo by rendering the specified text along the perimeter of a circle" msgstr "Создать логотип, расположив текст по кругу" #: ../plug-ins/script-fu/scripts/text-circle.scm.h:3 @@ -2543,7 +2634,8 @@ msgid "Text C_ircle..." msgstr "Текст по _кругу..." #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:3 -msgid "Create a textured logo with highlights, shadows, and a mosaic background" +msgid "" +"Create a textured logo with highlights, shadows, and a mosaic background" msgstr "Создать текстурный логотип с подсветкой, тенями и мозаичным фоном" #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4 @@ -2551,8 +2643,12 @@ msgid "Ending blend" msgstr "Конечный цвет" #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5 -msgid "Fill the selected region (or alpha) with a texture and add highlights, shadows, and a mosaic background" -msgstr "Заполнить выделение (или альфа-канал) текстурой и добавить подсветку, тени и мозаику на заднем фоне" +msgid "" +"Fill the selected region (or alpha) with a texture and add highlights, " +"shadows, and a mosaic background" +msgstr "" +"Заполнить выделение (или альфа-канал) текстурой и добавить подсветку, тени и " +"мозаику на заднем фоне" #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8 msgid "Hexagons" @@ -2643,8 +2739,12 @@ msgid "Amplitude" msgstr "Размах" #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2 -msgid "Create a multi-layer image with an effect like a stone was thrown into the current image" -msgstr "Создать многослойное изображение с эффектом, как будто в текущее изображение бросили камень" +msgid "" +"Create a multi-layer image with an effect like a stone was thrown into the " +"current image" +msgstr "" +"Создать многослойное изображение с эффектом, как будто в текущее изображение " +"бросили камень" #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3 msgid "Invert direction" @@ -2659,8 +2759,12 @@ msgid "_Waves..." msgstr "_Волны..." #: ../plug-ins/script-fu/scripts/weave.scm.h:1 -msgid "Create a new layer filled with a weave effect to be used as an overlay or bump map" -msgstr "Создать новый слой, заполненный волнами для использования в качестве накладки или рельефа" +msgid "" +"Create a new layer filled with a weave effect to be used as an overlay or " +"bump map" +msgstr "" +"Создать новый слой, заполненный волнами для использования в качестве " +"накладки или рельефа" #: ../plug-ins/script-fu/scripts/weave.scm.h:2 msgid "Ribbon spacing" @@ -2696,7 +2800,9 @@ msgstr "П_летение..." #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)" -msgstr "Добавить легкий полупрозрачный 3D-эффект к выделенной области (или альфа-каналу)" +msgstr "" +"Добавить легкий полупрозрачный 3D-эффект к выделенной области (или альфа-" +"каналу)" #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2 msgid "Drop shadow X offset" diff --git a/po-tips/eu.po b/po-tips/eu.po index 26200803b4..833d2635fc 100644 --- a/po-tips/eu.po +++ b/po-tips/eu.po @@ -3,68 +3,148 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # Iñaki Larrañaga Murgoitio , 2004, 2006. -# Iñaki Larrañaga Murgoitio , 2007. +# Iñaki Larrañaga Murgoitio , 2007, 2013. msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-08 13:41+0200\n" -"PO-Revision-Date: 2007-09-08 13:44+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"POT-Creation-Date: 2013-08-28 21:11+0200\n" +"PO-Revision-Date: 2013-08-27 22:51+0200\n" +"Last-Translator: \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" #: ../data/tips/gimp-tips.xml.in.h:1 -msgid "Welcome to the GNU Image Manipulation Program!" -msgstr "Ongi etorri GNU Irudiak Manipulatzeko Programara!" +msgid "" +"You can get context-sensitive help for most of GIMP's features by pressing " +"the F1 key at any time. This also works inside the menus." +msgstr "" +"GIMPeko eginbide gehienentzako testuinguruko laguntza F1 tekla edozein " +"unetan sakatuta lor dezakezu. Horrek menuetan ere balio du." #: ../data/tips/gimp-tips.xml.in.h:2 msgid "" -"Ctrl-click with the Bucket Fill tool to have it use the background " -"color instead of the foreground color. Similarly, Ctrl-clicking " -"with the eyedropper tool sets the background color instead of the foreground " -"color." +"GIMP uses layers to let you organize your image. Think of them as a stack of " +"slides or filters, such that looking through them you see a composite of " +"their contents." msgstr "" -"Egin klik Ktrl sakatuta Bete tresnarekin, aurreko planoaren " -"kolorearen ordez atzeko planoaren kolorea erabil dezan. Era berean, egin " -"klik Ktrl sakatuta kolore-hautatzailea tresnarekin aurreko " -"planoaren kolorearen ordez atzeko planoaren kolorea ezar dezan." +"GIMPek geruzak erabiltzen ditu irudia antolatzen laguntzeko. Imajinatu " +"diapositiba- edo iragazki-multzoak direla eta haietan barrena begiratuta " +"haien edukia ikusten duzula." #: ../data/tips/gimp-tips.xml.in.h:3 msgid "" -"Ctrl-clicking on the layer mask's preview in the Layers dialog " -"toggles the effect of the layer mask. Alt-clicking on the layer " -"mask's preview in the Layers dialog toggles viewing the mask directly." +"You can perform many layer operations by right-clicking on the text label of " +"a layer in the Layers dialog." msgstr "" -"Egin klik Ktrl sakatuta, 'Geruzak' elkarrizketa-koadroko geruza-" -"maskararen aurrebistan geruza-maskararen efektua txandakatzeko. Egin klik " -"Alt sakatuta, 'Geruzak' elkarrizketa-koadroko geruza-maskararen " -"aurrebistan geruza-maskararen ikuspegia txandakatzeko." +"Geruza-eragiketa ugari egin ditzakezu 'Geruzak' elkarrizketa-koadroan geruza " +"baten testu-etiketan saguaren eskuineko botoiaz klik eginda." #: ../data/tips/gimp-tips.xml.in.h:4 msgid "" -"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " -"degree angles." +"When you save an image to work on it again later, try using XCF, GIMP's " +"native file format (use the file extension .xcf). This preserves " +"the layers and many aspects of your work-in-progress. Once a project is " +"completed, you can export it as JPEG, PNG, GIF, etc." msgstr "" -"Biratze-moduan eraldatze-tresnarekin Ktrl sakatuta arrastatzen " -"baduzu, 15 gradu biratuko da." +"Irudi bat gordetzen duzunean, beranduago harekin berriro lan egiteko, saiatu " +"XCF erabiltzen, GIMPen fitxategi-formatua da (erabili fitxategi-luzapen " +"hau: .xcf). Hala, irudiaren geruzak eta lantzen ari zaren arlo asko " +"mantenduko dira. Proiektua bukatutakoan, ordea, formatu hauetan gorde behar " +"duzu: JPEG, PNG, GIF, ..." #: ../data/tips/gimp-tips.xml.in.h:5 msgid "" -"Shift-click on the eye icon in the Layers dialog to hide all layers " -"but that one. Shift-click again to show all layers." +"Most plug-ins work on the current layer of the current image. In some cases, " +"you will have to merge all layers (Image→Flatten Image) if you want the plug-" +"in to work on the whole image." msgstr "" -"Egin klik Maius tekla sakatuta 'Geruzak' elkarrizketa-koadroko " -"begiaren ikonoan, geruza hori ez beste guztiak ezkutatzeko. Egin klik " -"berriro Maius tekla sakatuta, geruza guztiak agertzeko." +"Plugin gehienek uneko irudiaren uneko geruzan egiten dute lan. Batzuetan, " +"geruza guztiak batu behar dira (Irudia→Berdindu irudia) pluginak irudi osoan " +"lan egitea nahi baduzu." #: ../data/tips/gimp-tips.xml.in.h:6 msgid "" +"If a layer's name in the Layers dialog is displayed in bold, this " +"layer doesn't have an alpha-channel. You can add an alpha-channel using " +"Layer→Transparency→Add Alpha Channel." +msgstr "" +"Geruza elkarrizketa-koadroan geruza baten izena lodiz agertzen bada, " +"geruza horrek alfa-kanalik ez duela adierazten du. Alfa-kanala gehitzeko " +"erabili Geruza → Gardentasuna → Gehitu alfa kanaka." + +#: ../data/tips/gimp-tips.xml.in.h:7 +msgid "" +"Not all effects can be applied to all kinds of images. This is indicated by " +"a grayed-out menu-entry. You may need to change the image mode to RGB " +"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " +"Channel) or flatten it (Image→Flatten Image)." +msgstr "" +"Efektu guztiak ez dira berdin aplikatzen irudi-mota guztietan. Hori " +"adierazteko, menu-sarrera lausotuta agertuko da. Agian irudiaren modua " +"GBUra (gorria, berdea, urdina) aldatu behar duzu (Irudia→Modua→GBU), alfa " +"kanal bat gehitu (Geruzak→Gardentasuna→Gehitu alfa kanala) edo irudia " +"berdindu (Irudia→Berdindu irudia)." + +#: ../data/tips/gimp-tips.xml.in.h:8 +msgid "" +"You can adjust or move a selection by using Alt-drag. If this makes " +"the window move, your window manager uses the Alt key already. Most " +"window managers can be configured to ignore the Alt key or to use " +"the Super key (or \"Windows logo\") instead." +msgstr "" +"Hautapen bat doitzeko edo lekuz aldatzeko, erabili Alt-arrastatu. " +"Honek leihoa mugitzen badu, leiho kudeatzaileak Alt erabiltzen " +"duela adierazten du. Leiho kudeatzaile gehienak Alt teklari ez " +"ikusi egiteko edo Super (\"Windows-en logoa\") tekla erabiltzeko " +"horren ordez konfiguratuta daude." + +#: ../data/tips/gimp-tips.xml.in.h:9 +msgid "" +"You can drag and drop many things in GIMP. For example, dragging a color " +"from the toolbox or from a color palette and dropping it into an image will " +"fill the current selection with that color." +msgstr "" +"GIMPen hainbat gauza arrastatu eta jaregin ditzakezu. Adibidez, tresna-" +"laukitik edo kolore-paleta batetik kolore bat arrastatu eta irudi batean " +"jaregiten baduzu, uneko irudia edo hautapena kolore horrez beteko da." + +#: ../data/tips/gimp-tips.xml.in.h:10 +msgid "" +"You can use the middle mouse button to pan around the image (or optionally " +"hold Spacebar while you move the mouse)." +msgstr "" +"Saguaren erdiko botoia erabil dezakezu irudiaren inguruan ibiltzeko (edo " +"aukeran eduki Zuriunea tekla akatuta sagua mugitzen duzun " +"bitartean)." + +#: ../data/tips/gimp-tips.xml.in.h:11 +msgid "" +"Click and drag on a ruler to place a guide on an image. All dragged " +"selections will snap to the guides. You can remove guides by dragging them " +"off the image with the Move tool." +msgstr "" +"Egin klik erregelan eta arrastatu gida irudi batean jartzeko. Arrastatutako " +"hautapen guztiak gidetara moldatuko dira. Gidak kentzeko, arrastatu iruditik " +"'Mugitu' tresnarekin." + +#: ../data/tips/gimp-tips.xml.in.h:12 +msgid "" +"You can drag a layer from the Layers dialog and drop it onto the toolbox. " +"This will create a new image containing only that layer." +msgstr "" +"Geruza bat arrasta dezakezu 'Geruzak' elkarrizketa-koadrotik eta tresna-" +"laukira jaregin dezakezu. Irudi berri bat sortuko da eta geruza hori " +"bakarrik edukiko du." + +#: ../data/tips/gimp-tips.xml.in.h:13 +msgid "" "A floating selection must be anchored to a new layer or to the last active " "layer before doing other operations on the image. Click on the "New " "Layer" or the "Anchor Layer" button in the Layers dialog, or " @@ -75,7 +155,82 @@ msgstr "" "berria" edo "Ainguratu geruza" botoietan "Geruzak" " "elkarrizketa-koadroan, edo erabili menuak gauza bera egiteko." -#: ../data/tips/gimp-tips.xml.in.h:7 +#: ../data/tips/gimp-tips.xml.in.h:14 +msgid "" +"GIMP supports gzip compression on the fly. Just add .gz (or ." +"bz2, if you have bzip2 installed) to the filename and your image will " +"be saved compressed. Of course loading compressed images works too." +msgstr "" +"GIMPek gzip konprimatzea unean onartzen du. Fitxategi-izenari .gz " +"gehitu besterik ez duzu egin behar (edo .bz2, bzip2 instalatuta " +"baduzu) eta irudia konprimituta gordeko da. Noski, konprimitutako irudiak " +"ere karga daitezke." + +#: ../data/tips/gimp-tips.xml.in.h:15 +msgid "" +"Pressing and holding the Shift key before making a selection allows " +"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." +msgstr "" +"Hautapena egin aurretik Maius tekla sakatuta baduzu, uneko " +"hautapenera gehituko duzu ordeztu beharrean. Hautapena egin aurretik " +"Ktrl erabiltzen bada, unekotik kendu egiten da." + +#: ../data/tips/gimp-tips.xml.in.h:16 +msgid "" +"You can draw simple squares or circles using Edit→Stroke Selection. It " +"strokes the edge of your current selection. More complex shapes can be drawn " +"using the Path tool or with Filters→Render→Gfig." +msgstr "" +"'Editatu→Trazua' erabiliz lauki edo zirkulu soilak marraz daitezke uneko " +"hautapenaren ertza brotxa aktiboarekin margotuz. Forma konplexuagoak marraz " +"daitezke 'Iragazkiak→Errendatu→Gfig' aukeratuz." + +#: ../data/tips/gimp-tips.xml.in.h:17 +msgid "" +"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " +"their current settings. You can use the Paintbrush in gradient mode or even " +"the Eraser or the Smudge tool." +msgstr "" +"Bide bat trazatzen baduzu (Editatu→Trazatu), uneko marrazketa-tresna eta " +"haren ezarpenak erabiliko dira. Pintzela gradiente-moduan, 'Borragoma' edo " +"'Zirriborroa egin' tresnak ere erabil ditzakezu." + +#: ../data/tips/gimp-tips.xml.in.h:18 +msgid "" +"You can create and edit complex selections using the Path tool. The Paths " +"dialog allows you to work on multiple paths and to convert them to " +"selections." +msgstr "" +"Hautapen konplexuak egiteko eta editatzeko, erabili 'Bidea' tresna. 'Bideak' " +"elkarrizketa-koadroaren bidez, hainbat bide-izenetan lan egin dezakezu eta " +"haiek hautapen bihur ditzakezu." + +#: ../data/tips/gimp-tips.xml.in.h:19 +msgid "" +"You can use the paint tools to change the selection. Click on the "" +"Quick Mask" button at the bottom left of an image window. Change your " +"selection by painting in the image and click on the button again to convert " +"it back to a normal selection." +msgstr "" +"Margotzeko tresnak erabil ditzakezu hautapena aldatzeko. Egin klik irudi-" +"leiho bateko behealdeko ezkerreko "Maskara azkarra" botoian. " +"Aldatu hautapena irudian marraztuz, eta egin klik berriro botoian hautapen " +"arruntera itzultzeko." + +#: ../data/tips/gimp-tips.xml.in.h:20 +msgid "" +"You can save a selection to a channel (Select→Save to Channel) and then " +"modify this channel with any paint tools. Using the buttons in the Channels " +"dialog, you can toggle the visibility of this new channel or convert it to a " +"selection." +msgstr "" +"Hautapena kanalean gorde dezakezu (Hautatu→Gorde kanalean) eta gero kanala " +"aldatu margotzeko tresnekin. 'Kanalak' elkarrizketa-koadroko botoiak " +"erabiliz kanal berri honen ikusgaitasuna txandaka dezakezu edo hautapen " +"bihurtu." + +#: ../data/tips/gimp-tips.xml.in.h:21 msgid "" "After you enabled "Dynamic Keyboard Shortcuts" in the Preferences " "dialog, you can reassign shortcut keys. Do so by bringing up the menu, " @@ -93,54 +248,65 @@ msgstr "" "desgaitu nahi izatea, laster-teklak nahi gabe ezartzea edo kentzea " "saihesteko." -#: ../data/tips/gimp-tips.xml.in.h:8 +#: ../data/tips/gimp-tips.xml.in.h:22 msgid "" -"Click and drag on a ruler to place a guide on an image. All dragged " -"selections will snap to the guides. You can remove guides by dragging them " -"off the image with the Move tool." +"If your screen is too cluttered, you can press Tab in an image " +"window to toggle the visibility of the toolbox and other dialogs." msgstr "" -"Egin klik erregelan eta arrastatu gida irudi batean jartzeko. Arrastatutako " -"hautapen guztiak gidetara moldatuko dira. Gidak kentzeko, arrastatu iruditik " -"'Mugitu' tresnarekin." +"Pantaila beteegia badago, Tab tekla behin baino gehiagotan sakatu " +"irudi-leihoan, tresna-laukia edo beste elkarrizketa-koadroak ezkutatzeko edo " +"agertzeko." -#: ../data/tips/gimp-tips.xml.in.h:9 +#: ../data/tips/gimp-tips.xml.in.h:23 msgid "" -"GIMP allows you to undo most changes to the image, so feel free to " -"experiment." -msgstr "GIMP-ek irudiaren aldaketa gehienak desegin ditzakenez, jolastu irudiekin." - -#: ../data/tips/gimp-tips.xml.in.h:10 -msgid "" -"GIMP supports gzip compression on the fly. Just add .gz (or ." -"bz2, if you have bzip2 installed) to the filename and your image will " -"be saved compressed. Of course loading compressed images works too." +"Shift-click on the eye icon in the Layers dialog to hide all layers " +"but that one. Shift-click again to show all layers." msgstr "" -"GIMPek gzip konprimatzea unean onartzen du. Fitxategi-izenari .gz " -"gehitu besterik ez duzu egin behar (edo .bz2, bzip2 instalatuta " -"baduzu) eta irudia konprimituta gordeko da. Noski, konprimitutako irudiak " -"ere karga daitezke." +"Egin klik Maius tekla sakatuta 'Geruzak' elkarrizketa-koadroko " +"begiaren ikonoan, geruza hori ez beste guztiak ezkutatzeko. Egin klik " +"berriro Maius tekla sakatuta, geruza guztiak agertzeko." -#: ../data/tips/gimp-tips.xml.in.h:11 +#: ../data/tips/gimp-tips.xml.in.h:24 msgid "" -"GIMP uses layers to let you organize your image. Think of them as a stack of " -"slides or filters, such that looking through them you see a composite of " -"their contents." +"Ctrl-clicking on the layer mask's preview in the Layers dialog " +"toggles the effect of the layer mask. Alt-clicking on the layer " +"mask's preview in the Layers dialog toggles viewing the mask directly." msgstr "" -"GIMPek geruzak erabiltzen ditu irudia antolatzen laguntzeko. Imajinatu " -"diapositiba- edo iragazki-multzoak direla eta haietan barrena begiratuta " -"haien edukia ikusten duzula." +"Egin klik Ktrl sakatuta, 'Geruzak' elkarrizketa-koadroko geruza-" +"maskararen aurrebistan geruza-maskararen efektua txandakatzeko. Egin klik " +"Alt sakatuta, 'Geruzak' elkarrizketa-koadroko geruza-maskararen " +"aurrebistan geruza-maskararen ikuspegia txandakatzeko." -#: ../data/tips/gimp-tips.xml.in.h:12 +#: ../data/tips/gimp-tips.xml.in.h:25 msgid "" -"If a layer's name in the Layers dialog is displayed in bold, this " -"layer doesn't have an alpha-channel. You can add an alpha-channel using " -"Layer→Transparency→Add Alpha Channel." +"You can use Ctrl-Tab to cycle through all layers in an " +"image (if your window manager doesn't trap those keys...)." msgstr "" -"Geruza elkarrizketa-koadroan geruza baten izena lodiz agertzen bada, " -"geruza horrek alfa-kanalik ez duela adierazten du. Alfa-kanala gehitzeko " -"erabili Geruza → Gardentasuna → Gehitu alfa kanaka." +"Alt-Tab teklak erabil ditzakezu irudi bateko geruzetan " +"batetik bestera joateko (zure leiho-kudeatzaileak tekla horiek blokeatzen ez " +"baditu...)." -#: ../data/tips/gimp-tips.xml.in.h:13 +#: ../data/tips/gimp-tips.xml.in.h:26 +msgid "" +"Ctrl-click with the Bucket Fill tool to have it use the background " +"color instead of the foreground color. Similarly, Ctrl-clicking " +"with the eyedropper tool sets the background color instead of the foreground " +"color." +msgstr "" +"Egin klik Ktrl sakatuta Bete tresnarekin, aurreko planoaren " +"kolorearen ordez atzeko planoaren kolorea erabil dezan. Era berean, egin " +"klik Ktrl sakatuta kolore-hautatzailea tresnarekin aurreko " +"planoaren kolorearen ordez atzeko planoaren kolorea ezar dezan." + +#: ../data/tips/gimp-tips.xml.in.h:27 +msgid "" +"Ctrl-drag with the Rotate tool will constrain the rotation to 15 " +"degree angles." +msgstr "" +"Biratze-moduan eraldatze-tresnarekin Ktrl sakatuta arrastatzen " +"baduzu, 15 gradu biratuko da." + +#: ../data/tips/gimp-tips.xml.in.h:28 msgid "" "If some of your scanned photos do not look colorful enough, you can easily " "improve their tonal range with the "Auto" button in the Levels " @@ -152,190 +318,24 @@ msgstr "" "bidez (Koloreak→Mailak). Kolore-akatsik badago, "Kurbak" " "tresnarekin konpon ditzakezu (Koloreak→Kurbak)." -#: ../data/tips/gimp-tips.xml.in.h:14 -msgid "" -"If you stroke a path (Edit→Stroke Path), the paint tools can be used with " -"their current settings. You can use the Paintbrush in gradient mode or even " -"the Eraser or the Smudge tool." -msgstr "" -"Bide bat trazatzen baduzu (Editatu→Trazatu), uneko marrazketa-tresna eta " -"haren ezarpenak erabiliko dira. Pintzela gradiente-moduan, 'Borragoma' edo " -"'Zirriborroa egin' tresnak ere erabil ditzakezu." +#~ msgid "Welcome to the GNU Image Manipulation Program!" +#~ msgstr "Ongi etorri GNU Irudiak Manipulatzeko Programara!" -#: ../data/tips/gimp-tips.xml.in.h:15 -msgid "" -"If your screen is too cluttered, you can press Tab in an image " -"window to toggle the visibility of the toolbox and other dialogs." -msgstr "" -"Pantaila beteegia badago, Tab tekla behin baino gehiagotan sakatu " -"irudi-leihoan, tresna-laukia edo beste elkarrizketa-koadroak ezkutatzeko edo " -"agertzeko." - -#: ../data/tips/gimp-tips.xml.in.h:16 -msgid "" -"Most plug-ins work on the current layer of the current image. In some cases, " -"you will have to merge all layers (Image→Flatten Image) if you want the plug-" -"in to work on the whole image." -msgstr "" -"Plugin gehienek uneko irudiaren uneko geruzan egiten dute lan. Batzuetan, " -"geruza guztiak batu behar dira (Irudia→Berdindu irudia) pluginak irudi osoan " -"lan egitea nahi baduzu." - -#: ../data/tips/gimp-tips.xml.in.h:17 -msgid "" -"Not all effects can be applied to all kinds of images. This is indicated by " -"a grayed-out menu-entry. You may need to change the image mode to RGB " -"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha " -"Channel) or flatten it (Image→Flatten Image)." -msgstr "" -"Efektu guztiak ez dira berdin aplikatzen irudi-mota guztietan. Hori " -"adierazteko, menu-sarrera lausotuta agertuko da. Agian irudiaren modua " -"GBUra (gorria, berdea, urdina) aldatu behar duzu (Irudia→Modua→GBU), alfa " -"kanal bat gehitu (Geruzak→Gardentasuna→Gehitu alfa kanala) edo irudia " -"berdindu (Irudia→Berdindu irudia)." - -#: ../data/tips/gimp-tips.xml.in.h:18 -msgid "" -"Pressing and holding the Shift key before making a selection allows " -"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one." -msgstr "" -"Hautapena egin aurretik Maius tekla sakatuta baduzu, uneko " -"hautapenera gehituko duzu ordeztu beharrean. Hautapena egin aurretik " -"Ktrl erabiltzen bada, unekotik kendu egiten da." - -#: ../data/tips/gimp-tips.xml.in.h:19 -msgid "" -"To create a circle-shaped selection, hold Shift while doing an " -"ellipse select. To place a circle precisely, drag horizontal and vertical " -"guides tangent to the circle you want to select, place your cursor at the " -"intersection of the guides, and the resulting selection will just touch the " -"guides." -msgstr "" -"Zirkulu perfektu bat egiteko, eduki Maius sakatuta hautapen " -"eliptikoa egiten duzun bitartean. Zirkulu bat behar bezala kokatzeko, " -"arrastatu gida horizontalen eta bertikalen tangentea hautatu nahi duzun " -"zirkulura, jarri kurtsorea giden ebakiduran eta lortzen den hautapenak gidak " -"ukituko ditu." - -#: ../data/tips/gimp-tips.xml.in.h:20 -msgid "" -"When you save an image to work on it again later, try using XCF, GIMP's " -"native file format (use the file extension .xcf). This preserves " -"the layers and every aspect of your work-in-progress. Once a project is " -"completed, you can save it as JPEG, PNG, GIF, ..." -msgstr "" -"Irudi bat gordetzen duzunean, beranduago harekin berriro lan egiteko, saiatu " -"XCF erabiltzen, GIMPen fitxategi-formatua da (erabili fitxategi-luzapen " -"hau: .xcf). Hala, lantzen ari zaren irudiaren geruza eta itxura " -"guztia gordeko da. Proiektua bukatutakoan, ordea, formatu hauetan gorde " -"behar duzu: JPEG, PNG, GIF, ..." - -#: ../data/tips/gimp-tips.xml.in.h:21 -msgid "" -"You can adjust or move a selection by using Alt-drag. If this makes " -"the window move, your window manager uses the Alt key already. Most " -"window managers can be configured to ignore the Alt key or to use " -"the Super key (or \"Windows logo\") instead." -msgstr "" -"Hautapen bat doitzeko edo lekuz aldatzeko, erabili Alt-arrastatu. " -"Honek leihoa mugitzen badu, leiho kudeatzaileak Alt erabiltzen duela " -"adierazten du. Leiho kudeatzaile gehienak Alt teklari ez ikusi egiteko edo Super (\"Windows-en logoa\") tekla erabiltzeko horren ordez konfiguratuta daude." - -#: ../data/tips/gimp-tips.xml.in.h:22 -msgid "" -"You can create and edit complex selections using the Path tool. The Paths " -"dialog allows you to work on multiple paths and to convert them to " -"selections." -msgstr "" -"Hautapen konplexuak egiteko eta editatzeko, erabili 'Bidea' tresna. 'Bideak' " -"elkarrizketa-koadroaren bidez, hainbat bide-izenetan lan egin dezakezu eta " -"haiek hautapen bihur ditzakezu." - -#: ../data/tips/gimp-tips.xml.in.h:23 -msgid "" -"You can drag a layer from the Layers dialog and drop it onto the toolbox. " -"This will create a new image containing only that layer." -msgstr "" -"Geruza bat arrasta dezakezu 'Geruzak' elkarrizketa-koadrotik eta tresna-" -"laukira jaregin dezakezu. Irudi berri bat sortuko da eta geruza hori " -"bakarrik edukiko du." - -#: ../data/tips/gimp-tips.xml.in.h:24 -msgid "" -"You can drag and drop many things in GIMP. For example, dragging a color " -"from the toolbox or from a color palette and dropping it into an image will " -"fill the current selection with that color." -msgstr "" -"GIMPen hainbat gauza arrastatu eta jaregin ditzakezu. Adibidez, tresna-" -"laukitik edo kolore-paleta batetik kolore bat arrastatu eta irudi batean " -"jaregiten baduzu, uneko irudia edo hautapena kolore horrez beteko da." - -#: ../data/tips/gimp-tips.xml.in.h:25 -msgid "" -"You can draw simple squares or circles using Edit→Stroke Selection. It " -"strokes the edge of your current selection. More complex shapes can be drawn " -"using the Path tool or with Filters→Render→Gfig." -msgstr "" -"'Editatu→Trazua' erabiliz lauki edo zirkulu soilak marraz daitezke uneko " -"hautapenaren ertza brotxa aktiboarekin margotuz. Forma konplexuagoak marraz " -"daitezke 'Iragazkiak→Errendatu→Gfig' aukeratuz." - -#: ../data/tips/gimp-tips.xml.in.h:26 -msgid "" -"You can get context-sensitive help for most of GIMP's features by pressing " -"the F1 key at any time. This also works inside the menus." -msgstr "" -"GIMPeko eginbide gehienentzako testuinguruko laguntza F1 tekla edozein " -"unetan sakatuta lor dezakezu. Horrek menuetan ere balio du." - -#: ../data/tips/gimp-tips.xml.in.h:27 -msgid "" -"You can perform many layer operations by right-clicking on the text label of " -"a layer in the Layers dialog." -msgstr "" -"Geruza-eragiketa ugari egin ditzakezu 'Geruzak' elkarrizketa-koadroan geruza " -"baten testu-etiketan saguaren eskuineko botoiaz klik eginda." - -#: ../data/tips/gimp-tips.xml.in.h:28 -msgid "" -"You can save a selection to a channel (Select→Save to Channel) and then " -"modify this channel with any paint tools. Using the buttons in the Channels " -"dialog, you can toggle the visibility of this new channel or convert it to a " -"selection." -msgstr "" -"Hautapena kanalean gorde dezakezu (Hautatu→Gorde kanalean) eta gero kanala " -"aldatu margotzeko tresnekin. 'Kanalak' elkarrizketa-koadroko botoiak " -"erabiliz kanal berri honen ikusgaitasuna txandaka dezakezu edo hautapen " -"bihurtu." - -#: ../data/tips/gimp-tips.xml.in.h:29 -msgid "" -"You can use Ctrl-Tab to cycle through all layers in an " -"image (if your window manager doesn't trap those keys...)." -msgstr "" -"Alt-Tab teklak erabil ditzakezu irudi bateko geruzetan " -"batetik bestera joateko (zure leiho-kudeatzaileak tekla horiek blokeatzen ez " -"baditu...)." - -#: ../data/tips/gimp-tips.xml.in.h:30 -msgid "" -"You can use the middle mouse button to pan around the image (or optionally " -"hold Spacebar while you move the mouse)." -msgstr "" -"Saguaren erdiko botoia erabil dezakezu irudiaren inguruan ibiltzeko (edo " -"aukeran eduki Zuriunea tekla akatuta sagua mugitzen duzun " -"bitartean)." - -#: ../data/tips/gimp-tips.xml.in.h:31 -msgid "" -"You can use the paint tools to change the selection. Click on the "" -"Quick Mask" button at the bottom left of an image window. Change your " -"selection by painting in the image and click on the button again to convert " -"it back to a normal selection." -msgstr "" -"Margotzeko tresnak erabil ditzakezu hautapena aldatzeko. Egin klik irudi-" -"leiho bateko behealdeko ezkerreko "Maskara azkarra" botoian. " -"Aldatu hautapena irudian marraztuz, eta egin klik berriro botoian hautapen " -"arruntera itzultzeko." +#~ msgid "" +#~ "GIMP allows you to undo most changes to the image, so feel free to " +#~ "experiment." +#~ msgstr "" +#~ "GIMP-ek irudiaren aldaketa gehienak desegin ditzakenez, jolastu irudiekin." +#~ msgid "" +#~ "To create a circle-shaped selection, hold Shift while doing an " +#~ "ellipse select. To place a circle precisely, drag horizontal and vertical " +#~ "guides tangent to the circle you want to select, place your cursor at the " +#~ "intersection of the guides, and the resulting selection will just touch " +#~ "the guides." +#~ msgstr "" +#~ "Zirkulu perfektu bat egiteko, eduki Maius sakatuta hautapen " +#~ "eliptikoa egiten duzun bitartean. Zirkulu bat behar bezala kokatzeko, " +#~ "arrastatu gida horizontalen eta bertikalen tangentea hautatu nahi duzun " +#~ "zirkulura, jarri kurtsorea giden ebakiduran eta lortzen den hautapenak " +#~ "gidak ukituko ditu." diff --git a/po/POTFILES.in b/po/POTFILES.in index 6b502f1c81..571bee1d85 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -312,6 +312,7 @@ app/text/gimptext-compat.c app/text/gimptextlayer.c app/text/gimptextlayer-transform.c app/text/gimptextlayer-xcf.c +app/text/gimptextlayout.c app/text/text-enums.c app/tools/gimp-tools.c @@ -500,4 +501,5 @@ app/xcf/xcf.c data/tags/gimp-tags-default.xml.in +desktop/gimp.appdata.xml.in desktop/gimp.desktop.in.in diff --git a/po/de.po b/po/de.po index 31a59cf6f1..c2922a876d 100644 --- a/po/de.po +++ b/po/de.po @@ -13,13 +13,14 @@ # Mario Blättermann , 2011, 2012. # Daniel Winzen , 2013. # Christian Kirbach , 2011, 2012, 2013. +# Sven Claussner , 2013. # msgid "" msgstr "" "Project-Id-Version: gimp 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-25 10:59+0100\n" -"PO-Revision-Date: 2013-03-25 11:02+0100\n" +"POT-Creation-Date: 2013-11-23 17:20+0100\n" +"PO-Revision-Date: 2013-11-23 17:23+0100\n" "Last-Translator: Christian Kirbach \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -27,9 +28,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" -"X-Poedit-Language: German\n" -"X-Poedit-Country: GERMANY\n" +"X-Generator: Poedit 1.5.4\n" "X-Project-Style: gnome\n" #: ../app/about.h:23 @@ -79,7 +78,7 @@ msgstr "" "erhalten haben. Falls nicht, finden Sie sie unter http://www.gnu.org/" "licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -458,7 +457,7 @@ msgstr "Texteditor" msgid "Tool Options" msgstr "Werkzeugeinstellungen" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Werkzeuge" @@ -555,12 +554,12 @@ msgstr "Diesen Pinsel löschen" #: ../app/actions/brushes-actions.c:76 msgctxt "brushes-action" msgid "_Refresh Brushes" -msgstr "Pinsel n_eu laden" +msgstr "Die Pinsel n_eu laden" #: ../app/actions/brushes-actions.c:77 msgctxt "brushes-action" msgid "Refresh brushes" -msgstr "Pinsel neu laden" +msgstr "Die Pinsel neu laden" #: ../app/actions/brushes-actions.c:85 msgctxt "brushes-action" @@ -595,7 +594,7 @@ msgstr "Ablage ein_fügen in" #: ../app/actions/buffers-actions.c:52 msgctxt "buffers-action" msgid "Paste the selected buffer into the selection" -msgstr "Fügt die gewählte Ablage in die Auswahl ein" +msgstr "Die gewählte Ablage in die Auswahl einfügen" #: ../app/actions/buffers-actions.c:57 msgctxt "buffers-action" @@ -615,7 +614,7 @@ msgstr "Ablage _löschen" #: ../app/actions/buffers-actions.c:64 msgctxt "buffers-action" msgid "Delete the selected buffer" -msgstr "Die gewählten Ablage löschen" +msgstr "Die gewählte Ablage löschen" #: ../app/actions/channels-actions.c:44 msgctxt "channels-action" @@ -988,7 +987,7 @@ msgid "Use the composite color of all visible layers" msgstr "Das Ergebnis der Komposition aller sichtbaren Ebenen verwenden" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -1634,12 +1633,12 @@ msgstr "Alle Vorschaubilder neu laden" #: ../app/actions/documents-actions.c:93 msgctxt "documents-action" msgid "Remove Dangling E_ntries" -msgstr "_Hängende Einträge entfernen" +msgstr "_Defekte Einträge entfernen" #: ../app/actions/documents-actions.c:95 msgctxt "documents-action" msgid "Remove entries for which the corresponding file is not available" -msgstr "Einträge entfernen, für die die dazugehörige Datei nicht existiert" +msgstr "Einträge entfernen, deren dazugehörige Datei nicht existiert" #: ../app/actions/documents-commands.c:192 msgid "Clear Document History" @@ -1798,62 +1797,62 @@ msgstr "Zeichendynamik-Menü" #: ../app/actions/dynamics-actions.c:46 msgctxt "dynamics-action" msgid "_New Dynamics" -msgstr "_Neue Dynamik" +msgstr "_Neue Zeichendynamik" #: ../app/actions/dynamics-actions.c:47 msgctxt "dynamics-action" msgid "Create a new dynamics" -msgstr "Eine neue Dynamik erstellen" +msgstr "Eine neue Zeichendynamik erstellen" #: ../app/actions/dynamics-actions.c:52 msgctxt "dynamics-action" msgid "D_uplicate Dynamics" -msgstr "Dynamik _duplizieren" +msgstr "Zeichendynamik _duplizieren" #: ../app/actions/dynamics-actions.c:53 msgctxt "dynamics-action" msgid "Duplicate this dynamics" -msgstr "Diese Dynamik duplizieren" +msgstr "Diese Zeichendynamik duplizieren" #: ../app/actions/dynamics-actions.c:58 msgctxt "dynamics-action" msgid "Copy Dynamics _Location" -msgstr "Speicher_ort der Dynamik kopieren" +msgstr "Speicher_ort der Zeichendynamik kopieren" #: ../app/actions/dynamics-actions.c:59 msgctxt "dynamics-action" msgid "Copy dynamics file location to clipboard" -msgstr "Den Speicherort der Dynamikdatei in die Zwischenablage kopieren" +msgstr "Den Speicherort der Zeichendynamikdatei in die Zwischenablage kopieren" #: ../app/actions/dynamics-actions.c:64 msgctxt "dynamics-action" msgid "_Delete Dynamics" -msgstr "Dynamik _löschen" +msgstr "Zeichendynamik _löschen" #: ../app/actions/dynamics-actions.c:65 msgctxt "dynamics-action" msgid "Delete this dynamics" -msgstr "Diese Dynamik löschen" +msgstr "Diese Zeichendynamik löschen" #: ../app/actions/dynamics-actions.c:70 msgctxt "dynamics-action" msgid "_Refresh Dynamics" -msgstr "Dynamik _auffrischen" +msgstr "Zeichendynamik _auffrischen" #: ../app/actions/dynamics-actions.c:71 msgctxt "dynamics-action" msgid "Refresh dynamics" -msgstr "Dynamik auffrischen" +msgstr "Zeichendynamik auffrischen" #: ../app/actions/dynamics-actions.c:79 msgctxt "dynamics-action" msgid "_Edit Dynamics..." -msgstr "Dynamik _bearbeiten …" +msgstr "Zeichendynamik _bearbeiten …" #: ../app/actions/dynamics-actions.c:80 msgctxt "dynamics-action" msgid "Edit dynamics" -msgstr "_Dynamik bearbeiten" +msgstr "Zeichendynamik bearbeiten" #: ../app/actions/dynamics-editor-actions.c:42 msgctxt "dynamics-editor-action" @@ -1863,7 +1862,7 @@ msgstr "Editormenü für Zeichendynamik" #: ../app/actions/dynamics-editor-actions.c:50 msgctxt "dynamics-editor-action" msgid "Edit Active Dynamics" -msgstr "Aktive Dynamik bearbeiten" +msgstr "Aktive Zeichendynamik bearbeiten" #: ../app/actions/edit-actions.c:63 msgctxt "edit-action" @@ -2214,7 +2213,7 @@ msgstr "_Leeren" #: ../app/actions/error-console-actions.c:44 msgctxt "error-console-action" msgid "Clear error console" -msgstr "Fehlerkonsole leeren" +msgstr "Fehlerausgabe leeren" #: ../app/actions/error-console-actions.c:49 msgctxt "error-console-action" @@ -2394,8 +2393,8 @@ msgstr "Dieses Bild speichern und das Bildfenster schließen" #: ../app/actions/file-actions.c:146 msgctxt "file-action" -msgid "Export to" -msgstr "Exportieren nach" +msgid "Export" +msgstr "Exportieren" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2414,8 +2413,8 @@ msgstr "Das Bild zurück in die importierte Datei im Importformat exportieren" #: ../app/actions/file-actions.c:158 msgctxt "file-action" -msgid "Export..." -msgstr "Exportieren …" +msgid "Export As..." +msgstr "Exportieren als …" #: ../app/actions/file-actions.c:159 msgctxt "file-action" @@ -2435,54 +2434,55 @@ msgid "Over_write %s" msgstr "%s ü_berschreiben" #: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "Exportieren nach" +msgid "Export" +msgstr "Exportieren" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Bild öffnen" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Bild als Ebenen öffnen" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Keine Änderungen zu speichern" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Bild speichern" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Eine Kopie des Bildes speichern" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Eine neue Vorlage erstellen" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Bitte geben Sie dieser Vorlage einen Namen" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "Das Bild konnte nicht wiederhergestellt werden, da kein Dateiname mit dem " "Bild verknüpft ist." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Bild wiederherstellen" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Wollen Sie von »%s« zu »%s« zurückkehren?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2490,11 +2490,11 @@ msgstr "" "Indem Sie das Bild auf den zuletzt gespeicherten Stand zurücksetzen, werden " "alle Änderungen einschließlich des Journals verloren gehen." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Unbenannte Vorlage)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2892,7 +2892,7 @@ msgstr "_Neuer Farbverlauf" #: ../app/actions/gradients-actions.c:48 msgctxt "gradients-action" msgid "Create a new gradient" -msgstr "Ein neues Bild erstellen" +msgstr "Einen neuen Farbverlauf erstellen" #: ../app/actions/gradients-actions.c:53 msgctxt "gradients-action" @@ -2937,12 +2937,12 @@ msgstr "Diesen Farbverlauf löschen" #: ../app/actions/gradients-actions.c:77 msgctxt "gradients-action" msgid "_Refresh Gradients" -msgstr "Farbverläufe n_eu laden" +msgstr "Die Farbverläufe n_eu laden" #: ../app/actions/gradients-actions.c:78 msgctxt "gradients-action" msgid "Refresh gradients" -msgstr "Farbverläufe neu laden" +msgstr "Die Farbverläufe neu laden" #: ../app/actions/gradients-actions.c:86 msgctxt "gradients-action" @@ -3235,7 +3235,7 @@ msgid "Set Image Canvas Size" msgstr "Leinwandgröße festlegen" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Größe wird geändert" @@ -3264,21 +3264,21 @@ msgstr "" "Es konnte nicht ausgeschnitten oder kopiert werden,\n" "da der ausgewählte Bereich leer ist." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Druckgröße ändern" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Bild skalieren" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Skalierung" @@ -4005,12 +4005,12 @@ msgstr "Diese Palette löschen" #: ../app/actions/palettes-actions.c:83 msgctxt "palettes-action" msgid "_Refresh Palettes" -msgstr "Paletten n_eu laden" +msgstr "Die Paletten n_eu laden" #: ../app/actions/palettes-actions.c:84 msgctxt "palettes-action" msgid "Refresh palettes" -msgstr "Paletten neu laden" +msgstr "Die Paletten neu laden" #: ../app/actions/palettes-actions.c:92 msgctxt "palettes-action" @@ -4088,12 +4088,12 @@ msgstr "Dieses Muster löschen" #: ../app/actions/patterns-actions.c:76 msgctxt "patterns-action" msgid "_Refresh Patterns" -msgstr "Muster n_eu laden" +msgstr "Die Muster n_eu laden" #: ../app/actions/patterns-actions.c:77 msgctxt "patterns-action" msgid "Refresh patterns" -msgstr "Muster neu laden" +msgstr "Die Muster neu laden" #: ../app/actions/patterns-actions.c:85 msgctxt "patterns-action" @@ -4633,7 +4633,7 @@ msgstr "Textdatei (UTF-8) öffnen" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -4831,12 +4831,12 @@ msgstr "Diese Werkzeug-Voreinstellung löschen" #: ../app/actions/tool-presets-actions.c:72 msgctxt "tool-presets-action" msgid "_Refresh Tool Presets" -msgstr "Werkzeug-Voreinstellungen n_eu laden" +msgstr "Die Werkzeug-Voreinstellungen n_eu laden" #: ../app/actions/tool-presets-actions.c:73 msgctxt "tool-presets-action" msgid "Refresh tool presets" -msgstr "Werkzeug-Voreinstellungen neu laden" +msgstr "Die Werkzeug-Voreinstellungen neu laden" #: ../app/actions/tool-presets-actions.c:81 msgctxt "tool-presets-action" @@ -4931,7 +4931,7 @@ msgstr "_Neuer Pfad …" #: ../app/actions/vectors-actions.c:60 msgctxt "vectors-action" msgid "Create a new path..." -msgstr "Eine neue Vorlage erstellen" +msgstr "Einen neuen Pfad erstellen" #: ../app/actions/vectors-actions.c:65 msgctxt "vectors-action" @@ -4941,7 +4941,7 @@ msgstr "Neuer Pfad mit den aktuellen Werten" #: ../app/actions/vectors-actions.c:66 msgctxt "vectors-action" msgid "Create a new path with last used values" -msgstr "Eine neue Ebene mit den zuletzt verwendeten Werten erstellen" +msgstr "Einen neuen Pfad mit den zuletzt verwendeten Werten erstellen" #: ../app/actions/vectors-actions.c:71 msgctxt "vectors-action" @@ -5199,13 +5199,13 @@ msgstr "Eine neue Ansicht für das Bild erzeugen" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "_Schließen" +msgid "_Close View" +msgstr "_Ansicht schließen" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Dieses Bildfenster schließen" +msgid "Close the active image view" +msgstr "Die aktive Bildansicht schließen" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5637,11 +5637,11 @@ msgstr "A_ndere (%s) …" msgid "_Zoom (%s)" msgstr "_Vergrößerung (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Farbe des Leinwandrahmens" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Benutzerdefinierte Farbe des Leinwandrahmens festlegen" @@ -6143,8 +6143,8 @@ msgstr "" #: ../app/config/gimprc-blurbs.h:160 msgid "When enabled, the selected dynamics will be used for all tools." msgstr "" -"Wenn diese Option ausgewählt ist, wird die ausgewählte Dynamik bei allen " -"Werkzeugen verwendet." +"Wenn diese Option ausgewählt ist, wird die ausgewählte Zeichendynamik bei " +"allen Werkzeugen verwendet." #: ../app/config/gimprc-blurbs.h:166 msgid "When enabled, the selected gradient will be used for all tools." @@ -6236,9 +6236,9 @@ msgid "" "If enabled, the move tool sets the edited layer or path as active. This " "used to be the default behaviour in older versions." msgstr "" -"Wenn diese Option aktiviert ist, wird bei der Verschiebung einer Eben oder " +"Wenn diese Option aktiviert ist, wird bei der Verschiebung einer Ebene oder " "eines Pfades mit dem Verschiebewerkzeug diese Ebene bzw. derjenige Pfad " -"aktiviert. Dies war in früheren Version von GIMP das Standardverhalten." +"aktiviert. Dies war in früheren Versionen von GIMP das Standardverhalten." #: ../app/config/gimprc-blurbs.h:245 msgid "" @@ -7385,7 +7385,7 @@ msgid "Jitter" msgstr "Zittern" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 +#: ../app/gui/session.c:408 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" @@ -7514,7 +7514,7 @@ msgstr "Parasiten" #: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2743 #: ../app/tools/gimppaintoptions-gui.c:203 msgid "Dynamics" -msgstr "Dynamik" +msgstr "Zeichendynamiken" #. initialize the list of fonts #: ../app/core/gimp.c:976 @@ -7571,8 +7571,8 @@ msgstr "" "Schwerwiegender Fehler beim Lesen der Pinseldatei »%s«: Unbekannte Version " "%d." -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 -#: ../app/core/gimpbrush-load.c:727 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:744 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" @@ -7591,7 +7591,19 @@ msgstr "Ungültige UTF-8-Zeichenkette in Pinseldatei »%s«." msgid "Unnamed" msgstr "Unbenannt" -#: ../app/core/gimpbrush-load.c:382 +#: ../app/core/gimpbrush-load.c:354 +#, fuzzy, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Schwerwiegender Fehler beim Lesen der Pinseldatei »%s«: Nicht unterstützte " +"Farbtiefe %d\n" +"GIMP-Pinsel müssen in Graustufen oder RGB vorliegen." + +#: ../app/core/gimpbrush-load.c:399 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7601,7 +7613,7 @@ msgstr "" "Farbtiefe %d\n" "GIMP-Pinsel müssen in Graustufen oder RGB vorliegen." -#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:871 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7609,7 +7621,7 @@ msgstr "" "Schwerwiegender Fehler in Pinseldatei »%s«: abr-Formatversion %d ist " "unbekannt." -#: ../app/core/gimpbrush-load.c:621 +#: ../app/core/gimpbrush-load.c:638 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7687,7 +7699,6 @@ msgstr "Winkel des Pinsels" # CHECK #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7874,7 +7885,7 @@ msgstr "Deckkraft" msgid "Paint Mode" msgstr "Malmodus" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "»%s« konnte nicht gelöscht werden: %s" @@ -8021,7 +8032,7 @@ msgid "Posterize" msgstr "Posterisieren" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Es sind nicht genügend Punkte vorhanden, um diese nachzuziehen." @@ -8210,12 +8221,18 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Farbpalette festlegen" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#, fuzzy +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Farbpalette festlegen" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Paletteneintrag ändern" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Farbe zur Palette hinzufügen" @@ -8302,39 +8319,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Sichtbare Ebenen vereinen" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Bild zusammenfügen" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "" + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Ebenengruppe kann nicht nach unten vereint werden." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Die Ebene zum Vereinen nach unten ist gesperrt." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Es gibt keine sichtbare Ebene, die nach unten vereint werden kann." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Nach unten vereinen" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Ebenengruppe vereinen" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Sichtbare Pfade vereinen" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Es sind nicht genügend Pfade als »Sichtbar« markiert, um den Vorgang " @@ -8369,7 +8390,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Prüfpunkt verschieben" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Bild skalieren" @@ -8479,7 +8500,7 @@ msgid "(Preview may be out of date)" msgstr "(Vorschau könnte veraltet sein)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8969,7 +8990,7 @@ msgctxt "plural" msgid "percent" msgstr "Prozent" -#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "Informationen zu GIMP" @@ -9163,15 +9184,15 @@ msgstr "Speicherort öffnen" msgid "Enter location (URI):" msgstr "Adresse zum Bild eingeben:" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Bild exportieren" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Exportieren" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9182,7 +9203,13 @@ msgstr "" "die dem Typ der gewählten Datei entspricht oder geben Sie gar keine " "Erweiterung an." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +#, fuzzy +msgid "The given filename cannot be used for exporting" +msgstr "" +"Der von Ihnen angegebene Dateiname besitzt keinerlei Dateinamenserweiterung." + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9191,7 +9218,17 @@ msgstr "" "verwenden. Wenn Sie das Bild als GIMP XCF-Format speichern wollen, so " "verwenden Sie stattdessen bitte Datei→Speichern." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Den Speichern-Dialog anzeigen" + +#: ../app/dialogs/file-save-dialog.c:613 +#, fuzzy +msgid "The given filename cannot be used for saving" +msgstr "" +"Der von Ihnen angegebene Dateiname besitzt keinerlei Dateinamenserweiterung." + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9199,7 +9236,15 @@ msgstr "" "Sie können diesen Dialog zum Speichern im GIMP XCF-Format verwenden. " "Verwenden Sie Datei→Exportieren zum Exportieren in andere Dateiformate." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Den Export-Dialog anzeigen" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Falsche Erweiterung" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9209,25 +9254,21 @@ msgstr "" "(z.B. .xcf oder .png) oder wählen Sie ein Dateiformat aus der gleichnamigen " "Liste." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Falsche Erweiterung" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "" "Die von Ihnen angegebene Dateinamenserweiterung stimmt nicht mit dem " "gewählten Dateityp überein." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Möchten Sie zum Speichern des Bildes diesen Namen trotzdem verwenden?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Speichern abgebrochen" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9899,7 +9940,7 @@ msgstr "_Pinsel" #: ../app/dialogs/preferences-dialog.c:1917 msgid "_Dynamics" -msgstr "_Dynamik" +msgstr "_Zeichendynamik" #: ../app/dialogs/preferences-dialog.c:1920 msgid "_Pattern" @@ -10114,7 +10155,7 @@ msgid "Vertical" msgstr "Vertikal" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "PPI" @@ -10433,33 +10474,60 @@ msgstr "_Y-Auflösung:" msgid "pixels/%a" msgstr "Pixel/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "GIMP beenden" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "Alle Bilder schließen" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "Wenn Sie GIMP jetzt beenden, gehen diese Änderungen verloren." -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "Wenn Sie diese Bilder jetzt schließen, gehen die Änderungen verloren." -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "Es ist ein Bild mit ungesicherten Änderungen geöffnet:" msgstr[1] "Es sind %d Bilder mit ungesicherten Änderungen geöffnet:" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Drücken Sie %s zum Beenden." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Drücken Sie %s zum Schließen aller Bilder." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Drücken Sie %s, um alle Änderungen zu verwerfen und zu beenden." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "" +"Drücken Sie %s, um alle Änderungen zu verwerfen und alle Bilder zu schließen." + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:181 msgid "_Discard Changes" msgstr "Änderungen _verwerfen" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "Exportiert als %s" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "Leinwandgröße" @@ -10732,22 +10800,24 @@ msgstr "In der Bildansicht navigieren" msgid "Drop image files here to open them" msgstr "Ziehen Sie Bilddateien hierher, um sie zu öffnen" -#: ../app/display/gimpdisplayshell-close.c:156 -#: ../app/display/gimpdisplayshell-close.c:229 +#: ../app/display/gimpdisplayshell-close.c:170 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "Close %s" msgstr "%s schließen" -#: ../app/display/gimpdisplayshell-close.c:167 -msgid "Close _without Saving" -msgstr "_Ohne Abspeichern schließen" +#: ../app/display/gimpdisplayshell-close.c:218 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "" +"Drücken Sie %s, um alle Änderungen zu verwerfen und das Bild zu schließen." -#: ../app/display/gimpdisplayshell-close.c:237 +#: ../app/display/gimpdisplayshell-close.c:278 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Möchten Sie die Änderungen am Bild »%s« vor dem Schließen speichern?" -#: ../app/display/gimpdisplayshell-close.c:270 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10759,7 +10829,7 @@ msgstr[1] "" "Wenn Sie dieses Bild nicht speichern, gehen die Änderungen der letzten %d " "Stunden verloren." -#: ../app/display/gimpdisplayshell-close.c:281 +#: ../app/display/gimpdisplayshell-close.c:322 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10774,7 +10844,7 @@ msgstr[1] "" "Wenn Sie dieses Bild nicht speichern, gehen die Änderungen der letzten " "Stunde und %d Minuten verloren." -#: ../app/display/gimpdisplayshell-close.c:293 +#: ../app/display/gimpdisplayshell-close.c:334 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10786,7 +10856,7 @@ msgstr[1] "" "Wenn Sie dieses Bild nicht speichern, gehen die Änderungen der letzten %d " "Minuten verloren." -#: ../app/display/gimpdisplayshell-close.c:311 +#: ../app/display/gimpdisplayshell-close.c:355 #, c-format msgid "The image has been exported to '%s'." msgstr "Das Bild wurde nach »%s« exportiert." @@ -10813,7 +10883,7 @@ msgstr "Die Pixel von Ebenengruppen können nicht verändert werden." #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 #: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 -#: ../app/tools/gimptransformtool.c:1067 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Die Pixel der aktiven Ebene sind gesperrt." @@ -10905,12 +10975,12 @@ msgstr "Das Plugin %s konnte das Bild nicht öffnen" msgid "Image doesn't contain any layers" msgstr "Das Bild enthält keine Ebenen" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:590 #, c-format msgid "Opening '%s' failed: %s" msgstr "»%s« konnte nicht geöffnet werden: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:700 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10927,12 +10997,12 @@ msgstr "Unbekannter Dateityp" msgid "%s plug-in could not save image" msgstr "Das Plugin %s konnte das Bild nicht speichern" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "»%s« ist kein gültiges Adressschema" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Ungültige Zeichenfolge in Adresse" @@ -10946,15 +11016,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Den Käfig zum Deformieren des Bilds deformieren" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "keine GIMP-Kurvendatei" -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "Syntaxfehler" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "keine GIMP-Datei mit Einstellungen für Werte" @@ -11533,7 +11603,7 @@ msgstr "" msgid "Free Select" msgstr "Freie Auswahl" -#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 +#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 msgid "Move Layer" msgstr "Ebene bewegen" @@ -11562,29 +11632,29 @@ msgstr "Nachgezogenen Pfad entfernen" msgid "Close path stroke" msgstr "Nachgezogenen Pfad schließen" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Nachgezogenen Pfad anpassen" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Nachgezogenen Pfad skalieren" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Nachgezogenen Pfad drehen" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Nachgezogenen Pfad spiegeln" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Nachgezogenen Pfad hinzufügen" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Nachgezogenen Pfad erweitern" @@ -11681,7 +11751,7 @@ msgstr "Plugin-Interpreter" msgid "Plug-In Environment" msgstr "Plugin-Umgebung" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11690,7 +11760,7 @@ msgstr "" "Fehler beim Aufruf von »%s«:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11783,15 +11853,21 @@ msgstr "Textebene transformieren" msgid "Discard Text Information" msgstr "Textinformationen verwerfen" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "" "Die Textfunktion ist nicht verfügbar, da keine Schriften vorhanden sind." -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Leere Textebene" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" @@ -11807,6 +11883,12 @@ msgstr "" "Möglicherweise sind eines oder mehrere Textattribute fehlerhaft. Falls Sie " "die Textebene nicht bearbeiten, können Sie dies einfach ignorieren." +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -12000,7 +12082,7 @@ msgstr "Farbverläufe funktioniert nicht mit Ebenen im indizierten Farbmodus." msgid "No gradient available for use with this tool." msgstr "Es ist kein Farbverlauf zur Verwendung mit diesem Werkzeug vorhanden." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s für eingeschränkte Winkel" @@ -12143,27 +12225,27 @@ msgctxt "command" msgid "Select by Color" msgstr "Nach Farbe auswählen" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Käfig-Transformation" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Käfig-Transformation: Eine Auswahl mit einem Käfig deformieren" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "_Käfig-Transformation" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Drücken Sie die Eingabetaste zur Ausführung der Transformation" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Käfig-Koeffizienten berechnen" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Käfig-Transformation" @@ -12380,11 +12462,11 @@ msgstr "Fa_rbpipette" msgid "Click in any image to view its color" msgstr "Klicken Sie zum Anzeigen einer Farbe in ein Bild" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Klicken Sie zum Wählen einer Vordergrundfarbe in ein Bild" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Klicken Sie zum Wählen einer Hintergrundfarbe in ein Bild" @@ -13279,7 +13361,7 @@ msgstr "Klicken und ziehen Sie zum Verschieben aller Punkte" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "Pixel" @@ -13398,7 +13480,7 @@ msgstr "Harte Kanten" #: ../app/tools/gimppaintoptions-gui.c:285 msgid "Dynamics Options" -msgstr "Optionen der Dynamik" +msgstr "Optionen der Zeichendynamik" #: ../app/tools/gimppaintoptions-gui.c:291 msgid "Fade Options" @@ -13451,7 +13533,7 @@ msgstr "%s zum Wählen einer Farbe" msgid "Cannot paint on layer groups." msgstr "Es kann nicht auf Ebenenmasken gezeichnet werden." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s für eine gerade Linie" @@ -14064,15 +14146,15 @@ msgstr "Ursprüngliches Seitenverhältnis beibehalten" msgid "Transforming" msgstr "Transformieren" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Es gibt keine Ebene, die transformiert werden kann." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Es gibt keinen Pfad, der transformiert werden kann." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Aktive nachgezogene Pfade sind gesperrt." @@ -15111,11 +15193,11 @@ msgid "Configure this tab" msgstr "Diesen Reiter konfigurieren" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Auto" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "" @@ -15410,79 +15492,79 @@ msgstr "" msgid "Querying..." msgstr "Abfragen …" -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Größe in Pixel:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Druckgröße:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Auflösung:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Farbraum:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Dateiname:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Dateigröße:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Dateityp:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Größe im Speicher:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Schritte rückgängig:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Schritte wiederholen:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Pixelanzahl:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Ebenenanzahl:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Kanalanzahl:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Pfadanzahl:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Keine" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "Pixel/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "Farben" @@ -15679,12 +15761,12 @@ msgstr "%d × %d PPI, %s" msgid "%d ppi, %s" msgstr "%d PPI, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Attribut »%s« ist mit dem Element <%s> in diesem Kontext ungültig" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Das äußerste Element im Text muss und nicht <%s> sein" @@ -15870,7 +15952,7 @@ msgstr "Gespeicherten Pinsel anwenden" #: ../app/widgets/gimptoolpreseteditor.c:171 msgid "Apply stored dynamics" -msgstr "Gespeicherte Dynamik anwenden" +msgstr "Gespeicherte Zeichendynamik anwenden" #: ../app/widgets/gimptoolpreseteditor.c:177 msgid "Apply stored gradient" @@ -16147,6 +16229,29 @@ msgstr "Rund" msgid "fuzzy" msgstr "unscharf" +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is also available for " +"Microsoft Windows and OS X." +msgstr "" + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Bildeditor" @@ -16154,3 +16259,13 @@ msgstr "Bildeditor" #: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "Bilder erstellen und Fotografien bearbeiten" + +#~ msgctxt "file-action" +#~ msgid "Export to" +#~ msgstr "Exportieren nach" + +#~ msgid "Export to" +#~ msgstr "Exportieren nach" + +#~ msgid "Close _without Saving" +#~ msgstr "_Ohne Abspeichern schließen" diff --git a/po/el.po b/po/el.po index 228aaf91f9..f9db44d8b1 100644 --- a/po/el.po +++ b/po/el.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: gimp.master.el.po\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&k" "eywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-06-04 14:53+0000\n" -"PO-Revision-Date: 2013-06-05 15:13+0300\n" +"POT-Creation-Date: 2013-09-13 16:06+0000\n" +"PO-Revision-Date: 2013-09-18 07:18+0300\n" "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" "Language-Team: team@gnome.gr\n" "Language: el\n" @@ -76,7 +76,7 @@ msgstr "" "Θα πρέπει να έχετε λάβει ένα αντίγραφο της Γενικής Δημόσιας Άδειας GNU μαζί " "με αυτό το πρόγραμμα. Αν όχι, δείτε στο http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -994,7 +994,7 @@ msgid "Use the composite color of all visible layers" msgstr "Χρήση του σύνθετου χρώματος από όλες τις ορατές στρώσεις" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2448,51 +2448,52 @@ msgstr "Αντικατάστασ_η του %s" msgid "Export to" msgstr "Εξαγωγή σε" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Άνοιγμα εικόνας" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Άνοιγμα εικόνας ως στρώσεις" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Δεν υπάρχουν αλλαγές για αποθήκευση" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Αποθήκευση εικόνας" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Αποθήκευση ενός αντιγράφου της εικόνας" # -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Δημιουργία νέου προτύπου" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Εισάγετε το όνομα του νέου προτύπου" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "Η επαναφορά απέτυχε. Δε βρέθηκε όνομα αρχείου συνδεμένου με αυτήν την εικόνα." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Επαναφορά εικόνας" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Επαναφορά του '%s' σε '%s';" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2500,11 +2501,11 @@ msgstr "" "Επαναφέροντας την εικόνα στην αποθηκευμένη κατάσταση στο δίσκο, θα χάσετε " "όλες τις αλλαγές σας, συμπεριλαμβανομένων των πληροφοριών αναιρέσεων." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Ανώνυμο πρότυπο)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3245,7 +3246,7 @@ msgid "Set Image Canvas Size" msgstr "Ορισμός των διαστάσεων του καμβά εικόνας" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Αλλαγή διαστάσεων" @@ -3272,16 +3273,16 @@ msgstr "Περιστροφή" msgid "Cannot crop because the current selection is empty." msgstr "Δεν μπορεί να γίνει περικοπή, γιατί η τρέχουσα επιλογή είναι κενή." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Αλλαγή μεγέθους εκτύπωσης" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Κλιμάκωση εικόνας" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 @@ -5208,15 +5209,11 @@ msgid "Create another view on this image" msgstr "Δημιουργία άλλης προβολής σε αυτή την εικόνα" #: ../app/actions/view-actions.c:82 -#| msgctxt "view-action" -#| msgid "_Close" msgctxt "view-action" msgid "_Close View" msgstr "_Κλείσιμο προβολής" #: ../app/actions/view-actions.c:83 -#| msgctxt "view-action" -#| msgid "Close this image window" msgctxt "view-action" msgid "Close the active image view" msgstr "Κλείσιμο της προβολής ενεργής εικόνας" @@ -5651,11 +5648,11 @@ msgstr "Ά_λλη (%s)..." msgid "_Zoom (%s)" msgstr "_Εστίαση (%s)" -#: ../app/actions/view-commands.c:605 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Ορισμός χρώματος καμβά υπόβαθρου" -#: ../app/actions/view-commands.c:607 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Ορισμός προσαρμοσμένου χρώματος υπόβαθρου καμβά" @@ -7881,7 +7878,7 @@ msgstr "Αδιαφάνεια" msgid "Paint Mode" msgstr "Κατάσταση ζωγραφικής" -#: ../app/core/gimpdata.c:681 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Αδυναμία διαγραφής '%s': %s" @@ -8034,7 +8031,7 @@ msgid "Posterize" msgstr "Αφίσα" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Δεν επαρκούν τα σημεία για πινελιά" @@ -8226,12 +8223,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Ορισμός χρωματολογίου" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Αναίρεση χρωματολογίου" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Αλλαγή εισόδου του χρωματολογίου" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Προσθήκη χρώματος στο χρωματολόγιο" @@ -8318,39 +8320,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Συγχώνευση ορατών στρώσεων" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Ισοπέδωση εικόνας" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Αδύνατη η ισοπέδωση μιας εικόνας χωρίς καμία ορατή στρώση." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Δεν μπορεί να συγχωνευτεί κάτω σε ομάδα στρώσεων." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Η στρώση για συγχώνευση κάτω είναι κλειδωμένη." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Δεν υπάρχουν ορατές στρώσεις για να συγχωνευτούν κάτω." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Συγχώνευση κάτω" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Συγχώνευση ομάδας στρώσεων" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Συγχώνευση ορατών μονοπατιών" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Δεν υπάρχουν αρκετά ορατά μονοπάτια για τη συγχώνευση. Απαιτούνται " @@ -8386,7 +8392,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Μετακίνηση σημείου δειγματοληψίας" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Κλιμάκωση εικόνας" @@ -8496,7 +8502,7 @@ msgid "(Preview may be out of date)" msgstr "(Η προεπισκόπηση μπορεί να μην είναι ενημερωμένη)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -9169,15 +9175,15 @@ msgstr "Άνοιγμα τοποθεσίας" msgid "Enter location (URI):" msgstr "Εισαγωγή τοποθεσίας (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Εξαγωγή εικόνας" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Εξαγωγή" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9187,7 +9193,12 @@ msgstr "" "αρχείου από την επέκτασή του. Παρακαλώ εισάγετε την κατάλληλη επέκταση " "αρχείου που ταιριάζει στο επιλεγμένο τύπο, ή μην εισάγετε καθόλου επέκταση." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for exporting" +msgstr "Το δοσμένο όνομα αρχείου δεν μπορεί να χρησιμοποιηθεί για εξαγωγή" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9196,7 +9207,18 @@ msgstr "" "διαφόρων τύπων. Αν απλά θέλετε να αποθηκεύσετε την εικόνα ως αρχείο XCF του " "GIMP, πηγαίνετε αρχείο→αποθήκευση." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +#| msgctxt "dialogs-action" +#| msgid "Open the layers dialog" +msgid "Take me to the Save dialog" +msgstr "Μετάβαση στον διάλογο αποθήκευσης" + +#: ../app/dialogs/file-save-dialog.c:613 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for saving" +msgstr "Το δοσμένο όνομα αρχείου δεν μπορεί να χρησιμοποιηθεί για αποθήκευση" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9204,7 +9226,17 @@ msgstr "" "Χρησιμοποιήστε αυτόν το διάλογο για να αποθηκεύσετε την εικόνα ως αρχείο XCF " "του GIMP. Για να εξάγετε σε άλλους τύπους αρχείων πηγαίνετε αρχείο→εξαγωγή." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +#| msgctxt "dialogs-action" +#| msgid "Open the paths dialog" +msgid "Take me to the Export dialog" +msgstr "Μετάβαση στον διάλογο εξαγωγής" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Ακατάλληλη επέκταση" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9213,24 +9245,20 @@ msgstr "" "μία γνωστή επέκταση αρχείου ή επιλέξτε έναν τύπο αρχείου από τη λίστα τύπων " "αρχείων." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Ακατάλληλη επέκταση" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "" "Η δοσμένη επέκταση αρχείου δεν αντιστοιχεί στον επιλεγμένο τύπο αρχείου." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Σίγουρα θέλετε να αποθηκεύσετε την εικόνα οπωσδήποτε με αυτό το όνομα;" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Ακύρωση αποθήκευσης" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10144,7 +10172,7 @@ msgid "Vertical" msgstr "Κάθετη" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10495,8 +10523,8 @@ msgstr "Αν κλείσετε αυτές τις εικόνες τώρα, οι α #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" -msgstr[0] "Υπάρχει μια εικόνα με μη αποθηκευμένες αλλαγές:" -msgstr[1] "Υπάρχουν %d εικόνες με μη αποθηκευμένες αλλαγές:" +msgstr[0] "Υπάρχει μια εικόνα με αναποθήκευτες αλλαγές:" +msgstr[1] "Υπάρχουν %d εικόνες με αναποθήκευτες αλλαγές:" #: ../app/dialogs/quit-dialog.c:235 msgid "_Discard Changes" @@ -10947,12 +10975,12 @@ msgstr "Το πρόσθετο %s δεν μπόρεσε να ανοίξει τη msgid "Image doesn't contain any layers" msgstr "Η εικόνα δεν περιέχει στρώσεις" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Το άνοιγμα του '%s' απέτυχε: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -12043,7 +12071,7 @@ msgstr "Η ανάμειξη δεν λειτουργεί για στρώσεις msgid "No gradient available for use with this tool." msgstr "Δεν υπάρχουν διαβαθμίσεις για χρήση με αυτό το εργαλείο." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s για περιορισμένες γωνίες" @@ -12189,7 +12217,7 @@ msgctxt "command" msgid "Select by Color" msgstr "Επιλογή κατά χρώμα" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "Μετασχηματισμός κλωβού" @@ -12201,15 +12229,15 @@ msgstr "Μετασχηματισμός κλωβού: Παραμορφώστε τ msgid "_Cage Transform" msgstr "_Μετασχηματισμός κλωβού" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "Πατήστε ENTER για εφαρμογή του μετασχηματισμού" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "Υπολογισμός συντελεστών κλωβού" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "Μετασχηματισμός κλωβού" @@ -12427,11 +12455,11 @@ msgstr "Επιλο_γέας χρωμάτων" msgid "Click in any image to view its color" msgstr "Κλικ σε εικόνα για να δείτε το χρώμα της" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Κλικ σε εικόνα για επιλογή νέου χρώματος προσκηνίου" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Κλικ σε εικόνα για επιλογή χρώματος παρασκηνίου" @@ -13332,7 +13360,7 @@ msgstr "Κλικ και σύρσιμο για μετακίνηση όλων τω # #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "εικονοστοιχεία" @@ -13505,7 +13533,7 @@ msgstr "%s για επιλογή χρώματος" msgid "Cannot paint on layer groups." msgstr "Δεν επιτρέπεται το ζωγράφισμα ομάδων στρώσεων." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s για ευθεία γραμμή" @@ -15478,83 +15506,83 @@ msgstr "" msgid "Querying..." msgstr "Υποβολή ερωτημάτων..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Μέγεθος σε εικονοστοιχεία:" # -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Μέγεθος εκτύπωσης:" # -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Ανάλυση:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Χρωματικός χώρος:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Όνομα αρχείου:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Μέγεθος αρχείου:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Τύπος αρχείου:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Δεσμευμένη μνήμη:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Βήματα αναιρέσεων:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Βήματα ακυρώσεων αναιρέσεων:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Αριθμός εικονοστοιχείων:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Αριθμός στρώσεων:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Αριθμός καναλιών:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Αριθμός μονοπατιών:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Κανένα" # -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "εικονοστοιχεία/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" # -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "χρώματα" diff --git a/po/es.po b/po/es.po index ce6aad1122..380349161a 100644 --- a/po/es.po +++ b/po/es.po @@ -17,15 +17,15 @@ msgstr "" "Project-Id-Version: gimp.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-05-25 16:30+0000\n" -"PO-Revision-Date: 2013-05-27 16:45+0200\n" +"POT-Creation-Date: 2013-11-19 20:44+0000\n" +"PO-Revision-Date: 2013-11-20 18:13+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Gtranslator 2.91.6\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../app/about.h:23 @@ -75,7 +75,7 @@ msgstr "" "junto con este programa. Si no ha sido así, consulte ." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -978,7 +978,7 @@ msgid "Use the composite color of all visible layers" msgstr "Usar el color compuesto de todas las capas visibles" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2383,9 +2383,10 @@ msgid "Save this image and close its window" msgstr "Guardar esta imagen y cerrar su ventana" #: ../app/actions/file-actions.c:146 +#| msgid "_Export" msgctxt "file-action" -msgid "Export to" -msgstr "Exportar a" +msgid "Export" +msgstr "Exportar" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2405,9 +2406,11 @@ msgstr "" "importación" #: ../app/actions/file-actions.c:158 +#| msgctxt "file-action" +#| msgid "Export..." msgctxt "file-action" -msgid "Export..." -msgstr "Exportar…" +msgid "Export As..." +msgstr "Exportar como…" #: ../app/actions/file-actions.c:159 msgctxt "file-action" @@ -2425,53 +2428,55 @@ msgid "Over_write %s" msgstr "_Sobreescribir %s" #: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "Exportar a" +#| msgid "_Export" +msgid "Export" +msgstr "Exportar" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Abrir imagen" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Abrir imagen como capas" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "No es necesario guardar ningún cambio" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Guardar imagen" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Guardar una copia de la imagen" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Crear una plantilla nueva" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Introduzca un nombre para esta plantilla" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "Falló al revertir. No hay un nombre de archivo asociado con esta imagen." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Revertir imagen" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "¿Quiere revertir «%s» a «%s»?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2479,11 +2484,11 @@ msgstr "" "Al revertir la imagen al estado guardado en el disco, perderá todos sus " "cambios, incluyendo toda la información de deshacer." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Plantilla sin nombre)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3224,7 +3229,7 @@ msgid "Set Image Canvas Size" msgstr "Establece el tamaño del lienzo de la imagen" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Redimensionando" @@ -3251,21 +3256,21 @@ msgstr "Rotando" msgid "Cannot crop because the current selection is empty." msgstr "No se puede recortar porque la selección actual está vacía." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Cambiar el tamaño de la impresión" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Escalar la imagen" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Escalado" @@ -4622,7 +4627,7 @@ msgstr "Abrir archivo de texto (UTF-8)" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -5185,15 +5190,11 @@ msgid "Create another view on this image" msgstr "Crea otra vista en esta imagen" #: ../app/actions/view-actions.c:82 -#| msgctxt "view-action" -#| msgid "_Close" msgctxt "view-action" msgid "_Close View" msgstr "_Cerrar vista" #: ../app/actions/view-actions.c:83 -#| msgctxt "view-action" -#| msgid "Close this image window" msgctxt "view-action" msgid "Close the active image view" msgstr "Cerrar la vista de la imagen activa" @@ -5629,11 +5630,11 @@ msgstr "Ot_ro (%s)…" msgid "_Zoom (%s)" msgstr "A_mpliación (%s)" -#: ../app/actions/view-commands.c:605 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Establecer el color de relleno del lienzo" -#: ../app/actions/view-commands.c:607 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Establecer el color personalizado de relleno del lienzo" @@ -7561,8 +7562,8 @@ msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: versión desconocida %d." -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 -#: ../app/core/gimpbrush-load.c:727 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:744 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" @@ -7581,7 +7582,24 @@ msgstr "Cadena UTF-8 no válida en el archivo de pincel «%s»." msgid "Unnamed" msgstr "Sin nombre" -#: ../app/core/gimpbrush-load.c:382 +#: ../app/core/gimpbrush-load.c:354 +#, c-format +#| msgid "" +#| "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +#| "GIMP brushes must be GRAY or RGBA." +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Error fatal de análisis en el archivo de pincel «%s»: profundidad de pincel " +"no soportada %d\n" +"Los pinceles de GIMP deben ser GRAY o RGBA.\n" +"Es posible que sea un archivo de pincel de GIMP obsoleto; pruebe a cargarlo " +"como imagen y a guardarlo otra vez." + +#: ../app/core/gimpbrush-load.c:399 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7591,7 +7609,7 @@ msgstr "" "no soportado %d\n" "Los pinceles de GIMP deben ser GRAY (GRISES) o RGBA." -#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:871 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7599,7 +7617,7 @@ msgstr "" "Error fatal de análisis en el archivo de pincel «%s»: imposible decodificar " "el formato abr versión %d." -#: ../app/core/gimpbrush-load.c:621 +#: ../app/core/gimpbrush-load.c:638 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7673,7 +7691,6 @@ msgid "Brush Angle" msgstr "Ángulo del pincel" #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7861,7 +7878,7 @@ msgstr "Opacidad" msgid "Paint Mode" msgstr "Modo de pintura" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "No se ha podido eliminar «%s»: %s" @@ -8007,7 +8024,7 @@ msgid "Posterize" msgstr "Posterizar" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "No hay suficientes puntos para trazar" @@ -8197,12 +8214,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Establecer mapa de colores" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Quitar el mapa de colores" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Cambiar entrada del mapa de colores" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Añadir color al mapa de colores" @@ -8289,39 +8311,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Combinar las capas visibles" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Aplanar la imagen" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "No se puede aplanar una imagen sin una capa visible." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "No se puede hacer una combinación a un grupo de capas." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "La capa a la que se pretende combinar está bloqueada." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "No hay ninguna capa visible a la que hacer la combinación." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Combinar hacia abajo" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Combinar el grupo de capas" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Combinar las rutas visibles" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "No hay suficientes capas visibles para hacer una combinación. Deben haber " @@ -8356,7 +8382,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Mover punto de muestra" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Escalar la imagen" @@ -8466,7 +8492,7 @@ msgid "(Preview may be out of date)" msgstr "(La vista previa podría estar desactualizada)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8951,7 +8977,7 @@ msgctxt "plural" msgid "percent" msgstr "porcentaje" -#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "Acerca de GIMP" @@ -9137,15 +9163,15 @@ msgstr "Abrir dirección" msgid "Enter location (URI):" msgstr "Introduzca dirección (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Exportar la imagen" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Exportar" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9155,7 +9181,11 @@ msgstr "" "desde la extensión del archivo. Introduzca una extensión que coincida con el " "formato de archivo seleccionado o no introduzca ninguna extensión de archivo." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "El nombre de archivo dado no se puede usar para exportar" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9164,7 +9194,15 @@ msgstr "" "quiere guardar la imagen en el formato XCF de GIMP, use Archivo→Guardar en " "su lugar." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Ir al diálogo de guardar" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "El nombre de archivo dado no se puede usar para guardar" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9172,7 +9210,15 @@ msgstr "" "Puede usar este diálogo para guardar en el formato XCF de GIMP. Use " "Archivo→Exportar para exportar a otros formatos de archivo." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Ir al diálogo de exportar" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Incongruencia de la extensión" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9181,24 +9227,20 @@ msgstr "" "introduzca una extensión de archivo conocida o seleccione un formato de " "archivo de la lista de formatos de archivo." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Incongruencia de la extensión" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "" "La extensión de archivo dada no concuerda con el tipo de archivo elegido." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "¿Seguro que quiere guardar la imagen con este nombre?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Guardado cancelado" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10091,7 +10133,7 @@ msgid "Vertical" msgstr "Vertical" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppp" @@ -10412,33 +10454,60 @@ msgstr "Resolución _Y:" msgid "pixels/%a" msgstr "píxeles/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "Salir de GIMP" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "Cerrar todas las imágenes" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "Si sale de GIMP ahora, estos cambios se perderán." -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "Si cierra ahora estas imágenes, se perderán los cambios." -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "Hay una imagen con cambios no guardados:" msgstr[1] "Hay %d imágenes con cambios no guardados:" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Pulse %s para salir." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Pulse %s para cerrar todas las imágenes." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Pulse %s para descartar todos los cambios y salir." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "Pulse %s para descartar todos los cambios y cerrar todas las imágenes." + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:181 msgid "_Discard Changes" msgstr "_Descartar cambios" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +#| msgid "Export to %s" +msgid "Exported to %s" +msgstr "Exportado a %s" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "Tamaño del lienzo" @@ -10707,22 +10776,23 @@ msgstr "Navegar por la imagen" msgid "Drop image files here to open them" msgstr "Arrastre hasta aquí los archivos de imagen para abrirlos" -#: ../app/display/gimpdisplayshell-close.c:156 -#: ../app/display/gimpdisplayshell-close.c:229 +#: ../app/display/gimpdisplayshell-close.c:170 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "Close %s" msgstr "Cerrar %s" -#: ../app/display/gimpdisplayshell-close.c:167 -msgid "Close _without Saving" -msgstr "Cerrar si_n guardar" +#: ../app/display/gimpdisplayshell-close.c:218 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "Pulse %s para descartar todos los cambios y cerrar la imagen." -#: ../app/display/gimpdisplayshell-close.c:237 +#: ../app/display/gimpdisplayshell-close.c:278 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "¿Desea guardar los cambios a la imagen «%s» antes de cerrar?" -#: ../app/display/gimpdisplayshell-close.c:270 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10732,7 +10802,7 @@ msgstr[0] "" msgstr[1] "" "Si no guarda la imagen, los cambios desde las últimas %d horas se perderán." -#: ../app/display/gimpdisplayshell-close.c:281 +#: ../app/display/gimpdisplayshell-close.c:322 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10747,7 +10817,7 @@ msgstr[1] "" "Si no guarda la imagen, los cambios desde la última hora y %d minutos se " "perderán." -#: ../app/display/gimpdisplayshell-close.c:293 +#: ../app/display/gimpdisplayshell-close.c:334 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10757,7 +10827,7 @@ msgstr[0] "" msgstr[1] "" "Si no guarda la imagen, los cambios desde los últimos %d minutos se perderán." -#: ../app/display/gimpdisplayshell-close.c:311 +#: ../app/display/gimpdisplayshell-close.c:355 #, c-format msgid "The image has been exported to '%s'." msgstr "La imagen se ha exportado a «%s»." @@ -10875,12 +10945,12 @@ msgstr "El complemento %s no ha podido abrir la imagen" msgid "Image doesn't contain any layers" msgstr "La imagen no contiene ninguna capa" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "La apertura de «%s» ha fallado: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11497,7 +11567,7 @@ msgstr "" msgid "Free Select" msgstr "Selección libre" -#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 +#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 msgid "Move Layer" msgstr "Mover la capa" @@ -11525,29 +11595,29 @@ msgstr "Eliminar trazado de ruta" msgid "Close path stroke" msgstr "Cerrar trazado de ruta" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Trasladar trazado de ruta" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Escalar trazado de ruta" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Rotar trazado de ruta" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Voltear trazado de ruta" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Añadir un trazado de ruta" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Extender trazado de ruta" @@ -11747,17 +11817,25 @@ msgstr "Transformar la capa de texto" msgid "Discard Text Information" msgstr "Eliminar la información de texto" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "" "Debido a la falta de tipografías la funcionalidad de texto no está " "disponible." # Aquí creo que Empty es adjetivo también -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Capa de texto vacía" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"No se puede renderizar el texto. Parece ser que es muy grande. Hágalo más " +"corto o use una tipografía más pequeña." + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" @@ -11773,6 +11851,14 @@ msgstr "" "Algunas propiedades del texto podrían estar incorrectas. Al menos que quiera " "editar la capa de texto no necesitará preocuparse por esto." +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"No se puede generar el texto nuevo. Es muy probable que el tamaño del texto " +"sea muy grande." + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11966,7 +12052,7 @@ msgstr "La mezcla no funciona sobre capas indexadas." msgid "No gradient available for use with this tool." msgstr "No hay degradados disponibles para usar con esta herramienta." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s para ángulos restringidos" @@ -12112,27 +12198,27 @@ msgctxt "command" msgid "Select by Color" msgstr "Seleccionar por color" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Transformar rejilla" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Transformar rejilla: deformar una selección con una rejilla" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "_Transformar rejilla" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Pulse INTRO para realizar la transformación" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Calculando coeficientes de Cage" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Transformar rejilla" @@ -12352,11 +12438,11 @@ msgstr "_Recoge-color" msgid "Click in any image to view its color" msgstr "Pulse sobre cualquier imagen para ver su color" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Pulse sobre cualquier imagen para recoger el color de frente" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Pulse sobre cualquier imagen para recoger el color de fondo" @@ -13267,7 +13353,7 @@ msgstr "Pulse y arrastre para mover todos los puntos" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "píxeles" @@ -13438,7 +13524,7 @@ msgstr "%s para recoger un color" msgid "Cannot paint on layer groups." msgstr "No se puede pintar sobre un grupo de capas." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s para una línea recta" @@ -15393,79 +15479,79 @@ msgstr "" msgid "Querying..." msgstr "Consultando…" -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Tamaño en píxeles:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Tamaño de la impresión:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Resolución:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Espacio de color:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Nombre de archivo:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Tamaño del archivo:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Tipo de archivo:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Tamaño en la memoria:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Pasos de deshacer:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Pasos de rehacer:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Número de píxeles:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Número de capas:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Número de canales:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Número de rutas:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Ninguno" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "píxeles/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g x %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "colores" @@ -16128,6 +16214,41 @@ msgstr "redondo" msgid "fuzzy" msgstr "borroso" +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP es el acrónimo de Programa de Manipulación de Imágenes de GNU. Se " +"distribuye libre y gratuitamente para tareas de retocado de fotos, " +"composición de imágenes y autoría de imágenes." + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"Tiene muchas características. Se puede usar como un simple programa de " +"dibujo, un programa de retoque fotográfico profesional, un sistema de " +"procesado por lotes, un generador de imágenes renderizadas en masa, un " +"conversor de formato de imágenes, etc." + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is also available for " +"Microsoft Windows and OS X." +msgstr "" +"GIMP es expandible y extensible. Está diseñado para poder mejorarlo con " +"complementos y extensiones para hacer casi cualquier cosa. La interfaz de " +"programación avanzada permite hacer un script para cualquier cosa, desde una " +"tarea sencilla hasta los procedimientos de manipulación de imágenes más " +"complejos. GIMP también está disponible para Microsoft Windows y OS X." + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Editor de imagen" @@ -16136,6 +16257,16 @@ msgstr "Editor de imagen" msgid "Create images and edit photographs" msgstr "Cree imágenes y edite fotografías" +#~ msgctxt "file-action" +#~ msgid "Export to" +#~ msgstr "Exportar a" + +#~ msgid "Export to" +#~ msgstr "Exportar a" + +#~ msgid "Close _without Saving" +#~ msgstr "Cerrar si_n guardar" + #~ msgctxt "undo-type" #~ msgid "Brightness_Contrast" #~ msgstr "Brillo-_Contraste" diff --git a/po/eu.po b/po/eu.po index 7b7b12511e..02a722df88 100644 --- a/po/eu.po +++ b/po/eu.po @@ -3,21 +3,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # Hizkuntza Politikarako Sailburuordetza , 2004. -# Iñaki Larrañaga Murgoitio , 2004, 2005, 2006, 2008, 2010. -# Iñaki Larrañaga Murgoitio , 2007, 2011. +# Iñaki Larrañaga Murgoitio , 2004, 2005, 2006, 2008, 2010. +# Iñaki Larrañaga Murgoitio , 2007, 2011, 2013. msgid "" msgstr "" "Project-Id-Version: gimp.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-15 18:02+0200\n" -"PO-Revision-Date: 2011-09-15 18:02+0200\n" +"POT-Creation-Date: 2013-08-28 20:57+0200\n" +"PO-Revision-Date: 2013-08-28 21:01+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: eu\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" @@ -25,7 +25,7 @@ msgstr "" msgid "GIMP" msgstr "GIMP" -#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:2 +#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 msgid "GNU Image Manipulation Program" msgstr "GNUren Irudiak Manipulatzeko Programa" @@ -66,7 +66,7 @@ msgstr "" "Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat jasoko " "zenuen. Hala ez bada, bisitatu http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -260,7 +260,7 @@ msgstr "Brotxa-editorea" #. initialize the list of gimp brushes #: ../app/actions/actions.c:112 ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2739 msgid "Brushes" msgstr "Brotxak" @@ -338,7 +338,7 @@ msgid "File" msgstr "Fitxategia" #: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 -#: ../app/dialogs/preferences-dialog.c:2745 +#: ../app/dialogs/preferences-dialog.c:2759 msgid "Fonts" msgstr "Letra-tipoak" @@ -349,17 +349,17 @@ msgstr "Gradientearen editorea" #. initialize the list of gimp gradients #: ../app/actions/actions.c:172 ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2741 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2755 msgid "Gradients" msgstr "Gradienteak" #: ../app/actions/actions.c:175 ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2763 msgid "Tool Presets" msgstr "Tresnen aurrezarpenak" #: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 -#: ../app/widgets/gimptoolpreseteditor.c:75 +#: ../app/widgets/gimptoolpreseteditor.c:92 msgid "Tool Preset Editor" msgstr "Tresnen aurrezarpenen editorea" @@ -388,21 +388,23 @@ msgstr "Paletaren editorea" #. initialize the list of gimp palettes #: ../app/actions/actions.c:196 ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2737 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2751 msgid "Palettes" msgstr "Paletak" #. initialize the list of gimp patterns #: ../app/actions/actions.c:199 ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2733 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2747 msgid "Patterns" msgstr "Ereduak" -#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2749 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2767 msgid "Plug-Ins" msgstr "Pluginak" +#. Quick Mask Color #: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 +#: ../app/dialogs/preferences-dialog.c:2025 msgid "Quick Mask" msgstr "Maskara azkarra" @@ -433,12 +435,12 @@ msgstr "Testu-editorea" msgid "Tool Options" msgstr "Tresna-aukerak" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:385 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Tresnak" #: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 -#: ../app/tools/gimpvectortool.c:159 +#: ../app/tools/gimpvectortool.c:160 msgid "Paths" msgstr "Bideak" @@ -746,13 +748,13 @@ msgid "_Fill opacity:" msgstr "_Betegarriaren opakutasuna:" #: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 -#: ../app/widgets/gimpchanneltreeview.c:324 +#: ../app/widgets/gimpchanneltreeview.c:331 msgid "Channel" msgstr "Kanala" #: ../app/actions/channels-commands.c:117 #: ../app/actions/channels-commands.c:159 -#: ../app/widgets/gimpchanneltreeview.c:319 +#: ../app/widgets/gimpchanneltreeview.c:326 msgid "New Channel" msgstr "Kanal berria" @@ -765,9 +767,9 @@ msgid "New Channel Color" msgstr "Kolorearen kanal berria" #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 -#: ../app/display/gimpdisplayshell-dnd.c:632 -#: ../app/widgets/gimpchanneltreeview.c:251 -#: ../app/widgets/gimplayertreeview.c:775 +#: ../app/display/gimpdisplayshell-dnd.c:646 +#: ../app/widgets/gimpchanneltreeview.c:258 +#: ../app/widgets/gimplayertreeview.c:776 #, c-format msgid "%s Channel Copy" msgstr "%s kanalaren kopia" @@ -961,14 +963,14 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Erabili kolore konposatua ikusgai dauden geruza guztietan" -#: ../app/actions/data-commands.c:88 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:578 -#: ../app/widgets/gimplayertreeview.c:735 ../app/widgets/gimptoolbox-dnd.c:170 -#: ../app/widgets/gimptoolbox.c:809 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" "Opening '%s' failed:\n" @@ -979,9 +981,9 @@ msgstr "" "\n" "%s" -#: ../app/actions/data-commands.c:117 -#: ../app/actions/tool-options-commands.c:69 -#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1521 +#: ../app/actions/data-commands.c:118 +#: ../app/actions/tool-options-commands.c:72 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 @@ -1343,20 +1345,20 @@ msgctxt "dialogs-action" msgid "About GIMP" msgstr "GIMP-i buruz" -#: ../app/actions/dialogs-actions.c:326 -#: ../app/dialogs/preferences-dialog.c:1943 ../app/widgets/gimptoolbox.c:549 +#: ../app/actions/dialogs-actions.c:328 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "Tresna-kutxa" -#: ../app/actions/dialogs-actions.c:327 +#: ../app/actions/dialogs-actions.c:329 msgid "Raise the toolbox" msgstr "Igo tresna-kutxa" -#: ../app/actions/dialogs-actions.c:331 +#: ../app/actions/dialogs-actions.c:333 msgid "New Toolbox" msgstr "Tresna-kutxa berria" -#: ../app/actions/dialogs-actions.c:332 +#: ../app/actions/dialogs-actions.c:334 msgid "Create a new toolbox" msgstr "Sortu tresna-kutxa berria" @@ -2104,64 +2106,64 @@ msgstr "_Berregin" msgid "_Fade..." msgstr "_Iraungi..." -#: ../app/actions/edit-commands.c:136 +#: ../app/actions/edit-commands.c:137 msgid "Clear Undo History" msgstr "Garbitu desegite-historia" -#: ../app/actions/edit-commands.c:162 +#: ../app/actions/edit-commands.c:163 msgid "Really clear image's undo history?" msgstr "Irudiaren desegite-historia ezabatzea nahi duzu?" -#: ../app/actions/edit-commands.c:175 +#: ../app/actions/edit-commands.c:176 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." msgstr "Irudiaren desegite-historia garbitzean %s memoria irabaziko da." -#: ../app/actions/edit-commands.c:205 +#: ../app/actions/edit-commands.c:206 msgid "Cut pixels to the clipboard" msgstr "Ebaki pixelak arbelera" -#: ../app/actions/edit-commands.c:235 ../app/actions/edit-commands.c:264 +#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 msgid "Copied pixels to the clipboard" msgstr "Kopiatu hautatutako pixelak arbelean" -#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:359 -#: ../app/actions/edit-commands.c:538 +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." msgstr "Ez dago irudiaren daturik arbelean itsasteko." -#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:172 +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 #: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Arbela" -#: ../app/actions/edit-commands.c:373 +#: ../app/actions/edit-commands.c:374 msgid "Cut Named" msgstr "Ebaki izenduna" -#: ../app/actions/edit-commands.c:376 ../app/actions/edit-commands.c:417 -#: ../app/actions/edit-commands.c:437 +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" msgstr "Sartu buffer honen izena" -#: ../app/actions/edit-commands.c:414 +#: ../app/actions/edit-commands.c:415 msgid "Copy Named" msgstr "Kopiatu izenduna" -#: ../app/actions/edit-commands.c:434 +#: ../app/actions/edit-commands.c:435 msgid "Copy Visible Named " msgstr "Kopia ikusgai izenduna" -#: ../app/actions/edit-commands.c:555 +#: ../app/actions/edit-commands.c:560 msgid "There is no active layer or channel to cut from." msgstr "Ez dago ebakitzeko geruza edo kanal aktiborik." -#: ../app/actions/edit-commands.c:560 ../app/actions/edit-commands.c:592 -#: ../app/actions/edit-commands.c:616 +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:621 msgid "(Unnamed Buffer)" msgstr "(Buffer izengabea)" -#: ../app/actions/edit-commands.c:587 +#: ../app/actions/edit-commands.c:592 msgid "There is no active layer or channel to copy from." msgstr "Ez dago kopiatzeko geruza edo kanal aktiborik." @@ -2400,49 +2402,50 @@ msgstr "_Gainidatzi %s" msgid "Export to" msgstr "Esportatu hona" -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Ireki irudia" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Ireki irudia geruza gisa" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Ez dago aldaketarik gordetzeko" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Gorde irudia" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Gorde irudiaren kopia bat" -#: ../app/actions/file-commands.c:356 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Sortu txantiloi berria" -#: ../app/actions/file-commands.c:360 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Sartu txantiloi honentzako izena" -#: ../app/actions/file-commands.c:394 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "Ezin izan da leheneratu. Ez dago irudi honi lotutako fitxategi-izenik." -#: ../app/actions/file-commands.c:407 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Leheneratu irudia" -#: ../app/actions/file-commands.c:438 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Leheneratu '%s' '%s'(e)ra?" -#: ../app/actions/file-commands.c:444 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2450,11 +2453,11 @@ msgstr "" "Diskoan gordetako irudira leheneratzean, aldaketa guztiak galduko dituzu, " "desegiteko informazio guztia barne." -#: ../app/actions/file-commands.c:655 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Txantiloi izengabea)" -#: ../app/actions/file-commands.c:706 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3194,7 +3197,7 @@ msgid "Set Image Canvas Size" msgstr "Ezarri irudiaren oihalaren tamaina" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Tamaina aldatzen" @@ -3203,15 +3206,15 @@ msgid "Set Image Print Resolution" msgstr "Ezarri irudiaren inprimazio bereizmena" #: ../app/actions/image-commands.c:379 -#: ../app/pdb/drawable-transform-cmds.c:161 -#: ../app/pdb/drawable-transform-cmds.c:249 +#: ../app/pdb/drawable-transform-cmds.c:159 +#: ../app/pdb/drawable-transform-cmds.c:247 #: ../app/pdb/item-transform-cmds.c:162 msgid "Flipping" msgstr "Iraultzen" #: ../app/actions/image-commands.c:403 -#: ../app/pdb/drawable-transform-cmds.c:608 -#: ../app/pdb/drawable-transform-cmds.c:700 ../app/pdb/image-cmds.c:538 +#: ../app/pdb/drawable-transform-cmds.c:602 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" @@ -3221,20 +3224,20 @@ msgstr "Biratzen" msgid "Cannot crop because the current selection is empty." msgstr "Ezin da moztu uneko hautapena hutsik dagoelako." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Aldatu inprimatze-tamaina" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Eskalatu irudia" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 -#: ../app/pdb/drawable-transform-cmds.c:791 -#: ../app/pdb/drawable-transform-cmds.c:880 ../app/pdb/image-cmds.c:410 -#: ../app/pdb/image-cmds.c:446 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/drawable-transform-cmds.c:783 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 #: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" @@ -3340,7 +3343,7 @@ msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Editatu geruzaren izena" -#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:598 +#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 msgctxt "layers-action" msgid "_New Layer..." msgstr "Geruza _berria..." @@ -3350,7 +3353,7 @@ msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Sortu geruza berria eta gehitu irudiari" -#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:599 +#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 msgctxt "layers-action" msgid "_New Layer" msgstr "Geruza _berria" @@ -3769,7 +3772,7 @@ msgstr "Laster-tekla: " msgid "-Click on thumbnail in Layers dockable" msgstr "-Egin klik Geruzak atrakagarriko koadro txikiaren gainean" -#: ../app/actions/layers-actions.c:593 ../app/actions/layers-actions.c:594 +#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 msgctxt "layers-action" msgid "To _New Layer" msgstr "Geruza _berrira" @@ -3788,7 +3791,7 @@ msgstr "Geruza" #: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 #: ../app/widgets/gimpdrawabletreeview.c:326 -#: ../app/widgets/gimplayertreeview.c:836 +#: ../app/widgets/gimplayertreeview.c:837 msgid "New Layer" msgstr "Geruza berria" @@ -4059,146 +4062,146 @@ msgctxt "patterns-action" msgid "Edit pattern" msgstr "Editatu eredua" -#: ../app/actions/plug-in-actions.c:84 +#: ../app/actions/plug-in-actions.c:85 msgctxt "plug-in-action" msgid "Filte_rs" msgstr "_Iragazkiak" -#: ../app/actions/plug-in-actions.c:86 +#: ../app/actions/plug-in-actions.c:87 msgctxt "plug-in-action" msgid "Recently Used" msgstr "Duela gutxi erabilita" -#: ../app/actions/plug-in-actions.c:88 +#: ../app/actions/plug-in-actions.c:89 msgctxt "plug-in-action" msgid "_Blur" msgstr "_Lausotu" -#: ../app/actions/plug-in-actions.c:90 +#: ../app/actions/plug-in-actions.c:91 msgctxt "plug-in-action" msgid "_Noise" msgstr "_Zarata" -#: ../app/actions/plug-in-actions.c:92 +#: ../app/actions/plug-in-actions.c:93 msgctxt "plug-in-action" msgid "Edge-De_tect" msgstr "Detektatu e_rtzak" -#: ../app/actions/plug-in-actions.c:94 +#: ../app/actions/plug-in-actions.c:95 msgctxt "plug-in-action" msgid "En_hance" msgstr "_Nabarmendu" -#: ../app/actions/plug-in-actions.c:96 +#: ../app/actions/plug-in-actions.c:97 msgctxt "plug-in-action" msgid "C_ombine" msgstr "Ko_nbinatu" -#: ../app/actions/plug-in-actions.c:98 +#: ../app/actions/plug-in-actions.c:99 msgctxt "plug-in-action" msgid "_Generic" msgstr "_Generikoa" -#: ../app/actions/plug-in-actions.c:100 +#: ../app/actions/plug-in-actions.c:101 msgctxt "plug-in-action" msgid "_Light and Shadow" msgstr "_Argia eta itzala" -#: ../app/actions/plug-in-actions.c:102 +#: ../app/actions/plug-in-actions.c:103 msgctxt "plug-in-action" msgid "_Distorts" msgstr "_Desitxuratzea" -#: ../app/actions/plug-in-actions.c:104 +#: ../app/actions/plug-in-actions.c:105 msgctxt "plug-in-action" msgid "_Artistic" msgstr "_Artistikoa" -#: ../app/actions/plug-in-actions.c:106 +#: ../app/actions/plug-in-actions.c:107 msgctxt "plug-in-action" msgid "_Decor" msgstr "_Dekorazioa" -#: ../app/actions/plug-in-actions.c:108 +#: ../app/actions/plug-in-actions.c:109 msgctxt "plug-in-action" msgid "_Map" msgstr "_Mapa" -#: ../app/actions/plug-in-actions.c:110 +#: ../app/actions/plug-in-actions.c:111 msgctxt "plug-in-action" msgid "_Render" msgstr "_Errendatuak" -#: ../app/actions/plug-in-actions.c:112 +#: ../app/actions/plug-in-actions.c:113 msgctxt "plug-in-action" msgid "_Clouds" msgstr "_Hodeiak" -#: ../app/actions/plug-in-actions.c:114 +#: ../app/actions/plug-in-actions.c:115 msgctxt "plug-in-action" msgid "_Nature" msgstr "_Natura" -#: ../app/actions/plug-in-actions.c:116 +#: ../app/actions/plug-in-actions.c:117 msgctxt "plug-in-action" msgid "_Pattern" msgstr "_Eredua" -#: ../app/actions/plug-in-actions.c:118 +#: ../app/actions/plug-in-actions.c:119 msgctxt "plug-in-action" msgid "_Web" msgstr "_Web" -#: ../app/actions/plug-in-actions.c:120 +#: ../app/actions/plug-in-actions.c:121 msgctxt "plug-in-action" msgid "An_imation" msgstr "An_imazioa" -#: ../app/actions/plug-in-actions.c:123 +#: ../app/actions/plug-in-actions.c:124 msgctxt "plug-in-action" msgid "Reset all _Filters" msgstr "Berrasieratu _iragazki guztiak" -#: ../app/actions/plug-in-actions.c:124 +#: ../app/actions/plug-in-actions.c:125 msgctxt "plug-in-action" msgid "Reset all plug-ins to their default settings" msgstr "Ezarri plugin guztiak beraien ezarpen lehenetsiekin" -#: ../app/actions/plug-in-actions.c:132 +#: ../app/actions/plug-in-actions.c:133 msgctxt "plug-in-action" msgid "Re_peat Last" msgstr "E_rrepikatu azkena" -#: ../app/actions/plug-in-actions.c:134 +#: ../app/actions/plug-in-actions.c:135 msgctxt "plug-in-action" msgid "Rerun the last used plug-in using the same settings" msgstr "Exekutatu berriro erabilitako azken plugina ezarpen berdinak erabiliz" -#: ../app/actions/plug-in-actions.c:139 +#: ../app/actions/plug-in-actions.c:140 msgctxt "plug-in-action" msgid "R_e-Show Last" msgstr "Erakutsi _berriro azkena" -#: ../app/actions/plug-in-actions.c:140 +#: ../app/actions/plug-in-actions.c:141 msgctxt "plug-in-action" msgid "Show the last used plug-in dialog again" msgstr "Erakutsi erabilitako azken pluginaren elkarrizketa-koadroa berriro" -#: ../app/actions/plug-in-actions.c:531 +#: ../app/actions/plug-in-actions.c:551 #, c-format msgid "Re_peat \"%s\"" msgstr "Erre_pikatu \"%s\"" -#: ../app/actions/plug-in-actions.c:532 +#: ../app/actions/plug-in-actions.c:552 #, c-format msgid "R_e-Show \"%s\"" msgstr "Erakutsi _berriro \"%s\"" -#: ../app/actions/plug-in-actions.c:548 +#: ../app/actions/plug-in-actions.c:568 msgid "Repeat Last" msgstr "Errepikatu azkena" -#: ../app/actions/plug-in-actions.c:550 +#: ../app/actions/plug-in-actions.c:570 msgid "Re-Show Last" msgstr "Erakutsi berriro azkena" @@ -4401,59 +4404,59 @@ msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "Trazatu hautapena erabilitako azken balioekin" -#: ../app/actions/select-commands.c:155 +#: ../app/actions/select-commands.c:156 msgid "Feather Selection" msgstr "Difuminatu hautapena" -#: ../app/actions/select-commands.c:159 +#: ../app/actions/select-commands.c:160 msgid "Feather selection by" msgstr "Difuminatu hautapena:" -#: ../app/actions/select-commands.c:196 +#: ../app/actions/select-commands.c:197 msgid "Shrink Selection" msgstr "Txikitu hautapena" -#: ../app/actions/select-commands.c:200 +#: ../app/actions/select-commands.c:201 msgid "Shrink selection by" msgstr "Uzkurtu hautapena:" -#: ../app/actions/select-commands.c:208 +#: ../app/actions/select-commands.c:209 msgid "_Shrink from image border" msgstr "_Uzkurtu irudiaren ertzetik" -#: ../app/actions/select-commands.c:236 +#: ../app/actions/select-commands.c:237 msgid "Grow Selection" msgstr "Handitu hautapena" -#: ../app/actions/select-commands.c:240 +#: ../app/actions/select-commands.c:241 msgid "Grow selection by" msgstr "Handitu hautapena:" -#: ../app/actions/select-commands.c:266 +#: ../app/actions/select-commands.c:267 msgid "Border Selection" msgstr "Ertzen hautapena" -#: ../app/actions/select-commands.c:270 +#: ../app/actions/select-commands.c:271 msgid "Border selection by" msgstr "Ertzaren hautapena:" #. Feather button -#: ../app/actions/select-commands.c:279 +#: ../app/actions/select-commands.c:280 msgid "_Feather border" msgstr "_Difuminatu ertzak" #. Edge lock button -#: ../app/actions/select-commands.c:292 +#: ../app/actions/select-commands.c:293 msgid "_Lock selection to image edges" msgstr "_Blokeatu hautapena irudiaren ertzetara" -#: ../app/actions/select-commands.c:342 ../app/actions/select-commands.c:375 +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 #: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:281 msgid "There is no active layer or channel to stroke to." msgstr "Ez dago trazatzeko geruza edo kanal aktiborik." -#: ../app/actions/select-commands.c:348 +#: ../app/actions/select-commands.c:351 msgid "Stroke Selection" msgstr "Trazatu hautapena" @@ -4583,14 +4586,14 @@ msgstr "Ireki testu-fitxategia (UTF-8)" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:422 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 #: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 #: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 #: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:647 ../app/tools/gimplevelstool.c:747 +#: ../app/tools/gimpcurvestool.c:649 ../app/tools/gimplevelstool.c:747 #: ../app/xcf/xcf.c:329 #, c-format msgid "Could not open '%s' for reading: %s" @@ -4671,127 +4674,127 @@ msgctxt "text-tool-action" msgid "From right to left" msgstr "Eskuinetik ezkerrera" -#: ../app/actions/tool-options-actions.c:54 +#: ../app/actions/tool-options-actions.c:56 msgctxt "tool-options-action" msgid "Tool Options Menu" msgstr "Tresna-aukeren menua" -#: ../app/actions/tool-options-actions.c:58 +#: ../app/actions/tool-options-actions.c:60 msgctxt "tool-options-action" msgid "_Save Tool Preset" msgstr "_Gorde tresnaren aurrezarpena" -#: ../app/actions/tool-options-actions.c:62 +#: ../app/actions/tool-options-actions.c:64 msgctxt "tool-options-action" msgid "_Restore Tool Preset" msgstr "_Freskatu tresnaren aurrezarpena" -#: ../app/actions/tool-options-actions.c:66 +#: ../app/actions/tool-options-actions.c:68 msgctxt "tool-options-action" msgid "E_dit Tool Preset" msgstr "_Editatu tresnaren aurrezarpena" -#: ../app/actions/tool-options-actions.c:70 +#: ../app/actions/tool-options-actions.c:72 msgctxt "tool-options-action" msgid "_Delete Tool Preset" msgstr "E_zabatu tresnaren aurrezarpena" -#: ../app/actions/tool-options-actions.c:74 +#: ../app/actions/tool-options-actions.c:76 msgctxt "tool-options-action" msgid "_New Tool Preset..." msgstr "Tresnaren aurrezarpen _berria..." -#: ../app/actions/tool-options-actions.c:79 +#: ../app/actions/tool-options-actions.c:81 msgctxt "tool-options-action" msgid "R_eset Tool Options" msgstr "_Berrasieratu tresna-aukerak" -#: ../app/actions/tool-options-actions.c:80 +#: ../app/actions/tool-options-actions.c:82 msgctxt "tool-options-action" msgid "Reset to default values" msgstr "Berrasieratu balio lehenetsiak" -#: ../app/actions/tool-options-actions.c:85 +#: ../app/actions/tool-options-actions.c:87 msgctxt "tool-options-action" msgid "Reset _all Tool Options" msgstr "Berrasieratu tresna-aukerak g_uztiak..." -#: ../app/actions/tool-options-actions.c:86 +#: ../app/actions/tool-options-actions.c:88 msgctxt "tool-options-action" msgid "Reset all tool options" msgstr "Berrasieratu tresna-aukerak guztiak" -#: ../app/actions/tool-options-commands.c:180 +#: ../app/actions/tool-options-commands.c:186 msgid "Reset All Tool Options" msgstr "Berrasieratu tresna-aukerak guztiak" -#: ../app/actions/tool-options-commands.c:203 +#: ../app/actions/tool-options-commands.c:209 msgid "Do you really want to reset all tool options to default values?" msgstr "" "Nahi duzu tresna-aukera guztiak lehenespeneko balioekin berrasieratzea?" -#: ../app/actions/tool-preset-actions.c:44 -msgctxt "tool-preset-action" -msgid "Tool Preset Menu" +#: ../app/actions/tool-presets-actions.c:44 +msgctxt "tool-presets-action" +msgid "Tool Presets Menu" msgstr "Tresnaren aurrezarpenen menua" -#: ../app/actions/tool-preset-actions.c:48 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:48 +msgctxt "tool-presets-action" msgid "_New Tool Preset" msgstr "Tresnaren aurrezarpen _berria" -#: ../app/actions/tool-preset-actions.c:49 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:49 +msgctxt "tool-presets-action" msgid "Create a new tool preset" msgstr "Sortu tresnaren aurrezarpen berria" -#: ../app/actions/tool-preset-actions.c:54 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:54 +msgctxt "tool-presets-action" msgid "D_uplicate Tool Preset" msgstr "Bi_koiztu tresnaren aurrezarpena" -#: ../app/actions/tool-preset-actions.c:55 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:55 +msgctxt "tool-presets-action" msgid "Duplicate this tool preset" msgstr "Bikoiztu tresnaren aurrezarpena" -#: ../app/actions/tool-preset-actions.c:60 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:60 +msgctxt "tool-presets-action" msgid "Copy Tool Preset _Location" msgstr "Kopiatu tresnaren aurrezarpenaren _kokalekua" -#: ../app/actions/tool-preset-actions.c:61 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:61 +msgctxt "tool-presets-action" msgid "Copy tool preset file location to clipboard" msgstr "Kopiatu tresnaren aurrezarpenaren fitxategiaren kokalekua arbelean" -#: ../app/actions/tool-preset-actions.c:66 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:66 +msgctxt "tool-presets-action" msgid "_Delete Tool Preset" msgstr "E_zabatu tresnaren aurrezarpena" -#: ../app/actions/tool-preset-actions.c:67 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:67 +msgctxt "tool-presets-action" msgid "Delete this tool preset" msgstr "Ezabatu tresnaren aurrezarpena" -#: ../app/actions/tool-preset-actions.c:72 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:72 +msgctxt "tool-presets-action" msgid "_Refresh Tool Presets" msgstr "_Freskatu tresnaren aurrezarpenak" -#: ../app/actions/tool-preset-actions.c:73 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:73 +msgctxt "tool-presets-action" msgid "Refresh tool presets" msgstr "Freskatu tresnaren aurrezarpenak" -#: ../app/actions/tool-preset-actions.c:81 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:81 +msgctxt "tool-presets-action" msgid "_Edit Tool Preset..." msgstr "_Editatu tresnaren aurrezarpena..." -#: ../app/actions/tool-preset-actions.c:82 -msgctxt "tool-preset-action" +#: ../app/actions/tool-presets-actions.c:82 +msgctxt "tool-presets-action" msgid "Edit this tool preset" msgstr "Editatu tresnaren aurrezarpena" @@ -5095,7 +5098,7 @@ msgid "Edit Path Attributes" msgstr "Editatu bidearen atributuak" #: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 -#: ../app/widgets/gimpvectorstreeview.c:243 +#: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "Bidea" @@ -5107,8 +5110,8 @@ msgstr "Bide berria" msgid "New Path Options" msgstr "Bide berriaren aukerak" -#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:198 -#: ../app/tools/gimpvectortool.c:1980 +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 +#: ../app/tools/gimpvectortool.c:1975 msgid "Stroke Path" msgstr "Trazatu bidea" @@ -5144,13 +5147,13 @@ msgstr "Sortu irudiaren beste ikuspegia" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "It_xi" +msgid "_Close View" +msgstr "It_xi ikuspegia" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Itxi irudiaren leihoa" +msgid "Close the active image view" +msgstr "Itxi irudi aktiboaren ikuspegia" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5373,13 +5376,23 @@ msgctxt "view-action" msgid "Toggle fullscreen view" msgstr "Txandakatu pantaila osoko ikuspegia" +#: ../app/actions/view-actions.c:238 +msgctxt "view-action" +msgid "Use GEGL" +msgstr "Erabili GEGL" + +#: ../app/actions/view-actions.c:239 +msgctxt "view-action" +msgid "Use GEGL to create this window's projection" +msgstr "Erabili GEGL leiho honen proiekzioa sortzeko" + #: ../app/actions/view-actions.c:263 msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "Zooma t_xikiagotu" #: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -msgctxt "view-action" +msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Zooma txikiagotu" @@ -5389,7 +5402,7 @@ msgid "Zoom _In" msgstr "Zooma ha_ndiagotu" #: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -msgctxt "view-action" +msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Zooma handiagotu" @@ -5403,234 +5416,234 @@ msgctxt "view-zoom-action" msgid "Zoom In" msgstr "Zooma handiagotu" -#: ../app/actions/view-actions.c:300 +#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (%1600)" -#: ../app/actions/view-actions.c:301 +#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "Zooma 16:1" -#: ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (%800)" -#: ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "Zooma 8:1" -#: ../app/actions/view-actions.c:312 +#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (%400)" -#: ../app/actions/view-actions.c:313 +#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "Zooma 4:1" -#: ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (%200)" -#: ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "Zooma 2:1" -#: ../app/actions/view-actions.c:324 +#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (%100)" -#: ../app/actions/view-actions.c:325 +#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "Zooma 1:1" -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:360 msgctxt "view-zoom-action" msgid "1:_2 (50%)" msgstr "1:_2 (%50)" -#: ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:361 msgctxt "view-zoom-action" msgid "Zoom 1:2" msgstr "Zooma 1:2" -#: ../app/actions/view-actions.c:336 +#: ../app/actions/view-actions.c:366 msgctxt "view-zoom-action" msgid "1:_4 (25%)" msgstr "1:_4 (%25)" -#: ../app/actions/view-actions.c:337 +#: ../app/actions/view-actions.c:367 msgctxt "view-zoom-action" msgid "Zoom 1:4" msgstr "Zooma 1:4" -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:372 msgctxt "view-zoom-action" msgid "1:_8 (12.5%)" msgstr "1:_8 (%12,5)" -#: ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:373 msgctxt "view-zoom-action" msgid "Zoom 1:8" msgstr "Zooma 1:8" -#: ../app/actions/view-actions.c:348 +#: ../app/actions/view-actions.c:378 msgctxt "view-zoom-action" msgid "1:1_6 (6.25%)" msgstr "1:1_6 (%6,25)" -#: ../app/actions/view-actions.c:349 +#: ../app/actions/view-actions.c:379 msgctxt "view-zoom-action" msgid "Zoom 1:16" msgstr "Zooma 1:16" -#: ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:384 msgctxt "view-zoom-action" msgid "Othe_r..." msgstr "Be_stelakoa..." -#: ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:385 msgctxt "view-zoom-action" msgid "Set a custom zoom factor" msgstr "Ezarri zoomaren faktore pertsonalizatua" -#: ../app/actions/view-actions.c:363 +#: ../app/actions/view-actions.c:393 msgctxt "view-padding-color" msgid "From _Theme" msgstr "_Gaitik" -#: ../app/actions/view-actions.c:364 +#: ../app/actions/view-actions.c:394 msgctxt "view-padding-color" msgid "Use the current theme's background color" msgstr "Erabili uneko gaiaren atzeko planoaren kolorea" -#: ../app/actions/view-actions.c:369 +#: ../app/actions/view-actions.c:399 msgctxt "view-padding-color" msgid "_Light Check Color" msgstr "Koadrikularen kolore _argia" -#: ../app/actions/view-actions.c:370 +#: ../app/actions/view-actions.c:400 msgctxt "view-padding-color" msgid "Use the light check color" msgstr "Erabili koadrikula argiaren kolorea" -#: ../app/actions/view-actions.c:375 +#: ../app/actions/view-actions.c:405 msgctxt "view-padding-color" msgid "_Dark Check Color" msgstr "Koadrikularen kolore _iluna" -#: ../app/actions/view-actions.c:376 +#: ../app/actions/view-actions.c:406 msgctxt "view-padding-color" msgid "Use the dark check color" msgstr "Erabili koadrikula ilunaren kolorea" -#: ../app/actions/view-actions.c:381 +#: ../app/actions/view-actions.c:411 msgctxt "view-padding-color" msgid "Select _Custom Color..." msgstr "Hautatu kolore p_ertsonalizatua..." -#: ../app/actions/view-actions.c:382 +#: ../app/actions/view-actions.c:412 msgctxt "view-padding-color" msgid "Use an arbitrary color" msgstr "Erabili ausazko kolorea" -#: ../app/actions/view-actions.c:387 +#: ../app/actions/view-actions.c:417 msgctxt "view-padding-color" msgid "As in _Preferences" msgstr "Hobespenetan _bezala" -#: ../app/actions/view-actions.c:389 +#: ../app/actions/view-actions.c:419 msgctxt "view-padding-color" msgid "Reset padding color to what's configured in preferences" msgstr "Ezarri kolore betegarria hobespenekoarekin" -#: ../app/actions/view-actions.c:588 +#: ../app/actions/view-actions.c:618 #, c-format msgid "Re_vert Zoom (%d%%)" msgstr "_Leheneratu zooma (%%%d)" -#: ../app/actions/view-actions.c:596 +#: ../app/actions/view-actions.c:626 msgid "Re_vert Zoom" msgstr "_Leheneratu zooma" -#: ../app/actions/view-actions.c:732 +#: ../app/actions/view-actions.c:761 #, c-format msgid "Othe_r (%s)..." msgstr "_Bestelakoa (%s) ..." -#: ../app/actions/view-actions.c:741 +#: ../app/actions/view-actions.c:770 #, c-format msgid "_Zoom (%s)" msgstr "_Zooma (%s)" -#: ../app/actions/view-commands.c:580 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Ezarri oihalaren kolore betegarria" -#: ../app/actions/view-commands.c:582 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Ezarri oihalaren kolore pertsonalizatu betegarria" -#: ../app/actions/window-actions.c:168 +#: ../app/actions/window-actions.c:170 #, c-format msgid "Screen %s" msgstr "%s pantaila" -#: ../app/actions/window-actions.c:170 +#: ../app/actions/window-actions.c:172 #, c-format msgid "Move this window to screen %s" msgstr "Eraman leihoa %s pantailara" -#: ../app/actions/windows-actions.c:96 +#: ../app/actions/windows-actions.c:93 msgctxt "windows-action" msgid "_Windows" msgstr "_Leihoak" -#: ../app/actions/windows-actions.c:98 +#: ../app/actions/windows-actions.c:95 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "Duela gutxi _itxitako atrakagarriak" -#: ../app/actions/windows-actions.c:100 +#: ../app/actions/windows-actions.c:97 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "Elkarrizketa-koadro _atrakagaiak" -#: ../app/actions/windows-actions.c:103 +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "Next Image" msgstr "Hurrengo irudia" -#: ../app/actions/windows-actions.c:104 +#: ../app/actions/windows-actions.c:101 msgctxt "windows-action" msgid "Switch to the next image" msgstr "Aldatu hurrengo irudira" -#: ../app/actions/windows-actions.c:109 +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Previous Image" msgstr "Aurreko irudia" -#: ../app/actions/windows-actions.c:110 +#: ../app/actions/windows-actions.c:107 msgctxt "windows-action" msgid "Switch to the previous image" msgstr "Aldatu aurreko irudira" -#: ../app/actions/windows-actions.c:118 +#: ../app/actions/windows-actions.c:115 msgctxt "windows-action" msgid "Hide Docks" msgstr "Ezkutatu atrakagarriak" -#: ../app/actions/windows-actions.c:119 +#: ../app/actions/windows-actions.c:116 msgctxt "windows-action" msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." @@ -5638,19 +5651,15 @@ msgstr "" "Gaitutakoan atrakagarriak eta bestelako elkarrizketa-koadroak ezkutatzen " "dira, irudiaren leihoak soilik utziz." -#: ../app/actions/windows-actions.c:125 +#: ../app/actions/windows-actions.c:122 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "Leiho bakarreko modua" -#: ../app/actions/windows-actions.c:126 +#: ../app/actions/windows-actions.c:123 msgctxt "windows-action" -msgid "" -"When enabled GIMP is in a single-window mode. Far from completely " -"implemented!" -msgstr "" -"Gaituta dagoenean, GIMP leiho bakarreko moduan egongo da. Ez dago bere " -"osotasunean garatuta." +msgid "When enabled GIMP is in a single-window mode." +msgstr "GIMP leiho bakarreko moduan gaituta dagoenean." #: ../app/base/base-enums.c:23 msgctxt "curve-type" @@ -5947,7 +5956,7 @@ msgstr "Eskuina" #: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 #: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 #: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:700 +#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:702 #: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:422 #, c-format @@ -6213,6 +6222,10 @@ msgstr "" "berri diren elkarrizketa-koadroetan." #: ../app/config/gimprc-blurbs.h:287 +msgid "Sets the default quick mask color." +msgstr "Maskara azkarraren kolore lehenetsia ezartzen du." + +#: ../app/config/gimprc-blurbs.h:290 msgid "" "When enabled, the image window will automatically resize itself whenever the " "physical image size changes." @@ -6220,7 +6233,7 @@ msgstr "" "Gaituta dagoenean, irudiaren leihoa automatikoki aldatuko da tamainaz, " "irudiaren tamaina fisikoa aldatzen den bakoitzean." -#: ../app/config/gimprc-blurbs.h:291 +#: ../app/config/gimprc-blurbs.h:294 msgid "" "When enabled, the image window will automatically resize itself when zooming " "into and out of images." @@ -6228,18 +6241,18 @@ msgstr "" "Gaituta dagoenean, irudiaren leihoa automatikoki aldatuko da tamainaz, " "irudiaren zooma handitzean eta txikitzean." -#: ../app/config/gimprc-blurbs.h:295 +#: ../app/config/gimprc-blurbs.h:298 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "" "Utzi GIMPi abio bakoitzean gordetako azken saioa leheneratzen saiatzen." -#: ../app/config/gimprc-blurbs.h:298 +#: ../app/config/gimprc-blurbs.h:301 msgid "" "Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "" "Gogoratu uneko tresna, eredua, kolorea eta brotxa hurrengo GIMP saioetan." -#: ../app/config/gimprc-blurbs.h:302 +#: ../app/config/gimprc-blurbs.h:305 msgid "" "Keep a permanent record of all opened and saved files in the Recent " "Documents list." @@ -6247,16 +6260,16 @@ msgstr "" "Mantendu irekitako eta gordetako fitxategi guztien betirako erregistroa " "azken dokumentuen zerrendan." -#: ../app/config/gimprc-blurbs.h:306 +#: ../app/config/gimprc-blurbs.h:309 msgid "Save the positions and sizes of the main dialogs when GIMP exits." msgstr "" "Gorde elkarrizketa-koadro nagusien kokalekuak eta tamainak GIMP ixtean." -#: ../app/config/gimprc-blurbs.h:309 +#: ../app/config/gimprc-blurbs.h:312 msgid "Save the tool options when GIMP exits." msgstr "Gorde tresna-aukerak GIMP ixtean." -#: ../app/config/gimprc-blurbs.h:315 +#: ../app/config/gimprc-blurbs.h:318 msgid "" "When enabled, all paint tools will show a preview of the current brush's " "outline." @@ -6264,7 +6277,7 @@ msgstr "" "Gaituta dagoenean, margotzeko tresna guztiek uneko brotxen eskemaren " "aurrebista erakutsiko dute." -#: ../app/config/gimprc-blurbs.h:319 +#: ../app/config/gimprc-blurbs.h:322 msgid "" "When enabled, dialogs will show a help button that gives access to the " "related help page. Without this button, the help page can still be reached " @@ -6274,7 +6287,7 @@ msgstr "" "dagokien laguntzako orrialdera joateko. Botoi hau gabe ere, laguntzako " "orrialdeak F1 tekla sakatuz eskura daitezke." -#: ../app/config/gimprc-blurbs.h:324 +#: ../app/config/gimprc-blurbs.h:327 msgid "" "When enabled, the mouse pointer will be shown over the image while using a " "paint tool." @@ -6282,7 +6295,7 @@ msgstr "" "Gaituta dagoenean, kurtsorea irudiaren gainean erakutsiko da, margotze-" "tresna erabiltzean." -#: ../app/config/gimprc-blurbs.h:328 +#: ../app/config/gimprc-blurbs.h:331 msgid "" "When enabled, the menubar is visible by default. This can also be toggled " "with the \"View->Show Menubar\" command." @@ -6291,7 +6304,7 @@ msgstr "" "\"Ikuspegia->Erakutsi menu-barra\" komandoaren bidez ere aktibatu eta " "desaktibatu daiteke." -#: ../app/config/gimprc-blurbs.h:332 +#: ../app/config/gimprc-blurbs.h:335 msgid "" "When enabled, the rulers are visible by default. This can also be toggled " "with the \"View->Show Rulers\" command." @@ -6299,7 +6312,7 @@ msgstr "" "Gaituta dagoenean, erregelak ikusgai daude lehenespenez. Hori \"Ikuspegia-" ">Erakutsi erregelak\" komandoaren bidez ere aktiba daiteke." -#: ../app/config/gimprc-blurbs.h:336 +#: ../app/config/gimprc-blurbs.h:339 msgid "" "When enabled, the scrollbars are visible by default. This can also be " "toggled with the \"View->Show Scrollbars\" command." @@ -6308,7 +6321,7 @@ msgstr "" "\"Ikuspegia->Erakutsi korritze-barrak bai/ez\" komandoaren bidez ere aktiba " "daiteke." -#: ../app/config/gimprc-blurbs.h:340 +#: ../app/config/gimprc-blurbs.h:343 msgid "" "When enabled, the statusbar is visible by default. This can also be toggled " "with the \"View->Show Statusbar\" command." @@ -6316,7 +6329,7 @@ msgstr "" "Gaituta dagoenean, egoera-barra ikusgai dago lehenespenez. Hori \"Ikuspegia-" ">Erakutsi egoera-barra\" komandoaren bidez ere aktiba daiteke." -#: ../app/config/gimprc-blurbs.h:344 +#: ../app/config/gimprc-blurbs.h:347 msgid "" "When enabled, the selection is visible by default. This can also be toggled " "with the \"View->Show Selection\" command." @@ -6325,7 +6338,7 @@ msgstr "" "\"Ikuspegia->Erakutsi hautapena\" komandoaren bidez ere aktiba eta desaktiba " "daiteke." -#: ../app/config/gimprc-blurbs.h:348 +#: ../app/config/gimprc-blurbs.h:351 msgid "" "When enabled, the layer boundary is visible by default. This can also be " "toggled with the \"View->Show Layer Boundary\" command." @@ -6334,7 +6347,7 @@ msgstr "" "\"Ikuspegia->Erakutsi geruzaren muga\" komandoaren bidez ere aktiba eta " "desaktiba daiteke." -#: ../app/config/gimprc-blurbs.h:352 +#: ../app/config/gimprc-blurbs.h:355 msgid "" "When enabled, the guides are visible by default. This can also be toggled " "with the \"View->Show Guides\" command." @@ -6342,7 +6355,7 @@ msgstr "" "Gaituta dagoenean, gidak ikusgai daude lehenespenez. Hori \"Ikuspegia-" ">Erakutsi gidak\" komandoaren bidez ere aktiba daiteke." -#: ../app/config/gimprc-blurbs.h:356 +#: ../app/config/gimprc-blurbs.h:359 msgid "" "When enabled, the grid is visible by default. This can also be toggled with " "the \"View->Show Grid\" command." @@ -6350,7 +6363,7 @@ msgstr "" "Gaituta dagoenean, sareta ikusgai egongo da lehenespenez. Hori \"Ikuspegia-" ">Erakutsi sareta\" komandoaren bidez ere aktiba eta desaktiba daiteke." -#: ../app/config/gimprc-blurbs.h:360 +#: ../app/config/gimprc-blurbs.h:363 msgid "" "When enabled, the sample points are visible by default. This can also be " "toggled with the \"View->Show Sample Points\" command." @@ -6358,24 +6371,24 @@ msgstr "" "Gaituta dagoenean, lagina-puntuak ikusgai daude lehenespenez. Hori " "\"Ikuspegia->Erakutsi lagina-puntuak\" komandoaren bidez ere aktiba daiteke." -#: ../app/config/gimprc-blurbs.h:364 +#: ../app/config/gimprc-blurbs.h:367 msgid "Show a tooltip when the pointer hovers over an item." msgstr "Erakutsi aholkua kurtsorea elementu baten gainean kokatzean." -#: ../app/config/gimprc-blurbs.h:367 +#: ../app/config/gimprc-blurbs.h:370 msgid "Use GIMP in a single-window mode." msgstr "Erabili GIMP leiho bakarreko moduan." -#: ../app/config/gimprc-blurbs.h:370 +#: ../app/config/gimprc-blurbs.h:373 msgid "Hide docks and other windows, leaving only image windows." msgstr "" "Ezkutatu atrakagarriak eta bestelako leihoak, irudien leihoak soilik utziz." -#: ../app/config/gimprc-blurbs.h:373 +#: ../app/config/gimprc-blurbs.h:376 msgid "What to do when the space bar is pressed in the image window." msgstr "Zer egin Zuriunea tekla sakatzen bada leiho nagusian." -#: ../app/config/gimprc-blurbs.h:376 +#: ../app/config/gimprc-blurbs.h:379 msgid "" "Sets the swap file location. GIMP uses a tile based memory allocation " "scheme. The swap file is used to quickly and easily swap tiles out to disk " @@ -6392,11 +6405,11 @@ msgstr "" "fitxategia NFSren gainean muntatutako direktorioan sortzen bada. Hori dela " "eta, komeni da zure trukatze-fitxategia \"/tmp\" karpetan gordetzea." -#: ../app/config/gimprc-blurbs.h:385 +#: ../app/config/gimprc-blurbs.h:388 msgid "When enabled, menus can be torn off." msgstr "Gaituta dagoenean, menuak bereizi egin daitezke." -#: ../app/config/gimprc-blurbs.h:388 +#: ../app/config/gimprc-blurbs.h:391 msgid "" "When enabled, you can change keyboard shortcuts for menu items by hitting a " "key combination while the menu item is highlighted." @@ -6404,15 +6417,15 @@ msgstr "" "Gaituta dagoenean, menu-elementuen laster-teklak alda ditzakezu menu-" "elementua nabarmendua dagoenean tekla konbinazio bat sakatuz." -#: ../app/config/gimprc-blurbs.h:392 +#: ../app/config/gimprc-blurbs.h:395 msgid "Save changed keyboard shortcuts when GIMP exits." msgstr "Gorde aldatutako laster-teklak GIMP ixtean." -#: ../app/config/gimprc-blurbs.h:395 +#: ../app/config/gimprc-blurbs.h:398 msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Leheneratu gordetako laster-teklak GIMP abiarazten duzun bakoitzean." -#: ../app/config/gimprc-blurbs.h:398 +#: ../app/config/gimprc-blurbs.h:401 msgid "" "Sets the folder for temporary storage. Files will appear here during the " "course of running GIMP. Most files will disappear when GIMP exits, but some " @@ -6424,13 +6437,13 @@ msgstr "" "GIMP ixtean, baina baliteke fitxategi batzuk geratzea; beraz, hobe da " "direktorio hau beste erabiltzaileekin ez partekatzea." -#: ../app/config/gimprc-blurbs.h:410 +#: ../app/config/gimprc-blurbs.h:413 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "" "'Ireki' elkarrizketa-koadroan erakusten den koadro txikiaren tamaina " "ezartzen du " -#: ../app/config/gimprc-blurbs.h:413 +#: ../app/config/gimprc-blurbs.h:416 msgid "" "The thumbnail in the Open dialog will be automatically updated if the file " "being previewed is smaller than the size set here." @@ -6438,7 +6451,7 @@ msgstr "" "'Ireki' elkarrizketa-koadroko koadro txikia automatikoki eguneratuko da " "aurrebistan dagoen fitxategia ezarritako tamaina baino txikiagoa bada." -#: ../app/config/gimprc-blurbs.h:417 +#: ../app/config/gimprc-blurbs.h:420 msgid "" "When the amount of pixel data exceeds this limit, GIMP will start to swap " "tiles to disk. This is a lot slower but it makes it possible to work on " @@ -6450,28 +6463,28 @@ msgstr "" "irudiekin lan egitea uzten du. Ordenagailuak RAM memoria ugari izanez gero, " "handiagotu hau balio altuagora." -#: ../app/config/gimprc-blurbs.h:423 +#: ../app/config/gimprc-blurbs.h:426 msgid "Show the current foreground and background colors in the toolbox." msgstr "Erakutsi uneko aurreko eta atzeko planoen koloreak tresna-barran." -#: ../app/config/gimprc-blurbs.h:426 +#: ../app/config/gimprc-blurbs.h:429 msgid "Show the currently selected brush, pattern and gradient in the toolbox." msgstr "Erakutsi unean hautatutako brotxa, eredu eta gradientea tresna-barran." -#: ../app/config/gimprc-blurbs.h:429 +#: ../app/config/gimprc-blurbs.h:432 msgid "Show the currently active image in the toolbox." msgstr "Erakutsi uneko irudi aktiboa tresna-barran." -#: ../app/config/gimprc-blurbs.h:435 +#: ../app/config/gimprc-blurbs.h:438 msgid "Sets the manner in which transparency is displayed in images." msgstr "Gardentasuna irudietan bistaratzeko modua ezartzen du." -#: ../app/config/gimprc-blurbs.h:438 +#: ../app/config/gimprc-blurbs.h:441 msgid "Sets the size of the checkerboard used to display transparency." msgstr "" "Gardentasuna bistaratzeko erabiltzen den koadrikularen tamaina ezartzen du." -#: ../app/config/gimprc-blurbs.h:441 +#: ../app/config/gimprc-blurbs.h:444 msgid "" "When enabled, GIMP will not save an image if it has not been changed since " "it was opened." @@ -6479,7 +6492,7 @@ msgstr "" "Gaituta dagoenean, GIMPek ez du gordeko irudia ireki denetik aldatu gabe " "badago." -#: ../app/config/gimprc-blurbs.h:445 +#: ../app/config/gimprc-blurbs.h:448 msgid "" "Sets the minimal number of operations that can be undone. More undo levels " "are kept available until the undo-size limit is reached." @@ -6487,7 +6500,7 @@ msgstr "" "Desegin daitezkeen eragiketen gutxieneko kopurua ezartzen du. Desegiteko " "maila gehiago eskaintzen dira desegiteko mailen mugara heldu arte." -#: ../app/config/gimprc-blurbs.h:449 +#: ../app/config/gimprc-blurbs.h:452 msgid "" "Sets an upper limit to the memory that is used per image to keep operations " "on the undo stack. Regardless of this setting, at least as many undo-levels " @@ -6497,16 +6510,16 @@ msgstr "" "memoriaren gehienezko muga ezartzen du. Ezarpen honetaz aparte, " "konfigurazioaren arabera hainbat aldiz desegin daiteke." -#: ../app/config/gimprc-blurbs.h:454 +#: ../app/config/gimprc-blurbs.h:457 msgid "Sets the size of the previews in the Undo History." msgstr "'Desegin historia'-ko aurrebistaren tamaina ezartzen du." -#: ../app/config/gimprc-blurbs.h:457 +#: ../app/config/gimprc-blurbs.h:460 msgid "When enabled, pressing F1 will open the help browser." msgstr "Gaituta dagoenean, laguntza-arakatzailea irekiko da F1 sakatzen bada." -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:167 ../app/gui/session.c:243 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "analisi-errore larria" @@ -6992,12 +7005,12 @@ msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Ainguratu hautapen mugikorra" -#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "Itsatsi" -#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "Ebaki" @@ -7173,168 +7186,168 @@ msgctxt "undo-type" msgid "Not undoable" msgstr "Ezin da desegin" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:1187 msgctxt "select-criterion" msgid "Composite" msgstr "Konposatua" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1188 msgctxt "select-criterion" msgid "Red" msgstr "Gorria" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1189 msgctxt "select-criterion" msgid "Green" msgstr "Berdea" -#: ../app/core/core-enums.c:1188 +#: ../app/core/core-enums.c:1190 msgctxt "select-criterion" msgid "Blue" msgstr "Urdina" -#: ../app/core/core-enums.c:1189 +#: ../app/core/core-enums.c:1191 msgctxt "select-criterion" msgid "Hue" msgstr "Ñabardura" -#: ../app/core/core-enums.c:1190 +#: ../app/core/core-enums.c:1192 msgctxt "select-criterion" msgid "Saturation" msgstr "Saturazioa" -#: ../app/core/core-enums.c:1191 +#: ../app/core/core-enums.c:1193 msgctxt "select-criterion" msgid "Value" msgstr "Balioa" -#: ../app/core/core-enums.c:1220 +#: ../app/core/core-enums.c:1222 msgctxt "message-severity" msgid "Message" msgstr "Mezua" -#: ../app/core/core-enums.c:1221 +#: ../app/core/core-enums.c:1223 msgctxt "message-severity" msgid "Warning" msgstr "Abisua" -#: ../app/core/core-enums.c:1222 +#: ../app/core/core-enums.c:1224 msgctxt "message-severity" msgid "Error" msgstr "Errorea" -#: ../app/core/core-enums.c:1251 +#: ../app/core/core-enums.c:1253 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "Galdetu zer egin" -#: ../app/core/core-enums.c:1252 +#: ../app/core/core-enums.c:1254 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "Mantendu kapsulatutako profila" -#: ../app/core/core-enums.c:1253 +#: ../app/core/core-enums.c:1255 msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "Bihurtu GBU kolore-espaziora" -#: ../app/core/core-enums.c:1290 +#: ../app/core/core-enums.c:1292 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "Opakutasuna" -#: ../app/core/core-enums.c:1291 +#: ../app/core/core-enums.c:1293 msgctxt "dynamics-output-type" msgid "Size" msgstr "Tamaina" -#: ../app/core/core-enums.c:1292 +#: ../app/core/core-enums.c:1294 msgctxt "dynamics-output-type" msgid "Angle" msgstr "Angelua" -#: ../app/core/core-enums.c:1293 +#: ../app/core/core-enums.c:1295 msgctxt "dynamics-output-type" msgid "Color" msgstr "Kolorea" -#: ../app/core/core-enums.c:1294 +#: ../app/core/core-enums.c:1296 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "Gogortasuna" -#: ../app/core/core-enums.c:1295 +#: ../app/core/core-enums.c:1297 msgctxt "dynamics-output-type" msgid "Force" msgstr "Indarra" -#: ../app/core/core-enums.c:1296 +#: ../app/core/core-enums.c:1298 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "Aspektu-erlazioa" -#: ../app/core/core-enums.c:1297 +#: ../app/core/core-enums.c:1299 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "Tartea" -#: ../app/core/core-enums.c:1298 +#: ../app/core/core-enums.c:1300 msgctxt "dynamics-output-type" msgid "Rate" msgstr "Emaria" -#: ../app/core/core-enums.c:1299 +#: ../app/core/core-enums.c:1301 msgctxt "dynamics-output-type" msgid "Flow" msgstr "Fluxua" -#: ../app/core/core-enums.c:1300 +#: ../app/core/core-enums.c:1302 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Fluktuazioa" -#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:344 -#: ../app/gui/session.c:349 ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:206 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "Huts egin du \"%s\" ezabatzean: %s" -#: ../app/core/gimp-edit.c:189 ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "Itsatsitako geruza" -#: ../app/core/gimp-edit.c:388 +#: ../app/core/gimp-edit.c:420 msgctxt "undo-type" msgid "Clear" msgstr "Garbitu" -#: ../app/core/gimp-edit.c:407 +#: ../app/core/gimp-edit.c:439 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "Bete aurreko planoaren kolorearekin" -#: ../app/core/gimp-edit.c:411 +#: ../app/core/gimp-edit.c:443 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "Bete atzeko planoaren kolorearekin" -#: ../app/core/gimp-edit.c:415 +#: ../app/core/gimp-edit.c:447 msgctxt "undo-type" msgid "Fill with White" msgstr "Bete zuriz" -#: ../app/core/gimp-edit.c:419 +#: ../app/core/gimp-edit.c:451 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "Bete gardentasunez" -#: ../app/core/gimp-edit.c:423 +#: ../app/core/gimp-edit.c:455 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "Bete ereduarekin" -#: ../app/core/gimp-edit.c:515 +#: ../app/core/gimp-edit.c:547 msgid "Global Buffer" msgstr "Buffer globala" @@ -7368,7 +7381,7 @@ msgstr "AurPlanoa gardenera" msgid "tags-locale:C" msgstr "tips-locale:eu" -#: ../app/core/gimp-user-install.c:159 +#: ../app/core/gimp-user-install.c:173 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " @@ -7377,7 +7390,7 @@ msgstr "" "Badirudi lehendik ere GIMP %s erabili duzula. GIMP aplikazioak zure " "ezarpenak hona migratuko ditu: '%s'." -#: ../app/core/gimp-user-install.c:164 +#: ../app/core/gimp-user-install.c:178 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -7386,17 +7399,17 @@ msgstr "" "Badirudi aurreneko aldia dela GIMP erabiltzen duzula. GIMP aplikazioak '%s' " "izeneko karpeta sortuko du eta fitxategi batzuk kopiatuko ditu bertan." -#: ../app/core/gimp-user-install.c:316 +#: ../app/core/gimp-user-install.c:329 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "'%s' fitxategia kopiatzen '%s'(e)tik..." -#: ../app/core/gimp-user-install.c:331 ../app/core/gimp-user-install.c:357 +#: ../app/core/gimp-user-install.c:344 ../app/core/gimp-user-install.c:370 #, c-format msgid "Creating folder '%s'..." msgstr "'%s' karpeta sortzen..." -#: ../app/core/gimp-user-install.c:342 ../app/core/gimp-user-install.c:368 +#: ../app/core/gimp-user-install.c:355 ../app/core/gimp-user-install.c:381 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Ezin da '%s' karpeta sortu: %s" @@ -7420,7 +7433,7 @@ msgid "Parasites" msgstr "Parasitoak" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2729 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2743 #: ../app/tools/gimppaintoptions-gui.c:203 msgid "Dynamics" msgstr "Dinamika" @@ -7431,7 +7444,7 @@ msgid "Fonts (this may take a while)" msgstr "Letra-tipoak (denbora behar du)" #. initialize the module list -#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2757 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2775 msgid "Modules" msgstr "Moduluak" @@ -7440,58 +7453,60 @@ msgstr "Moduluak" msgid "Updating tag cache" msgstr "Etiketen cachea eguneratzen" -#: ../app/core/gimpbrush-load.c:178 +#: ../app/core/gimpbrush-load.c:180 #, c-format -msgid "Could not read %d bytes from '%s': %s" -msgstr "Ezin dira %d byte irakurri '%s'(e)tik: %s" +msgid "Could not read %d byte from '%s': %s" +msgid_plural "Could not read %d bytes from '%s': %s" +msgstr[0] "Ezin izan da byte %d irakurri '%s'(e)tik: %s" +msgstr[1] "Ezin izan dira %d byte irakurri '%s'(e)tik: %s" -#: ../app/core/gimpbrush-load.c:198 +#: ../app/core/gimpbrush-load.c:202 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Zabalera=0." -#: ../app/core/gimpbrush-load.c:207 +#: ../app/core/gimpbrush-load.c:211 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Altuera=0." -#: ../app/core/gimpbrush-load.c:216 +#: ../app/core/gimpbrush-load.c:220 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "Analisi-errore larria '%s' brotxa-fitxategian: Byteak=0." -#: ../app/core/gimpbrush-load.c:240 +#: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "Analisi-errore larria '%s' brotxa-fitxategian: %d sakonera ezezaguna." -#: ../app/core/gimpbrush-load.c:253 +#: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" "Analisi-errore larria: '%s' brotxa-fitxategian:: %d brotxa-bertsio ezezaguna." -#: ../app/core/gimpbrush-load.c:269 ../app/core/gimpbrush-load.c:389 -#: ../app/core/gimpbrush-load.c:723 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 +#: ../app/core/gimpbrush-load.c:727 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" "Analisi-errore larria '%s' brotxa-fitxategian: fitxategia trunkatuta ageri " "da." -#: ../app/core/gimpbrush-load.c:277 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "UTF-8 kate baliogabea '%s' brotxa-fitxategian." -#: ../app/core/gimpbrush-load.c:284 ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 #: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "Izengabea" -#: ../app/core/gimpbrush-load.c:378 +#: ../app/core/gimpbrush-load.c:382 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7501,7 +7516,7 @@ msgstr "" "onartzen\n" "GIMPen brotxak grisak edo GBUA izan behar dute." -#: ../app/core/gimpbrush-load.c:450 +#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7509,7 +7524,7 @@ msgstr "" "Analisi-errore larria: '%s' brotxa-fitxategian: ezin da deskodetu formatu " "laburreko %d bertsioa." -#: ../app/core/gimpbrush-load.c:617 +#: ../app/core/gimpbrush-load.c:621 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7761,8 +7776,8 @@ msgstr "Ezarri kanal-opakutasuna" msgid "Selection Mask" msgstr "Hautapen-maskara" -#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:113 -#: ../app/widgets/gimplayertreeview.c:283 +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:111 +#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 msgid "Opacity" msgstr "Opakutasuna" @@ -7770,13 +7785,13 @@ msgstr "Opakutasuna" msgid "Paint Mode" msgstr "Margotze-modua" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Ezin izan da `%s' ezabatu: %s" -#: ../app/core/gimpdatafactory.c:427 ../app/core/gimpdatafactory.c:456 -#: ../app/core/gimpdatafactory.c:622 ../app/core/gimpdatafactory.c:644 +#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 +#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 #, c-format msgid "" "Failed to save data:\n" @@ -7787,17 +7802,17 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:536 ../app/core/gimpdatafactory.c:539 +#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 #: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496 msgid "copy" msgstr "kopiatu" -#: ../app/core/gimpdatafactory.c:548 ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:505 #, c-format msgid "%s copy" msgstr "%s(r)en kopia" -#: ../app/core/gimpdatafactory.c:741 +#: ../app/core/gimpdatafactory.c:742 #, c-format msgid "" "You have a writable data folder configured (%s), but this folder does not " @@ -7808,7 +7823,7 @@ msgstr "" "dago. Sortu ezazu karpeta, edo konpondu zure konfigurazioa Hobespenak " "elkarrizketa-koadroko 'Karpetak' atalean." -#: ../app/core/gimpdatafactory.c:762 +#: ../app/core/gimpdatafactory.c:763 #, c-format msgid "" "You have a writable data folder configured, but this folder is not part of " @@ -7820,12 +7835,12 @@ msgstr "" "Konpondu zure konfigurazioa Hobespenak elkarrizketa-koadroko 'Karpetak' " "atalean." -#: ../app/core/gimpdatafactory.c:772 +#: ../app/core/gimpdatafactory.c:773 #, c-format msgid "You don't have any writable data folder configured." msgstr "Ez duzu datuak idazteko karpetarik konfiguratu." -#: ../app/core/gimpdatafactory.c:889 +#: ../app/core/gimpdatafactory.c:937 #, c-format msgid "" "Failed to load data:\n" @@ -7842,11 +7857,7 @@ msgid "Blend" msgstr "Nahastu" #: ../app/core/gimpdrawable-brightness-contrast.c:70 -msgctxt "undo-type" -msgid "Brightness_Contrast" -msgstr "Distira_Kontrastea" - -#: ../app/core/gimpdrawable-brightness-contrast.c:81 +#: ../app/core/gimpdrawable-brightness-contrast.c:83 msgctxt "undo-type" msgid "Brightness-Contrast" msgstr "Distira-Kontrastea" @@ -7921,7 +7932,7 @@ msgid "Posterize" msgstr "Posterizatu" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Ez dago nahikoa puntu trazatzeko" @@ -7936,8 +7947,8 @@ msgstr "Errendatu trazua" #: ../app/core/gimpdrawable-threshold.c:70 #: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 -#: ../app/tools/gimpbucketfilloptions.c:282 -#: ../app/tools/gimpregionselectoptions.c:215 +#: ../app/tools/gimpbucketfilloptions.c:285 +#: ../app/tools/gimpregionselectoptions.c:216 #: ../app/tools/gimpthresholdtool.c:90 msgid "Threshold" msgstr "Muga" @@ -7961,7 +7972,7 @@ msgstr "Eraldatu geruza" msgid "Transformation" msgstr "Eraldatzea" -#: ../app/core/gimpdrawable.c:484 +#: ../app/core/gimpdrawable.c:494 msgctxt "undo-type" msgid "Scale" msgstr "Eskala" @@ -8057,41 +8068,41 @@ msgstr "" "Saretako lehen marraren desplazamendu bertikala, zenbaki negatiboa izan " "behar du." -#: ../app/core/gimpgrouplayer.c:213 +#: ../app/core/gimpgrouplayer.c:219 msgid "Layer Group" msgstr "Geruzen taldea" -#: ../app/core/gimpgrouplayer.c:214 +#: ../app/core/gimpgrouplayer.c:220 msgctxt "undo-type" msgid "Rename Layer Group" msgstr "Aldatu geruzen taldearen izena" -#: ../app/core/gimpgrouplayer.c:215 +#: ../app/core/gimpgrouplayer.c:221 msgctxt "undo-type" msgid "Move Layer Group" msgstr "Aldatu geruzen taldea lekuz" -#: ../app/core/gimpgrouplayer.c:216 +#: ../app/core/gimpgrouplayer.c:222 msgctxt "undo-type" msgid "Scale Layer Group" msgstr "Eskalatu geruzen taldea" -#: ../app/core/gimpgrouplayer.c:217 +#: ../app/core/gimpgrouplayer.c:223 msgctxt "undo-type" msgid "Resize Layer Group" msgstr "Aldatu geruzen taldea tamainaz" -#: ../app/core/gimpgrouplayer.c:218 +#: ../app/core/gimpgrouplayer.c:224 msgctxt "undo-type" msgid "Flip Layer Group" msgstr "Irauli geruzen taldea" -#: ../app/core/gimpgrouplayer.c:219 +#: ../app/core/gimpgrouplayer.c:225 msgctxt "undo-type" msgid "Rotate Layer Group" msgstr "Biratu geruzen taldea" -#: ../app/core/gimpgrouplayer.c:220 +#: ../app/core/gimpgrouplayer.c:226 msgctxt "undo-type" msgid "Transform Layer Group" msgstr "Eraldatu geruzen taldea" @@ -8111,12 +8122,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Ezarri kolore-mapa" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Kendu kolore-maparen ezarpena" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Aldatu kolore-maparen sarrera" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Gehitu kolorea kolore-mapari" @@ -8203,39 +8219,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Batu ikusgai dauden geruzak" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Berdindu irudia" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Ezin da geruza ikusgairik gabeko irudia berdindu." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Ezin da geruzen talde batean batu." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Batzea nahi den helburuko geruza blokeatuta dago." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Ez dago helburuko geruza ikusgairik batzeko." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Batu beherantz" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Batu geruzen taldea" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Batu ikusgai dauden bideak" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "Ez daude batzeko behar adina bide ikusgai. Gutxienez bi behar dira." @@ -8268,7 +8288,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Aldatu lagina-puntua lekuz" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Eskalatu irudia" @@ -8278,57 +8298,69 @@ msgstr "Eskalatu irudia" msgid "Can't undo %s" msgstr "Ezin da %s desegin" -#: ../app/core/gimpimage.c:1806 +#: ../app/core/gimpimage.c:1784 +msgid " (exported)" +msgstr " (esportatuta)" + +#: ../app/core/gimpimage.c:1788 +msgid " (overwritten)" +msgstr " (gainidatzitza)" + +#: ../app/core/gimpimage.c:1797 +msgid " (imported)" +msgstr " (inportatuta)" + +#: ../app/core/gimpimage.c:1922 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "Aldatu irudiaren bereizmena" -#: ../app/core/gimpimage.c:1858 +#: ../app/core/gimpimage.c:1974 msgctxt "undo-type" msgid "Change Image Unit" msgstr "Aldatu irudiaren unitatea" -#: ../app/core/gimpimage.c:2850 +#: ../app/core/gimpimage.c:2987 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "Erantsi parasitoa irudiari" -#: ../app/core/gimpimage.c:2891 +#: ../app/core/gimpimage.c:3028 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "Kendu parasitoa iruditik" -#: ../app/core/gimpimage.c:3600 +#: ../app/core/gimpimage.c:3737 msgctxt "undo-type" msgid "Add Layer" msgstr "Gehitu geruza" -#: ../app/core/gimpimage.c:3650 ../app/core/gimpimage.c:3670 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "Kendu geruza" -#: ../app/core/gimpimage.c:3663 +#: ../app/core/gimpimage.c:3801 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "Kendu hautapen mugikorra" -#: ../app/core/gimpimage.c:3832 +#: ../app/core/gimpimage.c:3969 msgctxt "undo-type" msgid "Add Channel" msgstr "Gehitu kanala" -#: ../app/core/gimpimage.c:3870 ../app/core/gimpimage.c:3882 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "Kendu kanala" -#: ../app/core/gimpimage.c:3936 +#: ../app/core/gimpimage.c:4074 msgctxt "undo-type" msgid "Add Path" msgstr "Gehitu bidea" -#: ../app/core/gimpimage.c:3967 +#: ../app/core/gimpimage.c:4105 msgctxt "undo-type" msgid "Remove Path" msgstr "Kendu bidea" @@ -8366,7 +8398,7 @@ msgid "(Preview may be out of date)" msgstr "(Aurrebista iraungita dago)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:438 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8374,7 +8406,7 @@ msgid_plural "%d × %d pixels" msgstr[0] "%d x %d pixel" msgstr[1] "%d x %d pixel" -#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:339 +#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8401,12 +8433,20 @@ msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Kendu parasitoa elementutik" +#: ../app/core/gimpitem-exclusive.c:81 +msgid "Set Item Exclusive Visible" +msgstr "Ezarri elementua esklusiboki ikusgai" + +#: ../app/core/gimpitem-exclusive.c:172 +msgid "Set Item Exclusive Linked" +msgstr "Ezarri elementua esklusiboki ikusgai" + #: ../app/core/gimplayer-floating-sel.c:95 msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Ainguratu hautapen mugikorra" -#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:609 +#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 msgid "" "Cannot create a new layer from the floating selection because it belongs to " "a layer mask or channel." @@ -8482,13 +8522,13 @@ msgstr "Ezin da geruza gorago igo." msgid "Layer cannot be lowered more." msgstr "Ezin da geruza gehiago jaitsi." -#: ../app/core/gimplayer.c:439 ../app/core/gimplayer.c:1505 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1528 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" msgstr "%s maskara" -#: ../app/core/gimplayer.c:478 +#: ../app/core/gimplayer.c:489 #, c-format msgid "" "Floating Selection\n" @@ -8497,45 +8537,45 @@ msgstr "" "Hautapen mugikorra\n" "(%s)" -#: ../app/core/gimplayer.c:1425 +#: ../app/core/gimplayer.c:1448 msgid "Unable to add a layer mask since the layer already has one." msgstr "Ezin da geruza-maskara gehitu, geruzak dagoeneko baduelako bat." -#: ../app/core/gimplayer.c:1436 +#: ../app/core/gimplayer.c:1459 msgid "Cannot add layer mask of different dimensions than specified layer." msgstr "Ezin da aipatutako geruzaren neurriak ez dituen geruza-maskara gehitu." -#: ../app/core/gimplayer.c:1442 +#: ../app/core/gimplayer.c:1465 msgctxt "undo-type" msgid "Add Layer Mask" msgstr "Gehitu geruza-maskara" -#: ../app/core/gimplayer.c:1560 +#: ../app/core/gimplayer.c:1583 msgctxt "undo-type" msgid "Transfer Alpha to Mask" msgstr "Transferitu alfa maskarara" -#: ../app/core/gimplayer.c:1730 +#: ../app/core/gimplayer.c:1753 msgctxt "undo-type" msgid "Apply Layer Mask" msgstr "Aplikatu geruza-maskara" -#: ../app/core/gimplayer.c:1731 +#: ../app/core/gimplayer.c:1754 msgctxt "undo-type" msgid "Delete Layer Mask" msgstr "Ezabatu geruza-maskara" -#: ../app/core/gimplayer.c:1850 +#: ../app/core/gimplayer.c:1873 msgctxt "undo-type" msgid "Add Alpha Channel" msgstr "Gehitu alfa kanala" -#: ../app/core/gimplayer.c:1904 +#: ../app/core/gimplayer.c:1927 msgctxt "undo-type" msgid "Remove Alpha Channel" msgstr "Kendu alfa kanala" -#: ../app/core/gimplayer.c:1924 +#: ../app/core/gimplayer.c:1947 msgctxt "undo-type" msgid "Layer to Image Size" msgstr "Geruza irudi-tamainara" @@ -8831,27 +8871,27 @@ msgctxt "plural" msgid "percent" msgstr "ehunekoa" -#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478 +#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 msgid "About GIMP" msgstr "GIMP-i buruz" -#: ../app/dialogs/about-dialog.c:122 +#: ../app/dialogs/about-dialog.c:123 msgid "Visit the GIMP website" msgstr "Bisitatu GIMPen web gunea" #. Translators: insert your names here, #. separated by newline -#: ../app/dialogs/about-dialog.c:128 +#: ../app/dialogs/about-dialog.c:129 msgid "translator-credits" msgstr "" "Hizkuntza Politikarako Sailburuordetza \n" "Iñaki Larrañaga Murgoitio " -#: ../app/dialogs/about-dialog.c:518 +#: ../app/dialogs/about-dialog.c:521 msgid "GIMP is brought to you by" msgstr "GIMP honek ekartzen dizu:" -#: ../app/dialogs/about-dialog.c:592 +#: ../app/dialogs/about-dialog.c:596 msgid "This is an unstable development release." msgstr "Hau garapeneko bertsio desegonkorra da." @@ -8900,7 +8940,7 @@ msgstr "Gaitu g_ardentasunaren bilbea" msgid "Converting to indexed colors" msgstr "Kolore indexatuetara bihurtzen" -#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:152 +#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Ezin da 256 kolore baino gehiagodun paletara bihurtu." @@ -8920,7 +8960,7 @@ msgid "" msgstr "Ziur zaude '%s' ezabatu nahi duzula zerrendatik eta diskotik?" #: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161 -#: ../app/gui/gui-message.c:145 +#: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "GIMPeko mezua" @@ -8993,7 +9033,7 @@ msgstr "Iraungitu %s" msgid "_Fade" msgstr "_Iraungitu" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "_Modua:" @@ -9013,15 +9053,15 @@ msgstr "Ireki kokalekua" msgid "Enter location (URI):" msgstr "Sartu helbidea (URIa):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Esportatu irudia" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Esportatu" -#: ../app/dialogs/file-save-dialog.c:436 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9031,7 +9071,11 @@ msgstr "" "(fitxategi-luzapenetik). Sartu fitxategi-luzapena fitxategi formatuarekin " "bat datorrena, edo sartu fitxategia luzapenik gabe." -#: ../app/dialogs/file-save-dialog.c:563 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "Zehaztutako fitxategi-izena ezin da esportatzeko erabili." + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9040,7 +9084,15 @@ msgstr "" "esportatzeko. Irudia GIMPen XFC formatuan gordetzea nahi baduzu, horren " "ordez erabili Fitxategia→Gorde aukera." -#: ../app/dialogs/file-save-dialog.c:570 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Eraman nazazu Gorde elkarrizketa-koadrora" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "Zehaztutako fitxategi-izena ezin da gordetzeko erabili" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9048,7 +9100,15 @@ msgstr "" "Elkarrizketa-koadro hau erabil dezakezu GIMPen XFC formatuan gordetzeko. " "Irudia beste formatu batean gordetzeko, erabili Fitxategia→Esportatu aukera." -#: ../app/dialogs/file-save-dialog.c:576 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Eraman nazazu Esportatu elkarrizketa-koadrora" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Luzapena ez dator bat" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9056,24 +9116,20 @@ msgstr "" "Zehaztutako fitxategi-izenak ez du luzapen ezagunik. Sartu fitxategi-luzapen " "ezaguna edo hautatu fitxategi-formatua zerrendatik." -#: ../app/dialogs/file-save-dialog.c:590 -msgid "Extension Mismatch" -msgstr "Luzapena ez dator bat" - -#: ../app/dialogs/file-save-dialog.c:606 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "" "Zehaztutako fitxategi-luzapena ez dator bat aukeratutako fitxategi motarekin." -#: ../app/dialogs/file-save-dialog.c:610 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Dena den, izen hau erabiliz irudia gorde nahi duzu?" -#: ../app/dialogs/file-save-dialog.c:665 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Gordetzea bertan behera utzi da" -#: ../app/dialogs/file-save-dialog.c:673 ../app/widgets/gimpdnd-xds.c:185 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9132,26 +9188,26 @@ msgstr "Batu _talde aktiboarekin soilik" msgid "_Discard invisible layers" msgstr "_Baztertu geruza ikusezinak" -#: ../app/dialogs/image-new-dialog.c:96 +#: ../app/dialogs/image-new-dialog.c:97 msgid "Create a New Image" msgstr "Sortu irudi berria" -#: ../app/dialogs/image-new-dialog.c:144 -#: ../app/dialogs/preferences-dialog.c:2008 +#: ../app/dialogs/image-new-dialog.c:135 +#: ../app/dialogs/preferences-dialog.c:2009 msgid "_Template:" msgstr "_Txantiloia:" -#: ../app/dialogs/image-new-dialog.c:303 +#: ../app/dialogs/image-new-dialog.c:308 msgid "Confirm Image Size" msgstr "Berretsi irudi-tamaina" -#: ../app/dialogs/image-new-dialog.c:325 +#: ../app/dialogs/image-new-dialog.c:330 #: ../app/dialogs/image-scale-dialog.c:239 #, c-format msgid "You are trying to create an image with a size of %s." msgstr "%s tamainako irudia sortzen saiatzen ari zara." -#: ../app/dialogs/image-new-dialog.c:332 +#: ../app/dialogs/image-new-dialog.c:337 #, c-format msgid "" "An image of the chosen size will use more memory than what is configured as " @@ -9246,12 +9302,12 @@ msgstr "Geruzaren i_zena:" #. The size labels #: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1122 +#: ../app/tools/gimpmeasuretool.c:1129 msgid "Width:" msgstr "Zabalera:" #: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1150 +#: ../app/tools/gimpmeasuretool.c:1157 msgid "Height:" msgstr "Altuera:" @@ -9275,31 +9331,31 @@ msgstr "GIMP berrabiarazi beharko duzu aldaketek eragina izan dezaten." msgid "Module" msgstr "Modulua" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" msgstr "Memorian bakarrik" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:473 msgid "No longer available" msgstr "Ez dago erabilgarri" -#: ../app/dialogs/module-dialog.c:494 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "Egilea:" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "Bertsioa:" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "Data:" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "Copyright-a:" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "Kokalekua:" @@ -9530,7 +9586,7 @@ msgid "Preferences" msgstr "Hobespenak" #: ../app/dialogs/preferences-dialog.c:1507 -#: ../app/dialogs/preferences-dialog.c:2765 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Environment" msgstr "Ingurunea" @@ -9663,7 +9719,7 @@ msgstr "Laguntza-sistema" #. General #: ../app/dialogs/preferences-dialog.c:1782 #: ../app/dialogs/preferences-dialog.c:1866 -#: ../app/dialogs/preferences-dialog.c:2065 +#: ../app/dialogs/preferences-dialog.c:2079 #: ../app/widgets/gimpcontrollereditor.c:185 msgid "General" msgstr "Orokorra" @@ -9747,482 +9803,499 @@ msgstr "_Dinamika" msgid "_Pattern" msgstr "_Eredua" -#: ../app/dialogs/preferences-dialog.c:1926 +#. Move Tool +#: ../app/dialogs/preferences-dialog.c:1927 msgid "Move Tool" msgstr "Aldatu tresna lekuz" -#: ../app/dialogs/preferences-dialog.c:1930 +#: ../app/dialogs/preferences-dialog.c:1931 msgid "Set layer or path as active" msgstr "Ezarri geruza edo bidea aktibo gisa" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1955 -#: ../app/dialogs/preferences-dialog.c:2141 +#: ../app/dialogs/preferences-dialog.c:1956 +#: ../app/dialogs/preferences-dialog.c:2155 #: ../app/widgets/gimpgrideditor.c:134 msgid "Appearance" msgstr "Itxura" -#: ../app/dialogs/preferences-dialog.c:1959 +#: ../app/dialogs/preferences-dialog.c:1960 msgid "Show _foreground & background color" msgstr "Erakutsi _aurreko eta atzeko planoaren kolorea" -#: ../app/dialogs/preferences-dialog.c:1963 +#: ../app/dialogs/preferences-dialog.c:1964 msgid "Show active _brush, pattern & gradient" msgstr "Erakutsi _brotxa, eredu eta gradiente aktiboa" -#: ../app/dialogs/preferences-dialog.c:1967 +#: ../app/dialogs/preferences-dialog.c:1968 msgid "Show active _image" msgstr "Erakutsi _irudi aktiboa" #. Tool Editor -#: ../app/dialogs/preferences-dialog.c:1975 +#: ../app/dialogs/preferences-dialog.c:1976 msgid "Tools configuration" msgstr "Tresnen konfigurazioa" -#: ../app/dialogs/preferences-dialog.c:1990 +#: ../app/dialogs/preferences-dialog.c:1991 msgid "Default New Image" msgstr "Irudi berri lehenetsia" -#: ../app/dialogs/preferences-dialog.c:1993 +#: ../app/dialogs/preferences-dialog.c:1994 msgid "Default Image" msgstr "Irudi lehenetsia" -#: ../app/dialogs/preferences-dialog.c:2030 +#: ../app/dialogs/preferences-dialog.c:2028 +msgid "Set the default Quick Mask color" +msgstr "Ezarri maskara azkarraren kolorea" + +#: ../app/dialogs/preferences-dialog.c:2034 +msgid "Quick Mask color:" +msgstr "Maskara azkarraren kolorea:" + +#: ../app/dialogs/preferences-dialog.c:2044 msgid "Default Image Grid" msgstr "Irudi-sareta lehenetsia" -#: ../app/dialogs/preferences-dialog.c:2033 +#: ../app/dialogs/preferences-dialog.c:2047 msgid "Default Grid" msgstr "Sareta lehenetsia" -#: ../app/dialogs/preferences-dialog.c:2053 +#: ../app/dialogs/preferences-dialog.c:2067 msgid "Image Windows" msgstr "Irudi-leihoak" -#: ../app/dialogs/preferences-dialog.c:2068 +#: ../app/dialogs/preferences-dialog.c:2082 msgid "Use \"_Dot for dot\" by default" msgstr "Erabili \"_Puntuz puntu\" lehenespenez" -#: ../app/dialogs/preferences-dialog.c:2074 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Marching _ants speed:" msgstr "Inurrien _abiadura:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2078 +#: ../app/dialogs/preferences-dialog.c:2092 msgid "Zoom & Resize Behavior" msgstr "Zoomaren eta tamaina-aldaketen portaera" -#: ../app/dialogs/preferences-dialog.c:2082 +#: ../app/dialogs/preferences-dialog.c:2096 msgid "Resize window on _zoom" msgstr "Aldatu leihoaren _tamaina zoom egitean" -#: ../app/dialogs/preferences-dialog.c:2085 +#: ../app/dialogs/preferences-dialog.c:2099 msgid "Resize window on image _size change" msgstr "Aldatu leihoaren tamaina _irudiaren tamaina aldatzean" -#: ../app/dialogs/preferences-dialog.c:2091 +#: ../app/dialogs/preferences-dialog.c:2105 msgid "Fit to window" msgstr "Doitu leihora" -#: ../app/dialogs/preferences-dialog.c:2093 +#: ../app/dialogs/preferences-dialog.c:2107 msgid "Initial zoom _ratio:" msgstr "Hasierako zoomaren _erlazioa:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2097 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Space Bar" msgstr "Zuriunea tekla" -#: ../app/dialogs/preferences-dialog.c:2103 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "_While space bar is pressed:" msgstr "_Zuriunea tekla sakatzen den heinean:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2107 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Mouse Pointers" msgstr "Saguaren kurtsoreak" -#: ../app/dialogs/preferences-dialog.c:2111 +#: ../app/dialogs/preferences-dialog.c:2125 msgid "Show _brush outline" msgstr "Erakutsi _brotxaren eskema" -#: ../app/dialogs/preferences-dialog.c:2114 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Show pointer for paint _tools" msgstr "Erakutsi margotze-_tresnaren kurtsorea" -#: ../app/dialogs/preferences-dialog.c:2120 +#: ../app/dialogs/preferences-dialog.c:2134 msgid "Pointer _mode:" msgstr "Kurtsore-_modua:" -#: ../app/dialogs/preferences-dialog.c:2123 +#: ../app/dialogs/preferences-dialog.c:2137 msgid "Pointer re_ndering:" msgstr "Kurtsore-_errendatzea:" -#: ../app/dialogs/preferences-dialog.c:2126 +#: ../app/dialogs/preferences-dialog.c:2140 msgid "Pointer _handedness:" msgstr "Kurtsore _ezkerra/eskuina:" -#: ../app/dialogs/preferences-dialog.c:2138 +#: ../app/dialogs/preferences-dialog.c:2152 msgid "Image Window Appearance" msgstr "Irudiaren leihoaren itxura" -#: ../app/dialogs/preferences-dialog.c:2149 +#: ../app/dialogs/preferences-dialog.c:2163 msgid "Default Appearance in Normal Mode" msgstr "Itxura lehenetsia modu normalean" -#: ../app/dialogs/preferences-dialog.c:2154 +#: ../app/dialogs/preferences-dialog.c:2168 msgid "Default Appearance in Fullscreen Mode" msgstr "Itxura lehenetsia pantaila osoaren moduan" -#: ../app/dialogs/preferences-dialog.c:2163 +#: ../app/dialogs/preferences-dialog.c:2177 msgid "Image Title & Statusbar Format" msgstr "Irudiaren izenburuaren eta egoera-barraren formatua" -#: ../app/dialogs/preferences-dialog.c:2166 +#: ../app/dialogs/preferences-dialog.c:2180 msgid "Title & Status" msgstr "Izenburua eta egoera" -#: ../app/dialogs/preferences-dialog.c:2184 +#: ../app/dialogs/preferences-dialog.c:2198 msgid "Current format" msgstr "Uneko formatua" -#: ../app/dialogs/preferences-dialog.c:2185 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Default format" msgstr "Formatu lehenetsia" -#: ../app/dialogs/preferences-dialog.c:2186 +#: ../app/dialogs/preferences-dialog.c:2200 msgid "Show zoom percentage" msgstr "Erakutsi zoomaren ehunekoa" -#: ../app/dialogs/preferences-dialog.c:2187 +#: ../app/dialogs/preferences-dialog.c:2201 msgid "Show zoom ratio" msgstr "Erakutsi zoomaren erlazioa" -#: ../app/dialogs/preferences-dialog.c:2188 +#: ../app/dialogs/preferences-dialog.c:2202 msgid "Show image size" msgstr "Erakutsi irudiaren tamaina" -#: ../app/dialogs/preferences-dialog.c:2201 +#: ../app/dialogs/preferences-dialog.c:2215 msgid "Image Title Format" msgstr "Irudiaren izenburuaren formatua" -#: ../app/dialogs/preferences-dialog.c:2203 +#: ../app/dialogs/preferences-dialog.c:2217 msgid "Image Statusbar Format" msgstr "Irudiaren egoera-barraren formatua" -#: ../app/dialogs/preferences-dialog.c:2288 +#: ../app/dialogs/preferences-dialog.c:2302 msgid "Display" msgstr "Bistaratu" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2300 +#: ../app/dialogs/preferences-dialog.c:2314 msgid "Transparency" msgstr "Gardentasuna" -#: ../app/dialogs/preferences-dialog.c:2304 +#: ../app/dialogs/preferences-dialog.c:2318 msgid "_Check style:" msgstr "_Egiaztatu estiloa:" -#: ../app/dialogs/preferences-dialog.c:2307 +#: ../app/dialogs/preferences-dialog.c:2321 msgid "Check _size:" msgstr "Egia_ztatu tamaina:" -#: ../app/dialogs/preferences-dialog.c:2310 +#: ../app/dialogs/preferences-dialog.c:2324 msgid "Monitor Resolution" msgstr "Monitorearen bereizmena" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2314 -#: ../app/display/gimpcursorview.c:200 ../app/widgets/gimpgrideditor.c:199 +#: ../app/dialogs/preferences-dialog.c:2328 +#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 #: ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "Pixelak" -#: ../app/dialogs/preferences-dialog.c:2332 +#: ../app/dialogs/preferences-dialog.c:2346 msgid "Horizontal" msgstr "Horizontala" -#: ../app/dialogs/preferences-dialog.c:2334 +#: ../app/dialogs/preferences-dialog.c:2348 msgid "Vertical" msgstr "Bertikala" -#: ../app/dialogs/preferences-dialog.c:2336 -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/dialogs/preferences-dialog.c:2350 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2352 +#: ../app/dialogs/preferences-dialog.c:2366 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "_Detektatu automatikoki (unean %d x %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2370 +#: ../app/dialogs/preferences-dialog.c:2384 msgid "_Enter manually" msgstr "_Sartu eskuz" -#: ../app/dialogs/preferences-dialog.c:2385 +#: ../app/dialogs/preferences-dialog.c:2399 msgid "C_alibrate..." msgstr "K_alibratu..." -#: ../app/dialogs/preferences-dialog.c:2413 +#: ../app/dialogs/preferences-dialog.c:2427 msgid "Color Management" msgstr "Kolore-kudeaketa" -#: ../app/dialogs/preferences-dialog.c:2433 +#: ../app/dialogs/preferences-dialog.c:2447 msgid "_RGB profile:" msgstr "_GBU profila:" -#: ../app/dialogs/preferences-dialog.c:2434 +#: ../app/dialogs/preferences-dialog.c:2448 msgid "Select RGB Color Profile" msgstr "Hautatu GBU kolorearen profila" -#: ../app/dialogs/preferences-dialog.c:2435 +#: ../app/dialogs/preferences-dialog.c:2449 msgid "_CMYK profile:" msgstr "_CMYK profila:" -#: ../app/dialogs/preferences-dialog.c:2436 +#: ../app/dialogs/preferences-dialog.c:2450 msgid "Select CMYK Color Profile" msgstr "Hautatu CMYK kolorearen profila" -#: ../app/dialogs/preferences-dialog.c:2437 +#: ../app/dialogs/preferences-dialog.c:2451 msgid "_Monitor profile:" msgstr "_Monitorearen profila:" -#: ../app/dialogs/preferences-dialog.c:2438 +#: ../app/dialogs/preferences-dialog.c:2452 msgid "Select Monitor Color Profile" msgstr "Hautatu monitorearen kolore-profila" -#: ../app/dialogs/preferences-dialog.c:2439 +#: ../app/dialogs/preferences-dialog.c:2453 msgid "_Print simulation profile:" msgstr "_Inprimatze-simulatzearen profila:" -#: ../app/dialogs/preferences-dialog.c:2440 +#: ../app/dialogs/preferences-dialog.c:2454 msgid "Select Printer Color Profile" msgstr "Hautatu inprimatze-kolorearen profila" -#: ../app/dialogs/preferences-dialog.c:2451 +#: ../app/dialogs/preferences-dialog.c:2465 msgid "_Mode of operation:" msgstr "_Eragiketa modua:" -#: ../app/dialogs/preferences-dialog.c:2481 +#: ../app/dialogs/preferences-dialog.c:2495 msgid "_Try to use the system monitor profile" msgstr "_Saiatu sistemako monitore-profila erabiltzen" -#: ../app/dialogs/preferences-dialog.c:2491 +#: ../app/dialogs/preferences-dialog.c:2505 msgid "_Display rendering intent:" msgstr "_Bistaratu errendatze saiakera:" -#: ../app/dialogs/preferences-dialog.c:2500 +#: ../app/dialogs/preferences-dialog.c:2514 msgid "_Softproof rendering intent:" msgstr "_Probako errendatze saiakera:" -#: ../app/dialogs/preferences-dialog.c:2513 +#: ../app/dialogs/preferences-dialog.c:2527 msgid "Mark out of gamut colors" msgstr "Markatu kolore-gamatik kanpoko koloreak" -#: ../app/dialogs/preferences-dialog.c:2518 +#: ../app/dialogs/preferences-dialog.c:2532 msgid "Select Warning Color" msgstr "Hautatu abisuaren kolorea" -#: ../app/dialogs/preferences-dialog.c:2531 +#: ../app/dialogs/preferences-dialog.c:2545 msgid "File Open behaviour:" msgstr "Fitxategiak irekitzeko portaera:" -#: ../app/dialogs/preferences-dialog.c:2543 +#: ../app/dialogs/preferences-dialog.c:2557 msgid "Input Devices" msgstr "Sarrerako gailuak" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2553 +#: ../app/dialogs/preferences-dialog.c:2567 msgid "Extended Input Devices" msgstr "Sarrerako gailu hedatuak" -#: ../app/dialogs/preferences-dialog.c:2557 +#: ../app/dialogs/preferences-dialog.c:2571 msgid "Configure E_xtended Input Devices..." msgstr "Konfiguratu sarrerako gailu _hedatuak..." -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2578 msgid "_Save input device settings on exit" msgstr "_Gorde sarrerako gailuen ezarpenak irtetzean" -#: ../app/dialogs/preferences-dialog.c:2568 +#: ../app/dialogs/preferences-dialog.c:2582 msgid "Save Input Device Settings _Now" msgstr "Gorde _orain sarrerako gailuen ezarpenak" -#: ../app/dialogs/preferences-dialog.c:2575 +#: ../app/dialogs/preferences-dialog.c:2589 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "Berrezarri gordetako sarrerako gailuen ezarpenak balio lehenetsietan" -#: ../app/dialogs/preferences-dialog.c:2590 +#: ../app/dialogs/preferences-dialog.c:2604 msgid "Additional Input Controllers" msgstr "Sarrerako kontroladore gehigarriak" -#: ../app/dialogs/preferences-dialog.c:2593 +#: ../app/dialogs/preferences-dialog.c:2607 msgid "Input Controllers" msgstr "Sarrerako kontroladoreak" -#: ../app/dialogs/preferences-dialog.c:2609 +#: ../app/dialogs/preferences-dialog.c:2623 msgid "Window Management" msgstr "Leiho-kudeaketa" -#: ../app/dialogs/preferences-dialog.c:2618 +#: ../app/dialogs/preferences-dialog.c:2632 msgid "Window Manager Hints" msgstr "Leiho-kudeatzailearen aholkuak" -#: ../app/dialogs/preferences-dialog.c:2624 +#: ../app/dialogs/preferences-dialog.c:2638 msgid "Hint for _docks and toolbox:" msgstr "Atrakagarri eta tresna-kutxaren aholkua:" -#: ../app/dialogs/preferences-dialog.c:2627 +#: ../app/dialogs/preferences-dialog.c:2641 msgid "Focus" msgstr "Fokua" -#: ../app/dialogs/preferences-dialog.c:2631 +#: ../app/dialogs/preferences-dialog.c:2645 msgid "Activate the _focused image" msgstr "Aktibatu irudi _enfokatua" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2635 +#: ../app/dialogs/preferences-dialog.c:2649 msgid "Window Positions" msgstr "Leihoen kokalekuak" -#: ../app/dialogs/preferences-dialog.c:2638 +#: ../app/dialogs/preferences-dialog.c:2652 msgid "_Save window positions on exit" msgstr "_Gorde leihoen kokalekuak irtetean" -#: ../app/dialogs/preferences-dialog.c:2642 +#: ../app/dialogs/preferences-dialog.c:2656 msgid "Save Window Positions _Now" msgstr "Gorde _orain leihoen kokalekuak" -#: ../app/dialogs/preferences-dialog.c:2649 +#: ../app/dialogs/preferences-dialog.c:2663 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Berrezarri gordetako leihoen kokalekuak balio lehenetsietan" -#: ../app/dialogs/preferences-dialog.c:2664 +#: ../app/dialogs/preferences-dialog.c:2678 msgid "Folders" msgstr "Karpetak" -#: ../app/dialogs/preferences-dialog.c:2684 +#: ../app/dialogs/preferences-dialog.c:2698 msgid "Temporary folder:" msgstr "Aldi baterako karpeta:" -#: ../app/dialogs/preferences-dialog.c:2685 +#: ../app/dialogs/preferences-dialog.c:2699 msgid "Select Folder for Temporary Files" msgstr "Hautatu karpeta aldi baterako fitxategientzat" -#: ../app/dialogs/preferences-dialog.c:2689 +#: ../app/dialogs/preferences-dialog.c:2703 msgid "Swap folder:" msgstr "Trukatze-karpeta:" -#: ../app/dialogs/preferences-dialog.c:2690 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "Select Swap Folder" msgstr "Hautatu trukatze-karpeta" -#: ../app/dialogs/preferences-dialog.c:2725 +#: ../app/dialogs/preferences-dialog.c:2739 msgid "Brush Folders" msgstr "Brotxa-karpetak" -#: ../app/dialogs/preferences-dialog.c:2727 +#: ../app/dialogs/preferences-dialog.c:2741 msgid "Select Brush Folders" msgstr "Hautatu brotxa-karpetak" -#: ../app/dialogs/preferences-dialog.c:2729 +#: ../app/dialogs/preferences-dialog.c:2743 msgid "Dynamics Folders" msgstr "Dinamiken karpetak" -#: ../app/dialogs/preferences-dialog.c:2731 +#: ../app/dialogs/preferences-dialog.c:2745 msgid "Select Dynamics Folders" msgstr "Hautatu dinamiken karpetak" -#: ../app/dialogs/preferences-dialog.c:2733 +#: ../app/dialogs/preferences-dialog.c:2747 msgid "Pattern Folders" msgstr "Eredu-karpetak" -#: ../app/dialogs/preferences-dialog.c:2735 +#: ../app/dialogs/preferences-dialog.c:2749 msgid "Select Pattern Folders" msgstr "Hautatu eredu-karpetak" -#: ../app/dialogs/preferences-dialog.c:2737 +#: ../app/dialogs/preferences-dialog.c:2751 msgid "Palette Folders" msgstr "Paleta-karpetak" -#: ../app/dialogs/preferences-dialog.c:2739 +#: ../app/dialogs/preferences-dialog.c:2753 msgid "Select Palette Folders" msgstr "Hautatu paleta-karpetak" -#: ../app/dialogs/preferences-dialog.c:2741 +#: ../app/dialogs/preferences-dialog.c:2755 msgid "Gradient Folders" msgstr "Gradiente-karpetak" -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/dialogs/preferences-dialog.c:2757 msgid "Select Gradient Folders" msgstr "Hautatu gradiente-karpetak" -#: ../app/dialogs/preferences-dialog.c:2745 +#: ../app/dialogs/preferences-dialog.c:2759 msgid "Font Folders" msgstr "Letra-tipoen karpetak" -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/dialogs/preferences-dialog.c:2761 msgid "Select Font Folders" msgstr "Hautatu letra-tipoen karpetak" -#: ../app/dialogs/preferences-dialog.c:2749 +#: ../app/dialogs/preferences-dialog.c:2763 +msgid "Tool Preset Folders" +msgstr "Tresnen aurrezarpenen karpetak" + +#: ../app/dialogs/preferences-dialog.c:2765 +msgid "Select Tool Preset Folders" +msgstr "Hautatu tresnen aurrezarpenen karpetak" + +#: ../app/dialogs/preferences-dialog.c:2767 msgid "Plug-In Folders" msgstr "Pluginen karpetak" -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/dialogs/preferences-dialog.c:2769 msgid "Select Plug-In Folders" msgstr "Hautatu pluginen karpetak" -#: ../app/dialogs/preferences-dialog.c:2753 +#: ../app/dialogs/preferences-dialog.c:2771 msgid "Scripts" msgstr "Script-ak" -#: ../app/dialogs/preferences-dialog.c:2753 +#: ../app/dialogs/preferences-dialog.c:2771 msgid "Script-Fu Folders" msgstr "Script-Fu karpetak" -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/dialogs/preferences-dialog.c:2773 msgid "Select Script-Fu Folders" msgstr "Hautatu script-Fu karpetak" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2775 msgid "Module Folders" msgstr "Modulu-karpetak" -#: ../app/dialogs/preferences-dialog.c:2759 +#: ../app/dialogs/preferences-dialog.c:2777 msgid "Select Module Folders" msgstr "Hautatu modulu-karpetak" -#: ../app/dialogs/preferences-dialog.c:2761 +#: ../app/dialogs/preferences-dialog.c:2779 msgid "Interpreters" msgstr "Interpretatzaileak" -#: ../app/dialogs/preferences-dialog.c:2761 +#: ../app/dialogs/preferences-dialog.c:2779 msgid "Interpreter Folders" msgstr "Interpretatzaileen karpetak" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2781 msgid "Select Interpreter Folders" msgstr "Hautatu interpretatzaileen karpetak" -#: ../app/dialogs/preferences-dialog.c:2765 +#: ../app/dialogs/preferences-dialog.c:2783 msgid "Environment Folders" msgstr "Ingurune-karpetak" -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/dialogs/preferences-dialog.c:2785 msgid "Select Environment Folders" msgstr "Hautatu ingurune-karpetak" -#: ../app/dialogs/preferences-dialog.c:2769 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Themes" msgstr "Gaiak" -#: ../app/dialogs/preferences-dialog.c:2769 +#: ../app/dialogs/preferences-dialog.c:2787 msgid "Theme Folders" msgstr "Gaien karpetak" -#: ../app/dialogs/preferences-dialog.c:2771 +#: ../app/dialogs/preferences-dialog.c:2789 msgid "Select Theme Folders" msgstr "Hautatu gaien karpetak" @@ -10317,7 +10390,7 @@ msgstr "_Bertikala:" msgid "Image Size" msgstr "Irudiaren tamaina" -#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:386 +#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:393 msgid "Quality" msgstr "Kalitatea" @@ -10483,91 +10556,91 @@ msgctxt "guides-type" msgid "Line spacing" msgstr "Sareta-marren tartea" -#: ../app/display/gimpcursorview.c:210 ../app/display/gimpcursorview.c:216 -#: ../app/display/gimpcursorview.c:235 ../app/display/gimpcursorview.c:241 -#: ../app/display/gimpcursorview.c:260 ../app/display/gimpcursorview.c:266 -#: ../app/display/gimpcursorview.c:282 ../app/display/gimpcursorview.c:289 -#: ../app/display/gimpcursorview.c:664 ../app/display/gimpcursorview.c:665 -#: ../app/display/gimpcursorview.c:666 ../app/display/gimpcursorview.c:667 -#: ../app/display/gimpcursorview.c:780 ../app/display/gimpcursorview.c:781 -#: ../app/display/gimpcursorview.c:782 ../app/display/gimpcursorview.c:783 +#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 +#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 +#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 +#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 +#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 +#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 +#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 +#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "e/e" -#: ../app/display/gimpcursorview.c:213 ../app/display/gimpcursorview.c:238 -#: ../app/display/gimpcursorview.c:263 +#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 +#: ../app/display/gimpcursorview.c:269 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 -#: ../app/display/gimpcursorview.c:269 +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 +#: ../app/display/gimpcursorview.c:275 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" msgstr "Y" #. Units -#: ../app/display/gimpcursorview.c:225 +#: ../app/display/gimpcursorview.c:231 msgid "Units" msgstr "Unitateak" #. Selection Bounding Box -#: ../app/display/gimpcursorview.c:250 +#: ../app/display/gimpcursorview.c:256 msgid "Selection Bounding Box" msgstr "Hautapenaren muga-koadroa" #. Width -#: ../app/display/gimpcursorview.c:286 +#: ../app/display/gimpcursorview.c:292 msgid "W" msgstr "Z" #. Height -#: ../app/display/gimpcursorview.c:293 +#: ../app/display/gimpcursorview.c:299 msgid "H" msgstr "A" -#: ../app/display/gimpcursorview.c:320 +#: ../app/display/gimpcursorview.c:328 msgid "_Sample Merged" msgstr "Batutako _lagina" -#: ../app/display/gimpdisplayshell.c:509 +#: ../app/display/gimpdisplayshell.c:508 msgid "Access the image menu" msgstr "Atzitu irudiaren menua" -#: ../app/display/gimpdisplayshell.c:623 +#: ../app/display/gimpdisplayshell.c:622 msgid "Zoom image when window size changes" msgstr "Aldatu irudiaren zooma leihoaren tamaina aldatzean" -#: ../app/display/gimpdisplayshell.c:652 +#: ../app/display/gimpdisplayshell.c:651 msgid "Toggle Quick Mask" msgstr "Txandakatu maskara azkarra" -#: ../app/display/gimpdisplayshell.c:675 +#: ../app/display/gimpdisplayshell.c:674 msgid "Navigate the image display" msgstr "Nabigatu irudiaren ikuspegian" -#: ../app/display/gimpdisplayshell.c:743 -#: ../app/display/gimpdisplayshell.c:1321 ../app/widgets/gimptoolbox.c:250 +#: ../app/display/gimpdisplayshell.c:746 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Jaregin irudien fitxategiak hemen irekitzeko" -#: ../app/display/gimpdisplayshell-close.c:153 -#: ../app/display/gimpdisplayshell-close.c:223 +#: ../app/display/gimpdisplayshell-close.c:156 +#: ../app/display/gimpdisplayshell-close.c:229 #, c-format msgid "Close %s" msgstr "Itxi %s" -#: ../app/display/gimpdisplayshell-close.c:164 +#: ../app/display/gimpdisplayshell-close.c:167 msgid "Close _without Saving" msgstr "Itxi gorde _gabe" -#: ../app/display/gimpdisplayshell-close.c:231 +#: ../app/display/gimpdisplayshell-close.c:237 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Gorde aldaketak '%s' irudian itxi aurretik?" -#: ../app/display/gimpdisplayshell-close.c:254 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10575,7 +10648,7 @@ msgid_plural "" msgstr[0] "Ez baduzu irudia gorde, azken orduko aldaketak galduko dira." msgstr[1] "Ez baduzu irudia gorde, azken %d ordutako aldaketak galduko dira." -#: ../app/display/gimpdisplayshell-close.c:264 +#: ../app/display/gimpdisplayshell-close.c:281 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10590,7 +10663,7 @@ msgstr[1] "" "Ez baduzu irudia gorde, azken orduko eta %d minututako aldaketak galduko " "dira." -#: ../app/display/gimpdisplayshell-close.c:275 +#: ../app/display/gimpdisplayshell-close.c:293 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10598,46 +10671,53 @@ msgid_plural "" msgstr[0] "Ez baduzu irudia gorde, azken minutuko (%d) aldaketak galduko dira." msgstr[1] "Ez baduzu irudia gorde, azken %d minututako aldaketak galduko dira." -#: ../app/display/gimpdisplayshell-dnd.c:232 -#: ../app/display/gimpdisplayshell-dnd.c:635 -#: ../app/display/gimpdisplayshell-dnd.c:695 +#: ../app/display/gimpdisplayshell-close.c:311 +#, c-format +msgid "The image has been exported to '%s'." +msgstr "Irudia '%s' gisa esportatu da." + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 msgid "Drop New Layer" msgstr "Bota geruza berria" -#: ../app/display/gimpdisplayshell-dnd.c:275 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "Bota bide berria" -#: ../app/display/gimpdisplayshell-dnd.c:347 -#: ../app/display/gimpdisplayshell-dnd.c:449 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:135 ../app/tools/gimpimagemaptool.c:280 +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Ezin da geruzen taldeko pixelik aldatu." -#: ../app/display/gimpdisplayshell-dnd.c:355 -#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180 -#: ../app/tools/gimpbucketfilltool.c:142 ../app/tools/gimpcroptool.c:325 +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 +#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:245 ../app/tools/gimptransformtool.c:1061 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Geruza aktiboko pixelak blokeatuta daude." -#: ../app/display/gimpdisplayshell-dnd.c:535 -#: ../app/widgets/gimplayertreeview.c:724 +#: ../app/display/gimpdisplayshell-dnd.c:549 +#: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "Jaregin geruzak" -#: ../app/display/gimpdisplayshell-dnd.c:668 -#: ../app/display/gimpdisplayshell-dnd.c:685 -#: ../app/widgets/gimplayertreeview.c:801 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Jaregindako bufferra" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "Kolore-pantailen iragazkiak" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "Konfiguratu kolore-pantailen iragazkiak" @@ -10651,7 +10731,7 @@ msgstr "Irudia '%s' gisa gordeta" msgid "Image exported to '%s'" msgstr "Irudia '%s' gisa esportatuta" -#: ../app/display/gimpdisplayshell-layer-select.c:120 +#: ../app/display/gimpdisplayshell-layer-select.c:122 msgid "Layer Select" msgstr "Geruza-hautapena" @@ -10671,38 +10751,26 @@ msgstr "Zoomaren erlazioa:" msgid "Zoom:" msgstr "Zooma:" -#: ../app/display/gimpdisplayshell-title.c:301 +#: ../app/display/gimpdisplayshell-title.c:282 msgid "(modified)" msgstr "(aldatuta)" -#: ../app/display/gimpdisplayshell-title.c:306 +#: ../app/display/gimpdisplayshell-title.c:287 msgid "(clean)" msgstr "(garbia)" -#: ../app/display/gimpdisplayshell-title.c:360 -#: ../app/display/gimpdisplayshell-title.c:373 +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 #: ../app/widgets/gimpactiongroup.c:860 msgid "(none)" msgstr "(bat ere ez)" -#: ../app/display/gimpdisplayshell-title.c:502 -msgid " (exported)" -msgstr " (esportatuta)" - -#: ../app/display/gimpdisplayshell-title.c:504 -msgid " (overwritten)" -msgstr " (gainidatzitza)" - -#: ../app/display/gimpdisplayshell-title.c:510 -msgid " (imported)" -msgstr " (inportatuta)" - #: ../app/display/gimpstatusbar.c:356 #, c-format msgid "Cancel %s" msgstr "Bertan behera utzi %s" -#: ../app/file/file-open.c:136 ../app/file/file-save.c:112 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "Ez da fitxategi erregularra" @@ -10716,16 +10784,16 @@ msgstr "%s pluginak SUCCESS eman du, baina ez du irudirik itzuli" msgid "%s plug-In could not open image" msgstr "%s pluginak ezin izan du irudia ireki" -#: ../app/file/file-open.c:523 +#: ../app/file/file-open.c:530 msgid "Image doesn't contain any layers" msgstr "Irudiak ez du geruzarik" -#: ../app/file/file-open.c:576 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Ezin izan da '%s' ireki: %s" -#: ../app/file/file-open.c:683 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10733,21 +10801,21 @@ msgstr "" "Kolorearen kudeaketa desgaitu egin da. Berriro gaitzeko erabili Hobespenak " "elkarrizketa-koadroa." -#: ../app/file/file-procedure.c:198 +#: ../app/file/file-procedure.c:195 msgid "Unknown file type" msgstr "Fitxategi mota ezezaguna" -#: ../app/file/file-save.c:208 +#: ../app/file/file-save.c:221 #, c-format msgid "%s plug-in could not save image" msgstr "%s pluginak ezin izan du irudia gorde" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s': ez da baliozko URI eskema" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Karaktere-sekuentzia baliogabea URIan" @@ -10761,24 +10829,24 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Desitxuratu kaiola irudia desitxuratzeko" -#: ../app/gegl/gimpcurvesconfig.c:385 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "ez da GIMPen kurben fitxategia" -#: ../app/gegl/gimpcurvesconfig.c:400 ../app/gegl/gimplevelsconfig.c:711 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "analisi-errorea" -#: ../app/gegl/gimplevelsconfig.c:664 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "ez da GIMPen mailen fitxategia" -#: ../app/gegl/gimpoperationcagecoefcalc.c:65 +#: ../app/gegl/gimpoperationcagecoefcalc.c:67 msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "" "GIMPeko kaiola tresnaren koefizienteen bufferraren multzoa kalkulatzen du." -#: ../app/gegl/gimpoperationcagetransform.c:104 +#: ../app/gegl/gimpoperationcagetransform.c:106 msgid "" "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " "tool" @@ -10786,11 +10854,11 @@ msgstr "" "GIMPeko kaiola tresnaren koefizienteen bufferraren multzoa koordenatuen " "bufferrera bihurtzen du." -#: ../app/gegl/gimpoperationcagetransform.c:125 +#: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "Bete kolore lisoarekin" -#: ../app/gegl/gimpoperationcagetransform.c:126 +#: ../app/gegl/gimpoperationcagetransform.c:129 #: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" msgstr "Bete kaiolaren jatorriko posizioa kolore liso batekin" @@ -10800,7 +10868,7 @@ msgstr "Bete kaiolaren jatorriko posizioa kolore liso batekin" msgid "Documents" msgstr "Dokumentuak" -#: ../app/gui/splash.c:114 +#: ../app/gui/splash.c:115 msgid "GIMP Startup" msgstr "GIMPen abioa" @@ -10836,11 +10904,11 @@ msgstr "Zuritu/Belztu" msgid "Eraser" msgstr "Borragoma" -#: ../app/paint/gimpheal.c:118 ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Konpondu" -#: ../app/paint/gimpheal.c:157 +#: ../app/paint/gimpheal.c:170 msgid "Healing does not operate on indexed layers." msgstr "Konpontzeak ez du marrazgai indexatuetan funtzionatzen." @@ -10925,7 +10993,7 @@ msgstr "Perspektibaren klona" msgid "Perspective Clone does not operate on indexed layers." msgstr "Perspektibaren klonak ez du geruza indexatuetan funtzionatzen." -#: ../app/paint/gimpsmudge.c:83 ../app/tools/gimpsmudgetool.c:53 +#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 msgid "Smudge" msgstr "Zirriborroa egin" @@ -10973,6 +11041,21 @@ msgctxt "convolve-type" msgid "Sharpen" msgstr "Enfokatzea" +#: ../app/paint/paint-enums.c:144 +msgctxt "ink-blob-type" +msgid "Circle" +msgstr "Zirkulua" + +#: ../app/paint/paint-enums.c:145 +msgctxt "ink-blob-type" +msgid "Square" +msgstr "Karratua" + +#: ../app/paint/paint-enums.c:146 +msgctxt "ink-blob-type" +msgid "Diamond" +msgstr "Erronboa" + #: ../app/pdb/channel-cmds.c:184 msgid "Combine Masks" msgstr "Konbinatu maskarak" @@ -10981,28 +11064,28 @@ msgstr "Konbinatu maskarak" msgid "Plug-In" msgstr "Plugina" -#: ../app/pdb/drawable-transform-cmds.c:349 -#: ../app/pdb/drawable-transform-cmds.c:447 +#: ../app/pdb/drawable-transform-cmds.c:345 +#: ../app/pdb/drawable-transform-cmds.c:443 #: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 #: ../app/tools/gimpperspectivetool.c:82 msgid "Perspective" msgstr "Perspektiba" -#: ../app/pdb/drawable-transform-cmds.c:967 -#: ../app/pdb/drawable-transform-cmds.c:1052 +#: ../app/pdb/drawable-transform-cmds.c:957 +#: ../app/pdb/drawable-transform-cmds.c:1042 #: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 #: ../app/tools/gimpsheartool.c:112 msgid "Shearing" msgstr "Zizailamendua" -#: ../app/pdb/drawable-transform-cmds.c:1150 +#: ../app/pdb/drawable-transform-cmds.c:1138 #: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 msgid "2D Transform" msgstr "2D eraldatzea" -#: ../app/pdb/drawable-transform-cmds.c:1246 -#: ../app/pdb/drawable-transform-cmds.c:1352 -#: ../app/pdb/drawable-transform-cmds.c:1456 +#: ../app/pdb/drawable-transform-cmds.c:1234 +#: ../app/pdb/drawable-transform-cmds.c:1338 +#: ../app/pdb/drawable-transform-cmds.c:1442 #: ../app/pdb/item-transform-cmds.c:815 msgid "2D Transforming" msgstr "2D eraldatzen" @@ -11011,15 +11094,15 @@ msgstr "2D eraldatzen" msgid "Blending" msgstr "Nahasten" -#: ../app/pdb/floating-sel-cmds.c:64 +#: ../app/pdb/floating-sel-cmds.c:65 msgid "Cannot remove this layer because it is not a floating selection." msgstr "Ezin da geruza hau kendu, hautapen mugikorra ez delako." -#: ../app/pdb/floating-sel-cmds.c:96 +#: ../app/pdb/floating-sel-cmds.c:98 msgid "Cannot anchor this layer because it is not a floating selection." msgstr "Ezin da geruza hau ainguratu, hautapen mugikorra ez delako." -#: ../app/pdb/floating-sel-cmds.c:128 +#: ../app/pdb/floating-sel-cmds.c:131 msgid "" "Cannot convert this layer to a normal layer because it is not a floating " "selection." @@ -11051,81 +11134,95 @@ msgstr "'%s' brotxa ez da editagarria" msgid "Brush '%s' is not a generated brush" msgstr "'%s' brotxa ez da sortutako brotxa" -#: ../app/pdb/gimppdb-utils.c:133 +#: ../app/pdb/gimppdb-utils.c:134 +msgid "Invalid empty paint dynamics name" +msgstr "Margo dinamikoen izen huts baliogabea" + +#: ../app/pdb/gimppdb-utils.c:143 +#, c-format +msgid "Paint dynamics '%s' not found" +msgstr "Ez da '%s' margo dinamikorik aurkitu" + +#: ../app/pdb/gimppdb-utils.c:148 +#, c-format +msgid "Paint dynamics '%s' is not editable" +msgstr "'%s' margo dinamikoa ez da editagarria" + +#: ../app/pdb/gimppdb-utils.c:168 msgid "Invalid empty pattern name" msgstr "Ereduaren izen hutsa baliogabea" -#: ../app/pdb/gimppdb-utils.c:142 +#: ../app/pdb/gimppdb-utils.c:177 #, c-format msgid "Pattern '%s' not found" msgstr "Ez da '%s' eredua aurkitu" -#: ../app/pdb/gimppdb-utils.c:162 +#: ../app/pdb/gimppdb-utils.c:197 msgid "Invalid empty gradient name" msgstr "Gradientearen izen hutsa baliogabea" -#: ../app/pdb/gimppdb-utils.c:171 +#: ../app/pdb/gimppdb-utils.c:206 #, c-format msgid "Gradient '%s' not found" msgstr "Ez da '%s' gradientea aurkitu" -#: ../app/pdb/gimppdb-utils.c:176 +#: ../app/pdb/gimppdb-utils.c:211 #, c-format msgid "Gradient '%s' is not editable" msgstr "'%s' gradientea ez da editagarria" -#: ../app/pdb/gimppdb-utils.c:197 +#: ../app/pdb/gimppdb-utils.c:232 msgid "Invalid empty palette name" msgstr "Paletaren izen hutsa baliogabea" -#: ../app/pdb/gimppdb-utils.c:206 +#: ../app/pdb/gimppdb-utils.c:241 #, c-format msgid "Palette '%s' not found" msgstr "Ez da '%s' paleta aurkitu" -#: ../app/pdb/gimppdb-utils.c:211 +#: ../app/pdb/gimppdb-utils.c:246 #, c-format msgid "Palette '%s' is not editable" msgstr "'%s' paleta ez da editagarria" -#: ../app/pdb/gimppdb-utils.c:231 +#: ../app/pdb/gimppdb-utils.c:266 msgid "Invalid empty font name" msgstr "Letra-tipoaren izen huts baliogabea" -#: ../app/pdb/gimppdb-utils.c:241 +#: ../app/pdb/gimppdb-utils.c:276 #, c-format msgid "Font '%s' not found" msgstr "Ez da'%s' letra-tipoa aurkitu" -#: ../app/pdb/gimppdb-utils.c:260 +#: ../app/pdb/gimppdb-utils.c:295 msgid "Invalid empty buffer name" msgstr "Bufferraren izen huts baliogabea" -#: ../app/pdb/gimppdb-utils.c:270 +#: ../app/pdb/gimppdb-utils.c:305 #, c-format msgid "Named buffer '%s' not found" msgstr "Ez da '%s' izeneko bufferrik aurkitu" -#: ../app/pdb/gimppdb-utils.c:289 +#: ../app/pdb/gimppdb-utils.c:324 msgid "Invalid empty paint method name" msgstr "Margotzeko metodoaren izen huts baliogabea" -#: ../app/pdb/gimppdb-utils.c:299 +#: ../app/pdb/gimppdb-utils.c:334 #, c-format msgid "Paint method '%s' does not exist" msgstr "Ez da margotzeko '%s' metodorik existitzen" -#: ../app/pdb/gimppdb-utils.c:318 +#: ../app/pdb/gimppdb-utils.c:353 #, c-format msgid "Item '%s' (%d) cannot be used because it has not been added to an image" msgstr "'%s' (%d) elementua da erabili, ez baita irudi bati gehitu" -#: ../app/pdb/gimppdb-utils.c:328 +#: ../app/pdb/gimppdb-utils.c:363 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" msgstr "'%s' (%d) elementua ezin da erabili, ez baita irudi bati erantsi" -#: ../app/pdb/gimppdb-utils.c:357 +#: ../app/pdb/gimppdb-utils.c:392 #, c-format msgid "" "Item '%s' (%d) cannot be used because it is not a direct child of an item " @@ -11134,7 +11231,7 @@ msgstr "" "'%s' (%d) elementua ezin da erabili, ez baita elementu-zuhaitz baten " "direktorio umea" -#: ../app/pdb/gimppdb-utils.c:385 +#: ../app/pdb/gimppdb-utils.c:420 #, c-format msgid "" "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " @@ -11143,77 +11240,77 @@ msgstr "" "'%s' (%d) eta '%s' (%d) elementuak ezin dira erabili, ez baitira elementu-" "zuhaitz berdinaren zati" -#: ../app/pdb/gimppdb-utils.c:410 +#: ../app/pdb/gimppdb-utils.c:445 #, c-format msgid "Item '%s' (%d) must not be an ancestor of '%s' (%d)" msgstr "'%s' (%d) elementua ezin da '%s' (%d) elementuaren aitzindari izan" -#: ../app/pdb/gimppdb-utils.c:434 +#: ../app/pdb/gimppdb-utils.c:469 #, c-format msgid "Item '%s' (%d) has already been added to an image" msgstr "'%s' elementua (%d) jadanik irudi bati gehitu zaio" -#: ../app/pdb/gimppdb-utils.c:442 +#: ../app/pdb/gimppdb-utils.c:477 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" msgstr "'%s' (%d) elementua gehitzen saiatu da okerreko irudiari" -#: ../app/pdb/gimppdb-utils.c:461 +#: ../app/pdb/gimppdb-utils.c:496 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" msgstr "'%s' (%d) elementua ezin da aldatu, bere edukia blokeatuta dagoelako" -#: ../app/pdb/gimppdb-utils.c:481 +#: ../app/pdb/gimppdb-utils.c:516 #, c-format msgid "Item '%s' (%d) cannot be used because it is not a group item" msgstr "'%s' (%d) elementua ezin da erabili, ez baita 'taldea' elementua" -#: ../app/pdb/gimppdb-utils.c:501 +#: ../app/pdb/gimppdb-utils.c:536 #, c-format msgid "Item '%s' (%d) cannot be modified because it is a group item" msgstr "'%s' (%d) elementua ezin da aldatu, 'taldea' elementua delako" -#: ../app/pdb/gimppdb-utils.c:522 +#: ../app/pdb/gimppdb-utils.c:557 #, c-format msgid "Layer '%s' (%d) cannot be used because it is not a text layer" msgstr "'%s' (%d) geruza ezin da erabili, ez delako testu-geruza bat" -#: ../app/pdb/gimppdb-utils.c:563 +#: ../app/pdb/gimppdb-utils.c:598 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" msgstr "'%s' irudia (%d) '%s' motakoa da, baina '%s' motako irudia espero zen" -#: ../app/pdb/gimppdb-utils.c:586 +#: ../app/pdb/gimppdb-utils.c:621 #, c-format msgid "Image '%s' (%d) is already of type '%s'" msgstr "'%s' irudia (%d) '%s' motakoa da jadanik" -#: ../app/pdb/gimppdb-utils.c:614 +#: ../app/pdb/gimppdb-utils.c:649 #, c-format msgid "Vectors object %d does not contain stroke with ID %d" msgstr "%d. bektore-objektuak ez dauka trazurik %d IDarekin" -#: ../app/pdb/gimppdb.c:409 +#: ../app/pdb/gimppdb.c:410 #, c-format msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %" -"s, got %s." +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." msgstr "" -"'%s' prozedurak itzulerako %d. argumentuaren okerreko balio mota itzuli du. %" -"s espero zen, baina %s jaso da." +"'%s' prozedurak itzulerako %d. argumentuaren okerreko balio mota itzuli du. " +"%s espero zen, baina %s jaso da." -#: ../app/pdb/gimppdbcontext.c:82 +#: ../app/pdb/gimppdbcontext.c:89 #: ../app/tools/gimpforegroundselectoptions.c:79 #: ../app/tools/gimpselectionoptions.c:78 msgid "Smooth edges" msgstr "Ertz leunak" -#: ../app/pdb/gimpprocedure.c:370 ../app/plug-in/gimppluginprocframe.c:208 +#: ../app/pdb/gimpprocedure.c:372 ../app/plug-in/gimppluginprocframe.c:208 #, c-format msgid "Procedure '%s' returned no return values" msgstr "'%s' prozedurak ez du itzulerako baliorik itzuli" -#: ../app/pdb/gimpprocedure.c:641 +#: ../app/pdb/gimpprocedure.c:642 #, c-format msgid "" "Procedure '%s' returned a wrong value type for return value '%s' (#%d). " @@ -11222,16 +11319,16 @@ msgstr "" "'%s' prozedurak itzulerako '%s' (#%d) balioaren okerreko balio mota itzuli " "du. %s espero zen, baina %s jaso da." -#: ../app/pdb/gimpprocedure.c:653 +#: ../app/pdb/gimpprocedure.c:654 #, c-format msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%" -"d). Expected %s, got %s." +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." msgstr "" "'%s' prozedurak itzulerako '%s' (#%d) argumentuaren okerreko balio mota " "itzuli du. %s espero zen, baina %s jaso da." -#: ../app/pdb/gimpprocedure.c:685 +#: ../app/pdb/gimpprocedure.c:687 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11240,7 +11337,7 @@ msgstr "" "'%s' prozedurak '%s' argumentuaren okerreko IDa itzuli du. Badirudi plugina " "existitzen ez den geruza batekin lan egiten saiatzen ari dela." -#: ../app/pdb/gimpprocedure.c:697 +#: ../app/pdb/gimpprocedure.c:700 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " @@ -11249,7 +11346,7 @@ msgstr "" "'%s' prozedurak '%s' argumentua okerreko IDarekin deitu du. Badirudi " "plugina existitzen ez den geruza batekin lan egiten saiatzen ari dela." -#: ../app/pdb/gimpprocedure.c:713 +#: ../app/pdb/gimpprocedure.c:717 #, c-format msgid "" "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" @@ -11258,7 +11355,7 @@ msgstr "" "'%s' prozedurak '%s' argumentuaren okerreko IDa itzuli du. Badirudi plugina " "existitzen ez den irudi batekin lan egiten saiatzen ari dela." -#: ../app/pdb/gimpprocedure.c:725 +#: ../app/pdb/gimpprocedure.c:730 #, c-format msgid "" "Procedure '%s' has been called with an invalid ID for argument '%s'. Most " @@ -11267,7 +11364,7 @@ msgstr "" "'%s' prozedurak '%s' argumentua okerreko IDarekin deitu du. Badirudi " "plugina existitzen ez den irudi batekin lan egiten saiatzen ari dela." -#: ../app/pdb/gimpprocedure.c:745 +#: ../app/pdb/gimpprocedure.c:751 #, c-format msgid "" "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " @@ -11276,16 +11373,16 @@ msgstr "" "'%s' prozedurak '%s' itzuli du '%s' (#%d, %s mota) itzulerako balio gisa. " "Balio hau barrutiz kanpo dago." -#: ../app/pdb/gimpprocedure.c:758 +#: ../app/pdb/gimpprocedure.c:765 #, c-format msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %" -"s). This value is out of range." +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." msgstr "" "'%1$s' prozedurak '%3$s' (#%4$d, %5$s mota) argumentua '%2$s' balioarekin " "deitu du. Balio hau barrutiz kanpo dago." -#: ../app/pdb/image-cmds.c:2364 +#: ../app/pdb/image-cmds.c:2365 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "" @@ -11293,7 +11390,7 @@ msgstr "" "horren ordez." #: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 -#: ../app/tools/gimpfreeselecttool.c:195 +#: ../app/tools/gimpfreeselecttool.c:196 msgid "Free Select" msgstr "Hautapen librea" @@ -11313,7 +11410,7 @@ msgstr "Huts egin du testuaren geruza sortzean" #: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 #: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 #: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 -#: ../app/pdb/text-layer-cmds.c:1198 +#: ../app/pdb/text-layer-cmds.c:1196 msgid "Set text layer attribute" msgstr "Editatu testu-geruzaren atributuak" @@ -11325,29 +11422,29 @@ msgstr "Kendu bidearen trazua" msgid "Close path stroke" msgstr "Itxi bidearen trazuak" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Itzuli bidearen trazua" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Eskalatu bidearen trazua" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Biratu bidearen trazua" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Irauli bidearen trazua" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:816 -#: ../app/pdb/vectors-cmds.c:1035 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Gehitu bidearen trazua" -#: ../app/pdb/vectors-cmds.c:868 ../app/pdb/vectors-cmds.c:921 -#: ../app/pdb/vectors-cmds.c:982 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Hedatu bidearen trazua" @@ -11394,7 +11491,7 @@ msgstr "" msgid "Cancelled" msgstr "Bertan behera utzita" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:643 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11444,7 +11541,7 @@ msgstr "Pluginen interpretatzaileak" msgid "Plug-In Environment" msgstr "Pluginen ingurunea" -#: ../app/plug-in/gimppluginprocedure.c:980 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11453,7 +11550,7 @@ msgstr "" "'%s'(r)en dei-errorea:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:992 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11462,16 +11559,21 @@ msgstr "" "'%s'(r)en exekuzio-errorea:\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "Ezin zaio kolorearen profila gris-eskalako irudiari (%s) aplikatu" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Errorea '%s' exekutatzean" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Plugina falta da (%s)" @@ -11501,7 +11603,7 @@ msgstr "" "Gure etxe berrian ez da urik sartzen\n" "ateri dagoenean." -#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:1367 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "Gehitu testu-geruza" @@ -11550,7 +11652,7 @@ msgstr "" msgid "Empty Text Layer" msgstr "Testu-geruza hutsa" -#: ../app/text/gimptextlayer-xcf.c:75 +#: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" @@ -11595,7 +11697,7 @@ msgstr "_Aerografoa" msgid "Motion only" msgstr "Mugimendua soilik" -#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:222 +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 #: ../app/tools/gimpsmudgetool.c:91 msgid "Rate" msgstr "Emaria" @@ -11616,10 +11718,6 @@ msgstr "Banaketaren desplazamendu horizontala" msgid "Vertical offset for distribution" msgstr "Banaketaren desplazamendu bertikala" -#: ../app/tools/gimpalignoptions.c:247 ../app/tools/gimpalignoptions.c:298 -msgid "Align left edge of target" -msgstr "Lerrokatu helburuko ezker ertza" - #: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124 msgid "Align" msgstr "Lerrokatu" @@ -11628,6 +11726,10 @@ msgstr "Lerrokatu" msgid "Relative to:" msgstr "Erlatiboa:" +#: ../app/tools/gimpalignoptions.c:298 +msgid "Align left edge of target" +msgstr "Lerrokatu helburuko ezker ertza" + #: ../app/tools/gimpalignoptions.c:302 msgid "Align center of target" msgstr "Lerrokatu helburuko zentrua" @@ -11689,37 +11791,37 @@ msgstr "" msgid "_Align" msgstr "_Lerrokatu" -#: ../app/tools/gimpaligntool.c:542 +#: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "" "Egin klik geruza, bide edo gida batean; edo egin klik eta arrastatu hainbat " "geruza hartzeko" -#: ../app/tools/gimpaligntool.c:550 +#: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" msgstr "Egin klik geruza hau aurreneko elementu gisa hartzeko" -#: ../app/tools/gimpaligntool.c:557 +#: ../app/tools/gimpaligntool.c:564 msgid "Click to add this layer to the list" msgstr "Egin klik geruza hau zerrendari gehitzeko" -#: ../app/tools/gimpaligntool.c:561 +#: ../app/tools/gimpaligntool.c:568 msgid "Click to pick this guide as first item" msgstr "Egin klik gida hau aurreneko elementu gisa hartzeko" -#: ../app/tools/gimpaligntool.c:568 +#: ../app/tools/gimpaligntool.c:575 msgid "Click to add this guide to the list" msgstr "Egin klik gida hau zerrendari gehitzeko" -#: ../app/tools/gimpaligntool.c:572 +#: ../app/tools/gimpaligntool.c:579 msgid "Click to pick this path as first item" msgstr "Egin klik bide hau aurreneko elementu gisa hartzeko" -#: ../app/tools/gimpaligntool.c:579 +#: ../app/tools/gimpaligntool.c:586 msgid "Click to add this path to the list" msgstr "Egin klik bide hau zerrendari gehitzeko" -#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:339 +#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:346 msgid "Gradient" msgstr "Gradientea" @@ -11727,7 +11829,7 @@ msgstr "Gradientea" msgid "Shape:" msgstr "Forma:" -#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:323 +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:325 msgid "Repeat:" msgstr "Errepikatu:" @@ -11759,17 +11861,17 @@ msgstr "Nahasketak ez du geruza indexatuetan funtzionatzen." msgid "No gradient available for use with this tool." msgstr "Ez dago gradiente erabilgarririk tresna honekin erabiltzeko." -#: ../app/tools/gimpblendtool.c:441 ../app/tools/gimppainttool.c:620 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s angelu mugatuentzako" -#: ../app/tools/gimpblendtool.c:442 +#: ../app/tools/gimpblendtool.c:453 #, c-format msgid "%s to move the whole line" msgstr "%s marra osoa mugitzeko" -#: ../app/tools/gimpblendtool.c:446 +#: ../app/tools/gimpblendtool.c:457 msgid "Blend: " msgstr "Nahastea: " @@ -11801,15 +11903,15 @@ msgstr "Esportatu distira-kontrastearen ezarpenak" msgid "Brightness-Contrast does not operate on indexed layers." msgstr "Distirak/Kontrasteak ez du geruza indexatuetan funtzionatzen." -#: ../app/tools/gimpbrightnesscontrasttool.c:314 +#: ../app/tools/gimpbrightnesscontrasttool.c:318 msgid "_Brightness:" msgstr "_Distira:" -#: ../app/tools/gimpbrightnesscontrasttool.c:327 +#: ../app/tools/gimpbrightnesscontrasttool.c:331 msgid "Con_trast:" msgstr "Kon_trastea:" -#: ../app/tools/gimpbrightnesscontrasttool.c:339 +#: ../app/tools/gimpbrightnesscontrasttool.c:343 msgid "Edit these Settings as Levels" msgstr "Editatu ezarpen hauek maila gisa" @@ -11835,53 +11937,53 @@ msgid "Criterion used for determining color similarity" msgstr "Irizpidea (koloreen antzekotasuna zehazteko erabiltzeko)" #. fill type -#: ../app/tools/gimpbucketfilloptions.c:226 +#: ../app/tools/gimpbucketfilloptions.c:229 #, c-format msgid "Fill Type (%s)" msgstr "Betegarri mota (%s)" #. fill selection -#: ../app/tools/gimpbucketfilloptions.c:241 +#: ../app/tools/gimpbucketfilloptions.c:244 #, c-format msgid "Affected Area (%s)" msgstr "Eragindako area (%s)" -#: ../app/tools/gimpbucketfilloptions.c:245 +#: ../app/tools/gimpbucketfilloptions.c:248 msgid "Fill whole selection" msgstr "Bete hautapen osoa" -#: ../app/tools/gimpbucketfilloptions.c:246 +#: ../app/tools/gimpbucketfilloptions.c:249 msgid "Fill similar colors" msgstr "Bete antzeko koloreak" -#: ../app/tools/gimpbucketfilloptions.c:255 +#: ../app/tools/gimpbucketfilloptions.c:258 msgid "Finding Similar Colors" msgstr "Antzeko koloreak bilatzen" -#: ../app/tools/gimpbucketfilloptions.c:270 +#: ../app/tools/gimpbucketfilloptions.c:273 msgid "Fill transparent areas" msgstr "Bete area gardenak" -#: ../app/tools/gimpbucketfilloptions.c:276 ../app/tools/gimpclonetool.c:113 -#: ../app/tools/gimpcolorpickeroptions.c:155 ../app/tools/gimphealtool.c:98 -#: ../app/tools/gimpperspectiveclonetool.c:901 -#: ../app/tools/gimpregionselectoptions.c:209 +#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 +#: ../app/tools/gimpperspectiveclonetool.c:904 +#: ../app/tools/gimpregionselectoptions.c:210 msgid "Sample merged" msgstr "Batutako lagina" -#: ../app/tools/gimpbucketfilloptions.c:295 +#: ../app/tools/gimpbucketfilloptions.c:298 msgid "Fill by:" msgstr "Bete honekin:" -#: ../app/tools/gimpbucketfilltool.c:85 +#: ../app/tools/gimpbucketfilltool.c:86 msgid "Bucket Fill" msgstr "Bete" -#: ../app/tools/gimpbucketfilltool.c:86 +#: ../app/tools/gimpbucketfilltool.c:87 msgid "Bucket Fill Tool: Fill selected area with a color or pattern" msgstr "Betetzeko tresna: bete hautatutako area kolore edo eredu batez" -#: ../app/tools/gimpbucketfilltool.c:87 +#: ../app/tools/gimpbucketfilltool.c:88 msgid "_Bucket Fill" msgstr "_Betetzea" @@ -11903,7 +12005,7 @@ msgctxt "command" msgid "Select by Color" msgstr "Hautatu kolorearen arabera" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154 +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "Kaiola eraldatzea" @@ -11915,15 +12017,15 @@ msgstr "Kaiola eraldatzea: desitxuratu hautapena kaiolarekin" msgid "_Cage Transform" msgstr "_Kaiola eraldatzea" -#: ../app/tools/gimpcagetool.c:351 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "Sakatu SARTU eraldaketa aplikatzeko" -#: ../app/tools/gimpcagetool.c:1095 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "Kaiolaren koefizienteak kalkulatzen" -#: ../app/tools/gimpcagetool.c:1272 +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "Kaiola eraldatzea" @@ -11941,21 +12043,22 @@ msgstr "_Klonatu" msgid "Click to clone" msgstr "Egin klik klonatzeko" -#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90 +#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 #, c-format msgid "%s to set a new clone source" msgstr "%s klon-iturburu berria ezartzeko." -#: ../app/tools/gimpclonetool.c:89 +#. Translators: the translation of "Click" must be the first word +#: ../app/tools/gimpclonetool.c:90 msgid "Click to set a new clone source" msgstr "Egin klik klon-iturburu berria ezartzeko." -#: ../app/tools/gimpclonetool.c:108 -#: ../app/tools/gimpperspectiveclonetool.c:896 +#: ../app/tools/gimpclonetool.c:109 +#: ../app/tools/gimpperspectiveclonetool.c:899 msgid "Source" msgstr "Iturburua" -#: ../app/tools/gimpclonetool.c:130 ../app/tools/gimphealtool.c:110 +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 #: ../app/tools/gimpperspectiveclonetool.c:918 msgid "Alignment:" msgstr "Lerrokatzea:" @@ -12087,7 +12190,7 @@ msgstr "Kolore-hautatzailearen batez besteko erradioa" #: ../app/tools/gimpcoloroptions.c:157 #: ../app/tools/gimprectangleselectoptions.c:163 -#: ../app/tools/gimpselectionoptions.c:272 +#: ../app/tools/gimpselectionoptions.c:277 #: ../app/widgets/gimpbrusheditor.c:155 msgid "Radius" msgstr "Erradioa" @@ -12113,13 +12216,13 @@ msgstr "" "kolore-eredutan ikusteko" #. the pick FG/BG frame -#: ../app/tools/gimpcolorpickeroptions.c:160 +#: ../app/tools/gimpcolorpickeroptions.c:163 #, c-format msgid "Pick Mode (%s)" msgstr "Hautatze-modua (%s)" #. the use_info_window toggle button -#: ../app/tools/gimpcolorpickeroptions.c:169 +#: ../app/tools/gimpcolorpickeroptions.c:172 #, c-format msgid "Use info window (%s)" msgstr "Erabili informazio-leihoa (%s)" @@ -12136,39 +12239,39 @@ msgstr "Kolore hautatzailea tresna: ezarri kolorean irudien pixeletatik" msgid "C_olor Picker" msgstr "_Kolore-hautatzailea" -#: ../app/tools/gimpcolorpickertool.c:225 +#: ../app/tools/gimpcolorpickertool.c:231 msgid "Click in any image to view its color" msgstr "Egin klik edozein iruditan bere kolorea ikusteko" -#: ../app/tools/gimpcolorpickertool.c:232 ../app/tools/gimppainttool.c:476 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Egin klik edozein iruditan aurreko planoaren kolorea hautatzeko" -#: ../app/tools/gimpcolorpickertool.c:240 ../app/tools/gimppainttool.c:482 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Egin klik edozein iruditan atzeko planoaren kolorea hautatzeko" -#: ../app/tools/gimpcolorpickertool.c:248 +#: ../app/tools/gimpcolorpickertool.c:254 msgid "Click in any image to add the color to the palette" msgstr "Egin klik edozein iruditan kolorea paletari gehitzeko" -#: ../app/tools/gimpcolorpickertool.c:303 +#: ../app/tools/gimpcolorpickertool.c:309 msgid "Color Picker Information" msgstr "Kolore-hautatzailearen informazioa" -#: ../app/tools/gimpcolortool.c:229 ../app/tools/gimpcolortool.c:402 +#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 msgid "Move Sample Point: " msgstr "Aldatu lagina-puntua lekuz: " -#: ../app/tools/gimpcolortool.c:394 +#: ../app/tools/gimpcolortool.c:395 msgid "Remove Sample Point" msgstr "Kendu lagina-puntua" -#: ../app/tools/gimpcolortool.c:395 +#: ../app/tools/gimpcolortool.c:396 msgid "Cancel Sample Point" msgstr "Bertan behera utzi lagina-puntua" -#: ../app/tools/gimpcolortool.c:403 +#: ../app/tools/gimpcolortool.c:404 msgid "Add Sample Point: " msgstr "Gehitu lagina-puntua: " @@ -12185,34 +12288,34 @@ msgstr "" msgid "Bl_ur / Sharpen" msgstr "_Lausotu / Enfokatu" -#: ../app/tools/gimpconvolvetool.c:181 +#: ../app/tools/gimpconvolvetool.c:184 msgid "Click to blur" msgstr "Egin klik lausotzeko" -#: ../app/tools/gimpconvolvetool.c:182 +#: ../app/tools/gimpconvolvetool.c:185 msgid "Click to blur the line" msgstr "Egin klik marra lausotzeko" -#: ../app/tools/gimpconvolvetool.c:183 +#: ../app/tools/gimpconvolvetool.c:186 #, c-format msgid "%s to sharpen" msgstr "%s enfokatzeko" -#: ../app/tools/gimpconvolvetool.c:187 +#: ../app/tools/gimpconvolvetool.c:190 msgid "Click to sharpen" msgstr "Egin klik enfokatzeko" -#: ../app/tools/gimpconvolvetool.c:188 +#: ../app/tools/gimpconvolvetool.c:191 msgid "Click to sharpen the line" msgstr "Egin klik marra enfokatzeko" -#: ../app/tools/gimpconvolvetool.c:189 +#: ../app/tools/gimpconvolvetool.c:192 #, c-format msgid "%s to blur" msgstr "%s lausotzeko" #. the type radio box -#: ../app/tools/gimpconvolvetool.c:210 +#: ../app/tools/gimpconvolvetool.c:216 #, c-format msgid "Convolve Type (%s)" msgstr "Konboluzio mota (%s)" @@ -12260,64 +12363,64 @@ msgstr "Egin klik edo sakatu Sartu mozteko" msgid "There is no active layer to crop." msgstr "Ez dago mozteko geruza aktiborik." -#: ../app/tools/gimpcurvestool.c:149 +#: ../app/tools/gimpcurvestool.c:150 msgid "Curves" msgstr "Kurbak" -#: ../app/tools/gimpcurvestool.c:150 +#: ../app/tools/gimpcurvestool.c:151 msgid "Curves Tool: Adjust color curves" msgstr "Kurbak tresna: doitu kolore-kurbak" -#: ../app/tools/gimpcurvestool.c:151 +#: ../app/tools/gimpcurvestool.c:152 msgid "_Curves..." msgstr "_Kurbak..." -#: ../app/tools/gimpcurvestool.c:177 +#: ../app/tools/gimpcurvestool.c:178 msgid "Adjust Color Curves" msgstr "Doitu kolore-kurbak" -#: ../app/tools/gimpcurvestool.c:179 +#: ../app/tools/gimpcurvestool.c:180 msgid "Import Curves" msgstr "Inportatu kurbak" -#: ../app/tools/gimpcurvestool.c:180 +#: ../app/tools/gimpcurvestool.c:181 msgid "Export Curves" msgstr "Esportatu kurbak" -#: ../app/tools/gimpcurvestool.c:231 +#: ../app/tools/gimpcurvestool.c:232 msgid "Curves does not operate on indexed layers." msgstr "Kurbak ez du geruza indexatuetan funtzionatzen." -#: ../app/tools/gimpcurvestool.c:339 +#: ../app/tools/gimpcurvestool.c:340 msgid "Click to add a control point" msgstr "Egin klik kontrol-puntua gehitzeko" -#: ../app/tools/gimpcurvestool.c:344 +#: ../app/tools/gimpcurvestool.c:345 msgid "Click to add control points to all channels" msgstr "Egin klik kontrol-puntuak gehitzeko kanal guztietan" -#: ../app/tools/gimpcurvestool.c:349 +#: ../app/tools/gimpcurvestool.c:350 msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Egin klik kurban kokatzeko (saiatu Maius, Ktrl)" -#: ../app/tools/gimpcurvestool.c:462 ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:463 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "_Kanala:" -#: ../app/tools/gimpcurvestool.c:488 ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:489 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "Berrezarri kana_la" -#: ../app/tools/gimpcurvestool.c:581 ../app/widgets/gimpdeviceinfoeditor.c:458 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Kurba _mota:" -#: ../app/tools/gimpcurvestool.c:656 ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Ezin izan da goiburua irakurri '%s'(e)tik: %s" -#: ../app/tools/gimpcurvestool.c:729 +#: ../app/tools/gimpcurvestool.c:731 msgid "Use _old curves file format" msgstr "Erabili kurben fitxategi-formatu _zaharra" @@ -12353,44 +12456,44 @@ msgstr "Zuritu / Belztu tresna: argitu edo ilundu selektiboki brotxa erabiliz" msgid "Dod_ge / Burn" msgstr "_Zuritu / Belztu" -#: ../app/tools/gimpdodgeburntool.c:184 +#: ../app/tools/gimpdodgeburntool.c:187 msgid "Click to dodge" msgstr "Egin klik zuritzeko" -#: ../app/tools/gimpdodgeburntool.c:185 +#: ../app/tools/gimpdodgeburntool.c:188 msgid "Click to dodge the line" msgstr "Egin klik marra zuritzeko" -#: ../app/tools/gimpdodgeburntool.c:186 +#: ../app/tools/gimpdodgeburntool.c:189 #, c-format msgid "%s to burn" msgstr "%s belzteko" -#: ../app/tools/gimpdodgeburntool.c:190 +#: ../app/tools/gimpdodgeburntool.c:193 msgid "Click to burn" msgstr "Egin klik belzteko" -#: ../app/tools/gimpdodgeburntool.c:191 +#: ../app/tools/gimpdodgeburntool.c:194 msgid "Click to burn the line" msgstr "Egin klik marra belzteko" -#: ../app/tools/gimpdodgeburntool.c:192 +#: ../app/tools/gimpdodgeburntool.c:195 #, c-format msgid "%s to dodge" msgstr "%s belzteko" #. the type (dodge or burn) -#: ../app/tools/gimpdodgeburntool.c:213 +#: ../app/tools/gimpdodgeburntool.c:219 #, c-format msgid "Type (%s)" msgstr "Mota (%s)" #. mode (highlights, midtones, or shadows) -#: ../app/tools/gimpdodgeburntool.c:224 +#: ../app/tools/gimpdodgeburntool.c:230 msgid "Range" msgstr "Barrutia" -#: ../app/tools/gimpdodgeburntool.c:230 +#: ../app/tools/gimpdodgeburntool.c:236 msgid "Exposure" msgstr "Esposizioa" @@ -12399,7 +12502,7 @@ msgid "Move Selection" msgstr "Aldatu hautapena lekuz" #: ../app/tools/gimpeditselectiontool.c:246 -#: ../app/tools/gimpeditselectiontool.c:1240 +#: ../app/tools/gimpeditselectiontool.c:1241 msgid "Move Floating Selection" msgstr "Aldatu hautapen mugikorra lekuz" @@ -12452,37 +12555,37 @@ msgstr "Desezabatu (%s)" msgid "Direction of flipping" msgstr "Iraulketaren norabidea" -#: ../app/tools/gimpflipoptions.c:130 +#: ../app/tools/gimpflipoptions.c:133 msgid "Affect:" msgstr "Eragina:" #. tool toggle -#: ../app/tools/gimpflipoptions.c:139 +#: ../app/tools/gimpflipoptions.c:142 #, c-format msgid "Flip Type (%s)" msgstr "Iraultze mota (%s)" -#: ../app/tools/gimpfliptool.c:83 +#: ../app/tools/gimpfliptool.c:84 msgid "Flip" msgstr "Irauli" -#: ../app/tools/gimpfliptool.c:84 +#: ../app/tools/gimpfliptool.c:85 msgid "" "Flip Tool: Reverse the layer, selection or path horizontally or vertically" msgstr "" "Irauli tresna: alderantzikatu geruza, hautapena edo bidea horizontalki edo " "bertikalki" -#: ../app/tools/gimpfliptool.c:86 +#: ../app/tools/gimpfliptool.c:87 msgid "_Flip" msgstr "_Irauli" -#: ../app/tools/gimpfliptool.c:186 +#: ../app/tools/gimpfliptool.c:187 msgctxt "undo-type" msgid "Flip horizontally" msgstr "Irauli horizontalki" -#: ../app/tools/gimpfliptool.c:189 +#: ../app/tools/gimpfliptool.c:190 msgctxt "undo-type" msgid "Flip vertically" msgstr "Irauli bertikalki" @@ -12490,7 +12593,7 @@ msgstr "Irauli bertikalki" #. probably this is not actually reached today, but #. * could be if someone defined FLIP_DIAGONAL, say... #. -#: ../app/tools/gimpfliptool.c:195 +#: ../app/tools/gimpfliptool.c:196 msgctxt "undo-desc" msgid "Flip" msgstr "Irauli" @@ -12536,84 +12639,84 @@ msgid "Sensitivity for yellow/blue component" msgstr "Horia/urdina osagaiaren sentikortasuna" #. single / multiple objects -#: ../app/tools/gimpforegroundselectoptions.c:278 +#: ../app/tools/gimpforegroundselectoptions.c:281 msgid "Contiguous" msgstr "Albokoa" #. foreground / background -#: ../app/tools/gimpforegroundselectoptions.c:283 +#: ../app/tools/gimpforegroundselectoptions.c:286 #, c-format msgid "Interactive refinement (%s)" msgstr "Fintze-elkarreragilea (%s)" -#: ../app/tools/gimpforegroundselectoptions.c:287 +#: ../app/tools/gimpforegroundselectoptions.c:290 msgid "Mark background" msgstr "Markatu atzeko planoa" -#: ../app/tools/gimpforegroundselectoptions.c:288 +#: ../app/tools/gimpforegroundselectoptions.c:291 msgid "Mark foreground" msgstr "Markatu aurreko planoa" -#: ../app/tools/gimpforegroundselectoptions.c:304 +#: ../app/tools/gimpforegroundselectoptions.c:307 msgid "Small brush" msgstr "Brotxa txikia" -#: ../app/tools/gimpforegroundselectoptions.c:312 +#: ../app/tools/gimpforegroundselectoptions.c:315 msgid "Large brush" msgstr "Brotxa handia" -#: ../app/tools/gimpforegroundselectoptions.c:335 +#: ../app/tools/gimpforegroundselectoptions.c:338 msgid "Smoothing:" msgstr "Leuntzea:" -#: ../app/tools/gimpforegroundselectoptions.c:341 +#: ../app/tools/gimpforegroundselectoptions.c:344 msgid "Preview color:" msgstr "Kolorearen aurrebista:" #. granularity -#: ../app/tools/gimpforegroundselectoptions.c:344 +#: ../app/tools/gimpforegroundselectoptions.c:347 msgid "Color Sensitivity" msgstr "Kolorearen sentikortasuna" -#: ../app/tools/gimpforegroundselecttool.c:143 +#: ../app/tools/gimpforegroundselecttool.c:144 msgid "Foreground Select" msgstr "Aurreko planoaren hautapena" -#: ../app/tools/gimpforegroundselecttool.c:144 +#: ../app/tools/gimpforegroundselecttool.c:145 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "" "Aurreko planoaren hautapena tresna: hautatu aurreko planoan dituen objektuen " "area" -#: ../app/tools/gimpforegroundselecttool.c:145 +#: ../app/tools/gimpforegroundselecttool.c:146 msgid "F_oreground Select" msgstr "A_urreko planoaren hautapena" -#: ../app/tools/gimpforegroundselecttool.c:301 +#: ../app/tools/gimpforegroundselecttool.c:304 msgid "Add more strokes or press Enter to accept the selection" msgstr "Gehitu trazu gehiago edo sakatu Sartu hautapena onartzeko" -#: ../app/tools/gimpforegroundselecttool.c:303 +#: ../app/tools/gimpforegroundselecttool.c:306 msgid "Mark foreground by painting on the object to extract" msgstr "Markatu aurreko planoa erauziko den objektuan margotuz" -#: ../app/tools/gimpforegroundselecttool.c:308 +#: ../app/tools/gimpforegroundselecttool.c:311 msgid "Roughly outline the object to extract" msgstr "Marraztu gutxi gorabehera objektuaren inguruan erauzteko" -#: ../app/tools/gimpforegroundselecttool.c:750 +#: ../app/tools/gimpforegroundselecttool.c:753 msgctxt "command" msgid "Foreground Select" msgstr "Aurreko planoaren hautapena" -#: ../app/tools/gimpfreeselecttool.c:196 +#: ../app/tools/gimpfreeselecttool.c:197 msgid "" "Free Select Tool: Select a hand-drawn region with free and polygonal segments" msgstr "" "Hautapen librea tresna: hautatu eskuz marraztutako eskualdeak segmentu libre " "eta poligonalekin" -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/tools/gimpfreeselecttool.c:198 msgid "_Free Select" msgstr "Hautapen _librea" @@ -12637,7 +12740,7 @@ msgstr "" "Klik egin eta arrastatu segmentu libre bat gehitzeko; egin klik segmentu " "poligonal bat gehitzeko" -#: ../app/tools/gimpfreeselecttool.c:1560 +#: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" msgid "Free Select" msgstr "Hautapen librea" @@ -12676,16 +12779,16 @@ msgstr "_GEGL eragiketa..." msgid "GEGL operations do not operate on indexed layers." msgstr "GEGL eragiketek ez dute geruza indexatuetan eragiten." -#: ../app/tools/gimpgegltool.c:377 +#: ../app/tools/gimpgegltool.c:378 msgid "_Operation:" msgstr "_Eragiketa:" #. The options vbox -#: ../app/tools/gimpgegltool.c:436 +#: ../app/tools/gimpgegltool.c:437 msgid "Operation Settings" msgstr "Eragiketaren ezarpenak" -#: ../app/tools/gimpgegltool.c:441 +#: ../app/tools/gimpgegltool.c:442 msgid "Select an operation from the list above" msgstr "Hautatu eragiketa gaineko zerrendatik" @@ -12701,12 +12804,13 @@ msgstr "_Konponketa" msgid "Click to heal" msgstr "Egin klik konpontzeko" -#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81 +#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82 #, c-format msgid "%s to set a new heal source" msgstr "%s konponketa-iturburu berria ezartzeko." -#: ../app/tools/gimphealtool.c:80 +#. Translators: the translation of "Click" must be the first word +#: ../app/tools/gimphealtool.c:81 msgid "Click to set a new heal source" msgstr "Egin klik konponketa-iturburu berria ezartzeko" @@ -12797,7 +12901,7 @@ msgstr "_Aurrezarpenak:" msgid "Settings saved to '%s'" msgstr "Ezarpenak '%s'(e)n gorde dira" -#: ../app/tools/gimpimagemaptool.c:366 +#: ../app/tools/gimpimagemaptool.c:363 msgid "_Preview" msgstr "_Aurrebista" @@ -12824,7 +12928,7 @@ msgstr "Sentikortasuna" #: ../app/tools/gimpinkoptions-gui.c:94 #: ../app/widgets/gimpdynamicseditor.c:144 -#: ../app/widgets/gimpdynamicsoutputeditor.c:71 +#: ../app/widgets/gimpdynamicsoutputeditor.c:72 msgid "Tilt" msgstr "Okerdura" @@ -12868,32 +12972,32 @@ msgstr "" msgid "Intelligent _Scissors" msgstr "_Guraize adimentsua" -#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:600 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "Egin klik eta arrastatu puntua lekuz aldatzeko." -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s: desgaitu doiketa automatikoa" -#: ../app/tools/gimpiscissorstool.c:919 +#: ../app/tools/gimpiscissorstool.c:921 msgid "Click to close the curve" msgstr "Egin klik kurba ixteko" -#: ../app/tools/gimpiscissorstool.c:925 +#: ../app/tools/gimpiscissorstool.c:927 msgid "Click to add a point on this segment" msgstr "Egin klik puntua gehitzeko segmentuan." -#: ../app/tools/gimpiscissorstool.c:939 +#: ../app/tools/gimpiscissorstool.c:941 msgid "Click or press Enter to convert to a selection" msgstr "Egin klik edo sakatu Sartu hautapenera bihurtzeko" -#: ../app/tools/gimpiscissorstool.c:949 +#: ../app/tools/gimpiscissorstool.c:951 msgid "Press Enter to convert to a selection" msgstr "Sakatu Sartu hautapenera bihurtzeko" -#: ../app/tools/gimpiscissorstool.c:964 +#: ../app/tools/gimpiscissorstool.c:966 msgid "Click or Click-Drag to add a point" msgstr "Egin klik edo klik eta arrastatu puntua gehitzeko" @@ -12972,26 +13076,25 @@ msgstr "Aldatu irudiaren leihoa tamainaz zoomaren maila berriro doitzeko" msgid "Direction of magnification" msgstr "Luparen norabidea" -#: ../app/tools/gimpmagnifyoptions.c:169 +#: ../app/tools/gimpmagnifyoptions.c:172 msgid "Auto-resize window" msgstr "Aldatu leihoaren tamaina automatikoki" #. tool toggle -#: ../app/tools/gimpmagnifyoptions.c:174 +#: ../app/tools/gimpmagnifyoptions.c:177 #, c-format msgid "Direction (%s)" msgstr "Norabidea (%s)" -#: ../app/tools/gimpmagnifytool.c:90 +#: ../app/tools/gimpmagnifytool.c:91 msgid "Zoom" msgstr "Zooma" -#: ../app/tools/gimpmagnifytool.c:91 +#: ../app/tools/gimpmagnifytool.c:92 msgid "Zoom Tool: Adjust the zoom level" msgstr "Zoomaren tresna: doitu zoomaren maila" -#: ../app/tools/gimpmagnifytool.c:92 -msgctxt "tool" +#: ../app/tools/gimpmagnifytool.c:93 msgid "_Zoom" msgstr "_Zooma" @@ -13016,49 +13119,49 @@ msgstr "Neurtzeko tresna: neurtu distantziak eta angeluak" msgid "_Measure" msgstr "_Neurtu" -#: ../app/tools/gimpmeasuretool.c:245 +#: ../app/tools/gimpmeasuretool.c:247 msgid "Add Guides" msgstr "Gehitu gidak" -#: ../app/tools/gimpmeasuretool.c:311 +#: ../app/tools/gimpmeasuretool.c:313 msgid "Drag to create a line" msgstr "Arrastatu marra bat sortzeko" -#: ../app/tools/gimpmeasuretool.c:555 +#: ../app/tools/gimpmeasuretool.c:560 msgid "Click to place vertical and horizontal guides" msgstr "Egin klik gida horizontala eta bertikala kokatzeko" -#: ../app/tools/gimpmeasuretool.c:563 +#: ../app/tools/gimpmeasuretool.c:568 msgid "Click to place a horizontal guide" msgstr "Egin klik gida horizontala kokatzeko" -#: ../app/tools/gimpmeasuretool.c:577 +#: ../app/tools/gimpmeasuretool.c:582 msgid "Click to place a vertical guide" msgstr "Egin klik gida bertikala kokatzeko" -#: ../app/tools/gimpmeasuretool.c:590 +#: ../app/tools/gimpmeasuretool.c:595 msgid "Click-Drag to add a new point" msgstr "Egin klik eta arrastatu puntu berria gehitzeko" -#: ../app/tools/gimpmeasuretool.c:619 +#: ../app/tools/gimpmeasuretool.c:624 msgid "Click-Drag to move all points" msgstr "Egin klik eta arrastatu puntu guztiak lekuz aldatzeko" -#: ../app/tools/gimpmeasuretool.c:932 ../app/tools/gimpmeasuretool.c:1077 -#: ../app/tools/gimpmeasuretool.c:1133 ../app/tools/gimpmeasuretool.c:1161 -#: ../app/tools/gimppainttool.c:629 +#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 +#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "pixel" -#: ../app/tools/gimpmeasuretool.c:1045 +#: ../app/tools/gimpmeasuretool.c:1052 msgid "Measure Distances and Angles" msgstr "Neurtu distantziak eta angeluak" -#: ../app/tools/gimpmeasuretool.c:1066 +#: ../app/tools/gimpmeasuretool.c:1073 msgid "Distance:" msgstr "Distantzia:" -#: ../app/tools/gimpmeasuretool.c:1094 +#: ../app/tools/gimpmeasuretool.c:1101 msgid "Angle:" msgstr "Angelua:" @@ -13092,33 +13195,33 @@ msgstr "Lekuz aldatu:" msgid "Tool Toggle (%s)" msgstr "Aldatu tresna (%s)" -#: ../app/tools/gimpmovetool.c:126 +#: ../app/tools/gimpmovetool.c:127 msgctxt "tool" msgid "Move" msgstr "Lekuz aldatu" -#: ../app/tools/gimpmovetool.c:127 +#: ../app/tools/gimpmovetool.c:128 msgid "Move Tool: Move layers, selections, and other objects" msgstr "" "Lekuz aldatzeko tresna: aldatu geruzak, hautapenak eta beste objektuak lekuz" -#: ../app/tools/gimpmovetool.c:128 +#: ../app/tools/gimpmovetool.c:129 msgid "_Move" msgstr "_Lekuz aldatu" -#: ../app/tools/gimpmovetool.c:246 ../app/tools/gimpmovetool.c:551 +#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 msgid "Move Guide: " msgstr "Aldatu gida lekuz: " -#: ../app/tools/gimpmovetool.c:545 +#: ../app/tools/gimpmovetool.c:548 msgid "Remove Guide" msgstr "Kendu gida" -#: ../app/tools/gimpmovetool.c:545 +#: ../app/tools/gimpmovetool.c:548 msgid "Cancel Guide" msgstr "Utzi gida" -#: ../app/tools/gimpmovetool.c:551 +#: ../app/tools/gimpmovetool.c:554 msgid "Add Guide: " msgstr "Gehitu gida: " @@ -13130,9 +13233,9 @@ msgstr "Pintzela tresna: margotu trazu leunak brotxa erabiliz" msgid "_Paintbrush" msgstr "_Pintzela" -#: ../app/tools/gimppaintoptions-gui.c:99 -#: ../app/tools/gimpselectionoptions.c:212 -#: ../app/widgets/gimpbrushselect.c:185 ../app/widgets/gimplayertreeview.c:267 +#: ../app/tools/gimppaintoptions-gui.c:92 +#: ../app/tools/gimpselectionoptions.c:217 +#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Modua:" @@ -13156,48 +13259,48 @@ msgstr "Berrezarri aspektu-erlazioa brotxaren jatorrizkora" msgid "Reset angle to zero" msgstr "Berrezarri angelua zerora" -#: ../app/tools/gimppaintoptions-gui.c:235 +#: ../app/tools/gimppaintoptions-gui.c:238 msgid "Incremental" msgstr "Inkrementala" -#: ../app/tools/gimppaintoptions-gui.c:251 +#: ../app/tools/gimppaintoptions-gui.c:256 msgid "Hard edge" msgstr "Ertz gogorra" -#: ../app/tools/gimppaintoptions-gui.c:280 +#: ../app/tools/gimppaintoptions-gui.c:285 msgid "Dynamics Options" msgstr "Dinamikaren aukerak" -#: ../app/tools/gimppaintoptions-gui.c:286 +#: ../app/tools/gimppaintoptions-gui.c:291 msgid "Fade Options" msgstr "Iraungitzearen aukerak" -#: ../app/tools/gimppaintoptions-gui.c:300 +#: ../app/tools/gimppaintoptions-gui.c:305 msgid "Fade length" msgstr "Iraungitzearen luzera" -#: ../app/tools/gimppaintoptions-gui.c:327 -#: ../app/widgets/gimpviewablebox.c:310 +#: ../app/tools/gimppaintoptions-gui.c:334 +#: ../app/widgets/gimpviewablebox.c:311 msgid "Reverse" msgstr "Alderantzikatu" -#: ../app/tools/gimppaintoptions-gui.c:334 +#: ../app/tools/gimppaintoptions-gui.c:341 msgid "Color Options" msgstr "Kolorearen aukerak" -#: ../app/tools/gimppaintoptions-gui.c:360 +#: ../app/tools/gimppaintoptions-gui.c:367 msgid "Amount" msgstr "Kopurua" -#: ../app/tools/gimppaintoptions-gui.c:364 +#: ../app/tools/gimppaintoptions-gui.c:371 msgid "Apply Jitter" msgstr "Aplikatu fluktuazioa" -#: ../app/tools/gimppaintoptions-gui.c:382 +#: ../app/tools/gimppaintoptions-gui.c:389 msgid "Smooth stroke" msgstr "Trazu leuna" -#: ../app/tools/gimppaintoptions-gui.c:392 +#: ../app/tools/gimppaintoptions-gui.c:399 msgid "Weight" msgstr "Pisua" @@ -13218,7 +13321,7 @@ msgstr "%s kolorea hautatzeko" msgid "Cannot paint on layer groups." msgstr "Ezin da margotu geruzen taldeetan." -#: ../app/tools/gimppainttool.c:675 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s marra zuzena sortzeko" @@ -13243,7 +13346,7 @@ msgstr "" msgid "_Perspective Clone" msgstr "_Perspektibaren klona" -#: ../app/tools/gimpperspectiveclonetool.c:672 +#: ../app/tools/gimpperspectiveclonetool.c:675 msgid "Ctrl-Click to set a clone source" msgstr "Ktrl+klik klon-iturburua ezartzeko." @@ -13409,7 +13512,7 @@ msgstr "Hautapen laukizuzenaren tresna: hautatu eskualde laukizuzena" msgid "_Rectangle Select" msgstr "Hautapen _laukizuzena" -#: ../app/tools/gimprectangletool.c:1144 ../app/tools/gimprectangletool.c:2013 +#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 msgid "Rectangle: " msgstr "Laukizuzena: " @@ -13425,11 +13528,11 @@ msgstr "Oinarrizko hautapena ikusgai dauden geruza guztietan" msgid "Selection criterion" msgstr "Hautapenaren irizpidea" -#: ../app/tools/gimpregionselectoptions.c:203 +#: ../app/tools/gimpregionselectoptions.c:204 msgid "Select transparent areas" msgstr "Hautatu area gardenak" -#: ../app/tools/gimpregionselectoptions.c:229 +#: ../app/tools/gimpregionselectoptions.c:226 msgid "Select by:" msgstr "Hautatu honekin:" @@ -13493,47 +13596,47 @@ msgstr "Gaitu hautapenaren ertzak difuminatzea" msgid "Radius of feathering" msgstr "Difuminatzearen erradioa" -#: ../app/tools/gimpselectionoptions.c:259 ../app/tools/gimptextoptions.c:538 +#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:538 msgid "Antialiasing" msgstr "Antialiasing-a" -#: ../app/tools/gimpselectionoptions.c:276 +#: ../app/tools/gimpselectionoptions.c:281 msgid "Feather edges" msgstr "Difuminatu ertzak" -#: ../app/tools/gimpselectiontool.c:252 +#: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" msgstr "Egin klik eta arrastatu uneko hautapena ordezteko" -#: ../app/tools/gimpselectiontool.c:260 +#: ../app/tools/gimpselectiontool.c:263 msgid "Click-Drag to create a new selection" msgstr "Egin klik eta arrastatu hautapen berria sortzeko" -#: ../app/tools/gimpselectiontool.c:265 +#: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" msgstr "Egin klik eta arrastatu uneko hautapenari gehitzeko" -#: ../app/tools/gimpselectiontool.c:274 +#: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" msgstr "Egin klik eta arrastatu uneko hautapenetik kentzeko" -#: ../app/tools/gimpselectiontool.c:283 +#: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" msgstr "Egin klik eta arrastatu uneko hautapenarekin gurutzatzeko" -#: ../app/tools/gimpselectiontool.c:293 +#: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" msgstr "Egin klik eta arrastatu uneko maskara lekuz aldatzeko" -#: ../app/tools/gimpselectiontool.c:301 +#: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" msgstr "Egin klik eta arrastatu hautatutako pixelak lekuz aldatzeko" -#: ../app/tools/gimpselectiontool.c:305 +#: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" msgstr "Egin klik eta arrastatu hautatutako pixelen kopia lekuz aldatzeko" -#: ../app/tools/gimpselectiontool.c:309 +#: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" msgstr "Egin klik hautapen mugikorra ainguratzeko" @@ -13671,31 +13774,31 @@ msgstr "Koadroa:" msgid "Language:" msgstr "Hizkuntza:" -#: ../app/tools/gimptexttool.c:189 +#: ../app/tools/gimptexttool.c:191 msgid "Text" msgstr "Testua" -#: ../app/tools/gimptexttool.c:190 +#: ../app/tools/gimptexttool.c:192 msgid "Text Tool: Create or edit text layers" msgstr "Testuaren tresna: sortu edo editatu testuen geruzak" -#: ../app/tools/gimptexttool.c:191 +#: ../app/tools/gimptexttool.c:193 msgid "Te_xt" msgstr "Te_stua" -#: ../app/tools/gimptexttool.c:943 +#: ../app/tools/gimptexttool.c:959 msgid "Reshape Text Layer" msgstr "Aldatu testuaren geruzaren forma" -#: ../app/tools/gimptexttool.c:1478 ../app/tools/gimptexttool.c:1481 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "Berretsi testu-edizioa" -#: ../app/tools/gimptexttool.c:1485 +#: ../app/tools/gimptexttool.c:1520 msgid "Create _New Layer" msgstr "Sortu geruza _berria" -#: ../app/tools/gimptexttool.c:1509 +#: ../app/tools/gimptexttool.c:1544 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13710,7 +13813,7 @@ msgstr "" "Geruza edita dezakezu, edo sortu testu-geruza berria bere testu-atributuak " "oinarritzat hartuz." -#: ../app/tools/gimptexttool-editor.c:1159 +#: ../app/tools/gimptexttool-editor.c:1199 msgid "GIMP Text Editor" msgstr "GIMP Testu-editorea" @@ -13742,7 +13845,7 @@ msgstr "Mugak ez du geruza indexatuetan funtzionatzen." msgid "Automatically adjust to optimal binarization threshold" msgstr "Egokitu automatikoki bitarrera bihurtzeko muga optimora" -#: ../app/tools/gimptool.c:949 +#: ../app/tools/gimptool.c:978 msgid "Can't work on an empty image, add a layer first" msgstr "Ez da lanik egin irudi huts batean, gehitu geruza aurrenik" @@ -13771,66 +13874,70 @@ msgid "Size of a grid cell for variable number of composition guides" msgstr "" "Saretako gelaxkaren tamaina gida konponsatuaren kopuru aldagaiarentzako" -#: ../app/tools/gimptransformoptions.c:138 -msgid "Limit rotation steps to 15 degrees" -msgstr "Mugatu biraketaren urratsak 15 gradutara" - -#: ../app/tools/gimptransformoptions.c:276 +#: ../app/tools/gimptransformoptions.c:277 msgid "Transform:" msgstr "Eraldatu:" -#: ../app/tools/gimptransformoptions.c:285 +#: ../app/tools/gimptransformoptions.c:286 #: ../app/widgets/gimpdynamicseditor.c:143 -#: ../app/widgets/gimpdynamicsoutputeditor.c:70 +#: ../app/widgets/gimpdynamicsoutputeditor.c:71 msgid "Direction" msgstr "Norabidea" #. the interpolation menu -#: ../app/tools/gimptransformoptions.c:290 +#: ../app/tools/gimptransformoptions.c:291 msgid "Interpolation:" msgstr "Interpolazioa:" #. the clipping menu -#: ../app/tools/gimptransformoptions.c:299 +#: ../app/tools/gimptransformoptions.c:300 msgid "Clipping:" msgstr "Mozketa" -#: ../app/tools/gimptransformoptions.c:309 +#: ../app/tools/gimptransformoptions.c:310 msgid "Image opacity" msgstr "Irudiaren opakotasuna" -#: ../app/tools/gimptransformoptions.c:311 +#: ../app/tools/gimptransformoptions.c:312 msgid "Show image preview" msgstr "Erakutsi irudiaren aurrebista" #. the guides frame -#: ../app/tools/gimptransformoptions.c:317 +#: ../app/tools/gimptransformoptions.c:318 msgid "Guides" msgstr "Gidak" -#: ../app/tools/gimptransformoptions.c:345 +#: ../app/tools/gimptransformoptions.c:346 #, c-format msgid "15 degrees (%s)" msgstr "15 gradu (%s)" -#: ../app/tools/gimptransformoptions.c:349 +#: ../app/tools/gimptransformoptions.c:347 +msgid "Limit rotation steps to 15 degrees" +msgstr "Mugatu biraketaren urratsak 15 gradutara" + +#: ../app/tools/gimptransformoptions.c:351 #, c-format msgid "Keep aspect (%s)" msgstr "Mantendu aspektua (%s)" -#: ../app/tools/gimptransformtool.c:211 +#: ../app/tools/gimptransformoptions.c:352 +msgid "Keep the original aspect ratio" +msgstr "Mantendu jatorrizko aspektu-erlazioa" + +#: ../app/tools/gimptransformtool.c:213 msgid "Transforming" msgstr "Eraldatzea" -#: ../app/tools/gimptransformtool.c:1060 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Ez dago eraldatzeko geruzarik." -#: ../app/tools/gimptransformtool.c:1073 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Ez dago eraldatzeko biderik." -#: ../app/tools/gimptransformtool.c:1074 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Bide aktiboaren trazuak blokeatuta daude." @@ -13842,11 +13949,11 @@ msgstr "Murriztu poligonoen edizioa" msgid "Edit Mode" msgstr "Editatze-modua" -#: ../app/tools/gimpvectoroptions.c:173 +#: ../app/tools/gimpvectoroptions.c:174 msgid "Polygonal" msgstr "Poligonala" -#: ../app/tools/gimpvectoroptions.c:177 +#: ../app/tools/gimpvectoroptions.c:178 #, c-format msgid "" "Path to Selection\n" @@ -13860,15 +13967,15 @@ msgstr "" "%s Gurutzatu" #. Create a selection from the current path -#: ../app/tools/gimpvectoroptions.c:188 +#: ../app/tools/gimpvectoroptions.c:189 msgid "Selection from Path" msgstr "Hautapena bidetik" -#: ../app/tools/gimpvectortool.c:160 +#: ../app/tools/gimpvectortool.c:161 msgid "Paths Tool: Create and edit paths" msgstr "Bidearen tresna: sortu eta editatu bideak" -#: ../app/tools/gimpvectortool.c:161 +#: ../app/tools/gimpvectortool.c:162 msgid "Pat_hs" msgstr "_Bideak" @@ -13880,128 +13987,128 @@ msgstr "Bide aktiboa blokeatuta dago." msgid "Add Stroke" msgstr "Gehitu traza" -#: ../app/tools/gimpvectortool.c:364 +#: ../app/tools/gimpvectortool.c:365 msgid "Add Anchor" msgstr "Gehitu aingura" -#: ../app/tools/gimpvectortool.c:390 +#: ../app/tools/gimpvectortool.c:391 msgid "Insert Anchor" msgstr "Txertatu aingura" -#: ../app/tools/gimpvectortool.c:421 +#: ../app/tools/gimpvectortool.c:422 msgid "Drag Handle" msgstr "Arrastatu heldulekua" -#: ../app/tools/gimpvectortool.c:452 +#: ../app/tools/gimpvectortool.c:453 msgid "Drag Anchor" msgstr "Arrastatu aingura" -#: ../app/tools/gimpvectortool.c:470 +#: ../app/tools/gimpvectortool.c:471 msgid "Drag Anchors" msgstr "Arrastatu aingurak" -#: ../app/tools/gimpvectortool.c:493 +#: ../app/tools/gimpvectortool.c:494 msgid "Drag Curve" msgstr "Arrastatu kurba" -#: ../app/tools/gimpvectortool.c:522 +#: ../app/tools/gimpvectortool.c:523 msgid "Connect Strokes" msgstr "Konektatu trazak" -#: ../app/tools/gimpvectortool.c:554 +#: ../app/tools/gimpvectortool.c:555 msgid "Drag Path" msgstr "Bota bide berria" -#: ../app/tools/gimpvectortool.c:565 +#: ../app/tools/gimpvectortool.c:566 msgid "Convert Edge" msgstr "Bihurtu ertza" -#: ../app/tools/gimpvectortool.c:596 +#: ../app/tools/gimpvectortool.c:597 msgid "Delete Anchor" msgstr "Ezabatu aingura" -#: ../app/tools/gimpvectortool.c:619 +#: ../app/tools/gimpvectortool.c:620 msgid "Delete Segment" msgstr "Ezabatu segmentua" -#: ../app/tools/gimpvectortool.c:838 +#: ../app/tools/gimpvectortool.c:842 msgid "Move Anchors" msgstr "Mugitu aingurak" -#: ../app/tools/gimpvectortool.c:1201 +#: ../app/tools/gimpvectortool.c:1205 msgid "Click to pick path to edit" msgstr "Egin klik editatzeko bidea aukeratzeko" -#: ../app/tools/gimpvectortool.c:1205 +#: ../app/tools/gimpvectortool.c:1209 msgid "Click to create a new path" msgstr "Egin klik bide berria sortzeko" -#: ../app/tools/gimpvectortool.c:1209 +#: ../app/tools/gimpvectortool.c:1213 msgid "Click to create a new component of the path" msgstr "Egin klik bidearen osagai berria sortzeko." -#: ../app/tools/gimpvectortool.c:1213 +#: ../app/tools/gimpvectortool.c:1217 msgid "Click or Click-Drag to create a new anchor" msgstr "Egin klik edo egin klik eta arrastatu aingura berria sortzeko" -#: ../app/tools/gimpvectortool.c:1223 ../app/tools/gimpvectortool.c:1230 +#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the anchor around" msgstr "Egin klik eta arrastatu aingura lekuz aldatzeko." -#: ../app/tools/gimpvectortool.c:1234 ../app/tools/gimpvectortool.c:1257 +#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 msgid "Click-Drag to move the anchors around" msgstr "Egin klik eta arrastatu aingurak lekuz aldatzeko." -#: ../app/tools/gimpvectortool.c:1240 +#: ../app/tools/gimpvectortool.c:1246 msgid "Click-Drag to move the handle around" msgstr "Egin klik eta arrastatu heldulekua lekuz aldatzeko." -#: ../app/tools/gimpvectortool.c:1247 +#: ../app/tools/gimpvectortool.c:1253 msgid "Click-Drag to move the handles around symmetrically" msgstr "Egin klik eta arrastatu heldulekua lekuz simetrikoki aldatzeko" -#: ../app/tools/gimpvectortool.c:1262 +#: ../app/tools/gimpvectortool.c:1268 msgid "Click-Drag to change the shape of the curve" msgstr "Egin klik eta arrastatu kurbaren forma aldatzeko" -#: ../app/tools/gimpvectortool.c:1265 +#: ../app/tools/gimpvectortool.c:1271 #, c-format msgid "%s: symmetrical" msgstr "%s: simetrikoa" -#: ../app/tools/gimpvectortool.c:1270 +#: ../app/tools/gimpvectortool.c:1276 msgid "Click-Drag to move the component around" msgstr "Egin klik eta arrastatu osagaia lekuz aldatzeko" -#: ../app/tools/gimpvectortool.c:1278 +#: ../app/tools/gimpvectortool.c:1284 msgid "Click-Drag to move the path around" msgstr "Egin klik eta arrastatu bidea lekuz aldatzeko" -#: ../app/tools/gimpvectortool.c:1282 +#: ../app/tools/gimpvectortool.c:1288 msgid "Click-Drag to insert an anchor on the path" msgstr "Egin klik aingura bidean txertatzeko" -#: ../app/tools/gimpvectortool.c:1290 +#: ../app/tools/gimpvectortool.c:1296 msgid "Click to delete this anchor" msgstr "Egin klik aingura ezabatzeko." -#: ../app/tools/gimpvectortool.c:1294 +#: ../app/tools/gimpvectortool.c:1300 msgid "Click to connect this anchor with the selected endpoint" msgstr "Egin klik aingura hau hautatutako amaiera-puntuarekin konektatzeko" -#: ../app/tools/gimpvectortool.c:1299 +#: ../app/tools/gimpvectortool.c:1305 msgid "Click to open up the path" msgstr "Egin klik bidea irekitzeko" -#: ../app/tools/gimpvectortool.c:1303 +#: ../app/tools/gimpvectortool.c:1309 msgid "Click to make this node angular" msgstr "Egin klik nodoa angularra egiteko" -#: ../app/tools/gimpvectortool.c:1803 +#: ../app/tools/gimpvectortool.c:1810 msgid "Delete Anchors" msgstr "Ezabatu aingurak" -#: ../app/tools/gimpvectortool.c:1974 +#: ../app/tools/gimpvectortool.c:1969 msgid "There is no active layer or channel to stroke to" msgstr "Ez dago trazatzeko geruza edo kanal aktiborik." @@ -14200,47 +14307,47 @@ msgstr "_Bilatu:" msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "GBUA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:338 #: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "Ekintza" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:367 msgid "Shortcut" msgstr "Laster-teklak" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:393 msgid "Name" msgstr "Izena" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "Huts egin du laster-teklak aldatzeak." -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:670 msgid "Conflicting Shortcuts" msgstr "Gatazka laster-tekletan" -#: ../app/widgets/gimpactionview.c:675 +#: ../app/widgets/gimpactionview.c:676 msgid "_Reassign shortcut" msgstr "Esleitu laster-tekla _berriro" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:691 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "" "\"%1$s\" laster-tekla jadanik \"%3$s\" taldeko \"%2$s\" elementuak dauka." -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "Laster-tekla berriro esleitzeak \"%s\"-(e)tik ezabatuko du." -#: ../app/widgets/gimpactionview.c:767 +#: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." msgstr "Laster-tekla baliogabea." -#: ../app/widgets/gimpactionview.c:856 +#: ../app/widgets/gimpactionview.c:867 msgid "Removing shortcut failed." msgstr "Huts egin du laster-tekla kentzeak." @@ -14257,22 +14364,18 @@ msgid "Aspect ratio" msgstr "Aspektu-erlazioa" #: ../app/widgets/gimpbrusheditor.c:210 -#: ../app/widgets/gimpbrushfactoryview.c:79 +#: ../app/widgets/gimpbrushfactoryview.c:80 #: ../app/widgets/gimpgrideditor.c:174 msgid "Spacing" msgstr "Tartea" #: ../app/widgets/gimpbrusheditor.c:215 -#: ../app/widgets/gimpbrushfactoryview.c:83 +#: ../app/widgets/gimpbrushfactoryview.c:84 msgid "Percentage of width of brush" msgstr "Brotxaren zabaleraren ehunekoa" -#: ../app/widgets/gimpbrushselect.c:172 -msgid "Opacity:" -msgstr "Opakutasuna:" - -#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:258 -#: ../app/widgets/gimpeditor.c:748 +#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 +#: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(bat ere ez)" @@ -14280,41 +14383,41 @@ msgstr "(bat ere ez)" msgid "Add the current color to the color history" msgstr "Gehitu uneko kolorea koloreen historiari" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "Iragazki erabilgarriak" -#: ../app/widgets/gimpcolordisplayeditor.c:215 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "Eraman gora hautatutako iragazkia" -#: ../app/widgets/gimpcolordisplayeditor.c:224 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "Eraman behera hautatutako iragazkia" -#: ../app/widgets/gimpcolordisplayeditor.c:270 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "Iragazki aktiboak" -#: ../app/widgets/gimpcolordisplayeditor.c:321 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "Berrezarri hautatutako iragazkia balio lehenetsiekin" -#: ../app/widgets/gimpcolordisplayeditor.c:495 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "Gehitu '%s' iragazki aktiboen zerrendan" -#: ../app/widgets/gimpcolordisplayeditor.c:532 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "Kendu '%s' iragazki aktiboen zerrendatik." -#: ../app/widgets/gimpcolordisplayeditor.c:563 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "Ez da iragazkirik hautatu" -#: ../app/widgets/gimpcoloreditor.c:258 +#: ../app/widgets/gimpcoloreditor.c:260 msgid "" "Hexadecimal color notation as used in HTML and CSS. This entry also accepts " "CSS color names." @@ -14374,15 +14477,15 @@ msgstr "Beltza:" msgid "Alpha:" msgstr "Alfa:" -#: ../app/widgets/gimpcolormapeditor.c:199 +#: ../app/widgets/gimpcolormapeditor.c:200 msgid "Color index:" msgstr "Koloreen indizea:" -#: ../app/widgets/gimpcolormapeditor.c:209 +#: ../app/widgets/gimpcolormapeditor.c:210 msgid "HTML notation:" msgstr "HTML notazioa:" -#: ../app/widgets/gimpcolormapeditor.c:465 +#: ../app/widgets/gimpcolormapeditor.c:466 msgid "Only indexed images have a colormap." msgstr "Indexatutako irudiek soilik dute kolore-mapa." @@ -14390,11 +14493,11 @@ msgstr "Indexatutako irudiek soilik dute kolore-mapa." msgid "Palette" msgstr "Paleta" -#: ../app/widgets/gimpcontainerpopup.c:578 +#: ../app/widgets/gimpcontainerpopup.c:595 msgid "Smaller Previews" msgstr "Aurrebista txikiagoak" -#: ../app/widgets/gimpcontainerpopup.c:583 +#: ../app/widgets/gimpcontainerpopup.c:600 msgid "Larger Previews" msgstr "Aurrebista handiagoak" @@ -14507,33 +14610,33 @@ msgstr "Prest" msgid "Available Controllers" msgstr "Kontroladora erabilgarriak" -#: ../app/widgets/gimpcontrollerlist.c:274 +#: ../app/widgets/gimpcontrollerlist.c:277 msgid "Active Controllers" msgstr "Aktibatu kontroladoreak" -#: ../app/widgets/gimpcontrollerlist.c:290 +#: ../app/widgets/gimpcontrollerlist.c:293 msgid "Configure the selected controller" msgstr "Konfiguratu hautatutako kontroladorea" -#: ../app/widgets/gimpcontrollerlist.c:298 +#: ../app/widgets/gimpcontrollerlist.c:301 msgid "Move the selected controller up" msgstr "Eraman gora hautatutako kontroladorea" -#: ../app/widgets/gimpcontrollerlist.c:306 +#: ../app/widgets/gimpcontrollerlist.c:309 msgid "Move the selected controller down" msgstr "Eraman behera hautatutako kontroladorea" -#: ../app/widgets/gimpcontrollerlist.c:424 +#: ../app/widgets/gimpcontrollerlist.c:427 #, c-format msgid "Add '%s' to the list of active controllers" msgstr "Gehitu '%s' kontroladore aktiboen zerrendari" -#: ../app/widgets/gimpcontrollerlist.c:475 +#: ../app/widgets/gimpcontrollerlist.c:478 #, c-format msgid "Remove '%s' from the list of active controllers" msgstr "Kendu '%s' kontroladore aktiboen zerrendatik." -#: ../app/widgets/gimpcontrollerlist.c:509 +#: ../app/widgets/gimpcontrollerlist.c:512 msgid "" "There can only be one active keyboard controller.\n" "\n" @@ -14543,7 +14646,7 @@ msgstr "" "\n" "Kontroladore-aktiboen zerrendan badago teklatu-kontroladore bat." -#: ../app/widgets/gimpcontrollerlist.c:520 +#: ../app/widgets/gimpcontrollerlist.c:523 msgid "" "There can only be one active wheel controller.\n" "\n" @@ -14553,7 +14656,7 @@ msgstr "" "\n" "Kontroladore-aktiboen zerrendan badago gurpil-kontroladore bat." -#: ../app/widgets/gimpcontrollerlist.c:531 +#: ../app/widgets/gimpcontrollerlist.c:534 msgid "" "There can only be one active mouse controller.\n" "\n" @@ -14563,24 +14666,24 @@ msgstr "" "\n" "Jadanik badago sagu-kontroladore bat kontroladore-aktiboen zerrendan." -#: ../app/widgets/gimpcontrollerlist.c:557 +#: ../app/widgets/gimpcontrollerlist.c:560 msgid "Remove Controller?" msgstr "Kendu kontroladorea?" -#: ../app/widgets/gimpcontrollerlist.c:562 +#: ../app/widgets/gimpcontrollerlist.c:565 msgid "Disable Controller" msgstr "Desgaitu kontroladorea" -#: ../app/widgets/gimpcontrollerlist.c:564 +#: ../app/widgets/gimpcontrollerlist.c:567 msgid "Remove Controller" msgstr "Kendu kontroladorea" -#: ../app/widgets/gimpcontrollerlist.c:576 +#: ../app/widgets/gimpcontrollerlist.c:579 #, c-format msgid "Remove Controller '%s'?" msgstr "Kendu '%s' kontroladorea?" -#: ../app/widgets/gimpcontrollerlist.c:580 +#: ../app/widgets/gimpcontrollerlist.c:583 msgid "" "Removing this controller from the list of active controllers will " "permanently delete all event mappings you have configured.\n" @@ -14594,7 +14697,7 @@ msgstr "" "\"Desgaitu kontroladorea\" hautatzean kontroladorea desgaitu egiten du, " "ezabatu gabe ordea." -#: ../app/widgets/gimpcontrollerlist.c:632 +#: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" msgstr "Konfiguratu sarrerako kontroladorea" @@ -14749,7 +14852,7 @@ msgstr "" #: ../app/widgets/gimpdeviceinfoeditor.c:140 #: ../app/widgets/gimpdynamicseditor.c:141 -#: ../app/widgets/gimpdynamicsoutputeditor.c:68 +#: ../app/widgets/gimpdynamicsoutputeditor.c:69 msgid "Pressure" msgstr "Presioa" @@ -14761,75 +14864,78 @@ msgstr "X okerdura" msgid "Y tilt" msgstr "Y okerdura" -#: ../app/widgets/gimpdeviceinfoeditor.c:143 +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 #: ../app/widgets/gimpdynamicseditor.c:145 -#: ../app/widgets/gimpdynamicsoutputeditor.c:72 +#: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "Gurpila" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:193 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 msgid "Axes" msgstr "Ardatzak" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:267 +#: ../app/widgets/gimpdeviceinfoeditor.c:269 msgid "Keys" msgstr "Teklak" -#: ../app/widgets/gimpdeviceinfoeditor.c:364 -#: ../app/widgets/gimpdeviceinfoeditor.c:580 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "bat ere ez" -#: ../app/widgets/gimpdeviceinfoeditor.c:412 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 #, c-format msgid "%s Curve" msgstr "%s kurba" -#: ../app/widgets/gimpdeviceinfoeditor.c:471 -#: ../app/widgets/gimpdynamicsoutputeditor.c:195 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 +#: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "_Berrezarri kurba" -#: ../app/widgets/gimpdeviceinfoeditor.c:484 +#: ../app/widgets/gimpdeviceinfoeditor.c:487 #, c-format msgid "The axis '%s' has no curve" msgstr "'%s' ardatzak ez dauka kurbarik" -#: ../app/widgets/gimpdevicestatus.c:136 +#: ../app/widgets/gimpdevicestatus.c:137 msgid "Save device status" msgstr "Gorde gailuaren egoera" -#: ../app/widgets/gimpdevicestatus.c:432 +#: ../app/widgets/gimpdevicestatus.c:433 #, c-format msgid "Foreground: %d, %d, %d" msgstr "Aurreko planoa: %d, %d, %d" -#: ../app/widgets/gimpdevicestatus.c:437 +#: ../app/widgets/gimpdevicestatus.c:438 #, c-format msgid "Background: %d, %d, %d" msgstr "Atzeko planoa: %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:203 +#: ../app/widgets/gimpdnd-xds.c:204 msgid "The given filename does not have any known file extension." msgstr "Zehaztutako fitxategi-izenak ez du luzapen ezagunik." -#: ../app/widgets/gimpdnd-xds.c:221 +#: ../app/widgets/gimpdnd-xds.c:222 msgid "File Exists" msgstr "Fitxategia badago lehendik" -#: ../app/widgets/gimpdnd-xds.c:226 +#: ../app/widgets/gimpdnd-xds.c:227 msgid "_Replace" msgstr "_Ordeztu" -#: ../app/widgets/gimpdnd-xds.c:237 +#: ../app/widgets/gimpdnd-xds.c:238 #, c-format msgid "A file named '%s' already exists." msgstr "'%s' izeneko fitxategia jadanik existitzen da." -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "Gordetzen ari zaren irudiarekin ordeztea nahi duzu?" @@ -14855,16 +14961,16 @@ msgctxt "dock" msgid " | " msgstr " | " -#: ../app/widgets/gimpdockbook.c:292 +#: ../app/widgets/gimpdockbook.c:291 msgid "Configure this tab" msgstr "Konfiguratu fitxa" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Automatikoa" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "" @@ -14880,17 +14986,17 @@ msgid "Mapping matrix" msgstr "Mapaketaren matrizea" #: ../app/widgets/gimpdynamicseditor.c:142 -#: ../app/widgets/gimpdynamicsoutputeditor.c:69 +#: ../app/widgets/gimpdynamicsoutputeditor.c:70 msgid "Velocity" msgstr "Abiadura" #: ../app/widgets/gimpdynamicseditor.c:146 -#: ../app/widgets/gimpdynamicsoutputeditor.c:73 +#: ../app/widgets/gimpdynamicsoutputeditor.c:74 msgid "Random" msgstr "Ausazkoa" #: ../app/widgets/gimpdynamicseditor.c:147 -#: ../app/widgets/gimpdynamicsoutputeditor.c:74 +#: ../app/widgets/gimpdynamicsoutputeditor.c:75 msgid "Fade" msgstr "Iraungitu" @@ -14902,31 +15008,43 @@ msgstr "Errore-mezu gehiegi" msgid "Messages are redirected to stderr." msgstr "Mezuak stderr-era birbideratzen dira." -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 #, c-format msgid "%s Message" msgstr "%s mezua" -#: ../app/widgets/gimpfiledialog.c:327 +#: ../app/widgets/gimpfiledialog.c:330 msgid "Automatically Detected" msgstr "Automatikoki detektatuta" -#: ../app/widgets/gimpfiledialog.c:344 +#: ../app/widgets/gimpfiledialog.c:347 msgid "By Extension" msgstr "Luzapenaren arabera" -#: ../app/widgets/gimpfiledialog.c:790 +#: ../app/widgets/gimpfiledialog.c:801 msgid "All files" msgstr "Fitxategi guztiak" -#: ../app/widgets/gimpfiledialog.c:795 +#: ../app/widgets/gimpfiledialog.c:806 msgid "All images" msgstr "Irudi denak" -#: ../app/widgets/gimpfiledialog.c:971 +#: ../app/widgets/gimpfiledialog.c:813 +msgid "All XCF images" +msgstr "XCF irudi guztiak" + +#: ../app/widgets/gimpfiledialog.c:815 +msgid "All export images" +msgstr "Esportatutako irudi guztiak" + +#: ../app/widgets/gimpfiledialog.c:999 #, c-format msgid "Select File _Type (%s)" -msgstr "Hautatu fitxategi mota (%s)" +msgstr "Hautatu fitxategi _mota (%s)" #: ../app/widgets/gimpfileprocview.c:185 msgid "File Type" @@ -14944,84 +15062,84 @@ msgstr "Bete koloreaz" msgid "_Antialiasing" msgstr "_Antialiasing-a" -#: ../app/widgets/gimpgradienteditor.c:752 +#: ../app/widgets/gimpgradienteditor.c:753 #, c-format msgid "Zoom factor: %d:1" msgstr "Zoom-faktorea: %d:1" -#: ../app/widgets/gimpgradienteditor.c:755 +#: ../app/widgets/gimpgradienteditor.c:756 #, c-format msgid "Displaying [%0.4f, %0.4f]" msgstr "Bistaratzen [%0.4f, %0.4f]" -#: ../app/widgets/gimpgradienteditor.c:957 +#: ../app/widgets/gimpgradienteditor.c:953 #, c-format msgid "Position: %0.4f" msgstr "Posizioa: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:958 +#: ../app/widgets/gimpgradienteditor.c:954 #, c-format msgid "RGB (%0.3f, %0.3f, %0.3f)" msgstr "GBU (%0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpgradienteditor.c:960 +#: ../app/widgets/gimpgradienteditor.c:956 #, c-format msgid "HSV (%0.1f, %0.1f, %0.1f)" msgstr "ÑSB (%0.1f, %0.1f, %0.1f)" -#: ../app/widgets/gimpgradienteditor.c:962 +#: ../app/widgets/gimpgradienteditor.c:958 #, c-format msgid "Luminance: %0.1f Opacity: %0.1f" msgstr "Intentsitatea: %0.1f Opakotasuna: %0.1f" -#: ../app/widgets/gimpgradienteditor.c:993 +#: ../app/widgets/gimpgradienteditor.c:989 #, c-format msgid "RGB (%d, %d, %d)" msgstr "GBU (%d, %d, %d)" -#: ../app/widgets/gimpgradienteditor.c:1004 +#: ../app/widgets/gimpgradienteditor.c:1000 msgid "Foreground color set to:" msgstr "Ezarritako aurreko planoaren kolorea:" -#: ../app/widgets/gimpgradienteditor.c:1011 +#: ../app/widgets/gimpgradienteditor.c:1007 msgid "Background color set to:" msgstr "Ezarritako atzeko planoaren kolorea:" -#: ../app/widgets/gimpgradienteditor.c:1239 -#: ../app/widgets/gimpgradienteditor.c:1305 +#: ../app/widgets/gimpgradienteditor.c:1235 +#: ../app/widgets/gimpgradienteditor.c:1296 #, c-format -msgid "%s%sDrag: move & compress" -msgstr "%s%sArrastatu: aldatu lekuz eta konprimitu" +msgid "%s-Drag: move & compress" +msgstr "%s-Arrastatu: aldatu lekuz eta konprimitu" -#: ../app/widgets/gimpgradienteditor.c:1245 +#: ../app/widgets/gimpgradienteditor.c:1240 msgid "Drag: move" msgstr "Arrastatu: aldatu lekuz" -#: ../app/widgets/gimpgradienteditor.c:1252 -#: ../app/widgets/gimpgradienteditor.c:1266 -#: ../app/widgets/gimpgradienteditor.c:1280 -#: ../app/widgets/gimpgradienteditor.c:1302 +#: ../app/widgets/gimpgradienteditor.c:1247 +#: ../app/widgets/gimpgradienteditor.c:1260 +#: ../app/widgets/gimpgradienteditor.c:1273 +#: ../app/widgets/gimpgradienteditor.c:1294 #, c-format -msgid "%s%sClick: extend selection" -msgstr "%s%sEgin klik: luzatu hautapena" +msgid "%s-Click: extend selection" +msgstr "%s-Egin klik: luzatu hautapena" -#: ../app/widgets/gimpgradienteditor.c:1258 -#: ../app/widgets/gimpgradienteditor.c:1272 +#: ../app/widgets/gimpgradienteditor.c:1252 +#: ../app/widgets/gimpgradienteditor.c:1265 msgid "Click: select" msgstr "Egin klik: hautatu" -#: ../app/widgets/gimpgradienteditor.c:1286 -#: ../app/widgets/gimpgradienteditor.c:1310 +#: ../app/widgets/gimpgradienteditor.c:1278 +#: ../app/widgets/gimpgradienteditor.c:1300 msgid "Click: select Drag: move" msgstr "Egin klik: hautatu\tArrastatu: aldatu lekuz\t" -#: ../app/widgets/gimpgradienteditor.c:1525 -#: ../app/widgets/gimpgradienteditor.c:1533 +#: ../app/widgets/gimpgradienteditor.c:1515 +#: ../app/widgets/gimpgradienteditor.c:1523 #, c-format msgid "Handle position: %0.4f" msgstr "Heldulekuaren posizioa: %0.4f" -#: ../app/widgets/gimpgradienteditor.c:1550 +#: ../app/widgets/gimpgradienteditor.c:1540 #, c-format msgid "Distance: %0.4f" msgstr "Distantzia: %0.4f" @@ -15147,106 +15265,96 @@ msgstr "" msgid "Querying..." msgstr "Kontsulta..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Tamaina (pixeletan):" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Inprimatze-tamaina:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Bereizmena:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Kolore-espazioa:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Fitxategi-izena:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Fitxategi-tamaina:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Fitxategi mota:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Memoria-tamaina:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Desegite-urratsak:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Berregite-urratsak:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Pixel-kopurua:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Geruza-kopurua:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Kanal-kopurua:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Bide-kopurua:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:408 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Bat ere ez" -#: ../app/widgets/gimpimagepropview.c:462 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pixel/%s" -#: ../app/widgets/gimpimagepropview.c:464 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g x %g %s" -#: ../app/widgets/gimpimagepropview.c:485 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "koloreak" -#: ../app/widgets/gimpitemtreeview.c:707 +#: ../app/widgets/gimpitemtreeview.c:716 msgid "Lock:" msgstr "Blokeatu:" -#: ../app/widgets/gimpitemtreeview.c:1484 -msgid "Set Item Exclusive Visible" -msgstr "Ezarri elementua esklusiboki ikusgai" - -#: ../app/widgets/gimpitemtreeview.c:1492 -msgid "Set Item Exclusive Linked" -msgstr "Ezarri elementua esklusiboki ikusgai" - -#: ../app/widgets/gimplayertreeview.c:306 +#: ../app/widgets/gimplayertreeview.c:307 msgid "Lock alpha channel" msgstr "Blokeatu alfa kanala" -#: ../app/widgets/gimpmessagebox.c:434 +#: ../app/widgets/gimpmessagebox.c:433 #, c-format -msgid "Message repeated %d times." -msgstr "%d aldiz errepikatutako mezua." - -#: ../app/widgets/gimpmessagebox.c:436 msgid "Message repeated once." -msgstr "Mezua behin errepikatu da." +msgid_plural "Message repeated %d times." +msgstr[0] "Mezua behin errepikatu da." +msgstr[1] "Mezua %d aldiz errepikatu da." #: ../app/widgets/gimppaletteeditor.c:226 #: ../app/widgets/gimppaletteeditor.c:682 @@ -15257,6 +15365,10 @@ msgstr "Definitu gabe" msgid "Columns:" msgstr "Zutabeak:" +#: ../app/widgets/gimppanedbox.c:58 +msgid "You can drop dockable dialogs here" +msgstr "Elkarrizketa-koadro atrakagarriak hemen utz ditzakezu" + #: ../app/widgets/gimpprofilechooserdialog.c:127 msgid "ICC color profile (*.icc, *.icm)" msgstr "ICC kolore-profila (*.icc, *icm)" @@ -15284,35 +15396,35 @@ msgstr "UTF-8 baliogabea" msgid "Pick a setting from the list" msgstr "Hartu ezarpen bat zerrendatik" -#: ../app/widgets/gimpsettingsbox.c:290 +#: ../app/widgets/gimpsettingsbox.c:291 msgid "Add settings to favorites" msgstr "Gehitu ezarpenak gogokoei" -#: ../app/widgets/gimpsettingsbox.c:318 +#: ../app/widgets/gimpsettingsbox.c:319 msgid "_Import Settings from File..." msgstr "_Inportatu ezarpenak fitxategitik..." -#: ../app/widgets/gimpsettingsbox.c:324 +#: ../app/widgets/gimpsettingsbox.c:325 msgid "_Export Settings to File..." msgstr "_Esportatu ezarpenak fitxategira..." -#: ../app/widgets/gimpsettingsbox.c:331 +#: ../app/widgets/gimpsettingsbox.c:332 msgid "_Manage Settings..." msgstr "_Kudeatu ezarpenak..." -#: ../app/widgets/gimpsettingsbox.c:624 +#: ../app/widgets/gimpsettingsbox.c:636 msgid "Add Settings to Favorites" msgstr "Gehitu ezarpenak gogokoei" -#: ../app/widgets/gimpsettingsbox.c:627 +#: ../app/widgets/gimpsettingsbox.c:639 msgid "Enter a name for the settings" msgstr "Sartu izena ezarpenentzako" -#: ../app/widgets/gimpsettingsbox.c:628 +#: ../app/widgets/gimpsettingsbox.c:640 msgid "Saved Settings" msgstr "Ezarpenak gordeta" -#: ../app/widgets/gimpsettingsbox.c:669 +#: ../app/widgets/gimpsettingsbox.c:681 msgid "Manage Saved Settings" msgstr "Kudeatu gordetako ezarpenak" @@ -15366,11 +15478,11 @@ msgstr "Marratxo-eredua:" msgid "Dash _preset:" msgstr "Marratxo aurrezarpena:" -#: ../app/widgets/gimptagentry.c:43 +#: ../app/widgets/gimptagentry.c:45 msgid "filter" msgstr "iragazkia" -#: ../app/widgets/gimptagentry.c:44 +#: ../app/widgets/gimptagentry.c:46 msgid "enter tags" msgstr "sartu etiketak" @@ -15378,7 +15490,7 @@ msgstr "sartu etiketak" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1707 +#: ../app/widgets/gimptagentry.c:1732 msgid "," msgstr "," @@ -15421,12 +15533,12 @@ msgstr "%d x %d ppi, %s" msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:338 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "'%s' atributua ez da baliozkoa <%s> elementuan testuinguru honetan" -#: ../app/widgets/gimptextbuffer-serialize.c:410 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Testuko kanpoko elementua izan behar du <%s>" @@ -15465,19 +15577,19 @@ msgstr "Aldatu hautatutako testuaren karaktereen arteko tartea" msgid "Change baseline of selected text" msgstr "Aldatu hautatutako testuaren oinarri-lerroa" -#: ../app/widgets/gimptextstyleeditor.c:325 +#: ../app/widgets/gimptextstyleeditor.c:328 msgid "Bold" msgstr "Lodia" -#: ../app/widgets/gimptextstyleeditor.c:328 +#: ../app/widgets/gimptextstyleeditor.c:331 msgid "Italic" msgstr "Etzana" -#: ../app/widgets/gimptextstyleeditor.c:331 +#: ../app/widgets/gimptextstyleeditor.c:334 msgid "Underline" msgstr "Azpimarratua" -#: ../app/widgets/gimptextstyleeditor.c:334 +#: ../app/widgets/gimptextstyleeditor.c:337 msgid "Strikethrough" msgstr "Marratua" @@ -15485,13 +15597,13 @@ msgstr "Marratua" #, c-format msgid "" "Click to update preview\n" -"%s%sClick to force update even if preview is up-to-date" +"%s-Click to force update even if preview is up-to-date" msgstr "" "Egin klik aurrebista eguneratzeko\n" -"%s%s Egin klik eguneratzea derrigortzea nahi den bakoitzean, baita " -"aurrebista eguneratuta baldin badago ere" +"Egin klik %s aldiz eguneratzea bultzatzeko, baita aurrebista eguneratuta " +"baldin badago ere" -#: ../app/widgets/gimpthumbbox.c:348 +#: ../app/widgets/gimpthumbbox.c:347 msgid "Pr_eview" msgstr "_Aurrebista" @@ -15499,12 +15611,12 @@ msgstr "_Aurrebista" msgid "No selection" msgstr "Ez dago hautapenik" -#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616 +#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 #, c-format msgid "Thumbnail %d of %d" msgstr "%d/%d koadro txikia" -#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739 +#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 msgid "Creating preview..." msgstr "Aurrebista sortzen..." @@ -15528,8 +15640,8 @@ msgstr "Aldatu aurreko planoaren kolorea" msgid "Change Background Color" msgstr "Aldatu atzeko planoaren kolorea" -#: ../app/widgets/gimptoolbox-image-area.c:112 -#: ../app/widgets/gimptoolbox-image-area.c:117 +#: ../app/widgets/gimptoolbox-image-area.c:118 +#: ../app/widgets/gimptoolbox-image-area.c:123 msgid "" "The active image.\n" "Click to open the Image Dialog." @@ -15537,11 +15649,11 @@ msgstr "" "Irudi aktiboa.\n" "Egin klik irudien elkarrizketa-koadroa irekitzeko." -#: ../app/widgets/gimptoolbox-image-area.c:114 +#: ../app/widgets/gimptoolbox-image-area.c:120 msgid "Drag to an XDS enabled file-manager to save the image." msgstr "Arrastatu XDS gaituta duen fitxategi-kudeatzailera irudia gordetzeko." -#: ../app/widgets/gimptoolbox-indicator-area.c:149 +#: ../app/widgets/gimptoolbox-indicator-area.c:163 msgid "" "The active brush.\n" "Click to open the Brush Dialog." @@ -15549,7 +15661,7 @@ msgstr "" "Brotxa aktiboa.\n" "Egin klik brotxen elkarrizketa-koadroa irekitzeko." -#: ../app/widgets/gimptoolbox-indicator-area.c:181 +#: ../app/widgets/gimptoolbox-indicator-area.c:195 msgid "" "The active pattern.\n" "Click to open the Pattern Dialog." @@ -15557,7 +15669,7 @@ msgstr "" "Eredu aktiboa.\n" "Egin klik ereduen elkarrizketa-koadroa irekitzeko." -#: ../app/widgets/gimptoolbox-indicator-area.c:213 +#: ../app/widgets/gimptoolbox-indicator-area.c:227 msgid "" "The active gradient.\n" "Click to open the Gradient Dialog." @@ -15597,39 +15709,39 @@ msgstr "Berrezarri tresnaren aurrezarpena..." msgid "Delete Tool Preset..." msgstr "Ezabatu tresnaren aurrezarpena..." -#: ../app/widgets/gimptoolpreseteditor.c:126 +#: ../app/widgets/gimptoolpreseteditor.c:148 msgid "Icon:" msgstr "Ikonoa:" -#: ../app/widgets/gimptoolpreseteditor.c:136 +#: ../app/widgets/gimptoolpreseteditor.c:159 msgid "Apply stored FG/BG" msgstr "Aplikatu gordetako AurPl/AtzPla" -#: ../app/widgets/gimptoolpreseteditor.c:141 +#: ../app/widgets/gimptoolpreseteditor.c:165 msgid "Apply stored brush" msgstr "Aplikatu gordetako brotxa" -#: ../app/widgets/gimptoolpreseteditor.c:146 +#: ../app/widgets/gimptoolpreseteditor.c:171 msgid "Apply stored dynamics" msgstr "Aplikatu gordetako dinamika" -#: ../app/widgets/gimptoolpreseteditor.c:151 +#: ../app/widgets/gimptoolpreseteditor.c:177 msgid "Apply stored gradient" msgstr "Aplikatu gordetako gradientea" -#: ../app/widgets/gimptoolpreseteditor.c:156 +#: ../app/widgets/gimptoolpreseteditor.c:183 msgid "Apply stored pattern" msgstr "Aplikatu gordetako eredua" -#: ../app/widgets/gimptoolpreseteditor.c:161 +#: ../app/widgets/gimptoolpreseteditor.c:189 msgid "Apply stored palette" msgstr "Aplikatu gordetako paleta" -#: ../app/widgets/gimptoolpreseteditor.c:166 +#: ../app/widgets/gimptoolpreseteditor.c:195 msgid "Apply stored font" msgstr "Aplikatu gordetako letra-tipoa" -#: ../app/widgets/gimptoolpreseteditor.c:258 +#: ../app/widgets/gimptoolpreseteditor.c:292 #, c-format msgid "%s Preset" msgstr "%s aurrezarpena" @@ -15663,46 +15775,46 @@ msgstr "[ Oinarri-irudia ]" msgid "Lock path strokes" msgstr "Blokeatu bidearen trazuak" -#: ../app/widgets/gimpviewablebox.c:86 +#: ../app/widgets/gimpviewablebox.c:87 msgid "Open the brush selection dialog" msgstr "Ireki brotxa hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpviewablebox.c:150 +#: ../app/widgets/gimpviewablebox.c:151 msgid "Open the dynamics selection dialog" msgstr "Ireki dinamika hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpviewablebox.c:215 +#: ../app/widgets/gimpviewablebox.c:216 msgid "Open the pattern selection dialog" msgstr "Ireki eredua hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpviewablebox.c:283 +#: ../app/widgets/gimpviewablebox.c:284 msgid "Open the gradient selection dialog" msgstr "Ireki gradientea hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpviewablebox.c:400 +#: ../app/widgets/gimpviewablebox.c:401 msgid "Open the palette selection dialog" msgstr "Ireki eredua hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpviewablebox.c:465 +#: ../app/widgets/gimpviewablebox.c:466 msgid "Open the font selection dialog" msgstr "Ireki letra-tipoa hautatzeko elkarrizketa-koadroa" -#: ../app/widgets/gimpwidgets-utils.c:672 +#: ../app/widgets/gimpwidgets-utils.c:595 #, c-format msgid "%s (try %s)" msgstr "%s (saiatu %s)" -#: ../app/widgets/gimpwidgets-utils.c:672 +#: ../app/widgets/gimpwidgets-utils.c:595 #, c-format msgid "%s (%s)" msgstr "%s (%s)" -#: ../app/widgets/gimpwidgets-utils.c:676 +#: ../app/widgets/gimpwidgets-utils.c:599 #, c-format msgid "%s (try %s, %s)" msgstr "%s (saiatu %s, %s)" -#: ../app/widgets/gimpwidgets-utils.c:680 +#: ../app/widgets/gimpwidgets-utils.c:603 #, c-format msgid "%s (try %s, %s, %s)" msgstr "%s (saiatu %s, %s, %s)" @@ -15812,7 +15924,7 @@ msgctxt "tab-style" msgid "Undefined" msgstr "Definitu gabe" -#: ../app/xcf/xcf-load.c:333 +#: ../app/xcf/xcf-load.c:339 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -15820,7 +15932,7 @@ msgstr "" "XCF fitxategia hondatuta dago! Ahal den neurrian kargatu arren, osatu gabe " "dago." -#: ../app/xcf/xcf-load.c:344 +#: ../app/xcf/xcf-load.c:350 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -15828,7 +15940,7 @@ msgstr "" "XCF fitxategia hondatuta dago! Ezin izan da irudiaren datuen zati bat ere " "berreskuratu." -#: ../app/xcf/xcf-load.c:417 +#: ../app/xcf/xcf-load.c:423 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -15878,17 +15990,52 @@ msgid "Error saving XCF file: %s" msgstr "Errorea XCF fitxategia gordetzean: %s" #: ../data/tags/gimp-tags-default.xml.in.h:1 -msgid "fuzzy" -msgstr "zalantzazkoa" - -#: ../data/tags/gimp-tags-default.xml.in.h:2 msgid "round" msgstr "biribila" -#: ../desktop/gimp.desktop.in.in.h:1 +#. fuzzy as in a feathered, blurred, unfocused, soft brush +#: ../data/tags/gimp-tags-default.xml.in.h:3 +msgid "fuzzy" +msgstr "zalantzazkoa" + +#: ../desktop/gimp.desktop.in.in.h:2 +msgid "Image Editor" +msgstr "Irudi-editorea" + +#: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "Sortu irudiak eta editatu argazkiak" -#: ../desktop/gimp.desktop.in.in.h:3 -msgid "Image Editor" -msgstr "Irudi-editorea" +#~ msgctxt "tool-preset-action" +#~ msgid "_Delete Tool Preset" +#~ msgstr "E_zabatu tresnaren aurrezarpena" + +#~ msgctxt "view-action" +#~ msgid "Zoom out" +#~ msgstr "Zooma txikiagotu" + +#~ msgctxt "view-action" +#~ msgid "Zoom in" +#~ msgstr "Zooma handiagotu" + +#~ msgctxt "windows-action" +#~ msgid "" +#~ "When enabled GIMP is in a single-window mode. Far from completely " +#~ "implemented!" +#~ msgstr "" +#~ "Gaituta dagoenean, GIMP leiho bakarreko moduan egongo da. Ez dago bere " +#~ "osotasunean garatuta." + +#~ msgctxt "undo-type" +#~ msgid "Brightness_Contrast" +#~ msgstr "Distira_Kontrastea" + +#~ msgctxt "tool" +#~ msgid "_Zoom" +#~ msgstr "_Zooma" + +#~ msgid "Opacity:" +#~ msgstr "Opakutasuna:" + +#~ msgid "Message repeated %d times." +#~ msgstr "%d aldiz errepikatutako mezua." diff --git a/po/hu.po b/po/hu.po index 005c8d4371..582368dfc2 100644 --- a/po/hu.po +++ b/po/hu.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: gimp.gimp-2-8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-14 21:57+0000\n" -"PO-Revision-Date: 2013-03-16 23:01+0100\n" +"POT-Creation-Date: 2013-09-21 15:29+0000\n" +"PO-Revision-Date: 2013-09-22 10:21+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: \n" @@ -72,7 +72,7 @@ msgstr "" "A GIMP-hez a GNU General Public License egy példánya is jár, ha nem kapta " "meg, tájékozódjon a http://www.gnu.org/licenses/ oldalon." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -443,7 +443,7 @@ msgstr "Szövegszerkesztő" msgid "Tool Options" msgstr "Eszközbeállítások" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Eszközök" @@ -975,7 +975,7 @@ msgid "Use the composite color of all visible layers" msgstr "Az összes látható réteg összesített színe alapján" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2425,49 +2425,50 @@ msgstr "%s _felülírása" msgid "Export to" msgstr "Exportálás" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Kép megnyitása" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Kép megnyitása rétegekként" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Nincs elmentendő változás" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Kép mentése" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "A kép egy másolatának mentése" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Új sablon létrehozása" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Adjon meg egy nevet ehhez a sablonhoz." -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "Visszaállítás sikertelen. Nem kapcsolható fájlnév a képhez." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Kép visszaállítása" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Visszaállítja ezt: „%s” erre: „%s”?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2475,11 +2476,11 @@ msgstr "" "A képnek a lemezen tárolt állapotra való visszaállítása esetén minden " "változtatás elvész – beleértve a visszavonási információkat is." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Névtelen sablon)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3222,7 +3223,7 @@ msgid "Set Image Canvas Size" msgstr "Rajzvászon méretének beállítása" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Méret módosítása" @@ -3249,16 +3250,16 @@ msgstr "Elforgatás" msgid "Cannot crop because the current selection is empty." msgstr "Nem lehet kivágni, mert a kijelölt terület üres." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Nyomtatási méret módosítása" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Kép átméretezése" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 @@ -5182,14 +5183,18 @@ msgid "Create another view on this image" msgstr "Új nézet létrehozása ehhez a képhez" #: ../app/actions/view-actions.c:82 +#| msgctxt "view-action" +#| msgid "_Close" msgctxt "view-action" -msgid "_Close" -msgstr "_Bezárás" +msgid "_Close View" +msgstr "_Nézet bezárása" #: ../app/actions/view-actions.c:83 +#| msgctxt "view-action" +#| msgid "Close this image window" msgctxt "view-action" -msgid "Close this image window" -msgstr "Ezen képablak bezárása" +msgid "Close the active image view" +msgstr "Ezen aktív képnézet bezárása" # úgy illeszt, hogy nem lóghat túl az ablakon #: ../app/actions/view-actions.c:88 @@ -5625,11 +5630,11 @@ msgstr "_Egyéb (%s)…" msgid "_Zoom (%s)" msgstr "_Nagyítás (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Rajzvászon kitöltési színének beállítása" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Rajzvászon egyéni kitöltési színének beállítása" @@ -7361,7 +7366,7 @@ msgid "Jitter" msgstr "Elszórás" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" @@ -7837,7 +7842,7 @@ msgstr "Átlátszatlanság" msgid "Paint Mode" msgstr "Rajzolási mód" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "„%s” nem törölhető: %s" @@ -7983,7 +7988,7 @@ msgid "Posterize" msgstr "Poszter" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Nincs elég pont a körberajzoláshoz" @@ -8166,12 +8171,19 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Színtérkép beállítása" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#| msgctxt "undo-type" +#| msgid "Set Colormap" +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Színtérkép visszaállítása" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Színtérkép-bejegyzés módosítása" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Szín felvétele a színtérképbe" @@ -8258,39 +8270,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Látható rétegek összefésülése" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Egy réteggé lapítás" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Nem lehet lapítani egy képet látható rétegek nélkül." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Nem lehet összefésülni rétegcsoporttal." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Zárolva van a réteg, amellyel össze kíván fésülni." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Nincs látható réteg lejjebb, amellyel össze lehetne fésülni." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Összefésülés lefelé" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Rétegcsoport összefésülése" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Látható útvonalak összefésülése" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Nincs elég látható útvonal az összefésüléshez. Legalább két útvonalra van " @@ -8325,7 +8341,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Mintapont áthelyezése" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Kép átméretezése" @@ -8435,7 +8451,7 @@ msgid "(Preview may be out of date)" msgstr "(Az előnézeti kép elavult lehet)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -9101,15 +9117,15 @@ msgstr "Hely megnyitása" msgid "Enter location (URI):" msgstr "Adja meg a helyet (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Kép exportálása" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Exportálás" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9120,7 +9136,12 @@ msgstr "" "kijelölt fájlformátumhoz, vagy pedig egyáltalán ne adjon meg " "fájlkiterjesztést." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for exporting" +msgstr "A megadott fájlnév nem használható exportáláshoz" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9129,7 +9150,18 @@ msgstr "" "GIMP XCF formátumába szeretne menteni, akkor használja ehelyett a " "Fájl→Mentés parancsot." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +#| msgctxt "dialogs-action" +#| msgid "Open the layers dialog" +msgid "Take me to the Save dialog" +msgstr "Vigyél a mentés párbeszédablakhoz" + +#: ../app/dialogs/file-save-dialog.c:613 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for saving" +msgstr "A megadott fájlnév nem használható mentéshez" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9137,7 +9169,17 @@ msgstr "" "Ezzel a párbeszédablakkal a GIMP XCF formátumába mentheti a képet. A " "Fájl→Exportálás paranccsal exportálhat más formátumokba." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +#| msgctxt "dialogs-action" +#| msgid "Open the paths dialog" +msgid "Take me to the Export dialog" +msgstr "Vigyél az exportálás párbeszédablakhoz" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Kiterjesztés nem illeszkedik" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9146,24 +9188,20 @@ msgstr "" "ismert fájlkiterjesztést vagy válasszon ki egy fájlformátumot a " "fájlformátumok listájából." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Kiterjesztés nem illeszkedik" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "" "A megadott fájlkiterjesztés nem illeszkedik a kiválasztott fájltípushoz." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Mégis szeretné ezzel a névvel menteni a képet?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Mentés megszakítva" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10051,7 +10089,7 @@ msgid "Vertical" msgstr "Függőleges" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10746,7 +10784,7 @@ msgstr "A rétegcsoportok képpontjai nem módosíthatók." #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 #: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 -#: ../app/tools/gimptransformtool.c:1067 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Az aktív réteg képpontjai zárolva vannak." @@ -10838,12 +10876,12 @@ msgstr "A(z) %s bővítmény nem tudta megnyitni a képet" msgid "Image doesn't contain any layers" msgstr "A kép nem tartalmaz réteget" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "„%s” megnyitása sikertelen: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10860,12 +10898,12 @@ msgstr "Ismeretlen fájltípus" msgid "%s plug-in could not save image" msgstr "A(z) %s bővítmény nem tudta menteni a képet" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "„%s”: érvénytelen URI-séma" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Érvénytelen karaktersorozat az URI-ben" @@ -10879,15 +10917,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Kép deformálása a ketreccel" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "nem GIMP-görbefájl" -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "feldolgozási hiba" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "nem GIMP-szintfájl" @@ -11475,29 +11513,29 @@ msgstr "Vonal eltávolítása" msgid "Close path stroke" msgstr "Vonal bezárása" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Vonal eltolása" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Vonal átméretezése" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Vonal forgatása" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Vonal tükrözése" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Vonal létrehozása" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Vonal kiegészítése" @@ -11593,7 +11631,7 @@ msgstr "Bővítményfordítók" msgid "Plug-In Environment" msgstr "Bővítménykörnyezet" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11602,7 +11640,7 @@ msgstr "" "Hívási hiba ennél: „%s”:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11611,16 +11649,21 @@ msgstr "" "Végrehajtási hiba ennél: „%s”:\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "A színprofil nem alkalmazható szürkeárnyalatos képre (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Hiba a(z) „%s” végrehajtása közben" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Hiányzó bővítmény (%s)" @@ -11907,7 +11950,7 @@ msgstr "Színátmenet nem használható indexelt rétegeken." msgid "No gradient available for use with this tool." msgstr "Nincs használható színátmenet ehhez az eszközhöz." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "szög korlátozása: %s" @@ -12051,27 +12094,27 @@ msgctxt "command" msgid "Select by Color" msgstr "Kijelölés szín szerint" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Ketrec átalakítás" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Ketrec átalakítás: a kijelölést deformálja egy ketrec segítségével" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "_Ketrec átalakítás" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Az átalakítás véglegesítéséhez nyomja meg az Entert" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Ketrec együtthatók számítása" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Ketrec átalakítás" @@ -12290,11 +12333,11 @@ msgstr "Szín_pipetta" msgid "Click in any image to view its color" msgstr "A szín megjelenítéséhez kattintson valamelyik képre" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Az előtérszín beállításához kattintson valamelyik képre" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "A háttérszín beállításához kattintson valamelyik képre" @@ -13202,7 +13245,7 @@ msgstr "Az összes pont áthelyezése: kattintás+húzás" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "képpont" @@ -13375,7 +13418,7 @@ msgstr "szín beállítása: %s" msgid "Cannot paint on layer groups." msgstr "Nem lehet rétegcsoportra festeni." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "egyenes vonal: %s" @@ -13985,15 +14028,15 @@ msgstr "Eredeti méretarány megtartása" msgid "Transforming" msgstr "Átalakítás" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Nincs átalakítható réteg." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Nincs átalakítható útvonal." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Az aktív útvonal vonalai zárolva vannak." @@ -15025,11 +15068,11 @@ msgid "Configure this tab" msgstr "Ezen lap beállítása" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Automatikus" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "" @@ -15093,12 +15136,10 @@ msgid "All images" msgstr "Az összes kép" #: ../app/widgets/gimpfiledialog.c:813 -#| msgid "All images" msgid "All XCF images" msgstr "Az összes XCF kép" #: ../app/widgets/gimpfiledialog.c:815 -#| msgid "All images" msgid "All export images" msgstr "Az összes exportált kép" @@ -15326,79 +15367,79 @@ msgstr "" msgid "Querying..." msgstr "Lekérdezés…" -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Méret (képpont):" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Nyomtatási méret:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Felbontás:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Színséma:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Fájlnév:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Fájlméret:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Fájltípus:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Méret a memóriában:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Visszavonási lépések:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Újra végrehajtási lépések:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Képpontok száma:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Rétegek száma:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Csatornák száma:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Útvonalak száma:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Nincs" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "képpont/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "színek" @@ -15594,12 +15635,12 @@ msgstr "%d × %d ppi, %s" msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "„%s” attribútum <%s> elemen érvénytelen ebben a szövegkörnyezetben" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "A szöveg legkülső eleme kell legyen, nem pedig <%s>" diff --git a/po/it.po b/po/it.po index 8387f3b27e..afe102bebf 100644 --- a/po/it.po +++ b/po/it.po @@ -30,8 +30,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp 2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-07 22:23+0200\n" -"PO-Revision-Date: 2013-06-07 22:25+0200\n" +"POT-Creation-Date: 2013-11-18 18:33+0100\n" +"PO-Revision-Date: 2013-11-18 18:33+0100\n" "Last-Translator: Marco Ciampa \n" "Language-Team: gimp@erlug.linux.it\n" "Language: \n" @@ -85,7 +85,7 @@ msgstr "" "Dovresti aver ricevuto una copia della GNU General Public License con GIMP. " "Se così non fosse, vedere http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -986,7 +986,7 @@ msgid "Use the composite color of all visible layers" msgstr "Usa il colore composto da tutti i livelli visibili" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2387,8 +2387,8 @@ msgstr "Salva quest'immagine e chiudi la sua finestra" #: ../app/actions/file-actions.c:146 msgctxt "file-action" -msgid "Export to" -msgstr "Esporta su" +msgid "Export" +msgstr "Esporta" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2408,8 +2408,8 @@ msgstr "" #: ../app/actions/file-actions.c:158 msgctxt "file-action" -msgid "Export..." -msgstr "Esporta..." +msgid "Export As..." +msgstr "Esporta come..." #: ../app/actions/file-actions.c:159 msgctxt "file-action" @@ -2427,52 +2427,53 @@ msgid "Over_write %s" msgstr "So_vrascrivi %s" #: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "Esporta su" +msgid "Export" +msgstr "Esporta" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Apri immagine" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Apri immagine come livelli" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Nessuna modifica da salvare" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Salva immagine" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Salva una copia dell'immagine" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Crea un nuovo modello" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Inserisci un nome per questo modello" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "Fallita la ricarica. Nessun nome file associato a quest'immagine." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Ricarica immagine" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Ricaricare \"%s\" a \"%s\"?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2480,11 +2481,11 @@ msgstr "" "Ricaricando l'immagine salvata su disco, perderai tutte le modifiche, " "incluse tutte le informazioni di annullamento." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(modello senza nome)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3224,7 +3225,7 @@ msgid "Set Image Canvas Size" msgstr "Configura la dimensione della superficie" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Ridimensionamento" @@ -3251,16 +3252,16 @@ msgstr "Rotazione" msgid "Cannot crop because the current selection is empty." msgstr "Non è possibile ritagliare perché la regione selezionata è vuota." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Modifica le dimensioni della stampa" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Scala immagine" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 @@ -4617,7 +4618,7 @@ msgstr "Apri file di testo (UTF-8)" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -5616,11 +5617,11 @@ msgstr "Alt_ro (%s)..." msgid "_Zoom (%s)" msgstr "_Zoom (%s)" -#: ../app/actions/view-commands.c:605 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Seleziona colore di riempimento superficie" -#: ../app/actions/view-commands.c:607 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Imposta colore personalizzato di riempimento superficie" @@ -7532,8 +7533,8 @@ msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "" "Errore fatale di analisi nel file pennello '%s': versione sconosciuta %d." -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 -#: ../app/core/gimpbrush-load.c:727 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:744 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" @@ -7551,7 +7552,21 @@ msgstr "Stringa UTF-8 non valida nel file pennello '%s'." msgid "Unnamed" msgstr "Senza nome" -#: ../app/core/gimpbrush-load.c:382 +#: ../app/core/gimpbrush-load.c:354 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Errore fatale di analisi nel file pennello \"%s\": profondità pennello non " +"supportata %d\n" +"I pennelli di GIMP devono essere grigi o RGBA.\n" +"Potrebbe trattarsi di un file pennello obsoleto di GIMP; provare a caricarlo " +"come immagine e salvarlo nuovamente." + +#: ../app/core/gimpbrush-load.c:399 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7561,7 +7576,7 @@ msgstr "" "supportata %d\n" "I pennelli di GIMP devono essere grigi o RGBA." -#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:871 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7569,7 +7584,7 @@ msgstr "" "Errore fatale di analisi del file pennello '%s': impossibile decodificare " "versione formato abr %d." -#: ../app/core/gimpbrush-load.c:621 +#: ../app/core/gimpbrush-load.c:638 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7643,7 +7658,6 @@ msgid "Brush Angle" msgstr "Angolo pennello" #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "Errore fatale di analisi nel file pennello '%s': il file è errato." @@ -7829,7 +7843,7 @@ msgstr "Opacità" msgid "Paint Mode" msgstr "Modalità disegno" -#: ../app/core/gimpdata.c:681 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Impossibile cancellare '%s': %s" @@ -7976,7 +7990,7 @@ msgid "Posterize" msgstr "Posterizza" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Non ci sono abbastanza punti da tracciare" @@ -8165,12 +8179,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Imposta mappa colore" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Rimuovi mappa colore" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Cambia voce mappa colore" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Aggiungi colore alla mappa colore" @@ -8257,39 +8276,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Fondi livelli visibili" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Appiattisci immagine" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Non è possibile appiattire un'immagine senza alcun livello visibile." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Impossibile fondere in un gruppo livelli." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Il livello da fondere in basso è bloccato." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Nessun livello visibile su cui fondere in basso." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Fondi in basso" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Fondi il gruppo livelli" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Fondi tracciati visibili" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Non ci sono abbastanza tracciati visibili da fondere. Ce ne devono essere " @@ -8324,7 +8347,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Sposta punto di campionamento" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Scala immagine" @@ -8434,7 +8457,7 @@ msgid "(Preview may be out of date)" msgstr "(l'anteprima potrebbe non essere aggiornata)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8917,7 +8940,7 @@ msgctxt "plural" msgid "percent" msgstr "percento" -#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "Informazioni su GIMP" @@ -9099,15 +9122,15 @@ msgstr "Apri posizione" msgid "Enter location (URI):" msgstr "Inserisci posizione (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Esporta immagine" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Esporta" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9117,7 +9140,11 @@ msgstr "" "file dall'estensione. Inserire un'estensione corrispondente con il formato " "file selezionato o non inserire nessuna estensione." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "Il nome file dato non può essere usato per l'esportazione" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9126,7 +9153,15 @@ msgstr "" "desidera salvare l'immagine nel formato nativo di GIMP XCF, usare il comando " "File→Salva." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Portami alla finestra di dialogo di salvataggio" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "Il nome file dato non può essere usato per il salvataggio" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9134,7 +9169,15 @@ msgstr "" "Questa finestra di dialogo serve per salvare nel formato nativo di GIMP XCF. " "Per esportare in altri formati usare invece il comando File→Esporta." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Portami alla finestra di dialogo di esportazione" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Estensione non corrispondente" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9142,23 +9185,19 @@ msgstr "" "Il nome file dato ha un'estensione sconosciuta. Inserire un'estensione " "conosciuta o selezionare un formato file dall'elenco dei formati." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Estensione non corrispondente" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "L'estensione file data non corrisponde con il tipo di file scelto." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Usare ugualmente questo nome per salvare l'immagine?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Salvataggio annullato" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10045,7 +10084,7 @@ msgid "Vertical" msgstr "Verticale" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10364,33 +10403,60 @@ msgstr "Risoluzione _Y:" msgid "pixels/%a" msgstr "pixel/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "Esci da GIMP" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "Chiudi tutte le immagini" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "Se si esce da GIMP ora, queste modifiche saranno perse." -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "Se ora si chiudono queste immagini, verranno perse le modifiche." -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "C'è un'immagine con modifiche non salvate:" msgstr[1] "Ci sono %d immagini con modifiche non salvate:" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Premere %s per uscire." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Premere %s per chiudere tutte le immagini." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Premere %s per abbandonare tutti i cambiamenti e uscire." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "" +"Premere %s per abbandonare tutti i cambiamenti e chiudere tutte le immagini." + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:181 msgid "_Discard Changes" msgstr "Abban_dona le modifiche" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "Esportato su %s" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "Dimensione superficie" @@ -10658,22 +10724,23 @@ msgstr "Naviga nella finestra immagine" msgid "Drop image files here to open them" msgstr "Trascina e rilascia qui i file immagine per aprirli" -#: ../app/display/gimpdisplayshell-close.c:156 -#: ../app/display/gimpdisplayshell-close.c:229 +#: ../app/display/gimpdisplayshell-close.c:170 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "Close %s" msgstr "Chiudere %s" -#: ../app/display/gimpdisplayshell-close.c:167 -msgid "Close _without Saving" -msgstr "Chiudi sen_za salvare" +#: ../app/display/gimpdisplayshell-close.c:218 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "Premere %s per abbandonare tutti i cambiamenti e chiudere l'immagine." -#: ../app/display/gimpdisplayshell-close.c:237 +#: ../app/display/gimpdisplayshell-close.c:278 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Prima di chiudere, salvare le modifiche all'immagine '%s'?" -#: ../app/display/gimpdisplayshell-close.c:270 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10685,7 +10752,7 @@ msgstr[1] "" "Se non si salva l'immagine si perderanno le modifiche effettuate nelle " "ultime %d ore." -#: ../app/display/gimpdisplayshell-close.c:281 +#: ../app/display/gimpdisplayshell-close.c:322 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10700,7 +10767,7 @@ msgstr[1] "" "Se non si salva l'immagine si perderanno le modifiche effettuate nell'ultima " "ora e %d minuti." -#: ../app/display/gimpdisplayshell-close.c:293 +#: ../app/display/gimpdisplayshell-close.c:334 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10712,7 +10779,7 @@ msgstr[1] "" "Se non si salva l'immagine si perderanno le modifiche effettuate negli " "ultimi %d minuti." -#: ../app/display/gimpdisplayshell-close.c:311 +#: ../app/display/gimpdisplayshell-close.c:355 #, c-format msgid "The image has been exported to '%s'." msgstr "L'immagine è stata esportata su \"%s\"." @@ -10829,12 +10896,12 @@ msgstr "Il plug-in %s non può aprire l'immagine" msgid "Image doesn't contain any layers" msgstr "L'immagine non contiene nessun livello" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "L'apertura di \"%s\" è fallita: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11620,7 +11687,8 @@ msgstr "" #: ../app/plug-in/plug-in-icc-profile.c:74 #, c-format msgid "Can't apply color profile to grayscale image (%s)" -msgstr "Impossibile applicare il profilo colore all'immagine in scala di grigi (%s)" +msgstr "" +"Impossibile applicare il profilo colore all'immagine in scala di grigi (%s)" #: ../app/plug-in/plug-in-icc-profile.c:117 #: ../app/plug-in/plug-in-icc-profile.c:192 @@ -11701,16 +11769,24 @@ msgstr "Trasforma livello di testo" msgid "Discard Text Information" msgstr "Abbandona le informazioni sul testo" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "" "A causa della mancanza di qualsiasi carattere, la funzionalità di testo non " "è disponibile." -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Livello testo vuoto" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"Il testo non può essere renderizzato. È probabilmente troppo grande. " +"Accorciarlo o usare un carattere più piccolo." + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" @@ -11727,6 +11803,14 @@ msgstr "" "che non si voglia modificare il livello del testo, non\n" "preoccupatevi di questo." +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"La nuova disposizione del testo non può essere generata. Molto probabilmente " +"la dimensione dei caratteri è troppo grande." + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11921,7 +12005,7 @@ msgstr "Sfumatura non agisce su livelli indicizzati." msgid "No gradient available for use with this tool." msgstr "Nessun motivo disponibile con questo strumento." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s per gli angoli bloccati" @@ -12065,27 +12149,27 @@ msgctxt "command" msgid "Select by Color" msgstr "Selezione per colore" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Trasformazione gabbia" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Trasformazione gabbia: deforma una selezione all'interno di una gabbia" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "_Trasformazione gabbia" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Premere INVIO per confermare la trasformazione" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Calcolo coefficienti gabbia" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Trasformazione gabbia" @@ -12302,11 +12386,11 @@ msgstr "Prelievo c_olore" msgid "Click in any image to view its color" msgstr "Fare clic sull'immagine per visualizzare il colore" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Fare clic sull'immagine per prelevare il colore di primo piano" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Fare clic sull'immagine per prelevare il colore di sfondo" @@ -13213,7 +13297,7 @@ msgstr "Fare clic e trascinare per spostare tutti i punti" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "pixel" @@ -13384,7 +13468,7 @@ msgstr "%s per prelevare un colore" msgid "Cannot paint on layer groups." msgstr "Impossibile disegnare sui gruppi livello." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s per una riga diritta" @@ -15338,79 +15422,79 @@ msgstr "" msgid "Querying..." msgstr "Interrogazione in corso..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Dimensione in pixel:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Dimensioni di stampa:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Risoluzione:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Spazio colore:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Nome file:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Dimensione file:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Tipo file:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Dimensione in memoria:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Azioni annullabili:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Azioni ripetibili:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Numero di pixel:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Numero di livelli:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Numero di canali:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Numero di tracciati:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Nessuna" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "punti/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "colori" @@ -16070,6 +16154,41 @@ msgstr "tondo" msgid "fuzzy" msgstr "fuzzy" +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP è un acronimo di GNU Image Manipulation Program. È un programma " +"distribuito liberamente per svolgere compiti come il fotoritocco, la " +"composizione e la creazione di immagini." + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"Ha molte capacità. Può essere usato come semplice programma di disegno, come " +"programma di fotoritocco avanzato, sistema di elaborazione automatica on-" +"line, renderizzatore in serie di immagini, convertitore di formato immagine, " +"ecc." + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is also available for " +"Microsoft Windows and OS X." +msgstr "" +"GIMP è espandibile ed estensibile. È stato progettato per essere ampliato " +"con plug-in ed estensioni per fare praticamente qualsiasi cosa. " +"L'interfaccia avanzata di scripting semplifica la conversione in procedura " +"dal compito più semplice fino all'elaborazione di immagini più complessa. " +"GIMP è disponibile anche per Microsoft Windows ed OS X." + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Modifica immagine" diff --git a/po/ja.po b/po/ja.po index 35b6f06dee..1272c9ea72 100644 --- a/po/ja.po +++ b/po/ja.po @@ -13,14 +13,14 @@ msgstr "" "Project-Id-Version: gimp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-03-13 20:50+0000\n" +"POT-Creation-Date: 2013-11-16 08:03+0000\n" "PO-Revision-Date: 2012-08-11 11:55+0900\n" "Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../app/about.h:23 @@ -72,7 +72,7 @@ msgstr "" "\n" "http://www.gnu.org/licenses/" -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -89,8 +89,8 @@ msgstr "" #, c-format msgid "No batch interpreter specified, using the default '%s'.\n" msgstr "" -"バッチインタープリターが指定されていません。既定のバッチインタープリター '%" -"s' を使用します。\n" +"バッチインタープリターが指定されていません。既定のバッチインタープリター " +"'%s' を使用します。\n" #: ../app/batch.c:93 ../app/batch.c:111 #, c-format @@ -445,7 +445,7 @@ msgstr "テキストエディター" msgid "Tool Options" msgstr "ツールオプション" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:388 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "ツールアイコン" @@ -783,7 +783,7 @@ msgid "New Channel Color" msgstr "チャンネル表示色" #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 -#: ../app/display/gimpdisplayshell-dnd.c:632 +#: ../app/display/gimpdisplayshell-dnd.c:646 #: ../app/widgets/gimpchanneltreeview.c:258 #: ../app/widgets/gimplayertreeview.c:776 #, c-format @@ -983,13 +983,13 @@ msgstr "" "フのときはアクティブなレイヤー上の色情報を表示します。" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:578 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170 -#: ../app/widgets/gimptoolbox.c:833 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" "Opening '%s' failed:\n" @@ -1002,7 +1002,7 @@ msgstr "" #: ../app/actions/data-commands.c:118 #: ../app/actions/tool-options-commands.c:72 -#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1523 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 @@ -1400,7 +1400,7 @@ msgid "About GIMP" msgstr "このアプリケーションの情報を表示します" #: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:555 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "ツールボックス" @@ -2491,36 +2491,37 @@ msgstr "%s に上書きエクスポート(_W)" msgid "Export to" msgstr "元ファイルにエクスポート" -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "画像ファイルを開く" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "レイヤーとして画像ファイルを開く" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "保存が必要な変更はありません" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "画像の保存" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "画像のコピーを保存" -#: ../app/actions/file-commands.c:356 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "新しいテンプレートを作成" -#: ../app/actions/file-commands.c:360 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "このテンプレートに付ける名前を入力してください" -#: ../app/actions/file-commands.c:394 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "復帰に失敗しました。\n" @@ -2528,16 +2529,16 @@ msgstr "" # 復帰ダイアログのタイトル # GTK+ では、"Revert" は「元に戻す」と訳されている（ボタンの表記）ため「（画像を元に戻す）」を追記した -#: ../app/actions/file-commands.c:407 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "復帰 (画像を元に戻す)" -#: ../app/actions/file-commands.c:438 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "編集中の画像 '%s' を画像ファイル '%s' の状態に戻しますか？" -#: ../app/actions/file-commands.c:444 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2545,11 +2546,11 @@ msgstr "" "画像をディスク上の画像ファイルの状態に戻します。\n" "作業履歴と保存していなかった変更はすべて破棄されます。" -#: ../app/actions/file-commands.c:655 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(名称未設定のテンプレート)" -#: ../app/actions/file-commands.c:706 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3276,7 +3277,7 @@ msgstr "画像を 180 度回転します(すべてのレイヤーが回転しま #: ../app/actions/image-actions.c:187 msgctxt "image-action" msgid "Rotate 90° counter-clock_wise" -msgstr "反時計回りに 90 度回転(_w)" +msgstr "反時計回りに 90 度回転(_W)" #: ../app/actions/image-actions.c:188 msgctxt "image-action" @@ -3288,7 +3289,7 @@ msgid "Set Image Canvas Size" msgstr "キャンバスサイズの変更" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "サイズ変更しています" @@ -3305,7 +3306,7 @@ msgstr "反転しています" #: ../app/actions/image-commands.c:403 #: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:533 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" @@ -3315,20 +3316,20 @@ msgstr "回転しています" msgid "Cannot crop because the current selection is empty." msgstr "何も選択されてないので切り抜けません。" -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "印刷サイズの変更" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "画像の拡大・縮小" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:405 -#: ../app/pdb/image-cmds.c:441 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 #: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" @@ -4689,7 +4690,7 @@ msgstr "テキストファイル (UTF-8) を開く" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:424 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -5254,15 +5255,15 @@ msgstr "この画像を別ウィンドウで表示します" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "閉じる(_C)" +msgid "_Close View" +msgstr "ビューを閉じる(_C)" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" +msgid "Close the active image view" msgstr "" -"この画像の編集を終了し画像を閉じます (開いている画像ウィンドウがこの画像のみ" -"のときは、画像は閉じられますがウィンドウは閉じられません)" +"アクティブなビューの画像の編集を終了し画像を閉じます (開いている画像ウィンド" +"ウがこの画像のみのときは、画像は閉じられますがウィンドウは閉じられません)" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5694,11 +5695,11 @@ msgstr "その他 (%s)(_R)..." msgid "_Zoom (%s)" msgstr "表示倍率 (%s)(_Z)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "キャンバス周りの表示色" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "キャンバス周りの表示色" @@ -5712,47 +5713,47 @@ msgstr "スクリーン %s" msgid "Move this window to screen %s" msgstr "このウィンドウをスクリーン %s に移動します" -#: ../app/actions/windows-actions.c:95 +#: ../app/actions/windows-actions.c:93 msgctxt "windows-action" msgid "_Windows" msgstr "ウィンドウ(_W)" -#: ../app/actions/windows-actions.c:97 +#: ../app/actions/windows-actions.c:95 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "最近閉じたドック(_R)" -#: ../app/actions/windows-actions.c:99 +#: ../app/actions/windows-actions.c:97 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "ドッキング可能なダイアログ(_D)" -#: ../app/actions/windows-actions.c:102 +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "Next Image" msgstr "次の画像" -#: ../app/actions/windows-actions.c:103 +#: ../app/actions/windows-actions.c:101 msgctxt "windows-action" msgid "Switch to the next image" msgstr "次の画像に移動します" -#: ../app/actions/windows-actions.c:108 +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Previous Image" msgstr "前の画像" -#: ../app/actions/windows-actions.c:109 +#: ../app/actions/windows-actions.c:107 msgctxt "windows-action" msgid "Switch to the previous image" msgstr "前の画像に移動します" -#: ../app/actions/windows-actions.c:117 +#: ../app/actions/windows-actions.c:115 msgctxt "windows-action" msgid "Hide Docks" msgstr "ドックを隠す" -#: ../app/actions/windows-actions.c:118 +#: ../app/actions/windows-actions.c:116 msgctxt "windows-action" msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." @@ -5760,12 +5761,12 @@ msgstr "" "この設定をオンにすると、ドックとダイアログを隠して画像ウィンドウのみを表示し" "ます。" -#: ../app/actions/windows-actions.c:124 +#: ../app/actions/windows-actions.c:122 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "シングルウィンドウモード" -#: ../app/actions/windows-actions.c:125 +#: ../app/actions/windows-actions.c:123 msgctxt "windows-action" msgid "When enabled GIMP is in a single-window mode." msgstr "この設定がオンのときは、シングルウィンドウモードで表示します" @@ -6633,8 +6634,8 @@ msgstr "作業履歴のプレビューの大きさを設定します。" msgid "When enabled, pressing F1 will open the help browser." msgstr "この設定がオンのときは、F1 キーを押すとヘルプブラウザーが開きます。" -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:167 ../app/gui/session.c:279 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "致命的な解析エラー" @@ -7124,12 +7125,12 @@ msgctxt "undo-type" msgid "Anchor floating selection" msgstr "フローティング選択範囲の固定" -#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "貼り付け" -#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "切り取り" @@ -7305,170 +7306,170 @@ msgctxt "undo-type" msgid "Not undoable" msgstr "元に戻せません" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:1187 msgctxt "select-criterion" msgid "Composite" msgstr "コンポジット" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1188 msgctxt "select-criterion" msgid "Red" msgstr "赤" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1189 msgctxt "select-criterion" msgid "Green" msgstr "緑" -#: ../app/core/core-enums.c:1188 +#: ../app/core/core-enums.c:1190 msgctxt "select-criterion" msgid "Blue" msgstr "青" -#: ../app/core/core-enums.c:1189 +#: ../app/core/core-enums.c:1191 msgctxt "select-criterion" msgid "Hue" msgstr "色相" -#: ../app/core/core-enums.c:1190 +#: ../app/core/core-enums.c:1192 msgctxt "select-criterion" msgid "Saturation" msgstr "彩度" -#: ../app/core/core-enums.c:1191 +#: ../app/core/core-enums.c:1193 msgctxt "select-criterion" msgid "Value" msgstr "明度" -#: ../app/core/core-enums.c:1220 +#: ../app/core/core-enums.c:1222 msgctxt "message-severity" msgid "Message" msgstr "メッセージ" -#: ../app/core/core-enums.c:1221 +#: ../app/core/core-enums.c:1223 msgctxt "message-severity" msgid "Warning" msgstr "警告" -#: ../app/core/core-enums.c:1222 +#: ../app/core/core-enums.c:1224 msgctxt "message-severity" msgid "Error" msgstr "エラー" -#: ../app/core/core-enums.c:1251 +#: ../app/core/core-enums.c:1253 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "どうするか確認" -#: ../app/core/core-enums.c:1252 +#: ../app/core/core-enums.c:1254 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "埋め込まれているプロファイルを使う" -#: ../app/core/core-enums.c:1253 +#: ../app/core/core-enums.c:1255 msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "RGB 作業用スペースに変換" -#: ../app/core/core-enums.c:1290 +#: ../app/core/core-enums.c:1292 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "不透明度" -#: ../app/core/core-enums.c:1291 +#: ../app/core/core-enums.c:1293 msgctxt "dynamics-output-type" msgid "Size" msgstr "サイズ" -#: ../app/core/core-enums.c:1292 +#: ../app/core/core-enums.c:1294 msgctxt "dynamics-output-type" msgid "Angle" msgstr "角度" -#: ../app/core/core-enums.c:1293 +#: ../app/core/core-enums.c:1295 msgctxt "dynamics-output-type" msgid "Color" msgstr "色" -#: ../app/core/core-enums.c:1294 +#: ../app/core/core-enums.c:1296 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "硬さ" -#: ../app/core/core-enums.c:1295 +#: ../app/core/core-enums.c:1297 msgctxt "dynamics-output-type" msgid "Force" msgstr "強さ" -#: ../app/core/core-enums.c:1296 +#: ../app/core/core-enums.c:1298 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "縦横比" -#: ../app/core/core-enums.c:1297 +#: ../app/core/core-enums.c:1299 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "間隔" -#: ../app/core/core-enums.c:1298 +#: ../app/core/core-enums.c:1300 msgctxt "dynamics-output-type" msgid "Rate" msgstr "割合" -#: ../app/core/core-enums.c:1299 +#: ../app/core/core-enums.c:1301 msgctxt "dynamics-output-type" msgid "Flow" msgstr "流量" -#: ../app/core/core-enums.c:1300 +#: ../app/core/core-enums.c:1302 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "散布" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:392 ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:206 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "" "'%s' の削除に失敗しました。\n" "%s" -#: ../app/core/gimp-edit.c:189 ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "貼り付けられたレイヤー" -#: ../app/core/gimp-edit.c:388 +#: ../app/core/gimp-edit.c:420 msgctxt "undo-type" msgid "Clear" msgstr "消去" -#: ../app/core/gimp-edit.c:407 +#: ../app/core/gimp-edit.c:439 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "描画色で塗りつぶす" -#: ../app/core/gimp-edit.c:411 +#: ../app/core/gimp-edit.c:443 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "背景色で塗りつぶす" -#: ../app/core/gimp-edit.c:415 +#: ../app/core/gimp-edit.c:447 msgctxt "undo-type" msgid "Fill with White" msgstr "白色で塗りつぶす" -#: ../app/core/gimp-edit.c:419 +#: ../app/core/gimp-edit.c:451 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "透明色で塗りつぶす" -#: ../app/core/gimp-edit.c:423 +#: ../app/core/gimp-edit.c:455 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "パターンで塗りつぶす" -#: ../app/core/gimp-edit.c:515 +#: ../app/core/gimp-edit.c:547 msgid "Global Buffer" msgstr "クリップボード" @@ -7502,7 +7503,7 @@ msgstr "描画色から透明" msgid "tags-locale:C" msgstr "tags-locale:ja" -#: ../app/core/gimp-user-install.c:159 +#: ../app/core/gimp-user-install.c:173 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " @@ -7511,7 +7512,7 @@ msgstr "" "現在のユーザーは、GIMP %s を使っていました。そのユーザーセッティングを '%s' " "に移行します。" -#: ../app/core/gimp-user-install.c:164 +#: ../app/core/gimp-user-install.c:178 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -7520,17 +7521,17 @@ msgstr "" "現在のユーザーは初めて GIMP を使用します。'%s' という名のフォルダーを作成し、" "そこに必要なファイルをコピーします。" -#: ../app/core/gimp-user-install.c:316 +#: ../app/core/gimp-user-install.c:329 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "'%2$s' から '%1$s' へファイルをコピー中..." -#: ../app/core/gimp-user-install.c:331 ../app/core/gimp-user-install.c:357 +#: ../app/core/gimp-user-install.c:344 ../app/core/gimp-user-install.c:370 #, c-format msgid "Creating folder '%s'..." msgstr "フォルダー '%s' を作成中..." -#: ../app/core/gimp-user-install.c:342 ../app/core/gimp-user-install.c:368 +#: ../app/core/gimp-user-install.c:355 ../app/core/gimp-user-install.c:381 #, c-format msgid "Cannot create folder '%s': %s" msgstr "" @@ -7576,56 +7577,56 @@ msgstr "モジュール" msgid "Updating tag cache" msgstr "タグキャッシュを更新" -#: ../app/core/gimpbrush-load.c:178 +#: ../app/core/gimpbrush-load.c:180 #, c-format msgid "Could not read %d byte from '%s': %s" msgid_plural "Could not read %d bytes from '%s': %s" msgstr[0] "'%2$s' から %1$d バイト読み込めません。%3$s" -#: ../app/core/gimpbrush-load.c:200 +#: ../app/core/gimpbrush-load.c:202 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." msgstr "ブラシ '%s' で致命的な解析エラー: 幅が 0 です。" -#: ../app/core/gimpbrush-load.c:209 +#: ../app/core/gimpbrush-load.c:211 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "ブラシ '%s' で致命的な解析エラー: 高さが 0 です。" -#: ../app/core/gimpbrush-load.c:218 +#: ../app/core/gimpbrush-load.c:220 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "ブラシ '%s' で致命的な解析エラー: サイズが 0 バイトです。" -#: ../app/core/gimpbrush-load.c:242 +#: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "ブラシ '%s' で致命的な解析エラー: %d は不明な深度です。" -#: ../app/core/gimpbrush-load.c:255 +#: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "ブラシ '%s' で致命的な解析エラー: %d は不明なバージョンです。" -#: ../app/core/gimpbrush-load.c:271 ../app/core/gimpbrush-load.c:391 -#: ../app/core/gimpbrush-load.c:725 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 +#: ../app/core/gimpbrush-load.c:727 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "ブラシ '%s' で致命的な解析エラー: ファイルが切り詰められています。" -#: ../app/core/gimpbrush-load.c:279 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "ブラシファイル '%s' 中に不適切な UTF-8 文字列があります。" -#: ../app/core/gimpbrush-load.c:286 ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 #: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "名前なし" -#: ../app/core/gimpbrush-load.c:380 +#: ../app/core/gimpbrush-load.c:382 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7635,7 +7636,7 @@ msgstr "" "す。\n" "GIMP ブラシは グレースケールか、RGBA でなければなりません。" -#: ../app/core/gimpbrush-load.c:452 +#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7643,7 +7644,7 @@ msgstr "" "ブラシ '%s' で致命的な解析エラー: abr フォーマットバージョン %d はデコードで" "きません。" -#: ../app/core/gimpbrush-load.c:619 +#: ../app/core/gimpbrush-load.c:621 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "ブラシ '%s' で致命的な解析エラー: ワイドブラシはサポートされません。" @@ -7714,7 +7715,6 @@ msgid "Brush Angle" msgstr "ブラシの角度を指定します" #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7902,7 +7902,7 @@ msgstr "不透明度" msgid "Paint Mode" msgstr "描画モードを指定します" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "" @@ -8049,7 +8049,7 @@ msgid "Posterize" msgstr "ポスタリゼーション" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "アンカー (端点) が不足しているので描画できません" @@ -8232,12 +8232,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "カラーマップの設定" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "カラーマップの設定を解除" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "カラーマップエントリーの変更" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "カラーマップに色を追加" @@ -8324,39 +8329,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "可視レイヤーの統合" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "画像の統合" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "画像に可視レイヤーがないので統合できません。" + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "レイヤーグループに統合できません。" -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "統合対象のレイヤーは保護されています。" -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "統合できる可視レイヤーがありません。" -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "下のレイヤーと統合" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "レイヤーグループの統合" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "可視パスの統合" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "統合するための可視パスが足りません。少なくとも二つは必要です。" @@ -8389,7 +8398,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "サンプルポイントを移動" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "画像の拡大・縮小" @@ -8399,57 +8408,72 @@ msgstr "画像の拡大・縮小" msgid "Can't undo %s" msgstr "%s は元に戻せません" -#: ../app/core/gimpimage.c:1808 +# 編集画像をエクスポートした後の画像ウィンドウに表示される +#: ../app/core/gimpimage.c:1784 +msgid " (exported)" +msgstr " (エクスポート済み)" + +# 編集画像を上書きエクスポートした後の画像ウィンドウに表示される +#: ../app/core/gimpimage.c:1788 +msgid " (overwritten)" +msgstr " (上書き済み)" + +# 画像ファイルを開き（インポート）一度も [保存]、[名前を付けて保存] をしていない間に、ウィンドウタイトルにこの表記が使用される。 +#: ../app/core/gimpimage.c:1797 +msgid " (imported)" +msgstr " (インポートされた画像)" + +#: ../app/core/gimpimage.c:1922 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "画像解像度の変更" -#: ../app/core/gimpimage.c:1860 +#: ../app/core/gimpimage.c:1974 msgctxt "undo-type" msgid "Change Image Unit" msgstr "画像単位の変更" -#: ../app/core/gimpimage.c:2852 +#: ../app/core/gimpimage.c:2987 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "画像にパラサイトを付加" -#: ../app/core/gimpimage.c:2893 +#: ../app/core/gimpimage.c:3028 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "画像からパラサイトを削除" -#: ../app/core/gimpimage.c:3602 +#: ../app/core/gimpimage.c:3737 msgctxt "undo-type" msgid "Add Layer" msgstr "レイヤーの追加" -#: ../app/core/gimpimage.c:3652 ../app/core/gimpimage.c:3672 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "レイヤーの削除" -#: ../app/core/gimpimage.c:3666 +#: ../app/core/gimpimage.c:3801 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "フローティング選択範囲の削除" -#: ../app/core/gimpimage.c:3834 +#: ../app/core/gimpimage.c:3969 msgctxt "undo-type" msgid "Add Channel" msgstr "チャンネルを追加" -#: ../app/core/gimpimage.c:3872 ../app/core/gimpimage.c:3885 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "チャンネルを削除" -#: ../app/core/gimpimage.c:3939 +#: ../app/core/gimpimage.c:4074 msgctxt "undo-type" msgid "Add Path" msgstr "パスを追加" -#: ../app/core/gimpimage.c:3970 +#: ../app/core/gimpimage.c:4105 msgctxt "undo-type" msgid "Remove Path" msgstr "パスを削除" @@ -8487,14 +8511,14 @@ msgid "(Preview may be out of date)" msgstr "(プレビューが古すぎます)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" msgstr[0] "%d × %d ピクセル" -#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:336 +#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8526,6 +8550,10 @@ msgstr "アイテムからパラサイトを削除" msgid "Set Item Exclusive Visible" msgstr "アイテムを排他表示にする" +#: ../app/core/gimpitem-exclusive.c:172 +msgid "Set Item Exclusive Linked" +msgstr "アイテムを排他リンクにする" + #: ../app/core/gimplayer-floating-sel.c:95 msgctxt "undo-type" msgid "Anchor Floating Selection" @@ -8794,8 +8822,7 @@ msgstr "GIMP パターンファイル '%s' 中に適切でない UTF-8 文字列 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." msgstr "" -"%sコールバックを実行できません。対応するプラグインがクラッシュしたかもしれま" -"せん。" +"%sコールバックを実行できません。対応するプラグインがクラッシュした可能性があります。" #: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 msgid "Please wait" @@ -8955,7 +8982,7 @@ msgctxt "plural" msgid "percent" msgstr "パーセント" -#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "GIMP について" @@ -9126,7 +9153,7 @@ msgstr "%s をフェード" msgid "_Fade" msgstr "フェード(_F)" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "モード(_M):" @@ -9146,15 +9173,15 @@ msgstr "場所を開く" msgid "Enter location (URI):" msgstr "場所の入力 (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "画像をエクスポート" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "エクスポート(_E)" -#: ../app/dialogs/file-save-dialog.c:431 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9164,7 +9191,11 @@ msgstr "" "す。選択したファイル形式に合った拡張子を入力するか、拡張子を全く入力しないで" "ください。" -#: ../app/dialogs/file-save-dialog.c:558 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "指定されたファイル名ではエクスポートできません" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9173,7 +9204,15 @@ msgstr "" "xcf 形式で画像を保存したいときは、メニューの [ファイル] → [保存] を実行してく" "ださい。" -#: ../app/dialogs/file-save-dialog.c:565 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "保存ダイアログを呼び出す" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "指定されたファイル名では保存できません" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9183,7 +9222,15 @@ msgstr "" "xcf 形式以外の画像ファイル形式で保存したいときは、メニューの [ファイル] → [エ" "クスポート] を実行してください。" -#: ../app/dialogs/file-save-dialog.c:571 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "エクスポートダイアログを呼び出す" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "拡張子が一致しません" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9191,23 +9238,19 @@ msgstr "" "指定されたファイル名には既知のファイル拡張子がありません。既知のファイル拡張" "子を入力するか、ファイル形式の一覧からファイル形式を選択してください。" -#: ../app/dialogs/file-save-dialog.c:585 -msgid "Extension Mismatch" -msgstr "拡張子が一致しません" - -#: ../app/dialogs/file-save-dialog.c:601 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "指定のファイル拡張子は選択したファイル形式と一致しません。" -#: ../app/dialogs/file-save-dialog.c:605 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "画像をこの名前で保存してもよろしいですか？" -#: ../app/dialogs/file-save-dialog.c:660 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "保存をキャンセルしました" -#: ../app/dialogs/file-save-dialog.c:668 ../app/widgets/gimpdnd-xds.c:185 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9410,31 +9453,31 @@ msgstr "変更を有効にするには GIMP を再起動する必要がありま msgid "Module" msgstr "モジュール" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" msgstr "メモリー中のみ" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:473 msgid "No longer available" msgstr "利用可能なものがありません" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "作者:" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "バージョン:" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "日付:" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "著作権:" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "場所:" @@ -10085,7 +10128,7 @@ msgid "Vertical" msgstr "垂直" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "dpi" @@ -10403,32 +10446,58 @@ msgstr "垂直解像度(_Y):" msgid "pixels/%a" msgstr "ピクセル/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "GIMPを終了します" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "すべての画像を閉じる" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "このままGIMPを終了すると、画像への変更が破棄されます。" -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "このまま閉じると、画像に加えた変更は破棄されます。" -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" msgstr[0] "以下の %d 個の画像は保存されていません。" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "終了するには %s キーを押します。" + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "画像をすべて閉じるには %s キーを押します。" + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "変更を破棄し終了するには %s キーを押します。" + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "変更を破棄し画像をすべて閉じるには %s キーを押します。" + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:181 msgid "_Discard Changes" msgstr "保存しない(_D)" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "%s にエクスポート済み" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "キャンバスサイズ" @@ -10696,8 +10765,8 @@ msgstr "クイックマスクの切り替え" msgid "Navigate the image display" msgstr "この画像のナビゲーションプレビューを表示します" -#: ../app/display/gimpdisplayshell.c:742 -#: ../app/display/gimpdisplayshell.c:1320 ../app/widgets/gimptoolbox.c:256 +#: ../app/display/gimpdisplayshell.c:746 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "" "ここにファイルアイコンをドロップすると、そのファイルを画像として開きます。 " @@ -10705,22 +10774,23 @@ msgstr "" "画像を開いているウィンドウにファイルアイコンをドロップしたときは、そのファイ" "ルをレイヤーとして開きます。" -#: ../app/display/gimpdisplayshell-close.c:153 -#: ../app/display/gimpdisplayshell-close.c:223 +#: ../app/display/gimpdisplayshell-close.c:170 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "Close %s" msgstr "%s を閉じる" -#: ../app/display/gimpdisplayshell-close.c:164 -msgid "Close _without Saving" -msgstr "保存せずに閉じる(_W)" +#: ../app/display/gimpdisplayshell-close.c:218 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "変更を破棄し画像を閉じるには %s キーを押します。" -#: ../app/display/gimpdisplayshell-close.c:231 +#: ../app/display/gimpdisplayshell-close.c:278 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "画像 '%s' の変更を保存しますか?" -#: ../app/display/gimpdisplayshell-close.c:254 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10729,7 +10799,7 @@ msgstr[0] "" "保存しない場合は %d 時間前からの変更が破棄されます。\n" "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)" -#: ../app/display/gimpdisplayshell-close.c:264 +#: ../app/display/gimpdisplayshell-close.c:322 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10741,7 +10811,7 @@ msgstr[0] "" "保存しない場合は 1 時間 %d 分前からの変更が破棄されます。\n" "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)" -#: ../app/display/gimpdisplayshell-close.c:275 +#: ../app/display/gimpdisplayshell-close.c:334 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10750,46 +10820,53 @@ msgstr[0] "" "保存しない場合は %d 分前からの変更が破棄されます。\n" "(このメッセージは画像の変更を xcf 形式で保存していない場合に表示されます。)" -#: ../app/display/gimpdisplayshell-dnd.c:232 -#: ../app/display/gimpdisplayshell-dnd.c:635 -#: ../app/display/gimpdisplayshell-dnd.c:693 +#: ../app/display/gimpdisplayshell-close.c:355 +#, c-format +msgid "The image has been exported to '%s'." +msgstr "画像は '%s' にエクスポートされています。" + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 msgid "Drop New Layer" msgstr "新しいレイヤーをドロップ" -#: ../app/display/gimpdisplayshell-dnd.c:275 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "新しいパスをドロップ" -#: ../app/display/gimpdisplayshell-dnd.c:347 -#: ../app/display/gimpdisplayshell-dnd.c:449 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:279 +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "レイヤーグループのピクセルは変更できません。" -#: ../app/display/gimpdisplayshell-dnd.c:355 -#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180 +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:246 ../app/tools/gimptransformtool.c:1062 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "アクティブレイヤー中のすべてのピクセルが保護されています。" -#: ../app/display/gimpdisplayshell-dnd.c:535 +#: ../app/display/gimpdisplayshell-dnd.c:549 #: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "レイヤーをドロップ" -#: ../app/display/gimpdisplayshell-dnd.c:668 -#: ../app/display/gimpdisplayshell-dnd.c:685 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "ドロップされたバッファー" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "カラーディスプレイフィルター" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "カラーディスプレイフィルターの設定" @@ -10823,41 +10900,26 @@ msgstr "表示比:" msgid "Zoom:" msgstr "表示倍率:" -#: ../app/display/gimpdisplayshell-title.c:301 +#: ../app/display/gimpdisplayshell-title.c:282 msgid "(modified)" msgstr "(修正済み)" -#: ../app/display/gimpdisplayshell-title.c:306 +#: ../app/display/gimpdisplayshell-title.c:287 msgid "(clean)" msgstr "(消去)" -#: ../app/display/gimpdisplayshell-title.c:357 -#: ../app/display/gimpdisplayshell-title.c:370 +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 #: ../app/widgets/gimpactiongroup.c:860 msgid "(none)" msgstr "(なし)" -# 編集画像をエクスポートした後の画像ウィンドウに表示される -#: ../app/display/gimpdisplayshell-title.c:499 -msgid " (exported)" -msgstr " (エクスポート済み)" - -# 編集画像を上書きエクスポートした後の画像ウィンドウに表示される -#: ../app/display/gimpdisplayshell-title.c:501 -msgid " (overwritten)" -msgstr " (上書き済み)" - -# 画像ファイルを開き（インポート）一度も [保存]、[名前を付けて保存] をしていない間に、ウィンドウタイトルにこの表記が使用される。 -#: ../app/display/gimpdisplayshell-title.c:507 -msgid " (imported)" -msgstr " (インポートされた画像)" - #: ../app/display/gimpstatusbar.c:356 #, c-format msgid "Cancel %s" msgstr "%s をキャンセル" -#: ../app/file/file-open.c:136 ../app/file/file-save.c:112 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "通常のファイルではありません" @@ -10871,18 +10933,18 @@ msgstr "%s プラグインは SUCCESS を返しましたが、画像が返って msgid "%s plug-In could not open image" msgstr "%s プラグインは画像を開けられません" -#: ../app/file/file-open.c:526 +#: ../app/file/file-open.c:530 msgid "Image doesn't contain any layers" msgstr "画像にレイヤーがありません" -#: ../app/file/file-open.c:579 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "" "'%s' のオープンに失敗しました。\n" "%s" -#: ../app/file/file-open.c:686 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10894,17 +10956,17 @@ msgstr "" msgid "Unknown file type" msgstr "ファイル形式が不明、または画像として開くことができない形式です。" -#: ../app/file/file-save.c:208 +#: ../app/file/file-save.c:221 #, c-format msgid "%s plug-in could not save image" msgstr "%s プラグインは画像を保存できません" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s:' は、不正な URI スキームです" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "URI 中に不適切な文字列が含まれます" @@ -10918,35 +10980,35 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "ケージを移動してオブジェクトを変形" -#: ../app/gegl/gimpcurvesconfig.c:385 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "GIMP のトーンカーブ設定ファイルではありません" -#: ../app/gegl/gimpcurvesconfig.c:400 ../app/gegl/gimplevelsconfig.c:786 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "解析エラー" -#: ../app/gegl/gimplevelsconfig.c:739 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "GIMP の色レベル設定ファイルではありません。" # operation_class->description -#: ../app/gegl/gimpoperationcagecoefcalc.c:65 +#: ../app/gegl/gimpoperationcagecoefcalc.c:67 msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "GIMP ケージ変形ツール用に係数バッファーを計算します" # operation_class->description -#: ../app/gegl/gimpoperationcagetransform.c:104 +#: ../app/gegl/gimpoperationcagetransform.c:106 msgid "" "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " "tool" msgstr "ケージ変形ツール用に、係数バッファーを座標系バッファーに変換します" -#: ../app/gegl/gimpoperationcagetransform.c:125 +#: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" msgstr "単色で塗りつぶす" -#: ../app/gegl/gimpoperationcagetransform.c:126 +#: ../app/gegl/gimpoperationcagetransform.c:129 #: ../app/tools/gimpcageoptions.c:144 msgid "Fill the original position of the cage with a plain color" msgstr "初期ケージ内を単色で塗りつぶす" @@ -10992,11 +11054,11 @@ msgstr "暗室" msgid "Eraser" msgstr "消しゴム" -#: ../app/paint/gimpheal.c:128 ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "修復ブラシ" -#: ../app/paint/gimpheal.c:167 +#: ../app/paint/gimpheal.c:170 msgid "Healing does not operate on indexed layers." msgstr "インデックスレイヤーでは修復ブラシは使えません。" @@ -11395,8 +11457,8 @@ msgstr "ベクターオブジェクト %d は ID %d によるストロークを #: ../app/pdb/gimppdb.c:410 #, c-format msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %" -"s, got %s." +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." msgstr "" "プロシージャー '%s' は、%d 番目の引数に誤ったデータ型 (%s でなければいけない" "ところに %s) を用いて呼び出されました。" @@ -11424,8 +11486,8 @@ msgstr "" #: ../app/pdb/gimpprocedure.c:654 #, c-format msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%" -"d). Expected %s, got %s." +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." msgstr "" "プロシージャー '%s' 呼び出し時の引数 '%s'(%d 番目の引数) は、データ型を誤って" "います。(%s のはずが %s でした。)" @@ -11478,13 +11540,13 @@ msgstr "" #: ../app/pdb/gimpprocedure.c:765 #, c-format msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %" -"s). This value is out of range." +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." msgstr "" "プロシージャー %1$s 呼び出し時の引数 '%3$s' (%4$d 番目の引数、%5$s 型) の値 " "'%2$s' は、適正値の範囲外です。" -#: ../app/pdb/image-cmds.c:2360 +#: ../app/pdb/image-cmds.c:2365 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "画像の解像度が制限を越えているため、標準解像度を代わりに使用します。" @@ -11522,29 +11584,29 @@ msgstr "パスストロークの削除" msgid "Close path stroke" msgstr "パスストロークを閉じる" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "パスストロークの剪段変形" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "パスストロークの拡大・縮小" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "パスストロークの回転" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "パスストロークの反転" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "パスストロークの追加" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "パスストロークの拡張" @@ -11592,7 +11654,7 @@ msgstr "" msgid "Cancelled" msgstr "キャンセル" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:643 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11604,7 +11666,7 @@ msgstr "" "\"%s\" プラグインがクラッシュしました。\n" "(%s)\n" "\n" -"クラッシュしたプラグインは GIMP の内部状態を不安定にするかもしれません。作業" +"プラグインのクラッシュによって GIMP の内部状態が不安定になった可能性があります。作業" "中の画像を一旦保存して GIMP を再起動した方が良いでしょう。" #: ../app/plug-in/gimppluginmanager-call.c:173 @@ -11642,7 +11704,7 @@ msgstr "プラグイン インタープリター" msgid "Plug-In Environment" msgstr "プラグインの環境" -#: ../app/plug-in/gimppluginprocedure.c:980 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11651,7 +11713,7 @@ msgstr "" "'%s' の呼出し時にエラーが発生しました。\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:992 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11660,16 +11722,21 @@ msgstr "" "'%s' の実行時にエラーが発生しました。\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "カラープロファイルはグレースケール画像に適用できません (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "'%s' を実行中にエラーが発生しました" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "プラグインが見つかりません (%s)" @@ -11699,7 +11766,7 @@ msgstr "" "Pack my box with\n" "five dozen liquor jugs." -#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1401 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "テキストレイヤーを追加" @@ -11739,14 +11806,22 @@ msgstr "テキストレイヤーの変形" msgid "Discard Text Information" msgstr "テキストレイヤーから文字情報を破棄する" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "フォントがないので文字機能は利用できません。" -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "空のテキストレイヤー" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"描画不可能なテキストです。 大き過ぎませんか。 少し短くするかあるいはもっと小" +"さなフォントを使用してみてください。" + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" @@ -11762,6 +11837,14 @@ msgstr "" "テキストパラサイトに間違いが見られます。(テキストを編集しなければ問題ありませ" "ん。)" +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"新しいテキストレイアウトが生成できません。 おそらくフォントサイズが大き過ぎま" +"す。" + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11961,7 +12044,7 @@ msgstr "インデックスレイヤーではグラデーションは使えませ msgid "No gradient available for use with this tool." msgstr "このツールで利用できるグラデーションはありません" -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s-ドラッグ: 15 度毎に角度をスナップ" @@ -12114,29 +12197,29 @@ msgctxt "command" msgid "Select by Color" msgstr "色域を選択" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "ケージ変形" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "" "[ケージ変形]\n" "ケージで囲まれた部分を自由に変形します" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "ケージ変形(_C)" -#: ../app/tools/gimpcagetool.c:351 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Enter/Return: 変形を確定します" -#: ../app/tools/gimpcagetool.c:1095 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "ケージ係数を計算中" -#: ../app/tools/gimpcagetool.c:1272 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "ケージ変形" @@ -12358,11 +12441,11 @@ msgstr "スポイト(_O)" msgid "Click in any image to view its color" msgstr "クリックされたピクセルの色情報を表示します" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "クリックされたピクセルの色を描画色に設定します" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "クリックされたピクセルの色を背景色に設定します" @@ -12533,7 +12616,7 @@ msgstr "チャンネル(_N):" msgid "R_eset Channel" msgstr "チャンネルのリセット(_E)" -#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "カーブの種類(_T)" @@ -12752,7 +12835,7 @@ msgid "" msgstr "" "スムージングの値を設定します\n" "値を小さくするとより正確に境界を判別しますが\n" -"抽出領域に穴が出来るかもしれません" +"抽出領域に穴ができる場合があります。" #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -12824,20 +12907,20 @@ msgstr "" msgid "F_oreground Select" msgstr "前景抽出選択(_O)" -#: ../app/tools/gimpforegroundselecttool.c:302 +#: ../app/tools/gimpforegroundselecttool.c:304 msgid "Add more strokes or press Enter to accept the selection" msgstr "" "さらになぞって抽出部分を修正、または Enter/Return キーで選択範囲を確定します" -#: ../app/tools/gimpforegroundselecttool.c:304 +#: ../app/tools/gimpforegroundselecttool.c:306 msgid "Mark foreground by painting on the object to extract" msgstr "抽出したい部分を塗って前景部分を指定します" -#: ../app/tools/gimpforegroundselecttool.c:309 +#: ../app/tools/gimpforegroundselecttool.c:311 msgid "Roughly outline the object to extract" msgstr "抽出したい部分の輪郭をおおまかに描きます" -#: ../app/tools/gimpforegroundselecttool.c:751 +#: ../app/tools/gimpforegroundselecttool.c:753 msgctxt "command" msgid "Foreground Select" msgstr "前景抽出選択" @@ -12916,16 +12999,16 @@ msgstr "GEGL 操作(_G)..." msgid "GEGL operations do not operate on indexed layers." msgstr "インデックスレイヤーでは GEGL を操作できません。" -#: ../app/tools/gimpgegltool.c:377 +#: ../app/tools/gimpgegltool.c:378 msgid "_Operation:" msgstr "操作(_O):" #. The options vbox -#: ../app/tools/gimpgegltool.c:436 +#: ../app/tools/gimpgegltool.c:437 msgid "Operation Settings" msgstr "操作設定" -#: ../app/tools/gimpgegltool.c:441 +#: ../app/tools/gimpgegltool.c:442 msgid "Select an operation from the list above" msgstr "上の一覧からオペレーションを選択してください" @@ -13040,7 +13123,7 @@ msgstr "プリセット(_S):" msgid "Settings saved to '%s'" msgstr "設定は '%s' で保存されました" -#: ../app/tools/gimpimagemaptool.c:362 +#: ../app/tools/gimpimagemaptool.c:363 msgid "_Preview" msgstr "プレビュー(_P)" @@ -13114,32 +13197,32 @@ msgstr "" msgid "Intelligent _Scissors" msgstr "電脳はさみ(_S)" -#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "クリック-ドラッグ: このポイントを移動します" -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s: 自動スナップを無効に" -#: ../app/tools/gimpiscissorstool.c:919 +#: ../app/tools/gimpiscissorstool.c:921 msgid "Click to close the curve" msgstr "クリック: カーブを閉じます" -#: ../app/tools/gimpiscissorstool.c:925 +#: ../app/tools/gimpiscissorstool.c:927 msgid "Click to add a point on this segment" msgstr "クリック: この線分上に新たなポイントを追加します" -#: ../app/tools/gimpiscissorstool.c:939 +#: ../app/tools/gimpiscissorstool.c:941 msgid "Click or press Enter to convert to a selection" msgstr "クリックまたは Enter/Return: 選択範囲に変換します" -#: ../app/tools/gimpiscissorstool.c:949 +#: ../app/tools/gimpiscissorstool.c:951 msgid "Press Enter to convert to a selection" msgstr "Enter/Return: 選択範囲に変換します" -#: ../app/tools/gimpiscissorstool.c:964 +#: ../app/tools/gimpiscissorstool.c:966 msgid "Click or Click-Drag to add a point" msgstr "クリックまたはクリック-ドラッグ: 新たなポイントを追加します" @@ -13296,7 +13379,7 @@ msgstr "クリック-ドラッグ: すべてのポイントを移動します" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "ピクセル" @@ -13471,7 +13554,7 @@ msgstr "%s-クリック: ピクセルの色を描画色に設定" msgid "Cannot paint on layer groups." msgstr "グループレイヤーに直接描画することはできません。" -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s-クリック: 直線を引く" @@ -13773,39 +13856,39 @@ msgstr "なめらかに" msgid "Feather edges" msgstr "境界をぼかす" -#: ../app/tools/gimpselectiontool.c:250 +#: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" msgstr "クリック-ドラッグ: 選択範囲を置き換えます" -#: ../app/tools/gimpselectiontool.c:258 +#: ../app/tools/gimpselectiontool.c:263 msgid "Click-Drag to create a new selection" msgstr "クリック-ドラッグ: 選択範囲を作成します" -#: ../app/tools/gimpselectiontool.c:263 +#: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" msgstr "クリック-ドラッグ: 作成した範囲を選択範囲に加えます" -#: ../app/tools/gimpselectiontool.c:272 +#: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" msgstr "クリック-ドラッグ: 作成した範囲を選択範囲から引きます" -#: ../app/tools/gimpselectiontool.c:281 +#: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" msgstr "クリック-ドラッグ: 既存の選択範囲との交差部分を新しい選択範囲にします" -#: ../app/tools/gimpselectiontool.c:291 +#: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" msgstr "クリック-ドラッグ: 選択マスクを移動します" -#: ../app/tools/gimpselectiontool.c:299 +#: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" msgstr "クリック-ドラッグ: 選択範囲中のピクセルを移動します" -#: ../app/tools/gimpselectiontool.c:303 +#: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" msgstr "クリック-ドラッグ: 選択範囲中のピクセルのコピーを移動します" -#: ../app/tools/gimpselectiontool.c:307 +#: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" msgstr "クリック: フローティング選択範囲を固定します" @@ -13885,7 +13968,7 @@ msgstr "" #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." -msgstr "ここで設定された言語はテキスト描画時に影響を与えるかもしれません" +msgstr "ここで設定された言語はテキスト描画時に影響を与える可能性があります。" #: ../app/tools/gimptextoptions.c:164 msgid "Text alignment" @@ -13963,19 +14046,19 @@ msgstr "" msgid "Te_xt" msgstr "テキスト(_X)" -#: ../app/tools/gimptexttool.c:958 +#: ../app/tools/gimptexttool.c:959 msgid "Reshape Text Layer" msgstr "テキストレイヤーの変形" -#: ../app/tools/gimptexttool.c:1512 ../app/tools/gimptexttool.c:1515 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "文字編集確認" -#: ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1520 msgid "Create _New Layer" msgstr "新しいテキストレイヤーの追加(_N)" -#: ../app/tools/gimptexttool.c:1543 +#: ../app/tools/gimptexttool.c:1544 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13989,7 +14072,7 @@ msgstr "" "このレイヤーを編集することも、文字アトリビュートを用いて新しいテキストレイ" "ヤーを生成することもできます。" -#: ../app/tools/gimptexttool-editor.c:1172 +#: ../app/tools/gimptexttool-editor.c:1199 msgid "GIMP Text Editor" msgstr "GIMP テキストエディター" @@ -14107,19 +14190,19 @@ msgstr "縦横比を維持 (%s)" msgid "Keep the original aspect ratio" msgstr "元の縦横比を維持して変形します" -#: ../app/tools/gimptransformtool.c:212 +#: ../app/tools/gimptransformtool.c:213 msgid "Transforming" msgstr "変形しています" -#: ../app/tools/gimptransformtool.c:1061 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "変形できるレイヤーがありません。" -#: ../app/tools/gimptransformtool.c:1074 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "変形できるパスがありません。" -#: ../app/tools/gimptransformtool.c:1075 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "アクティブなパスの境界線は保護されています。" @@ -14495,50 +14578,50 @@ msgstr "検索(_S):" msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:338 #: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "操作" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:367 msgid "Shortcut" msgstr "ショートカット" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:393 msgid "Name" msgstr "名前" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "ショートカットの変更に失敗しました" -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:670 msgid "Conflicting Shortcuts" msgstr "ショートカットが二重定義されています" -#: ../app/widgets/gimpactionview.c:675 +#: ../app/widgets/gimpactionview.c:676 msgid "_Reassign shortcut" msgstr "ショートカット再割り当て(_R)" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:691 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "" "ショートカット \"%1$s\" は、 \"%3$s\" グループの \"%2$s\" にすでに割り当て済" "みです。" -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "" "このショートカットを再割り当てすると、 \"%s\" に対する割り当ては削除されま" "す。" -#: ../app/widgets/gimpactionview.c:767 +#: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." msgstr "不正なショートカットです" -#: ../app/widgets/gimpactionview.c:856 +#: ../app/widgets/gimpactionview.c:867 msgid "Removing shortcut failed." msgstr "ショートカットの削除に失敗しました" @@ -14566,7 +14649,7 @@ msgid "Percentage of width of brush" msgstr "ブラシの移動間隔を、ブラシ幅のパーセンテージで指定します" #: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:748 +#: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(なし)" @@ -14574,37 +14657,37 @@ msgstr "(なし)" msgid "Add the current color to the color history" msgstr "現在の色を色履歴に追加します" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "利用可能なフィルター" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "選択したフィルターを上に移動" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "選択したフィルターを下に移動" -#: ../app/widgets/gimpcolordisplayeditor.c:271 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "アクティブなフィルター" -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "選択したフィルターの設定を既定値に戻します" -#: ../app/widgets/gimpcolordisplayeditor.c:496 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "'%s' をアクティブなフィルターの一覧に加えます" -#: ../app/widgets/gimpcolordisplayeditor.c:533 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "'%s' をアクティブなフィルターの一覧から削除します" -#: ../app/widgets/gimpcolordisplayeditor.c:564 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "フィルターが選択されていません" @@ -14684,11 +14767,11 @@ msgstr "カラーマップを持つのはインデックス画像のみです。 msgid "Palette" msgstr "パレット" -#: ../app/widgets/gimpcontainerpopup.c:591 +#: ../app/widgets/gimpcontainerpopup.c:595 msgid "Smaller Previews" msgstr "小さなプレビュー" -#: ../app/widgets/gimpcontainerpopup.c:596 +#: ../app/widgets/gimpcontainerpopup.c:600 msgid "Larger Previews" msgstr "大きなプレビュー" @@ -15057,39 +15140,42 @@ msgstr "X方向の傾き" msgid "Y tilt" msgstr "Y方向の傾き" -#: ../app/widgets/gimpdeviceinfoeditor.c:143 +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 #: ../app/widgets/gimpdynamicseditor.c:145 #: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "ホイール" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:193 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 msgid "Axes" msgstr "グラフ軸" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:267 +#: ../app/widgets/gimpdeviceinfoeditor.c:269 msgid "Keys" msgstr "キー" -#: ../app/widgets/gimpdeviceinfoeditor.c:364 -#: ../app/widgets/gimpdeviceinfoeditor.c:582 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "なし" -#: ../app/widgets/gimpdeviceinfoeditor.c:412 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 #, c-format msgid "%s Curve" msgstr "'%s' のカーブ" -#: ../app/widgets/gimpdeviceinfoeditor.c:471 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 #: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "カーブのリセット(_R)" -#: ../app/widgets/gimpdeviceinfoeditor.c:484 +#: ../app/widgets/gimpdeviceinfoeditor.c:487 #, c-format msgid "The axis '%s' has no curve" msgstr "'%s' にはカーブがありません" @@ -15108,24 +15194,24 @@ msgstr "描画色: %d, %d, %d" msgid "Background: %d, %d, %d" msgstr "背景色: %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:203 +#: ../app/widgets/gimpdnd-xds.c:204 msgid "The given filename does not have any known file extension." msgstr "指定されたファイル名に既知のファイル拡張子がありません。" -#: ../app/widgets/gimpdnd-xds.c:221 +#: ../app/widgets/gimpdnd-xds.c:222 msgid "File Exists" msgstr "ファイルは存在します" -#: ../app/widgets/gimpdnd-xds.c:226 +#: ../app/widgets/gimpdnd-xds.c:227 msgid "_Replace" msgstr "置換(_R)" -#: ../app/widgets/gimpdnd-xds.c:237 +#: ../app/widgets/gimpdnd-xds.c:238 #, c-format msgid "A file named '%s' already exists." msgstr "ファイル名 '%s' は既に存在します" -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "保存しようとしている画像で置き換えますか?" @@ -15156,11 +15242,11 @@ msgid "Configure this tab" msgstr "このタブの設定" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "自動" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "有効にすると、現在作業中の画像にダイアログが自動的に追従します。" @@ -15196,28 +15282,40 @@ msgstr "エラーメッセージが多すぎます!" msgid "Messages are redirected to stderr." msgstr "メッセージは標準エラー出力に出力されます。" -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 #, c-format msgid "%s Message" msgstr "%s エラーメッセージ" -#: ../app/widgets/gimpfiledialog.c:327 +#: ../app/widgets/gimpfiledialog.c:330 msgid "Automatically Detected" msgstr "自動判別" -#: ../app/widgets/gimpfiledialog.c:344 +#: ../app/widgets/gimpfiledialog.c:347 msgid "By Extension" msgstr "拡張子で判別" -#: ../app/widgets/gimpfiledialog.c:793 +#: ../app/widgets/gimpfiledialog.c:801 msgid "All files" msgstr "すべてのファイル" -#: ../app/widgets/gimpfiledialog.c:798 +#: ../app/widgets/gimpfiledialog.c:806 msgid "All images" msgstr "すべての画像" -#: ../app/widgets/gimpfiledialog.c:974 +#: ../app/widgets/gimpfiledialog.c:813 +msgid "All XCF images" +msgstr "すべての XCF 画像" + +#: ../app/widgets/gimpfiledialog.c:815 +msgid "All export images" +msgstr "エクスポートされたすべての画像" + +#: ../app/widgets/gimpfiledialog.c:999 #, c-format msgid "Select File _Type (%s)" msgstr "ファイル形式の選択(_T) (現在の設定: %s)" @@ -15444,79 +15542,79 @@ msgstr "" msgid "Querying..." msgstr "問い合わせています..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "ピクセルサイズ:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "印刷サイズ:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "解像度:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "色空間:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "ファイル名:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "ファイルサイズ:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "ファイル形式:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "メモリ中のサイズ:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "元に戻せるステップ:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "やり直せるステップ:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "ピクセル数:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "レイヤー数:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "チャンネル数:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "パス数:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "なし" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "ピクセル/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "色" @@ -15590,19 +15688,19 @@ msgstr "設定のエクスポート(_E)..." msgid "_Manage Settings..." msgstr "プリセットデータの編集(_M)..." -#: ../app/widgets/gimpsettingsbox.c:625 +#: ../app/widgets/gimpsettingsbox.c:636 msgid "Add Settings to Favorites" msgstr "設定をプリセットに追加" -#: ../app/widgets/gimpsettingsbox.c:628 +#: ../app/widgets/gimpsettingsbox.c:639 msgid "Enter a name for the settings" msgstr "この設定のプリセット名:" -#: ../app/widgets/gimpsettingsbox.c:629 +#: ../app/widgets/gimpsettingsbox.c:640 msgid "Saved Settings" msgstr "保存済設定" -#: ../app/widgets/gimpsettingsbox.c:670 +#: ../app/widgets/gimpsettingsbox.c:681 msgid "Manage Saved Settings" msgstr "プリセットデータの編集" @@ -15668,7 +15766,7 @@ msgstr "タグを付ける" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1734 +#: ../app/widgets/gimptagentry.c:1732 msgid "," msgstr "," @@ -15711,12 +15809,12 @@ msgstr "%d x %d dpi, %s" msgid "%d ppi, %s" msgstr "%d dpi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "テキスト中で使われている <%2$s> 要素の \"%1$s\" 属性は無効です。" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "最も外側の要素は <%s> ではなく でなければいけません" @@ -16103,7 +16201,7 @@ msgctxt "tab-style" msgid "Undefined" msgstr "不定" -#: ../app/xcf/xcf-load.c:336 +#: ../app/xcf/xcf-load.c:339 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -16111,7 +16209,7 @@ msgstr "" "この XCF ファイルは壊れています。できる限り読み込みましたが、完全に読み込むこ" "とはできませんでした。" -#: ../app/xcf/xcf-load.c:347 +#: ../app/xcf/xcf-load.c:350 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." @@ -16119,7 +16217,7 @@ msgstr "" "この XCF ファイルは壊れています。このファイルからは画像データを部分的でさえ読" "み込むことができませんでした。" -#: ../app/xcf/xcf-load.c:420 +#: ../app/xcf/xcf-load.c:423 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -16180,7 +16278,8 @@ msgid "round" msgstr "round" # タグ -#: ../data/tags/gimp-tags-default.xml.in.h:2 +#. fuzzy as in a feathered, blurred, unfocused, soft brush +#: ../data/tags/gimp-tags-default.xml.in.h:3 msgid "fuzzy" msgstr "fuzzy" @@ -16192,6 +16291,9 @@ msgstr "画像エディター" msgid "Create images and edit photographs" msgstr "画像の作成と写真の編集を行います" +#~ msgid "Close _without Saving" +#~ msgstr "保存せずに閉じる(_W)" + #~ msgctxt "undo-type" #~ msgid "Brightness_Contrast" #~ msgstr "明るさ-コントラスト(_C)" @@ -16211,9 +16313,6 @@ msgstr "画像の作成と写真の編集を行います" #~ msgid "Opacity:" #~ msgstr "不透明度:" -#~ msgid "Set Item Exclusive Linked" -#~ msgstr "アイテムを排他リンクにする" - #~ msgctxt "tool-preset-action" #~ msgid "_Delete Tool Preset" #~ msgstr "ツールプリセットの削除(_D)" diff --git a/po/ko.po b/po/ko.po index 85aff0c106..0d2446a209 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3,16 +3,17 @@ # Sung-Hyun Nam , 1999. # Dongsu Jang , 2004. # Ji-Hui Choi , 2007, 2012. +# Jihui Choi , 2012, 2013. # Sebul , 2012. -# Seong-ho Cho , 2012. +# Seong-ho Cho , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: GIMP 2.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-09 09:01+0000\n" -"PO-Revision-Date: 2012-09-09 19:18+0900\n" +"POT-Creation-Date: 2013-07-14 20:40+0000\n" +"PO-Revision-Date: 2013-07-08 20:00+0900\n" "Last-Translator: Seong-ho Cho \n" "Language-Team: \n" "Language: ko\n" @@ -20,9 +21,8 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Korean\n" -"X-Poedit-Country: KOREA, REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.5\n" #: ../app/about.h:23 msgid "GIMP" @@ -68,7 +68,7 @@ msgstr "" "김프와 함께 GNU 일반 공증 허가서 사본을 받아야 합니다. 만약 그렇지 않다면, 다" "음을 참조하시기 바랍니다 http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -117,7 +117,7 @@ msgstr "사용자 인터페이스 없이 실행합니다" #: ../app/main.c:178 msgid "Do not load brushes, gradients, patterns, ..." -msgstr "무늬, 그라디언트, 색상표, 붓 등을 불러오지 않습니다..." +msgstr "무늬, 그라디언트, 색상표, 붓 등을 불러오지 않습니다…" #: ../app/main.c:183 msgid "Do not load any fonts" @@ -436,7 +436,7 @@ msgstr "텍스트 편집기" msgid "Tool Options" msgstr "도구 옵션" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:388 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "도구" @@ -965,13 +965,13 @@ msgid "Use the composite color of all visible layers" msgstr "모든 보이는 레이어의 합성색을 사용합니다" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 #: ../app/display/gimpdisplayshell-dnd.c:592 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170 -#: ../app/widgets/gimptoolbox.c:833 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" "Opening '%s' failed:\n" @@ -1347,7 +1347,7 @@ msgid "About GIMP" msgstr "김프 정보입니다" #: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:555 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "도구상자" @@ -2402,49 +2402,49 @@ msgstr "%s 덮어쓰기(_W)" msgid "Export to" msgstr "내보내기" -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:489 +#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "이미지 열기" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:134 msgid "Open Image as Layers" msgstr "이미지를 레이어로 열기" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:266 msgid "No changes need to be saved" msgstr "저장할 변화가 없습니다" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 msgid "Save Image" msgstr "이미지 저장" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:279 msgid "Save a Copy of the Image" msgstr "이미지의 사본을 저장" -#: ../app/actions/file-commands.c:363 +#: ../app/actions/file-commands.c:364 msgid "Create New Template" msgstr "새 양식 만들기" -#: ../app/actions/file-commands.c:367 +#: ../app/actions/file-commands.c:368 msgid "Enter a name for this template" msgstr "이 양식의 이름을 입력하십시오" -#: ../app/actions/file-commands.c:397 +#: ../app/actions/file-commands.c:398 msgid "Revert failed. No file name associated with this image." msgstr "원상 복구 실패. 이 이미지에 해당되는 파일이 없습니다." -#: ../app/actions/file-commands.c:409 +#: ../app/actions/file-commands.c:410 msgid "Revert Image" msgstr "이미지 원상 복구" -#: ../app/actions/file-commands.c:435 +#: ../app/actions/file-commands.c:436 #, c-format msgid "Revert '%s' to '%s'?" msgstr "'%s'을(를) '%s'(으)로 되돌리겠습니까?" -#: ../app/actions/file-commands.c:441 +#: ../app/actions/file-commands.c:442 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -5144,13 +5144,13 @@ msgstr "이 이미지를 새 창으로 보입니다" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "닫기(_C)" +msgid "_Close View" +msgstr "뷰 닫기(_C)" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "이미지 창 닫기" +msgid "Close the active image view" +msgstr "활성화된 이미지 뷰를 닫습니다" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5581,11 +5581,11 @@ msgstr "기타(_R) (%s)..." msgid "_Zoom (%s)" msgstr "확대(_Z) (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "캔버스 채우기 색상 지정" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "캔버스 채우기 색상 지정" @@ -7251,8 +7251,8 @@ msgid "Jitter" msgstr "지터(Jitter)" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:206 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "\"%s\" 삭제 실패: %s" @@ -7716,7 +7716,7 @@ msgstr "불투명" msgid "Paint Mode" msgstr "그리기 모드" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:681 #, c-format msgid "Could not delete '%s': %s" msgstr "'%s'을(를) 지울 수 없습니다: %s" @@ -8042,12 +8042,20 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "색상표 설정" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#, fuzzy +#| msgctxt "undo-type" +#| msgid "Set Colormap" +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "색상표 설정" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "색상표 항목 바꾸기" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "색상표로 색상 추가" @@ -8199,7 +8207,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "표본점 이동" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "이미지 크기 조절" @@ -8209,69 +8217,69 @@ msgstr "이미지 크기 조절" msgid "Can't undo %s" msgstr "%s을(를) 취소할 수 없습니다" -#: ../app/core/gimpimage.c:1783 +#: ../app/core/gimpimage.c:1784 msgid " (exported)" msgstr " (추출됨)" -#: ../app/core/gimpimage.c:1787 +#: ../app/core/gimpimage.c:1788 msgid " (overwritten)" msgstr " (겹쳐써짐)" -#: ../app/core/gimpimage.c:1796 +#: ../app/core/gimpimage.c:1797 msgid " (imported)" msgstr " (가져옴)" -#: ../app/core/gimpimage.c:1917 +#: ../app/core/gimpimage.c:1922 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "이미지 해상도 바꾸기" -#: ../app/core/gimpimage.c:1969 +#: ../app/core/gimpimage.c:1974 msgctxt "undo-type" msgid "Change Image Unit" msgstr "이미지 단위 바꾸기" -#: ../app/core/gimpimage.c:2982 +#: ../app/core/gimpimage.c:2987 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "이미지에 기생충 덧붙이기" -#: ../app/core/gimpimage.c:3023 +#: ../app/core/gimpimage.c:3028 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "이미지에서 기생충 제거" -#: ../app/core/gimpimage.c:3732 +#: ../app/core/gimpimage.c:3737 msgctxt "undo-type" msgid "Add Layer" msgstr "레이어 추가" -#: ../app/core/gimpimage.c:3782 ../app/core/gimpimage.c:3802 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "레이어 제거" -#: ../app/core/gimpimage.c:3796 +#: ../app/core/gimpimage.c:3801 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "뜬 선택 영역 제거" -#: ../app/core/gimpimage.c:3964 +#: ../app/core/gimpimage.c:3969 msgctxt "undo-type" msgid "Add Channel" msgstr "채널 추가" -#: ../app/core/gimpimage.c:4002 ../app/core/gimpimage.c:4015 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "채널 제거" -#: ../app/core/gimpimage.c:4069 +#: ../app/core/gimpimage.c:4074 msgctxt "undo-type" msgid "Add Path" msgstr "경로 추가" -#: ../app/core/gimpimage.c:4100 +#: ../app/core/gimpimage.c:4105 msgctxt "undo-type" msgid "Remove Path" msgstr "경로 제거" @@ -8309,7 +8317,7 @@ msgid "(Preview may be out of date)" msgstr "(오래된 미리 보기 입니다.)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8936,7 +8944,7 @@ msgstr "점점 흐리게 %s" msgid "_Fade" msgstr "점점 흐리게(_F)" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "모드(_M):" @@ -8964,7 +8972,7 @@ msgstr "이미지 내보내기" msgid "_Export" msgstr "내보내기(_E)" -#: ../app/dialogs/file-save-dialog.c:432 +#: ../app/dialogs/file-save-dialog.c:419 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -8973,7 +8981,7 @@ msgstr "" "원격 파일 저장은 파일 확장자를 통해 파일 형식을 결정해야 합니다. 선택한 파일" "의 형식에 맞는 파일 확장자를 입력하거나 아예 파일 확장자를 입력하지 마십시오." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:546 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -8981,7 +8989,7 @@ msgstr "" "이 대화 상자를 이용하여 다양한 파일 형식으로 내보낼 수 있습니다. 이미지를 김" "프 XCF 형식으로 저장하려면 파일→저장 메뉴를 이용하십시오." -#: ../app/dialogs/file-save-dialog.c:566 +#: ../app/dialogs/file-save-dialog.c:553 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -8989,7 +8997,7 @@ msgstr "" "이 대화 상자를 이용하여 김프 XCF 형식으로 저장할 수 있습니다. 다른 파일 형식" "으로 내보내려면 파일→다른 형식으로 내보내기 메뉴를 이용하십시오." -#: ../app/dialogs/file-save-dialog.c:572 +#: ../app/dialogs/file-save-dialog.c:559 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -8997,23 +9005,23 @@ msgstr "" "확장자명이 빠졌습니다. 확장자명을 입력하거나 파일 형식 목록에서 파일 형식을 " "선택하십시오." -#: ../app/dialogs/file-save-dialog.c:586 +#: ../app/dialogs/file-save-dialog.c:573 msgid "Extension Mismatch" msgstr "잘못된 확장자" -#: ../app/dialogs/file-save-dialog.c:602 +#: ../app/dialogs/file-save-dialog.c:589 msgid "The given file extension does not match the chosen file type." msgstr "입력한 파일 확장자명은 선택한 파일의 형식과 일치하지 않습니다." -#: ../app/dialogs/file-save-dialog.c:606 +#: ../app/dialogs/file-save-dialog.c:593 msgid "Do you want to save the image using this name anyway?" msgstr "지금 파일로 이미지를 저장하시겠습니까?" -#: ../app/dialogs/file-save-dialog.c:664 +#: ../app/dialogs/file-save-dialog.c:651 msgid "Saving canceled" msgstr "저장 취소" -#: ../app/dialogs/file-save-dialog.c:672 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9214,31 +9222,31 @@ msgstr "바꾼 내용을 반영하려면, 김프를 다시 시작해야 합니 msgid "Module" msgstr "모듈" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" msgstr "메모리에만" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:473 msgid "No longer available" msgstr "더 이상 사용할 수 없음" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "작성:" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "버전:" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "날짜:" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "저작권:" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "위치:" @@ -9886,7 +9894,7 @@ msgid "Vertical" msgstr "위아래로" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10395,17 +10403,17 @@ msgstr "안내선 없음" #: ../app/display/display-enums.c:61 msgctxt "guides-type" msgid "Center lines" -msgstr "가운데 선" +msgstr "중심선" #: ../app/display/display-enums.c:62 msgctxt "guides-type" msgid "Rule of thirds" -msgstr "세 번째 규칙" +msgstr "1/3의 법칙" #: ../app/display/display-enums.c:63 msgctxt "guides-type" msgid "Rule of fifths" -msgstr "다섯 번째 규칙" +msgstr "1/5의 법칙" #: ../app/display/display-enums.c:64 msgctxt "guides-type" @@ -10437,7 +10445,7 @@ msgstr "줄 간격" #: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" -msgstr "n/a" +msgstr "없음" #: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 #: ../app/display/gimpcursorview.c:269 @@ -10495,7 +10503,7 @@ msgid "Navigate the image display" msgstr "이미지 화면을 둘러보기" #: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1325 ../app/widgets/gimptoolbox.c:256 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "이미지를 이곳에 끌어놓으면 이미지가 열립니다." @@ -10503,7 +10511,7 @@ msgstr "이미지를 이곳에 끌어놓으면 이미지가 열립니다." #: ../app/display/gimpdisplayshell-close.c:229 #, c-format msgid "Close %s" -msgstr "%s을(를) 닫습니까?" +msgstr "%s을(를) 닫으시겠습니까?" #: ../app/display/gimpdisplayshell-close.c:167 msgid "Close _without Saving" @@ -10539,10 +10547,10 @@ msgid_plural "" "If you don't save the image, changes from the last %d minutes will be lost." msgstr[0] "이미지를 저장하지 않을 경우, %d 분 이전에 바뀐 내용은 사라집니다." -#: ../app/display/gimpdisplayshell-close.c:305 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "The image has been exported to '%s'." -msgstr "이미지가 '%s'(으)로 내보내졌습니다." +msgstr "'%s'(으)로 이미지를 내보냈습니다." #: ../app/display/gimpdisplayshell-dnd.c:246 #: ../app/display/gimpdisplayshell-dnd.c:649 @@ -10557,6 +10565,7 @@ msgstr "새 경로 끌어서-놓기" #: ../app/display/gimpdisplayshell-dnd.c:361 #: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 #: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "레이어 그룹의 픽셀을 바꿀 수 없습니다." @@ -10564,7 +10573,8 @@ msgstr "레이어 그룹의 픽셀을 바꿀 수 없습니다." #: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:247 ../app/tools/gimptransformtool.c:1067 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "활성 레이어의 픽셀이 잠겼습니다." @@ -10575,27 +10585,27 @@ msgstr "레이어 삭제" #: ../app/display/gimpdisplayshell-dnd.c:682 #: ../app/display/gimpdisplayshell-dnd.c:699 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "버퍼 삭제" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "화면 색상 표시 필터" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "화면 색상 표시 필터 설정" #: ../app/display/gimpdisplayshell-handlers.c:796 #, c-format msgid "Image saved to '%s'" -msgstr "이미지가 '%s'(으)로 저장되었습니다." +msgstr "'%s'(으)로 이미지를 저장했습니다." #: ../app/display/gimpdisplayshell-handlers.c:810 #, c-format msgid "Image exported to '%s'" -msgstr "이미지를 '%s'(으)로 내보내었습니다." +msgstr "'%s'(으)로 이미지를 내보냈습니다." #: ../app/display/gimpdisplayshell-layer-select.c:122 msgid "Layer Select" @@ -10654,12 +10664,12 @@ msgstr "%s 플러그인을 이용해 이미지를 열 수 없습니다." msgid "Image doesn't contain any layers" msgstr "이미지에 레이어가 없습니다." -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "'%s' 열기 실패: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10674,14 +10684,14 @@ msgstr "알 수 없는 이미지 유형" #: ../app/file/file-save.c:221 #, c-format msgid "%s plug-in could not save image" -msgstr "%s 플러그인을 이용해 이미지를 저장할 수 없습니다." +msgstr "%s 플러그인을 사용하여 이미지를 저장할 수 없습니다." -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s:'은(는) 정확한 URI 스키마가 아닙니다." -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "URI의 글자 배열이 잘못되었습니다" @@ -10696,15 +10706,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "이미지 변형을 위해 골조 변형하기" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "김프 커브 파일이 아닙니다." -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "해석 오류" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "김프 레벨 파일이 아닙니다." @@ -11006,12 +11016,12 @@ msgstr "타당하지 않은 빈 페인트 동적 요소 이름" #: ../app/pdb/gimppdb-utils.c:143 #, c-format msgid "Paint dynamics '%s' not found" -msgstr "페인트 동적 요소 '%s'을(를) 찾을 수 없습니다." +msgstr "'%s' 페인트 동적 요소를 찾을 수 없습니다." #: ../app/pdb/gimppdb-utils.c:148 #, c-format msgid "Paint dynamics '%s' is not editable" -msgstr "페인트 동적 요소 '%s'은(는) 수정할 수 없습니다." +msgstr "'%s' 페인트 동적 요소를 수정할 수 없습니다." #: ../app/pdb/gimppdb-utils.c:168 msgid "Invalid empty pattern name" @@ -11020,7 +11030,7 @@ msgstr "빈 문자열은 무늬 이름으로 부적절합니다" #: ../app/pdb/gimppdb-utils.c:177 #, c-format msgid "Pattern '%s' not found" -msgstr "무늬 '%s'을(를) 찾을 수 없습니다." +msgstr "'%s' 무늬를 찾을 수 없습니다." #: ../app/pdb/gimppdb-utils.c:197 msgid "Invalid empty gradient name" @@ -11029,12 +11039,12 @@ msgstr "빈 문자열은 그라디언트 이름으로 부적절합니다" #: ../app/pdb/gimppdb-utils.c:206 #, c-format msgid "Gradient '%s' not found" -msgstr "그라디언트 '%s'을(를) 찾을 수 없습니다." +msgstr "'%s' 그라디언트를 찾을 수 없습니다." #: ../app/pdb/gimppdb-utils.c:211 #, c-format msgid "Gradient '%s' is not editable" -msgstr "그라디언트 '%s'은(는) 수정할 수 없습니다." +msgstr "'%s' 그라디언트를 수정할 수 없습니다." #: ../app/pdb/gimppdb-utils.c:232 msgid "Invalid empty palette name" @@ -11043,12 +11053,12 @@ msgstr "빈 문자열은 팔레트 이름으로 부적절합니다." #: ../app/pdb/gimppdb-utils.c:241 #, c-format msgid "Palette '%s' not found" -msgstr "팔레트 '%s'을(를) 찾을 수 없습니다." +msgstr "'%s' 팔레트를 찾을 수 없습니다." #: ../app/pdb/gimppdb-utils.c:246 #, c-format msgid "Palette '%s' is not editable" -msgstr "팔레트 '%s'은(는) 수정할 수 없습니다." +msgstr "'%s' 팔레트를 수정할 수 없습니다." #: ../app/pdb/gimppdb-utils.c:266 msgid "Invalid empty font name" @@ -11057,7 +11067,7 @@ msgstr "빈 문자열은 글꼴 이름으로 부적절합니다" #: ../app/pdb/gimppdb-utils.c:276 #, c-format msgid "Font '%s' not found" -msgstr "글꼴 '%s'이(가) 없습니다." +msgstr "'%s' 글꼴이 없습니다." #: ../app/pdb/gimppdb-utils.c:295 msgid "Invalid empty buffer name" @@ -11117,7 +11127,7 @@ msgstr "'%s' (%d) 항목은 이미 이미지에 추가되었습니다." #: ../app/pdb/gimppdb-utils.c:477 #, c-format msgid "Trying to add item '%s' (%d) to wrong image" -msgstr "잘못된 이미지에 '%s' (%d) 항목을 추가하려는 시도" +msgstr "잘못된 이미지에 '%s' (%d) 항목을 추가하려고 합니다" #: ../app/pdb/gimppdb-utils.c:496 #, c-format @@ -11286,29 +11296,29 @@ msgstr "경로 스트로크 제거하기" msgid "Close path stroke" msgstr "경로 스트로크 닫기" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "경로 스트로크 변환" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "경로 크기조정" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "경로 스트로크 회전" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "경로 스트로크 뒤집기" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "경로 실선 추가" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "경로 따라 그리기 확장" @@ -11354,7 +11364,7 @@ msgstr "" msgid "Cancelled" msgstr "취소됨" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:643 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11404,7 +11414,7 @@ msgstr "플러그인 해석기" msgid "Plug-In Environment" msgstr "플러그인 환경" -#: ../app/plug-in/gimppluginprocedure.c:980 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11413,7 +11423,7 @@ msgstr "" "'%s' 호출 오류:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:992 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11422,16 +11432,21 @@ msgstr "" "'%s' 실행 오류:\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "색 프로파일을 흑백 이미지에 적용할 수 없습니다 (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "'%s' 실행 오류" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "플러그인 없음 (%s)" @@ -11463,7 +11478,7 @@ msgstr "" "무궁화 꽃이 피었습니다.\n" "아름답고 고운 우리 말 우리 글!" -#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1401 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "텍스트 레이어 추가" @@ -11591,7 +11606,7 @@ msgstr "대상을 왼쪽 끝으로 정렬" #: ../app/tools/gimpalignoptions.c:302 msgid "Align center of target" -msgstr "대상을 가운데(수평)로 정렬" +msgstr "대상을 수평방향 가운데로 정렬" #: ../app/tools/gimpalignoptions.c:306 msgid "Align right edge of target" @@ -11603,7 +11618,7 @@ msgstr "대상을 위쪽으로 정렬" #: ../app/tools/gimpalignoptions.c:318 msgid "Align middle of target" -msgstr "대상을 가운데(수직)로 정렬" +msgstr "대상을 수직방향 가운데로 정렬" #: ../app/tools/gimpalignoptions.c:322 msgid "Align bottom of target" @@ -11619,7 +11634,7 @@ msgstr "대상을 왼쪽 끝으로 배치" #: ../app/tools/gimpalignoptions.c:342 msgid "Distribute horizontal centers of targets" -msgstr "대상을 가운데(수평)로 배치" +msgstr "대상을 수평방향 가운데로 배치" #: ../app/tools/gimpalignoptions.c:346 msgid "Distribute right edges of targets" @@ -11631,7 +11646,7 @@ msgstr "대상을 위쪽으로 배치" #: ../app/tools/gimpalignoptions.c:358 msgid "Distribute vertical centers of targets" -msgstr "대상을 가운데(수직)로 배치" +msgstr "대상을 수직방향 가운데로 배치" #: ../app/tools/gimpalignoptions.c:362 msgid "Distribute bottoms of targets" @@ -11861,7 +11876,7 @@ msgctxt "command" msgid "Select by Color" msgstr "색상으로 선택" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "Cage 변형" @@ -11873,15 +11888,15 @@ msgstr "골조 변형: 골조로 선택 영역 변형" msgid "_Cage Transform" msgstr "_Cage 변형" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "변형을 승인하려면 엔터를 누르십시오." -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "Cage 계수 계산" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "Cage 변형" @@ -11993,7 +12008,7 @@ msgstr "휘도 유지(_L)" #: ../app/tools/gimpcolorizetool.c:90 msgid "Colorize" -msgstr "컬러화(Colorize)" +msgstr "색상화" #: ../app/tools/gimpcolorizetool.c:91 msgid "Colorize Tool: Colorize the image" @@ -12017,7 +12032,7 @@ msgstr "색상화 설정 내보내기" #: ../app/tools/gimpcolorizetool.c:157 msgid "Colorize operates only on RGB color layers." -msgstr "컬러화는 RGB 색상 레이어에서만 동작합니다." +msgstr "색상화는 RGB 색상 레이어에서만 동작합니다." #: ../app/tools/gimpcolorizetool.c:224 msgid "Select Color" @@ -12262,7 +12277,7 @@ msgstr "채널(_N):" msgid "R_eset Channel" msgstr "채널 초기화(_E)" -#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "커브 유형(_T):" @@ -12302,7 +12317,7 @@ msgstr "닷지(Dodge) / 번(Burn)" #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" msgstr "" -"닷지(Dodge)/번(Burn) 도구: 붓을 이용해 이미지의 일부분을 밝게 만들거나 어둡" +"닷지(Dodge) / 번(Burn) 도구: 붓을 이용해 이미지의 일부분을 밝게 만들거나 어둡" "게 만듭니다." #: ../app/tools/gimpdodgeburntool.c:75 @@ -12456,7 +12471,7 @@ msgstr "연속된 영역 선택" msgid "" "Paint over areas to mark color values for inclusion or exclusion from " "selection" -msgstr "선택에 포함된/포함 안 된 색상값 표시를 위해 영역 전체 칠하기" +msgstr "선택에 포함된/안 된 색상값 표시를 위해 영역 전체 칠하기" #: ../app/tools/gimpforegroundselectoptions.c:98 msgid "Size of the brush used for refinements" @@ -13616,19 +13631,19 @@ msgstr "텍스트 도구: 텍스트 레이어를 만들거나 편집합니다" msgid "Te_xt" msgstr "텍스트(_X)" -#: ../app/tools/gimptexttool.c:958 +#: ../app/tools/gimptexttool.c:959 msgid "Reshape Text Layer" msgstr "텍스트 레이어 다시 날카롭게" -#: ../app/tools/gimptexttool.c:1512 ../app/tools/gimptexttool.c:1515 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "텍스트 편집 확인" -#: ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1520 msgid "Create _New Layer" msgstr "새 레이어 만들기(_N)" -#: ../app/tools/gimptexttool.c:1543 +#: ../app/tools/gimptexttool.c:1544 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13642,7 +13657,7 @@ msgstr "" "해당 레이어를 편집하거나 해당 레이어의 텍스트 속성을 가진 새 텍스트 레이어를 " "만들 수 있습니다." -#: ../app/tools/gimptexttool-editor.c:1180 +#: ../app/tools/gimptexttool-editor.c:1199 msgid "GIMP Text Editor" msgstr "김프 텍스트 편집기" @@ -13757,15 +13772,15 @@ msgstr "원본 종횡비 유지" msgid "Transforming" msgstr "변형 중" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "변형할 레이어가 없습니다." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "변형할 경로가 없습니다." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "활성 레이어의 스트로크가 잠겨 있습니다." @@ -14148,7 +14163,7 @@ msgstr "단축키" msgid "Name" msgstr "이름" -#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:841 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "단축키 변경에 실패했습니다." @@ -14170,11 +14185,11 @@ msgstr "단축키 \"%s\"은(는) 이미 \"%s\"(\"%s\" 그룹)에 할당되어 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "재설정된 단축키는 \"%s\"에서 제거될 것입니다." -#: ../app/widgets/gimpactionview.c:776 +#: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." msgstr "잘못된 단축키입니다." -#: ../app/widgets/gimpactionview.c:865 +#: ../app/widgets/gimpactionview.c:867 msgid "Removing shortcut failed." msgstr "단축키 제거에 실패했습니다." @@ -14210,37 +14225,37 @@ msgstr "(없음)" msgid "Add the current color to the color history" msgstr "현재 색상을 색상 이력에 추가" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "가용 필터" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "선택한 필터를 위로 이동" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "선택한 필터를 아래로 이동" -#: ../app/widgets/gimpcolordisplayeditor.c:271 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "활성 필터" -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "선택한 필터를 기본 값으로 초기화" -#: ../app/widgets/gimpcolordisplayeditor.c:503 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "활성 필터 목록에 '%s' 추가" -#: ../app/widgets/gimpcolordisplayeditor.c:540 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "활성 필터 목록에서 '%s' 제거" -#: ../app/widgets/gimpcolordisplayeditor.c:571 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "선택한 필터 없음" @@ -14689,39 +14704,42 @@ msgstr "X 기울기" msgid "Y tilt" msgstr "Y 기울기" -#: ../app/widgets/gimpdeviceinfoeditor.c:143 +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 #: ../app/widgets/gimpdynamicseditor.c:145 #: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "휠" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:193 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 msgid "Axes" msgstr "축" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:267 +#: ../app/widgets/gimpdeviceinfoeditor.c:269 msgid "Keys" msgstr "키" -#: ../app/widgets/gimpdeviceinfoeditor.c:364 -#: ../app/widgets/gimpdeviceinfoeditor.c:582 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "없음" -#: ../app/widgets/gimpdeviceinfoeditor.c:412 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 #, c-format msgid "%s Curve" msgstr "%s 커브" -#: ../app/widgets/gimpdeviceinfoeditor.c:471 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 #: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "_Reset Curve" -#: ../app/widgets/gimpdeviceinfoeditor.c:484 +#: ../app/widgets/gimpdeviceinfoeditor.c:487 #, c-format msgid "The axis '%s' has no curve" msgstr " '%s' 축에는 곡선이 없습니다" @@ -14788,11 +14806,11 @@ msgid "Configure this tab" msgstr "탭 설정" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "자동" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "대화상자가 자동으로 현재 작업중인 이미지를 반영합니다." @@ -14828,7 +14846,11 @@ msgstr "너무 많은 오류 메시지가 있습니다!" msgid "Messages are redirected to stderr." msgstr "메시지는 stderr로 보내집니다." -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 #, c-format msgid "%s Message" msgstr "%s 메시지" @@ -14841,23 +14863,23 @@ msgstr "자동 검출" msgid "By Extension" msgstr "확장자로" -#: ../app/widgets/gimpfiledialog.c:798 +#: ../app/widgets/gimpfiledialog.c:801 msgid "All files" msgstr "모든 파일" -#: ../app/widgets/gimpfiledialog.c:803 +#: ../app/widgets/gimpfiledialog.c:806 msgid "All images" msgstr "모든 이미지" -#: ../app/widgets/gimpfiledialog.c:810 +#: ../app/widgets/gimpfiledialog.c:813 msgid "All XCF images" msgstr "모든 XCF 이미지" -#: ../app/widgets/gimpfiledialog.c:812 +#: ../app/widgets/gimpfiledialog.c:815 msgid "All export images" msgstr "모든 가져온 이미지" -#: ../app/widgets/gimpfiledialog.c:996 +#: ../app/widgets/gimpfiledialog.c:999 #, c-format msgid "Select File _Type (%s)" msgstr "파일 유형 선택(_T) (%s)" @@ -15080,79 +15102,79 @@ msgstr "" msgid "Querying..." msgstr "요청 중..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "픽셀 단위 크기:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "인쇄 크기:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "해상도:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "색상 공간:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "파일명:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "파일 크기:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "파일 타입:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "메모리 내의 크기:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "실행 취소 수:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "재실행 수:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "픽셀 수:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "레이어 수:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "채널 수:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "경로 수:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "없음" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "픽셀/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "색상" @@ -15347,12 +15369,12 @@ msgstr "%d × %d ppi, %s" msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "이 문맥의 <%s> 요소에 \"%s\" 속성은 올바르지 않습니다" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "텍스트의 가장 바깥 요소는 <%s>가 아닌 이어야 합니다." @@ -15737,19 +15759,19 @@ msgctxt "tab-style" msgid "Undefined" msgstr "정의 안됨" -#: ../app/xcf/xcf-load.c:336 +#: ../app/xcf/xcf-load.c:339 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." msgstr "이 XCF 파일은 망가졌습니다. 불러온 파일이 완전하지 않을 수도 있습니다." -#: ../app/xcf/xcf-load.c:347 +#: ../app/xcf/xcf-load.c:350 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." msgstr "이 XCF 파일은 망가졌습니다. 파일을 불러올 수 없습니다." -#: ../app/xcf/xcf-load.c:420 +#: ../app/xcf/xcf-load.c:423 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" diff --git a/po/lt.po b/po/lt.po index baf0c3adf8..ae51520ad1 100644 --- a/po/lt.po +++ b/po/lt.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: GIMP HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-16 22:02+0000\n" -"PO-Revision-Date: 2013-03-17 18:12+0200\n" +"POT-Creation-Date: 2013-09-13 16:06+0000\n" +"PO-Revision-Date: 2013-09-13 22:25+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -72,7 +72,7 @@ msgstr "" "Jūs turėjote gauti GNU Bendrosios viešosios licencijos kopiją kartu su " "programa GIMP. Jei negavote, žr. http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -444,7 +444,7 @@ msgstr "Teksto rengyklė" msgid "Tool Options" msgstr "Įrankių parinktys" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Įrankinė" @@ -974,7 +974,7 @@ msgid "Use the composite color of all visible layers" msgstr "Naudoti sudėtinę visų matomų sluoksnių spalvą sluoksniais" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2416,50 +2416,51 @@ msgstr "_Perrašyti %s" msgid "Export to" msgstr "Eksportuoti į" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Atverti paveikslėlį" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Atverti paveikslėlį kaip sluoksnius" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Nėra įrašytinų pakeitimų" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Įrašyti paveikslėlį" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Įrašyti paveikslėlio kopiją" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Sukurti naują šabloną" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Įveskite pavadinimą šiam šablonui" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "Atstatyti nepavyko. Su šiuo paveikslėliu nesusietas joks failo pavadinimas." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Atstatyti paveikslėlį" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Atstatyti „%s“ į „%s“?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2467,11 +2468,11 @@ msgstr "" "Atstatydami paveikslėlį į būseną išsaugotą diske, prarasite visus " "pakeitimus, įskaitant ir visą atšaukimų informaciją." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Nepavadintas šablonas)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3215,7 +3216,7 @@ msgid "Set Image Canvas Size" msgstr "Nustatyti paveikslėlio matomosios srities dydį" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Keičiamas dydis" @@ -3242,16 +3243,16 @@ msgstr "Sukama" msgid "Cannot crop because the current selection is empty." msgstr "Nepavyko apkirpti, kadangi dabartinis pažymėjimas yra tuščias." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Keisti spaudinio dydį" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Keisti paveikslėlio dydį" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 @@ -5164,14 +5165,18 @@ msgid "Create another view on this image" msgstr "Sukurti naują šio paveikslėlio rodinį" #: ../app/actions/view-actions.c:82 +#| msgctxt "view-action" +#| msgid "_Close" msgctxt "view-action" -msgid "_Close" -msgstr "_Užverti" +msgid "_Close View" +msgstr "_Užverti vaizdą" #: ../app/actions/view-actions.c:83 +#| msgctxt "view-action" +#| msgid "Close this image window" msgctxt "view-action" -msgid "Close this image window" -msgstr "Užverti šį paveikslėlio langą" +msgid "Close the active image view" +msgstr "Užverti aktyvų paveikslėlio vaizdą" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5409,7 +5414,6 @@ msgid "Zoom _Out" msgstr "Su_mažinti" #: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -#| msgid "Zoom out" msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Atitraukti" @@ -5420,7 +5424,6 @@ msgid "Zoom _In" msgstr "Pa_didinti" #: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -#| msgid "Zoom in" msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Pritraukti" @@ -5604,11 +5607,11 @@ msgstr "Kit_a (%s) ..." msgid "_Zoom (%s)" msgstr "_Mastelis (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Nustatyti piešimo erdvės užpildo spalvą" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Nustatyti kitą piešimo erdvės užpildo spalvą" @@ -5676,7 +5679,6 @@ msgid "Single-Window Mode" msgstr "Vieno lango veiksena" #: ../app/actions/windows-actions.c:123 -#| msgid "Use GIMP in a single-window mode." msgctxt "windows-action" msgid "When enabled GIMP is in a single-window mode." msgstr "Kai įjungta, GIMP veiks vieno lango veiksena." @@ -7320,7 +7322,7 @@ msgid "Jitter" msgstr "Virpėjimas" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" @@ -7795,7 +7797,7 @@ msgstr "Nepermatomumas" msgid "Paint Mode" msgstr "Piešimo veiksena" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Nepavyko ištrinti „%s“: %s" @@ -7943,7 +7945,7 @@ msgid "Posterize" msgstr "Sumažinti spalvų kiekį" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Nepakanka taškų potėpiui atlikti" @@ -8126,12 +8128,19 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Nustatyti spalvų lentelę" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#| msgctxt "undo-type" +#| msgid "Set Colormap" +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Atstatyti spalvų lentelę" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Keisti spalvų lentelės įrašą" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Įtraukti spalvą į spalvų lentelę" @@ -8218,39 +8227,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Sujungti matomus sluoksnius" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Suploti paveikslėlį" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Negalima suplokštinti paveikslėlio be jokio matomo sluoksnio." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Negalima sujungti su žemesne sluoksnių grupe." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Sluoksnis sujungimu su žemesniu yra užrakintas." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Nėra matomo sluoksnio sujungimui su žemesniu." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Sujungti su žemesniu" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Sujungti sluoksnių grupę" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Sujungti matomus kontūrus" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "Sujungimui neužtenka matomų kontūrų, kurių turi būti bent du." @@ -8283,7 +8296,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Perkelti mėginio tašką" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Keisti paveikslėlio dydį" @@ -8393,7 +8406,7 @@ msgid "(Preview may be out of date)" msgstr "(Peržiūra gali būti pasenusi)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8435,7 +8448,6 @@ msgid "Set Item Exclusive Visible" msgstr "Nustatyti elementą išimtinai matomą" #: ../app/core/gimpitem-exclusive.c:172 -#| msgid "Set Item Exclusive Visible" msgid "Set Item Exclusive Linked" msgstr "Nustatyti elementą išskirtinai susietą" @@ -9059,15 +9071,15 @@ msgstr "Atverti vietą" msgid "Enter location (URI):" msgstr "Įveskite vietą (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Eksportuoti paveikslėlį" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Eksportuoti" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9077,7 +9089,12 @@ msgstr "" "plėtinį. Įveskite failo plėtinį, atitinkantį pasirinkto failo formatą arba " "iš viso nenurodykite failo plėtinio." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for exporting" +msgstr "Nurodytas failo pavadinimas negali būti naudojamas eksportavimui" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9085,7 +9102,18 @@ msgstr "" "Galite naudoti šį dialogą eksportavimui įvairiais failų formatais. Jei " "norite išsaugoti paveikslėlį GIMP XCF formatų, naudokite Failas→Įrašyti." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +#| msgctxt "dialogs-action" +#| msgid "Open the layers dialog" +msgid "Take me to the Save dialog" +msgstr "Pereiti į įrašymo dialogą" + +#: ../app/dialogs/file-save-dialog.c:613 +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for saving" +msgstr "Nurodytas failo pavadinimas negali būti naudojamas įrašymui" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9093,7 +9121,17 @@ msgstr "" "Galite naudoti šį dialogą įrašymui GIMP XCF formatu. Eksportavimui kitais " "failų formatais naudokite Failas→Eksportuoti." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +#| msgctxt "dialogs-action" +#| msgid "Open the paths dialog" +msgid "Take me to the Export dialog" +msgstr "Pereiti į eksporto dialogą" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Plėtinių neatitikimas" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9101,24 +9139,20 @@ msgstr "" "Nurodyto failo pavadinimo plėtinys nežinomas. Įveskite failo plėtinį arba " "failų formatų sąraše pasirinkite failo formatą." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Plėtinių neatitikimas" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "Nurodytas failo plėtinys neatitinka pasirinkto failo tipo." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Ar vis tiek norite įrašyti paveikslėlį šiuo pavadinimu?" # File Saving -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Išsaugojimas atšauktas" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9835,12 +9869,10 @@ msgid "Default Image" msgstr "Numatytasis paveikslėlis" #: ../app/dialogs/preferences-dialog.c:2028 -#| msgid "Edit Quick Mask Color" msgid "Set the default Quick Mask color" msgstr "Nustatyti numatytąją greitosios kaukės spalvą" #: ../app/dialogs/preferences-dialog.c:2034 -#| msgid "Edit Quick Mask Color" msgid "Quick Mask color:" msgstr "Greitosios kaukės spalva:" @@ -10005,7 +10037,7 @@ msgid "Vertical" msgstr "Vertikaliai" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "taškų colyje" @@ -10684,7 +10716,6 @@ msgstr[2] "" #: ../app/display/gimpdisplayshell-close.c:311 #, c-format -#| msgid "Image exported to '%s'" msgid "The image has been exported to '%s'." msgstr "Paveikslėlis eksportuotas į „%s“." @@ -10710,7 +10741,7 @@ msgstr "Negalima keisti sluoksnių grupių pikselių." #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 #: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 #: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 -#: ../app/tools/gimptransformtool.c:1067 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Aktyvaus sluoksnio pikseliai yra užrakinti." @@ -10800,12 +10831,12 @@ msgstr "Įskiepiui %s nepavyko atverti paveikslėlio" msgid "Image doesn't contain any layers" msgstr "Paveikslėlyje nėra sluoksnių" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Nepavyko atverti „%s“: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10821,12 +10852,12 @@ msgstr "Nežinomas failo tipas" msgid "%s plug-in could not save image" msgstr "Įskiepiui %s nepavyko įrašyti paveikslėlio" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "„%s:“ nėra tinkama URI schema" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "URI yra netinkama simbolių seka" @@ -10840,15 +10871,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Deformuoti narvą deformuojant paveikslėlį" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "tai ne GIMP kreivių failas" -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "apdorojimo klaida" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "tai ne GIMP lygių failas" @@ -11439,29 +11470,29 @@ msgstr "Pašalinti kontūro brūkšnį" msgid "Close path stroke" msgstr "Sujungti kontūro brūkšnius" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Išversti kontūro brūkšnį" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Keisti kontūro dydį" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Pasukti kontūrą" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Apsukti kontūrą" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Pridėti kontūro brūkšnį" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Išplėsti kontūro brūkšnį" @@ -11557,7 +11588,7 @@ msgstr "Įskiepių interpretatoriai" msgid "Plug-In Environment" msgstr "Įskiepių aplinka" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11566,7 +11597,7 @@ msgstr "" "Kvietimo klaida procedūrai „%s“:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11575,16 +11606,21 @@ msgstr "" "Vykdymo klaida procedūrai „%s“:\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "Negalima pritaikyti spalvų profilio juodai-baltam paveikslėliui (%s)" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Klaida vykdant „%s“" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Nėra įskiepio (%s)" @@ -11870,7 +11906,7 @@ msgstr "Perėjimas neveikia indeksuotose sluoksniuose." msgid "No gradient available for use with this tool." msgstr "Šiam įrankiui nėra naudotinų gradientų." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s suvaržytiems kampams" @@ -12013,7 +12049,7 @@ msgctxt "command" msgid "Select by Color" msgstr "Pažymėti pagal spalvą" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "Transformavimas narvu" @@ -12025,15 +12061,15 @@ msgstr "Transformavimas narvu: deformuokite pažymėtą sritį naudodami narvą" msgid "_Cage Transform" msgstr "_Transformavimas narvu" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "Paspauskite ENTER norėdami atlikti transformaciją" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "Skaičiuojami narvo koeficientai" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "Transformavimas narvu" @@ -12250,13 +12286,13 @@ msgstr "S_palvų parinkiklis" msgid "Click in any image to view its color" msgstr "Spustelėkite bet kokiame paveikslėlyje norėdami pamatyti jo spalvą" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "" "Spustelėkite bet kokiame paveikslėlyje norėdami pasirinkti priekinio plano " "spalvą" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Spustelėkite bet kokiame paveikslėlyje norėdami pasirinkti fono spalvą" @@ -13110,8 +13146,6 @@ msgid "Zoom Tool: Adjust the zoom level" msgstr "Mastelio įrankis: keisti mastelį" #: ../app/tools/gimpmagnifytool.c:93 -#| msgctxt "view-action" -#| msgid "_Zoom" msgid "_Zoom" msgstr "_Mastelis" @@ -13165,7 +13199,7 @@ msgstr "Spustelėkite ir vilkite norėdami perkelti visus taškus" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "pikseliai" @@ -13337,7 +13371,7 @@ msgstr "%s norėdami pasirinkti spalvą" msgid "Cannot paint on layer groups." msgstr "Negalima piešti ant sluoksnių grupių." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s tiesiai linijai" @@ -13949,15 +13983,15 @@ msgstr "Išlaikyti pradines proporcijas" msgid "Transforming" msgstr "Transformuojama" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Nėra transformuotino sluoksnio." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Nėra transformuotino kontūro." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Suaktyvinto kontūro potėpiai yra užrakinti." @@ -14986,11 +15020,11 @@ msgid "Configure this tab" msgstr "Konfigūruoti šią kortelę" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Auto" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "Kai įjungta, dialogas automatiškai seka paveikslėlį, kuriame dirbate." @@ -15052,12 +15086,10 @@ msgid "All images" msgstr "Visi paveikslėliai" #: ../app/widgets/gimpfiledialog.c:813 -#| msgid "All images" msgid "All XCF images" msgstr "Visi XCF paveikslėliai" #: ../app/widgets/gimpfiledialog.c:815 -#| msgid "All images" msgid "All export images" msgstr "Visi eksportuojami paveikslėliai" @@ -15285,79 +15317,79 @@ msgstr "" msgid "Querying..." msgstr "Užklausiama..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Dydis pikseliais:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Spaudinio dydis:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Raiška:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Spalvų erdvė:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Failo vardas:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Failo dydis:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Failo tipas:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Dydis atmintyje:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Atšaukiami žingsniai:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Pakartojami žingsniai:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Pikselių skaičius:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Sluoksnių skaičius:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Kanalų skaičius:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Kontūrų skaičius:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Nėra" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pikseliai/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "spalvos" @@ -15554,12 +15586,12 @@ msgstr "%d × %d taškų colyje, %s" msgid "%d ppi, %s" msgstr "%d taškų colyje, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Šiame kontekste požymis „%s“ yra netinkamas elemente <%s>" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Išoriškiausias elementas tekste turi būti , o ne <%s>" @@ -16027,4 +16059,3 @@ msgstr "Paveikslėlių rengyklė" #: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "Kurti paveikslėlius ir redaguoti fotografijas" - diff --git a/po/pa.po b/po/pa.po index 7861803f42..f9e846aa65 100644 --- a/po/pa.po +++ b/po/pa.po @@ -5,21 +5,21 @@ # # Punjab Linux Technology , 2004. # A S Alam , 2005,2006, 2007, 2010. -# Amanpreet Singh Alam , 2007, 2008, 2012. +# Amanpreet Singh Alam , 2007, 2008, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: gimp.HEAD.pa\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-04-24 05:53+0000\n" -"PO-Revision-Date: 2012-04-28 23:35+0530\n" +"POT-Creation-Date: 2013-09-10 10:18+0000\n" +"PO-Revision-Date: 2013-09-13 11:04-0500\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" +"Language: pa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pa\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../app/about.h:23 @@ -71,7 +71,7 @@ msgstr "" "ਮਿਲੀ ਹੈ ਤਾਂ " "http://www.gnu.org/licenses/ ਵੇਖੋ।" -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -441,7 +441,7 @@ msgstr "ਟੈਕਸਟ ਐਡੀਟਰ" msgid "Tool Options" msgstr "ਟੂਲ ਚੋਣ" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:388 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "ਟੂਲ" @@ -773,7 +773,7 @@ msgid "New Channel Color" msgstr "ਨਵਾਂ ਚੈਨਲ ਰੰਗ" #: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 -#: ../app/display/gimpdisplayshell-dnd.c:632 +#: ../app/display/gimpdisplayshell-dnd.c:646 #: ../app/widgets/gimpchanneltreeview.c:258 #: ../app/widgets/gimplayertreeview.c:776 #, c-format @@ -970,13 +970,13 @@ msgid "Use the composite color of all visible layers" msgstr "ਸਾਰੀਆਂ ਉਪਲੱਬਧ ਲੇਅਰਾਂ ਤੇ ਅਧਾਰ ਚੋਣ" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:194 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 -#: ../app/display/gimpdisplayshell-dnd.c:578 -#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:170 -#: ../app/widgets/gimptoolbox.c:833 +#: ../app/display/gimpdisplayshell-dnd.c:592 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" "Opening '%s' failed:\n" @@ -989,7 +989,7 @@ msgstr "" #: ../app/actions/data-commands.c:118 #: ../app/actions/tool-options-commands.c:72 -#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1523 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 #: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 #: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 @@ -1352,7 +1352,7 @@ msgid "About GIMP" msgstr "ਜੈਮਪ ਬਾਰੇ" #: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:555 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "ਟੂਲ-ਬਕਸਾ" @@ -2356,8 +2356,8 @@ msgid "" "current state of the image" msgstr "" "ਇਹ ਚਿੱਤਰ ਦੀ ਕਾਪੀ ਨੂੰ ਬਿਨਾਂ ਸਰੋਤ ਫਾਇਲ (ਜੇ ਕੋਈ ਹੋਵੇ ਤਾਂ) ਜਾਂ ਚਿੱਤਰ ਦੀ ਮੌਜੂਦ " -"ਹਾਲਤ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕੀਤੇ ਬਿਨਾਂ " -"ਸੰਭਾਲੋ।" +"ਹਾਲਤ ਨੂੰ ਪ੍ਰਭਾਵਿਤ " +"ਕੀਤੇ ਬਿਨਾਂ ਸੰਭਾਲੋ।" #: ../app/actions/file-actions.c:140 msgctxt "file-action" @@ -2380,8 +2380,6 @@ msgid "Export the image again" msgstr "ਚਿੱਤਰ ਫੇਰ ਐਕਸਪੋਰਟ ਕਰੋ" #: ../app/actions/file-actions.c:152 -#| msgctxt "file-action" -#| msgid "Overwrite" msgctxt "file-action" msgid "Over_write" msgstr "ਉੱਤੇ ਲਿਖੋ(_w)" @@ -2399,7 +2397,7 @@ msgstr "ਐਕਸਪੋਰਟ..." #: ../app/actions/file-actions.c:159 msgctxt "file-action" msgid "Export the image to various file formats such as PNG or JPEG" -msgstr "ਚਿਤੱਰ ਨੂੰ ਕਈ ਫਾਇਲ ਫਾਰਮੈਟ ਜਿਵੇਂ ਕਿ PNG ਜਾਂ JPEG ਵਿੱਚ ਐਕਸਪੋਰਟ ਕਰੋ" +msgstr "ਚਿੱਤਰ ਨੂੰ ਕਈ ਫਾਇਲ ਫਾਰਮੈਟ ਜਿਵੇਂ ਕਿ PNG ਜਾਂ JPEG ਵਿੱਚ ਐਕਸਪੋਰਟ ਕਰੋ" #: ../app/actions/file-actions.c:292 #, c-format @@ -2408,7 +2406,6 @@ msgstr "%s ਵਜੋਂ ਐਕਸਪੋਰਟ" #: ../app/actions/file-actions.c:298 #, c-format -#| msgid "Overwrite %s" msgid "Over_write %s" msgstr "%s ਉੱਤੇ ਲਿਖੋ(_w)" @@ -2416,49 +2413,50 @@ msgstr "%s ਉੱਤੇ ਲਿਖੋ(_w)" msgid "Export to" msgstr "ਐਕਸਪੋਰਟ ਕਰੋ" -#: ../app/actions/file-commands.c:112 ../app/actions/file-commands.c:492 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "ਚਿੱਤਰ ਖੋਲ੍ਹੋ" -#: ../app/actions/file-commands.c:133 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "ਚਿੱਤਰ ਲੇਅਰਾਂ ਵਾਂਗ ਖੋਲ੍ਹੋ" -#: ../app/actions/file-commands.c:265 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "ਕੋਈ ਬਦਲਾਅ ਸੰਭਾਲਣ ਦੀ ਲੋੜ ਨਹੀਂ ਹੈ" -#: ../app/actions/file-commands.c:272 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "ਚਿੱਤਰ ਸੰਭਾਲੋ" -#: ../app/actions/file-commands.c:278 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "ਚਿੱਤਰ ਦੀ ਇੱਕ ਕਾਪੀ ਸੰਭਾਲੋ" -#: ../app/actions/file-commands.c:356 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "ਨਵਾਂ ਟੈਪਲੇਟ ਬਣਾਓ" -#: ../app/actions/file-commands.c:360 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "ਇਸ ਟੈਪਲੇਟ ਦਾ ਨਾਂ ਦਿਓ" -#: ../app/actions/file-commands.c:394 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "ਰੀਵਰਟ ਫੇਲ੍ਹ ਹੈ। ਇਹ ਚਿੱਤਰ ਨਾਲ ਸਬੰਧਿਤ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ।" -#: ../app/actions/file-commands.c:407 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "ਚਿੱਤਰ ਰੀਵਰਟ" -#: ../app/actions/file-commands.c:438 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "ਕੀ '%s' ਨੂੰ '%s' ਤੋਂ ਰੀਵਰਟ ਕਰਨਾ ਹੈ?" -#: ../app/actions/file-commands.c:444 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2467,11 +2465,11 @@ msgstr "" "ਬੈਠੋਗੇ, ਜਿਸ ਵਿੱਚ " "ਸਭ ਵਾਪਸ (undo) ਜਾਣਕਾਰੀ ਵੀ ਹੈ।" -#: ../app/actions/file-commands.c:655 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(ਬਿਨਾਂ ਨਾਂ ਟੈਪਲੇਟ)" -#: ../app/actions/file-commands.c:706 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3214,7 +3212,7 @@ msgid "Set Image Canvas Size" msgstr "ਚਿੱਤਰ ਕੈਨਵਸ ਆਕਾਰ ਸੈੱਟ ਕਰੋ" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "ਮੁੜ-ਆਕਾਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ" @@ -3231,7 +3229,7 @@ msgstr "ਝਟਕਿਆ ਜਾ ਰਿਹਾ ਹੈ" #: ../app/actions/image-commands.c:403 #: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:533 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 #: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" @@ -3241,20 +3239,20 @@ msgstr "ਘੁੰਮਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" msgid "Cannot crop because the current selection is empty." msgstr "ਕਰੋਪ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ, ਕਿਉਂਕਿ ਮੌਜੂਦਾ ਚੋਣ ਖਾਲੀ ਹੈ।" -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "ਪਰਿੰਟ ਆਕਾਰ ਬਦਲੋ" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "ਚਿੱਤਰ ਸਕੇਲ ਕਰੋ" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:405 -#: ../app/pdb/image-cmds.c:441 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 #: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" @@ -4626,7 +4624,7 @@ msgstr "ਟੈਕਸਟ ਫਾਇਲ (UTF-8) ਖੋਲ੍ਹੋ" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:140 ../app/core/gimpbrush-load.c:424 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -4969,10 +4967,9 @@ msgid "Merge _Visible Paths" msgstr "ਦਿੱਖ ਮਾਰਗ ਵਿਲੀਨ(_V)" #: ../app/actions/vectors-actions.c:88 -#, fuzzy msgctxt "vectors-action" msgid "_Raise Path" -msgstr "ਉਭਾਰਿਆ ਮਾਰਗ(_R)" +msgstr "ਮਾਰਗ ਉਭਾਰੋ(_R)" #: ../app/actions/vectors-actions.c:89 #, fuzzy @@ -5015,10 +5012,9 @@ msgid "Lower this path to the bottom" msgstr "ਤਲੇ ਲਈ ਹੇਠਾਂ ਮਾਰਗ" #: ../app/actions/vectors-actions.c:112 -#, fuzzy msgctxt "vectors-action" msgid "Stro_ke Path..." -msgstr "ਸਟਰੋਕ ਮਾਰਗ(_k)..." +msgstr "..,ਸਟਰੋਕ ਮਾਰਗ(_k)" #: ../app/actions/vectors-actions.c:113 msgctxt "vectors-action" @@ -5208,13 +5204,18 @@ msgid "Create another view on this image" msgstr "ਇਸ ਚਿੱਤਰ ਉੱਤੇ ਹੋਰ ਝਲਕ ਬਣਾਓ" #: ../app/actions/view-actions.c:82 +#| msgctxt "view-action" +#| msgid "_Close" msgctxt "view-action" -msgid "_Close" -msgstr "ਬੰਦ ਕਰੋ(_C)" +msgid "_Close View" +msgstr "ਝਲਕ ਬੰਦ ਕਰੋ(_C)" #: ../app/actions/view-actions.c:83 +#, fuzzy +#| msgctxt "view-action" +#| msgid "Close this image window" msgctxt "view-action" -msgid "Close this image window" +msgid "Close the active image view" msgstr "ਇਹ ਚਿੱਤਰ ਵਿੰਡੋ ਬੰਦ ਕਰੋ" #: ../app/actions/view-actions.c:88 @@ -5439,8 +5440,6 @@ msgid "Toggle fullscreen view" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਝਲਕ ਬਦਲੋ" #: ../app/actions/view-actions.c:238 -#| msgctxt "config-action" -#| msgid "Use _GEGL" msgctxt "view-action" msgid "Use GEGL" msgstr "GEGL ਵਰਤੋਂ" @@ -5456,7 +5455,6 @@ msgid "Zoom _Out" msgstr "ਜ਼ੂਮ ਆਉਟ(_O)" #: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 -#| msgid "Zoom out" msgctxt "view-zoom-action" msgid "Zoom out" msgstr "ਜ਼ੂਮ ਆਉਟ" @@ -5467,7 +5465,6 @@ msgid "Zoom _In" msgstr "ਜ਼ੂਮ ਇਨ(_I)" #: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 -#| msgid "Zoom in" msgctxt "view-zoom-action" msgid "Zoom in" msgstr "ਜ਼ੂਮ ਇਨ" @@ -5615,10 +5612,9 @@ msgid "Use the dark check color" msgstr "ਗੂੜ੍ਹੇ ਚੈੱਕ ਰੰਗ ਵਰਤੋਂ" #: ../app/actions/view-actions.c:411 -#, fuzzy msgctxt "view-padding-color" msgid "Select _Custom Color..." -msgstr "ਕਸਟਮ ਰੰਗ ਚੁਣੋ(_C)..." +msgstr "...ਪਸੰਦੀਦਾ ਰੰਗ ਚੁਣੋ(_C)" #: ../app/actions/view-actions.c:412 #, fuzzy @@ -5655,11 +5651,11 @@ msgstr "ਹੋਰ(_r) (%s)..." msgid "_Zoom (%s)" msgstr "ਜ਼ੂਮ (%s)(_Z)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "ਕੈਨਵਸ ਪੈਡਿੰਗ ਰੰਗ ਸੈੱਟ ਕਰੋ" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "ਕਸਟਮ ਕੈਨਵਸ ਪੈਡਿੰਗ ਰੰਗ ਸੈੱਟ ਕਰੋ" @@ -5673,54 +5669,47 @@ msgstr "%s ਸਕਰੀਨ" msgid "Move this window to screen %s" msgstr "ਇਹ ਵਿੰਡੋ %s ਸਕਰੀਨ ਉੱਤੇ ਭੇਜੋ" -#: ../app/actions/windows-actions.c:95 +#: ../app/actions/windows-actions.c:93 msgctxt "windows-action" msgid "_Windows" msgstr "ਵਿੰਡੋ(_W)" -#: ../app/actions/windows-actions.c:97 +#: ../app/actions/windows-actions.c:95 msgctxt "windows-action" msgid "_Recently Closed Docks" msgstr "ਤਾਜ਼ਾ ਬੰਦ ਕੀਤੇ ਡੌਕ(_R)" -#: ../app/actions/windows-actions.c:99 +#: ../app/actions/windows-actions.c:97 msgctxt "windows-action" msgid "_Dockable Dialogs" msgstr "ਡੋਕ-ਯੋਗ ਡਾਈਲਾਗ(_D)" -#: ../app/actions/windows-actions.c:102 -#| msgctxt "edit-action" -#| msgid "_New Image" +#: ../app/actions/windows-actions.c:100 msgctxt "windows-action" msgid "Next Image" msgstr "ਅੱਗੇ ਚਿੱਤਰ" -#: ../app/actions/windows-actions.c:103 -#| msgctxt "space-bar-action" -#| msgid "Switch to Move tool" +#: ../app/actions/windows-actions.c:101 msgctxt "windows-action" msgid "Switch to the next image" msgstr "ਅਗਲੇ ਚਿੱਤਰ ਉੱਤੇ ਜਾਉ" -#: ../app/actions/windows-actions.c:108 -#| msgid "_Previous Tip" +#: ../app/actions/windows-actions.c:106 msgctxt "windows-action" msgid "Previous Image" msgstr "ਪਿਛਲਾ ਚਿੱਤਰ" -#: ../app/actions/windows-actions.c:109 -#| msgctxt "view-action" -#| msgid "Restore the previous zoom level" +#: ../app/actions/windows-actions.c:107 msgctxt "windows-action" msgid "Switch to the previous image" msgstr "ਪਿਛਲੇ ਚਿੱਤਰ ਉੱਤੇ ਜਾਓ" -#: ../app/actions/windows-actions.c:117 +#: ../app/actions/windows-actions.c:115 msgctxt "windows-action" msgid "Hide Docks" msgstr "ਡੋਕ ਓਹਲੇ" -#: ../app/actions/windows-actions.c:118 +#: ../app/actions/windows-actions.c:116 msgctxt "windows-action" msgid "" "When enabled docks and other dialogs are hidden, leaving only image windows." @@ -5728,13 +5717,12 @@ msgstr "" "ਜਦੋਂ ਚਾਲੂ ਕੀਤਾ ਜਾਵੇਗਾ ਤਾਂ ਡੌਕ ਤੇ ਹੋਰ ਡਾਈਲਾਗ ਲੁਕਵੇਂ ਹੋਣਗੇ, ਕੇਵਲ ਚਿੱਤਰ ਵਿੰਡੋ ਹੀ " "ਵੇਖਾਈ ਦੇਵੇਗੀ।" -#: ../app/actions/windows-actions.c:124 +#: ../app/actions/windows-actions.c:122 msgctxt "windows-action" msgid "Single-Window Mode" msgstr "ਇੱਕਲੀ-ਵਿੰਡੋ ਮੋਡ" -#: ../app/actions/windows-actions.c:125 -#| msgid "Use GIMP in a single-window mode." +#: ../app/actions/windows-actions.c:123 msgctxt "windows-action" msgid "When enabled GIMP is in a single-window mode." msgstr "ਜਦੋਂ ਜੈਮਪ ਦਾ ਇੱਕਲੀ ਵਿੰਡੋ ਮੋਡ ਚਾਲੂ ਹੋਵੇ।" @@ -6601,7 +6589,7 @@ msgstr "ਵਾਪਸ ਅਤੀਤ ਵਿੱਚ ਝਲਕਾਂ ਦਾ ਅਕਾ msgid "When enabled, pressing F1 will open the help browser." msgstr "ਜਦੋਂ ਯੋਗ ਕੀਤਾ ਤਾਂ , F1 ਦਬਾਉਣ ਨਾਲ ਮੱਦਦ ਬਰਾਊਜ਼ਰ ਖੁੱਲ ਜਾਵੇਗਾ।" -#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:133 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 #: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" @@ -7089,12 +7077,12 @@ msgctxt "undo-type" msgid "Anchor floating selection" msgstr "ਐਂਕਰ ਤਰਦੀ ਚੋਣ" -#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:261 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "ਚੇਪੋ" -#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:502 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "ਕੱਟੋ" @@ -7270,168 +7258,168 @@ msgctxt "undo-type" msgid "Not undoable" msgstr "ਵਾਪਸੀ ਯੋਗ ਨਹੀਂ" -#: ../app/core/core-enums.c:1185 +#: ../app/core/core-enums.c:1187 msgctxt "select-criterion" msgid "Composite" msgstr "ਰਚਨਾ" -#: ../app/core/core-enums.c:1186 +#: ../app/core/core-enums.c:1188 msgctxt "select-criterion" msgid "Red" msgstr "ਲਾਲ" -#: ../app/core/core-enums.c:1187 +#: ../app/core/core-enums.c:1189 msgctxt "select-criterion" msgid "Green" msgstr "ਹਰਾ" -#: ../app/core/core-enums.c:1188 +#: ../app/core/core-enums.c:1190 msgctxt "select-criterion" msgid "Blue" msgstr "ਨੀਲਾ" -#: ../app/core/core-enums.c:1189 +#: ../app/core/core-enums.c:1191 msgctxt "select-criterion" msgid "Hue" msgstr "ਆਭਾ" -#: ../app/core/core-enums.c:1190 +#: ../app/core/core-enums.c:1192 msgctxt "select-criterion" msgid "Saturation" msgstr "ਸੰਤ੍ਰਿਪਤੀ" -#: ../app/core/core-enums.c:1191 +#: ../app/core/core-enums.c:1193 msgctxt "select-criterion" msgid "Value" msgstr "ਮੁੱਲ" -#: ../app/core/core-enums.c:1220 +#: ../app/core/core-enums.c:1222 msgctxt "message-severity" msgid "Message" msgstr "ਸੁਨੇਹਾ" -#: ../app/core/core-enums.c:1221 +#: ../app/core/core-enums.c:1223 msgctxt "message-severity" msgid "Warning" msgstr "ਚੇਤਾਵਨੀ" -#: ../app/core/core-enums.c:1222 +#: ../app/core/core-enums.c:1224 msgctxt "message-severity" msgid "Error" msgstr "ਗਲਤੀ" -#: ../app/core/core-enums.c:1251 +#: ../app/core/core-enums.c:1253 msgctxt "color-profile-policy" msgid "Ask what to do" msgstr "ਪੁੱਛੋ ਕਿ ਕੀ ਕਰਨਾ ਹੈ" -#: ../app/core/core-enums.c:1252 +#: ../app/core/core-enums.c:1254 msgctxt "color-profile-policy" msgid "Keep embedded profile" msgstr "ਇੰਬੈੱਡ ਪਰੋਫਾਇਲ ਰੱਖੋ" -#: ../app/core/core-enums.c:1253 +#: ../app/core/core-enums.c:1255 msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "RGB ਵਰਕਸਪੇਸ ਲਈ ਕਨਵਰਟ" -#: ../app/core/core-enums.c:1290 +#: ../app/core/core-enums.c:1292 msgctxt "dynamics-output-type" msgid "Opacity" msgstr "ਧੁੰਦਲਾਪਨ" -#: ../app/core/core-enums.c:1291 +#: ../app/core/core-enums.c:1293 msgctxt "dynamics-output-type" msgid "Size" msgstr "ਅਕਾਰ" -#: ../app/core/core-enums.c:1292 +#: ../app/core/core-enums.c:1294 msgctxt "dynamics-output-type" msgid "Angle" msgstr "ਕੋਣ" -#: ../app/core/core-enums.c:1293 +#: ../app/core/core-enums.c:1295 msgctxt "dynamics-output-type" msgid "Color" msgstr "ਰੰਗ" -#: ../app/core/core-enums.c:1294 +#: ../app/core/core-enums.c:1296 msgctxt "dynamics-output-type" msgid "Hardness" msgstr "ਸਖਤ" -#: ../app/core/core-enums.c:1295 +#: ../app/core/core-enums.c:1297 msgctxt "dynamics-output-type" msgid "Force" msgstr "ਫੋਰਸ" -#: ../app/core/core-enums.c:1296 +#: ../app/core/core-enums.c:1298 msgctxt "dynamics-output-type" msgid "Aspect ratio" msgstr "ਅਕਾਰ ਅਨੁਪਾਤ" -#: ../app/core/core-enums.c:1297 +#: ../app/core/core-enums.c:1299 msgctxt "dynamics-output-type" msgid "Spacing" msgstr "ਫਾਸਲਾ" -#: ../app/core/core-enums.c:1298 +#: ../app/core/core-enums.c:1300 msgctxt "dynamics-output-type" msgid "Rate" msgstr "ਰੇਟ" -#: ../app/core/core-enums.c:1299 +#: ../app/core/core-enums.c:1301 msgctxt "dynamics-output-type" msgid "Flow" msgstr "ਵਹਾ" -#: ../app/core/core-enums.c:1300 +#: ../app/core/core-enums.c:1302 msgctxt "dynamics-output-type" msgid "Jitter" msgstr "ਜਿੱਟਰ" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 -#: ../app/widgets/gimpdevices.c:206 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 +#: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "\"%s\" ਹਟਾਉਣਾ ਅਸਫ਼ਲ: %s" -#: ../app/core/gimp-edit.c:189 ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "ਚੇਪੀ ਲੇਅਰ" -#: ../app/core/gimp-edit.c:388 +#: ../app/core/gimp-edit.c:420 msgctxt "undo-type" msgid "Clear" msgstr "ਸਾਫ਼ ਕਰੋ" -#: ../app/core/gimp-edit.c:407 +#: ../app/core/gimp-edit.c:439 msgctxt "undo-type" msgid "Fill with Foreground Color" msgstr "ਫਾਰਗਰਾਊਂਡ ਰੰਗ ਨਾਲ ਭਰੋ" -#: ../app/core/gimp-edit.c:411 +#: ../app/core/gimp-edit.c:443 msgctxt "undo-type" msgid "Fill with Background Color" msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ ਨਾਲ ਭਰੋ" -#: ../app/core/gimp-edit.c:415 +#: ../app/core/gimp-edit.c:447 msgctxt "undo-type" msgid "Fill with White" msgstr "ਸਫੈਦ ਨਾਲ ਭਰੋ" -#: ../app/core/gimp-edit.c:419 +#: ../app/core/gimp-edit.c:451 msgctxt "undo-type" msgid "Fill with Transparency" msgstr "ਪਾਰਦਰਸ਼ਤਾ ਨਾਲ ਭਰੋ" -#: ../app/core/gimp-edit.c:423 +#: ../app/core/gimp-edit.c:455 msgctxt "undo-type" msgid "Fill with Pattern" msgstr "ਪੈਟਰਨ ਨਾਲ ਭਰੋ" -#: ../app/core/gimp-edit.c:515 +#: ../app/core/gimp-edit.c:547 msgid "Global Buffer" msgstr "ਗਲੋਬਲ ਬਫ਼ਰ" @@ -7466,7 +7454,7 @@ msgstr "FG ਤੋਂ ਪਾਰਦਰਸ਼ੀ" msgid "tags-locale:C" msgstr "tips-locale:pa" -#: ../app/core/gimp-user-install.c:159 +#: ../app/core/gimp-user-install.c:173 #, c-format msgid "" "It seems you have used GIMP %s before. GIMP will now migrate your user " @@ -7476,7 +7464,7 @@ msgstr "" "ਲਈ ਮਾਈਗਰੇਟ " "ਕਰੇਗਾ।" -#: ../app/core/gimp-user-install.c:164 +#: ../app/core/gimp-user-install.c:178 #, c-format msgid "" "It appears that you are using GIMP for the first time. GIMP will now create " @@ -7486,17 +7474,17 @@ msgstr "" "ਬਣਾਏਗਾ ਅਤੇ " "ਕੁਝ ਫਾਇਲਾਂ ਇੱਥੇ ਕਾਪੀ ਕਰੇਗਾ।" -#: ../app/core/gimp-user-install.c:316 +#: ../app/core/gimp-user-install.c:329 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "'%s' ਫਾਇਲ '%s' ਤੋਂ ਕਾਪੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." -#: ../app/core/gimp-user-install.c:331 ../app/core/gimp-user-install.c:357 +#: ../app/core/gimp-user-install.c:344 ../app/core/gimp-user-install.c:370 #, c-format msgid "Creating folder '%s'..." msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..." -#: ../app/core/gimp-user-install.c:342 ../app/core/gimp-user-install.c:368 +#: ../app/core/gimp-user-install.c:355 ../app/core/gimp-user-install.c:381 #, c-format msgid "Cannot create folder '%s': %s" msgstr "ਫੋਲਡਰ '%s' ਬਣਾਇਆ ਨਹੀ ਜਾ ਸਕਿਆ ਹੈ: %s" @@ -7540,7 +7528,7 @@ msgstr "ਮੋਡੀਊਲ" msgid "Updating tag cache" msgstr "ਟੈਗ ਕੈਸ਼ ਅੱਪਡੇਟ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" -#: ../app/core/gimpbrush-load.c:178 +#: ../app/core/gimpbrush-load.c:180 #, fuzzy, c-format #| msgid "Could not read %d bytes from '%s': %s" msgid "Could not read %d byte from '%s': %s" @@ -7548,50 +7536,50 @@ msgid_plural "Could not read %d bytes from '%s': %s" msgstr[0] "%d ਬਾਈਟ '%s' ਤੋਂ ਪੜ੍ਹੇ ਨਹੀ ਜਾ ਸਕੇ ਹਨ: %s" msgstr[1] "%d ਬਾਈਟ '%s' ਤੋਂ ਪੜ੍ਹੇ ਨਹੀ ਜਾ ਸਕੇ ਹਨ: %s" -#: ../app/core/gimpbrush-load.c:200 +#: ../app/core/gimpbrush-load.c:202 #, c-format msgid "Fatal parse error in brush file '%s': Width = 0." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਪਾਰਸ ਗਲਤੀ: ਚੌੜਾਈ = 0" -#: ../app/core/gimpbrush-load.c:209 +#: ../app/core/gimpbrush-load.c:211 #, c-format msgid "Fatal parse error in brush file '%s': Height = 0." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਪਾਰਸ ਗਲਤੀ: ਉਚਾਈ = 0" -#: ../app/core/gimpbrush-load.c:218 +#: ../app/core/gimpbrush-load.c:220 #, c-format msgid "Fatal parse error in brush file '%s': Bytes = 0." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਪਾਰਸ ਗਲਤੀ: ਬਾਈਟ = 0" -#: ../app/core/gimpbrush-load.c:242 +#: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਗਲਤੀ ਹੈ: ਅਣਜਾਣ %d ਡੂੰਘਾਈ।" -#: ../app/core/gimpbrush-load.c:255 +#: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਗਲਤੀ: ਅਣਜਾਣ ਵਰਜਨ %d।" -#: ../app/core/gimpbrush-load.c:271 ../app/core/gimpbrush-load.c:391 -#: ../app/core/gimpbrush-load.c:725 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 +#: ../app/core/gimpbrush-load.c:727 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਗਲਤੀ: ਫਾਇਲ ਤਬਦੀਲ ਜਾਪਦੀ ਹੈ।" -#: ../app/core/gimpbrush-load.c:279 ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਗਲਤ UTF-8 ਲਾਈਨ" -#: ../app/core/gimpbrush-load.c:286 ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 #: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" msgstr "ਬੇ-ਨਾਮ" -#: ../app/core/gimpbrush-load.c:380 +#: ../app/core/gimpbrush-load.c:382 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7600,14 +7588,14 @@ msgstr "" "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਗਲਤੀ: ਅਣ-ਸਹਿਯੋਗੀ ਬੁਰਸ਼ ਡੂੰਘਾਈ %d।\n" "ਜੈਮਪ ਬੁਰਸ਼ GRAY ਜਾਂ RGBA ਹੋਣੇ ਜ਼ਰੂਰੀ ਹਨ।" -#: ../app/core/gimpbrush-load.c:452 +#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." msgstr "" "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਘਾਤਕ ਗਲਤੀ: abr ਫਾਰਮੈਟ ਵਰਜਨ %d ਨੂੰ ਡੀਕੋਡ ਕਰਨ ਲਈ ਅਸਫ਼ਲ ਹੈ।" -#: ../app/core/gimpbrush-load.c:619 +#: ../app/core/gimpbrush-load.c:621 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "ਬੁਰਸ਼ ਫਾਇਲ '%s' ਵਿੱਚ ਪਾਰਸ ਗਲਤੀ: ਵਾਇਡ ਬੁਰਸ਼ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।" @@ -7859,7 +7847,7 @@ msgstr "ਧੁੰਦਲਾਪਨ" msgid "Paint Mode" msgstr "ਪੇਂਟ ਮੋਡ" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "'%s' ਨੂੰ ਹਟਾਇਆ ਨਹੀ ਜਾ ਸਕਿਆ: %s" @@ -7999,7 +7987,7 @@ msgid "Posterize" msgstr "ਪੋਸਟਰਾਈਜ਼" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "" @@ -8178,13 +8166,21 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "ਰੰਗ-ਮੈਪ ਸੈੱਟ ਕਰੋ" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#, fuzzy +#| msgctxt "undo-type" +#| msgid "Set Colormap" +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "ਰੰਗ-ਮੈਪ ਸੈੱਟ ਕਰੋ" + +#: ../app/core/gimpimage-colormap.c:263 #, fuzzy msgctxt "undo-type" msgid "Change Colormap entry" msgstr "ਰੰਗ-ਮੈਪ ਐਂਟਰੀ ਬਦਲੋ" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 #, fuzzy msgctxt "undo-type" msgid "Add Color to Colormap" @@ -8275,42 +8271,46 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "ਦਿੱਸ ਰਹੀਆਂ ਲੇਅਰਾਂ ਮਰਜ਼ ਕਰੋ" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "ਸਮਤਲ ਚਿੱਤਰ" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "" + +#: ../app/core/gimpimage-merge.c:260 #, fuzzy msgid "Cannot merge down to a layer group." msgstr "ਲੇਅਰ ਮਾਸਕ ਦਾ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਦਾ" -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "" -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 #, fuzzy msgid "There is no visible layer to merge down to." msgstr "ਟਰਾਂਸਫਰ ਲਈ ਕੋਈ ਲੇਅਰ ਨਹੀਂ ਹੈ।" -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "ਹੇਠਾਂ ਨੂੰ ਮਰਜ਼" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "ਲੇਅਰਾਂ ਮਰਜ਼ ਕਰੋ" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 #, fuzzy msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "ਦਿੱਖ ਮਾਰਗ ਮਰਜ਼ ਕਰੋ" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "ਦਿੱਖ ਮਾਰਗ ਨੂੰ ਵਿਲੀਨ ਕਰਨ ਲਈ ਲੋੜੀਦੇ ਉਪਲੱਬਧ ਮਾਰਗ ਨਹੀ ਹਨ। ਘੱਟੋ-ਘੱਟ ਦੋ ਮਾਰਗ ਲੋੜੀਦੇ " @@ -8347,7 +8347,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "ਸੈਂਪਲ ਪੁਆਇੰਟ ਹਿਲਾਓ" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "ਚਿੱਤਰ ਸਕੇਲ ਕਰੋ" @@ -8357,57 +8357,69 @@ msgstr "ਚਿੱਤਰ ਸਕੇਲ ਕਰੋ" msgid "Can't undo %s" msgstr "%s ਵਾਪਸ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: ../app/core/gimpimage.c:1808 +#: ../app/core/gimpimage.c:1784 +msgid " (exported)" +msgstr " (ਐਕਸਪੋਰਟ ਕੀਤਾ)" + +#: ../app/core/gimpimage.c:1788 +msgid " (overwritten)" +msgstr " (ਉੱਤੇ ਲਿਖਿਆ)" + +#: ../app/core/gimpimage.c:1797 +msgid " (imported)" +msgstr " (ਇੰਪੋਰਟ ਕੀਤਾ)" + +#: ../app/core/gimpimage.c:1922 msgctxt "undo-type" msgid "Change Image Resolution" msgstr "ਚਿੱਤਰ ਰੈਜ਼ੋਲੇਸ਼ਨ ਬਦਲੋ" -#: ../app/core/gimpimage.c:1860 +#: ../app/core/gimpimage.c:1974 msgctxt "undo-type" msgid "Change Image Unit" msgstr "ਚਿੱਤਰ ਯੂਨਿਟ ਬਦਲੋ" -#: ../app/core/gimpimage.c:2852 +#: ../app/core/gimpimage.c:2987 msgctxt "undo-type" msgid "Attach Parasite to Image" msgstr "ਚਿੱਤਰ ਉੱਤੇ ਪੈਰਾਸਾਇਟ ਅਟੈਂਚ ਕਰੋ" -#: ../app/core/gimpimage.c:2893 +#: ../app/core/gimpimage.c:3028 msgctxt "undo-type" msgid "Remove Parasite from Image" msgstr "ਚਿੱਤਰ ਤੋਂ ਪੈਰਾਸਾਇਟ ਹਟਾਓ" -#: ../app/core/gimpimage.c:3602 +#: ../app/core/gimpimage.c:3737 msgctxt "undo-type" msgid "Add Layer" msgstr "ਲੇਅਰ ਸ਼ਾਮਲ" -#: ../app/core/gimpimage.c:3652 ../app/core/gimpimage.c:3672 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "ਲੇਅਰ ਹਟਾਓ" -#: ../app/core/gimpimage.c:3666 +#: ../app/core/gimpimage.c:3801 msgctxt "undo-type" msgid "Remove Floating Selection" msgstr "ਫਲੋਟਿੰਗ ਚੋਣ ਹਟਾਓ" -#: ../app/core/gimpimage.c:3834 +#: ../app/core/gimpimage.c:3969 msgctxt "undo-type" msgid "Add Channel" msgstr "ਚੈਨਲ ਸ਼ਾਮਲ ਕਰੋ" -#: ../app/core/gimpimage.c:3872 ../app/core/gimpimage.c:3885 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "ਚੈਨਲ ਹਟਾਓ" -#: ../app/core/gimpimage.c:3939 +#: ../app/core/gimpimage.c:4074 msgctxt "undo-type" msgid "Add Path" msgstr "ਮਾਰਗ ਸ਼ਾਮਲ ਕਰੋ" -#: ../app/core/gimpimage.c:3970 +#: ../app/core/gimpimage.c:4105 msgctxt "undo-type" msgid "Remove Path" msgstr "ਮਾਰਗ ਹਟਾਓ" @@ -8445,7 +8457,7 @@ msgid "(Preview may be out of date)" msgstr "(ਝਲਕ ਪੁਰਾਣੀ ਹੋ ਸਕਦੀ ਹੈ)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8453,7 +8465,7 @@ msgid_plural "%d × %d pixels" msgstr[0] "%d x %d ਪਿਕਸਲ" msgstr[1] "%d x %d ਪਿਕਸਲ" -#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:336 +#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8484,6 +8496,10 @@ msgstr "ਆਈਟਮ ਵਿੱਚ ਪੈਰਾਸਾਈਟ ਹਟਾਓ" msgid "Set Item Exclusive Visible" msgstr "ਆਈਟਮ ਨੂੰ ਨਿਵੇਕਲਾਂ ਦਿੱਖ ਸੈੱਟ ਕਰੋ" +#: ../app/core/gimpitem-exclusive.c:172 +msgid "Set Item Exclusive Linked" +msgstr "ਆਈਟਮ ਨੂੰ ਨਿਵੇਕਲਾਂ ਸੰਬੰਧਿਤ ਸੈੱਟ ਕਰੋ" + #: ../app/core/gimplayer-floating-sel.c:95 msgctxt "undo-type" msgid "Anchor Floating Selection" @@ -8640,15 +8656,11 @@ msgid "Cannot rename layer masks." msgstr "ਲੇਅਰ ਮਾਸਕ ਦਾ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਦਾ" #: ../app/core/gimplayermask.c:264 -#| msgctxt "layers-action" -#| msgid "_Disable Layer Mask" msgctxt "undo-type" msgid "Enable Layer Mask" msgstr "ਲੇਅਰ ਮਾਸਕ ਯੋਗ" #: ../app/core/gimplayermask.c:265 -#| msgctxt "layers-action" -#| msgid "_Disable Layer Mask" msgctxt "undo-type" msgid "Disable Layer Mask" msgstr "ਲੇਅਰ ਮਾਸਕ ਅਯੋਗ" @@ -9072,7 +9084,7 @@ msgstr "%s ਫੇਡ" msgid "_Fade" msgstr "ਫੇਡ ਕਰੋ(_F)" -#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:344 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "ਮੋਡ(_M):" @@ -9092,15 +9104,15 @@ msgstr "ਟਿਕਾਣਾ ਖੋਲ੍ਹੋ" msgid "Enter location (URI):" msgstr "ਟਿਕਾਣਾ ਦਿਓ (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "ਚਿੱਤਰ ਰੀਵਰਟ" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" -msgstr "ਇੰਪੋਰਟ(_I)" +msgstr "ਐਕਸਪੋਰਟ(_E)" -#: ../app/dialogs/file-save-dialog.c:431 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9110,22 +9122,52 @@ msgstr "" "ਫਾਇਲ ਇਕਸਟੈਂਸ਼ਨ " "ਦਿਓ, ਜੋ ਕਿ ਚੁਣੇ ਫਾਇਲ ਫਾਰਮੈਟ ਨਾਲ ਮੇਲ ਕਰੇ ਜਾਂ ਕੋਈ ਵੀ ਫਾਇਲ ਇਕਸਟੈਂਸ਼ਨ ਨਾ ਦਿਓ।" -#: ../app/dialogs/file-save-dialog.c:558 +#: ../app/dialogs/file-save-dialog.c:605 +#, fuzzy +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for exporting" +msgstr "ਦਿੱਤੇ ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਕੋਈ ਜਾਣੀ ਫਾਇਲ ਐਕਸ਼ਟੇਸ਼ਨ ਨਹੀਂ ਹੈ।" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." msgstr "" "ਤੁਸੀਂ ਇਹ ਡਾਈਲਾਗ ਨੂੰ ਕਈ ਫਾਇਲ ਫਾਰਮੈਟ ਵਿੱਚ ਐਕਸਪੋਰਟ ਕਰਨ ਲਈ ਵਰਤ ਸਕਦੇ ਹੋ। ਜੇ ਤੁਸੀਂ " -"ਚਿੱਤਰ ਨੂੰ " -"GIMP XCF ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇਸ ਦੀ ਬਜਾਏ ਫਾਇਲ→ਸੰਭਾਲੋ ਨੂੰ ਵਰਤੋਂ।" +"ਚਿੱਤਰ ਨੂੰ GIMP " +"XCF ਫਾਰਮੈਟ ਵਿੱਚ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇਸ ਦੀ ਬਜਾਏ ਫਾਇਲ→ਸੰਭਾਲੋ ਨੂੰ ਵਰਤੋਂ।" -#: ../app/dialogs/file-save-dialog.c:565 +#: ../app/dialogs/file-save-dialog.c:609 +#, fuzzy +#| msgctxt "dialogs-action" +#| msgid "Open the layers dialog" +msgid "Take me to the Save dialog" +msgstr "ਲੇਅਰ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" + +#: ../app/dialogs/file-save-dialog.c:613 +#, fuzzy +#| msgid "The given filename does not have any known file extension." +msgid "The given filename cannot be used for saving" +msgstr "ਦਿੱਤੇ ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਕੋਈ ਜਾਣੀ ਫਾਇਲ ਐਕਸ਼ਟੇਸ਼ਨ ਨਹੀਂ ਹੈ।" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." msgstr "" -#: ../app/dialogs/file-save-dialog.c:571 +#: ../app/dialogs/file-save-dialog.c:616 +#, fuzzy +#| msgctxt "dialogs-action" +#| msgid "Open the paths dialog" +msgid "Take me to the Export dialog" +msgstr "ਮਾਰਗ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "ਇਕਸਟੈਂਸ਼ਨ ਮਿਲਦੀ ਨਹੀਂ" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9134,23 +9176,19 @@ msgstr "" "ਜੀਂ ਜਾਂ ਫਾਇਲ " "ਫਾਰਮੈਟ ਲਿਸਟ ਤੋਂ ਇੱਕ ਫਾਇਲ ਫਾਰਮੈਟ ਚੁਣੋ ਜੀ।" -#: ../app/dialogs/file-save-dialog.c:585 -msgid "Extension Mismatch" -msgstr "ਇਕਸਟੈਂਸ਼ਨ ਮਿਲਦੀ ਨਹੀਂ" - -#: ../app/dialogs/file-save-dialog.c:601 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "ਦਿੱਤੀ ਫਾਇਲ ਇਕਟੇਂਸ਼ਨ ਚੁਣੀ ਫਾਇਲ ਕਿਸਮ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦੀ ਹੈ।" -#: ../app/dialogs/file-save-dialog.c:605 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "ਕੀ ਤੁਸੀਂ ਚਿੱਤਰ ਨੂੰ ਕਿਸੇ ਵੀ ਤਰ੍ਹਾਂ ਇਸ ਨਾਂ ਨਾਲ ਹੀ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../app/dialogs/file-save-dialog.c:660 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "ਸੰਭਾਲਣਾ ਰੱਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: ../app/dialogs/file-save-dialog.c:668 ../app/widgets/gimpdnd-xds.c:185 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9353,31 +9391,31 @@ msgstr "ਹੇਠ ਦਿੱਤੇ ਬਦਲਾਅ ਲਾਗੂ ਕਰਨ ਲਈ msgid "Module" msgstr "ਮੋਡੀਊਲ" -#: ../app/dialogs/module-dialog.c:465 +#: ../app/dialogs/module-dialog.c:468 msgid "Only in memory" msgstr "ਸਿਰਫ ਮੈਮੋਰੀ ਵਿੱਚ" -#: ../app/dialogs/module-dialog.c:470 +#: ../app/dialogs/module-dialog.c:473 msgid "No longer available" msgstr "ਹੁਣ ਉਪਲੱਬਧ ਨਹੀ" -#: ../app/dialogs/module-dialog.c:495 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "ਲੇਖਕ:" -#: ../app/dialogs/module-dialog.c:496 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "ਵਰਜਨ:" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "ਮਿਤੀ:" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "ਕਾਪੀਰਾਈਟ:" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "ਟਿਕਾਣਾ:" @@ -9870,12 +9908,10 @@ msgid "Default Image" msgstr "ਡਿਫਾਲਟ ਚਿੱਤਰ" #: ../app/dialogs/preferences-dialog.c:2028 -#| msgid "Edit Quick Mask Color" msgid "Set the default Quick Mask color" msgstr "ਚੁਸਤ ਮਾਸਕ ਰੰਗ ਸੋਧ" #: ../app/dialogs/preferences-dialog.c:2034 -#| msgid "Edit Quick Mask Color" msgid "Quick Mask color:" msgstr "ਚੁਸਤ ਮਾਸਕ ਰੰਗ ਸੋਧ:" @@ -10041,7 +10077,7 @@ msgid "Vertical" msgstr "ਲੰਬਕਾਰੀ" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10262,12 +10298,10 @@ msgid "Select Font Folders" msgstr "ਫੋਂਟ ਫੋਲਡਰ ਚੁਣੋ" #: ../app/dialogs/preferences-dialog.c:2763 -#| msgid "Tool Presets" msgid "Tool Preset Folders" msgstr "ਟੂਲ ਪ੍ਰੀ-ਸੈੱਟ ਫੋਲਡਰ" #: ../app/dialogs/preferences-dialog.c:2765 -#| msgid "Select Theme Folders" msgid "Select Tool Preset Folders" msgstr "ਟੂਲ ਪ੍ਰੀਸੈੱਟ ਫੋਲਡਰ ਚੁਣੋ" @@ -10570,8 +10604,6 @@ msgid "Golden sections" msgstr "ਸੁਨਿਹਰੀ ਭਾਗ" #: ../app/display/display-enums.c:65 -#| msgctxt "rectangle-guide" -#| msgid "Diagonal lines" msgctxt "guides-type" msgid "Diagonal lines" msgstr "ਵਿਕਰਣ ਲਾਈਨਾਂ" @@ -10650,27 +10682,27 @@ msgstr "ਤੁਰੰਤ ਮਾਸਕ ਬਦਲੋ" msgid "Navigate the image display" msgstr "ਚਿੱਤਰ ਨੈਗਟਿਵ ਵੇਖੋ" -#: ../app/display/gimpdisplayshell.c:742 -#: ../app/display/gimpdisplayshell.c:1320 ../app/widgets/gimptoolbox.c:256 +#: ../app/display/gimpdisplayshell.c:746 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "ਚਿੱਤਰਾਂ ਫਾਇਲਾਂ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਇੱਥੇ ਸੁੱਟੋ" -#: ../app/display/gimpdisplayshell-close.c:153 -#: ../app/display/gimpdisplayshell-close.c:223 +#: ../app/display/gimpdisplayshell-close.c:156 +#: ../app/display/gimpdisplayshell-close.c:229 #, c-format msgid "Close %s" msgstr " %s ਬੰਦ ਕਰੋ" -#: ../app/display/gimpdisplayshell-close.c:164 +#: ../app/display/gimpdisplayshell-close.c:167 msgid "Close _without Saving" msgstr "ਬਿਨਾਂ ਸੰਭਾਲੇ ਬੰਦ ਕਰੋ(_w)" -#: ../app/display/gimpdisplayshell-close.c:231 +#: ../app/display/gimpdisplayshell-close.c:237 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "ਕੀ ਬੰਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ '%s' ਚਿੱਤਰ 'ਚ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ?" -#: ../app/display/gimpdisplayshell-close.c:254 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10679,7 +10711,7 @@ msgstr[0] "ਤੁਸੀਂ ਚਿੱਤਰ ਨਾ ਸੰਭਾਲਿਆ ਤਾ msgstr[1] "" "ਤੁਸੀਂ ਚਿੱਤਰ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ ਆਖਰੀ %d ਘੰਟੇ ਦੀਆਂ ਤਬਦੀਲੀਆਂ ਖਤਮ ਹੋ ਜਾਣਗੀਆਂ।" -#: ../app/display/gimpdisplayshell-close.c:264 +#: ../app/display/gimpdisplayshell-close.c:281 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10693,7 +10725,7 @@ msgstr[1] "" "ਜੇ ਤੁਸੀਂ ਚਿੱਤਰ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ, ਆਖਰੀ ਘੰਟੇ ਅਤੇ %d ਮਿੰਟਾਂ ਕੀਤੇ ਬਦਲਾਅ ਖਤਮ ਹੋ " "ਜਾਣਗੇ।" -#: ../app/display/gimpdisplayshell-close.c:275 +#: ../app/display/gimpdisplayshell-close.c:293 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10702,46 +10734,54 @@ msgstr[0] "ਜੇ ਤੁਸੀਂ ਚਿੱਤਰ ਨਾ ਸੰਭਾਲਿਆ msgstr[1] "" "ਜੇ ਤੁਸੀਂ ਚਿੱਤਰ ਨਾ ਸੰਭਾਲਿਆ ਤਾਂ, ਆਖਰੀ %d ਮਿੰਟਾਂ ਕੀਤੇ ਬਦਲਾਅ ਖਤਮ ਹੋ ਜਾਣਗੇ।" -#: ../app/display/gimpdisplayshell-dnd.c:232 -#: ../app/display/gimpdisplayshell-dnd.c:635 -#: ../app/display/gimpdisplayshell-dnd.c:693 +#: ../app/display/gimpdisplayshell-close.c:311 +#, fuzzy, c-format +#| msgid "Image exported to '%s'" +msgid "The image has been exported to '%s'." +msgstr "ਚਿੱਤਰ '%s' ਉੱਤੇ ਐਕਸਪੋਰਟ ਕੀਤਾ" + +#: ../app/display/gimpdisplayshell-dnd.c:246 +#: ../app/display/gimpdisplayshell-dnd.c:649 +#: ../app/display/gimpdisplayshell-dnd.c:707 msgid "Drop New Layer" msgstr "ਨਵੀਂ ਲੇਅਰ ਡਰਾਪ ਕਰੋ" -#: ../app/display/gimpdisplayshell-dnd.c:275 +#: ../app/display/gimpdisplayshell-dnd.c:289 msgid "Drop New Path" msgstr "ਨਵਾਂ ਮਾਰਗ ਡਰਾਪ ਕਰੋ" -#: ../app/display/gimpdisplayshell-dnd.c:347 -#: ../app/display/gimpdisplayshell-dnd.c:449 ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:279 +#: ../app/display/gimpdisplayshell-dnd.c:361 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 +#: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "" -#: ../app/display/gimpdisplayshell-dnd.c:355 -#: ../app/display/gimpdisplayshell-dnd.c:457 ../app/tools/gimpblendtool.c:180 +#: ../app/display/gimpdisplayshell-dnd.c:369 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 #: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:286 ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimptransformtool.c:246 ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "" -#: ../app/display/gimpdisplayshell-dnd.c:535 +#: ../app/display/gimpdisplayshell-dnd.c:549 #: ../app/widgets/gimplayertreeview.c:725 msgid "Drop layers" msgstr "ਲੇਅਰ ਡਰਾਪ ਕਰੋ" -#: ../app/display/gimpdisplayshell-dnd.c:668 -#: ../app/display/gimpdisplayshell-dnd.c:685 -#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:266 +#: ../app/display/gimpdisplayshell-dnd.c:682 +#: ../app/display/gimpdisplayshell-dnd.c:699 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "ਡਰਾਪ ਕੀਤਾ ਬਫ਼ਰ" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "ਰੰਗ ਡਿਸਪਲੇਅ ਫਿਲਟਰ" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "ਰੰਗ ਡਿਸਪਲੇਅ ਫਿਲਟਰ ਦੀ ਸੰਰਚਨਾ" @@ -10775,38 +10815,26 @@ msgstr "ਜ਼ੂਮ ਰੇਸ਼ੋ:" msgid "Zoom:" msgstr "ਜ਼ੂਮ:" -#: ../app/display/gimpdisplayshell-title.c:301 +#: ../app/display/gimpdisplayshell-title.c:282 msgid "(modified)" msgstr "(ਸੋਧੀ)" -#: ../app/display/gimpdisplayshell-title.c:306 +#: ../app/display/gimpdisplayshell-title.c:287 msgid "(clean)" msgstr "(ਸਾਫ਼)" -#: ../app/display/gimpdisplayshell-title.c:357 -#: ../app/display/gimpdisplayshell-title.c:370 +#: ../app/display/gimpdisplayshell-title.c:338 +#: ../app/display/gimpdisplayshell-title.c:351 #: ../app/widgets/gimpactiongroup.c:860 msgid "(none)" msgstr "(ਕੋਈ ਨਹੀਂ)" -#: ../app/display/gimpdisplayshell-title.c:499 -msgid " (exported)" -msgstr " (ਐਕਸਪੋਰਟ ਕੀਤਾ)" - -#: ../app/display/gimpdisplayshell-title.c:501 -msgid " (overwritten)" -msgstr " (ਉੱਤੇ ਲਿਖਿਆ)" - -#: ../app/display/gimpdisplayshell-title.c:507 -msgid " (imported)" -msgstr " (ਇੰਪੋਰਟ ਕੀਤਾ)" - #: ../app/display/gimpstatusbar.c:356 #, c-format msgid "Cancel %s" msgstr "%s ਰੱਦ ਕਰੋ" -#: ../app/file/file-open.c:136 ../app/file/file-save.c:112 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "ਇੱਕ ਰੈਗੂਲਰ ਫਾਇਲ ਨਹੀਂ" @@ -10820,16 +10848,16 @@ msgstr "%s ਪਲੱਗਇਨ ਨੇ ਸਫ਼ਲ ਨਤੀਜਾ ਦਿੱਤ msgid "%s plug-In could not open image" msgstr "%s ਪਲੱਗਇਨ ਚਿੱਤਰ ਖੋਲ੍ਹ ਨਹੀਂ ਸਕਦੀ ਹੈ" -#: ../app/file/file-open.c:526 +#: ../app/file/file-open.c:530 msgid "Image doesn't contain any layers" msgstr "ਚਿੱਤਰ 'ਚ ਕੋਈ ਲੇਅਰ ਨਹੀਂ ਹੈ" -#: ../app/file/file-open.c:579 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "'%s' ਨੂੰ ਖੋਲ੍ਹਣਾ ਅਸਫਲ: %s" -#: ../app/file/file-open.c:686 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10841,22 +10869,21 @@ msgstr "" msgid "Unknown file type" msgstr "ਅਣਜਾਣ ਫਾਇਲ ਟਾਈਪ" -#: ../app/file/file-save.c:208 +#: ../app/file/file-save.c:221 #, c-format msgid "%s plug-in could not save image" msgstr "%s ਪਲੱਗਇਨ ਚਿੱਤਰ ਨਹੀਂ ਸੰਭਾਲ ਸਕਦੀ" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s:' ਇੱਕ ਠੀਕ URI ਸਕੀਮ ਨਹੀਂ ਹੈ" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "URI ਵਿੱਚ ਕੋਈ ਠੀਕ ਅੱਖਰ ਕ੍ਰਮ ਨਹੀਂ ਹੈ" #: ../app/gegl/gimp-gegl-enums.c:24 -#| msgid "Create a New Image" msgctxt "cage-mode" msgid "Create or adjust the cage" msgstr "ਪਿੰਜਰਾ ਬਣਾਉਣ ਜਾਂ ਅਡਜੱਸਟ ਕਰੋ" @@ -10867,15 +10894,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "ਲੇਅਰ ਨੂੰ ਚਿੱਤਰ ਦੇ ਆਕਾਰ ਮੁਤਾਬਕ ਮੁੜ-ਆਕਾਰ ਕਰੋ" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "ਇੱਕ ਜੈਮਪ ਕਰਵ ਫਾਇਲ ਨਹੀਂ ਹੈ" -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "ਪਾਰਸ ਗਲਤੀ" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "ਇੱਕ ਜੈਮਪ ਲੈਵਲ ਫਾਇਲ ਨਹੀਂ ਹੈ" @@ -10890,7 +10917,6 @@ msgid "" msgstr "" #: ../app/gegl/gimpoperationcagetransform.c:128 -#| msgid "Fill with _background color" msgid "Fill with plain color" msgstr "ਇੱਕ ਰੰਗ ਨਾਲ ਭਰੋ" @@ -10941,11 +10967,11 @@ msgstr "ਡੋਡਗੀ/ਬਰਨ" msgid "Eraser" msgstr "ਰਬੜ" -#: ../app/paint/gimpheal.c:128 ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "ਹੀਲ" -#: ../app/paint/gimpheal.c:167 +#: ../app/paint/gimpheal.c:170 msgid "Healing does not operate on indexed layers." msgstr "ਹੀਲਿੰਗ ਇੰਡੈਕਸਡ ਲੇਅਰਾਂ ਉੱਤੇ ਕੰਮ ਨਹੀਂ ਕਰਦੀ।" @@ -11083,22 +11109,16 @@ msgid "Sharpen" msgstr "ਸ਼ਾਰਪਨੇਸ" #: ../app/paint/paint-enums.c:144 -#| msgctxt "brush-generated-shape" -#| msgid "Circle" msgctxt "ink-blob-type" msgid "Circle" msgstr "ਚੱਕਰ" #: ../app/paint/paint-enums.c:145 -#| msgctxt "cap-style" -#| msgid "Square" msgctxt "ink-blob-type" msgid "Square" msgstr "ਵਰਗ" #: ../app/paint/paint-enums.c:146 -#| msgctxt "brush-generated-shape" -#| msgid "Diamond" msgctxt "ink-blob-type" msgid "Diamond" msgstr "ਹੀਰਾ" @@ -11183,19 +11203,16 @@ msgid "Brush '%s' is not a generated brush" msgstr "ਬੁਰਸ਼ '%s' ਇੱਕ ਤਿਆਰ ਕੀਤਾ ਬੁਰਸ਼ ਨਹੀਂ ਹੈ" #: ../app/pdb/gimppdb-utils.c:134 -#| msgid "Invalid empty paint method name" msgid "Invalid empty paint dynamics name" msgstr "ਗਲਤ ਖਾਲੀ ਪੇਂਟ ਢੰਗ ਨਾਂ" #: ../app/pdb/gimppdb-utils.c:143 #, c-format -#| msgid "Pattern '%s' not found" msgid "Paint dynamics '%s' not found" msgstr "ਪੇਂਟ ਡਾਇਨੇਮੈਕਿਸ '%s' ਨਹੀਂ ਲੱਭਿਆ" #: ../app/pdb/gimppdb-utils.c:148 #, c-format -#| msgid "Gradient '%s' is not editable" msgid "Paint dynamics '%s' is not editable" msgstr "ਪੇਂਟ ਡਾਇਨੇਮੈਕਿਸ '%s' ਸੋਧਯੋਗ ਨਹੀਂ" @@ -11356,8 +11373,8 @@ msgstr "ਵੈਕਟਰ ਆਬਜੈਕਟ %d ID %d ਨਾਲ ਕੋਈ ਸਟ #: ../app/pdb/gimppdb.c:410 #, c-format msgid "" -"Procedure '%s' has been called with a wrong type for argument #%d. Expected %" -"s, got %s." +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." msgstr "" "ਪਰੋਸੀਜ਼ਰ '%s' ਨੇ ਆਰਗੂਮੈਂਟ #%d ਲਈ ਗਲਤ ਟਾਈਫ ਨੂੰ ਕਾਲ ਕੀਤਾ ਸੀ। ਲੋੜ ਸੀ %s, ਮਿਲਿਆ %" "s।" @@ -11386,12 +11403,12 @@ msgstr "" #: ../app/pdb/gimpprocedure.c:654 #, c-format msgid "" -"Procedure '%s' has been called with a wrong value type for argument '%s' (#%" -"d). Expected %s, got %s." +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." msgstr "" "ਪਰੋਸੀਜ਼ਰ '%s' ਨੂੰ ਆਰਗੂਮੈਂਟ '%s' (#%d) ਲਈ ਇੱਕ ਗਲਤ ਮੁੱਲ ਟਾਈਪ ਨਾਲ ਕਾਲ ਕੀਤਾ ਗਿਆ " -"ਹੈ। ਲੋੜ ਸੀ %" -"s, ਮਿਲਿਆ %s" +"ਹੈ। ਲੋੜ ਸੀ " +"%s, ਮਿਲਿਆ %s" #: ../app/pdb/gimpprocedure.c:687 #, c-format @@ -11449,14 +11466,14 @@ msgstr "" #: ../app/pdb/gimpprocedure.c:765 #, c-format msgid "" -"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %" -"s). This value is out of range." +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." msgstr "" "ਪਰੋਸੀਜ਼ਰ '%s' ਨੇ '%s' ਮੁੱਲ ਨਾਲ ਆਰਗੂਮੈਂਟ '%s' (#%d, ਟਾਇਪ %s) ਕਾਲ ਕੀਤਾ ਸੀ। ਇਹ " "ਮੁੱਲ ਰੇਜ਼ ਤੋਂ " "ਬਾਹਰ ਹੈ।" -#: ../app/pdb/image-cmds.c:2360 +#: ../app/pdb/image-cmds.c:2365 msgid "" "Image resolution is out of bounds, using the default resolution instead." msgstr "" @@ -11495,32 +11512,32 @@ msgstr "ਮਾਰ ਸਟਰੋਕ ਹਟਾਓ" msgid "Close path stroke" msgstr "ਮਾਰਗ ਗੁੱਛਾ ਬੰਦ" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "ਟਰਾਂਸਲੇਟ ਮਾਰਗ ਸਟਰੋਕ" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 #, fuzzy msgid "Scale path stroke" msgstr "ਮਾਰਗ ਪੈਮਾਨਾ" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 #, fuzzy msgid "Rotate path stroke" msgstr "ਮਾਰਗ ਘੁੰਮਾਓ" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 #, fuzzy msgid "Flip path stroke" msgstr "ਮਾਰਗ ਝਟਕੋ" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "ਮਾਰਗ ਸਟਰੋਕ ਸ਼ਾਮਿਲ" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "" @@ -11566,7 +11583,7 @@ msgstr "" msgid "Cancelled" msgstr "ਰੱਦ ਕੀਤਾ" -#: ../app/plug-in/gimpplugin.c:639 +#: ../app/plug-in/gimpplugin.c:643 #, c-format msgid "" "Plug-in crashed: \"%s\"\n" @@ -11617,7 +11634,7 @@ msgstr "ਪਲੱਗਇਨ ਇੰਟਰਪਰੇਟਰ" msgid "Plug-In Environment" msgstr "ਪਲੱਗਇਨ ਇੰਵਾਇਰਨਮਿੰਟ" -#: ../app/plug-in/gimppluginprocedure.c:980 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11626,7 +11643,7 @@ msgstr "" "'%s' ਲਈ ਕਾਲ ਗਲਤੀ:\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:992 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11635,16 +11652,21 @@ msgstr "" "'%s' ਲਈ ਚਲਾਉਣ ਗਲਤੀ:\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "'%s' ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "ਪਲੱਗਇਨ ਗੁੰਮ ਹੈ (%s)" @@ -11674,7 +11696,7 @@ msgstr "" "ਪੰਜ ਦਰਜਨ ਸ਼ਰਾਬ ਦੇ ਜੱਗ\n" "ਨਾਲ ਮੇਰਾ ਬੌਕਸ ਭਰ ਦਿਓ।" -#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1401 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "ਟੈਕਸਟ ਲੇਅਰ ਸ਼ਾਮਲ" @@ -11775,8 +11797,6 @@ msgid "Rate" msgstr "ਰੇਟ" #: ../app/tools/gimpairbrushtool.c:97 -#| msgctxt "dynamics-output-type" -#| msgid "Flow" msgid "Flow" msgstr "ਵਹਾ" @@ -11896,7 +11916,6 @@ msgid "Click to add this path to the list" msgstr "ਇਹ ਪਾਥ ਨੂੰ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ" #: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:346 -#| msgid "Gradients" msgid "Gradient" msgstr "ਗਰੇਡੀਐਂਟ" @@ -11913,7 +11932,6 @@ msgid "Adaptive supersampling" msgstr "ਐਡਪਟਿਵ ਸੁਪਰ-ਸੈਪਲਿੰਗ" #: ../app/tools/gimpblendoptions.c:268 -#| msgid "Max depth:" msgid "Max depth" msgstr "ਵੱਧੋ-ਵੱਧ ਡੂੰਘਾਈ" @@ -11939,7 +11957,7 @@ msgstr "ਬਲੈੱਡ ਇੰਡੈਕਸਡ ਲੇਅਰ ਲਈ ਕੰਮ ਨ msgid "No gradient available for use with this tool." msgstr "ਇਹ ਟੂਲ ਨਾਲ ਵਰਤਣ ਵਾਸਤੇ ਕੋਈ ਪੈਟਰਨ ਨਹੀਂ ਹੈ।" -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s ਲਈ ਕਨਸਟਰੇਨਡ ਕੋਣ" @@ -12082,9 +12100,7 @@ msgctxt "command" msgid "Select by Color" msgstr "ਰੰਗ ਨਾਲ ਚੁਣੋ" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1154 -#| msgctxt "undo-type" -#| msgid "Transform" +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "ਪਿੰਜਰਾ ਟਰਾਂਸਫਰਮ" @@ -12093,22 +12109,18 @@ msgid "Cage Transform: Deform a selection with a cage" msgstr "" #: ../app/tools/gimpcagetool.c:154 -#| msgctxt "image-action" -#| msgid "_Transform" msgid "_Cage Transform" msgstr "ਪਿੰਜਰਾ ਟਰਾਂਸਫਰ(_C)" -#: ../app/tools/gimpcagetool.c:351 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "ਟਰਾਂਸਫਰਮ ਕਮਿਟ ਕਰਨ ਲਈ ਐਂਟਰ ਦਬਾਉ" -#: ../app/tools/gimpcagetool.c:1095 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "" -#: ../app/tools/gimpcagetool.c:1272 -#| msgctxt "undo-type" -#| msgid "Transform" +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "ਪਿੰਜਰਾ ਟਰਾਂਸਫਰਮ" @@ -12274,7 +12286,6 @@ msgstr "ਰੰਗ ਚੋਣਕਾਰ ਜਾਣਕਾਰੀ" #: ../app/tools/gimprectangleselectoptions.c:163 #: ../app/tools/gimpselectionoptions.c:277 #: ../app/widgets/gimpbrusheditor.c:155 -#| msgid "Radius:" msgid "Radius" msgstr "ਰੇਡੀਅਸ" @@ -12324,11 +12335,11 @@ msgstr "ਰੰਗ ਚੋਣਕਾਰ(_o)" msgid "Click in any image to view its color" msgstr "ਕਿਸੇ ਵੀ ਚਿੱਤਰ ਦੇ ਰੰਗ ਵੇਖਣ ਲਈ ਕਲਿੱਕ ਕਰੋ" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "ਫਾਰਗਰਾਊਂਡ ਰੰਗ ਚੁਣਨ ਲਈ ਕਿਸੇ ਚਿੱਤਰ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ ਚੁਣਨ ਲਈ ਕਿਸੇ ਚਿੱਤਰ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ" @@ -12493,7 +12504,7 @@ msgstr "ਚੈਨਲ(_n):" msgid "R_eset Channel" msgstr "ਚੈਨਲ ਮੁੜ-ਸੈੱਟ(_e)" -#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:458 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "ਕਰਵ ਟਾਈਪ(_t):" @@ -12577,7 +12588,6 @@ msgid "Range" msgstr "ਰੇਜ਼" #: ../app/tools/gimpdodgeburntool.c:236 -#| msgid "Exposure:" msgid "Exposure" msgstr "ਐਕਸਪੋਜ਼ਰ" @@ -12635,7 +12645,6 @@ msgid "Anti erase (%s)" msgstr "ਐਂਟੀ ਰਬੜ (%s)" #: ../app/tools/gimpflipoptions.c:66 -#| msgid "Direction" msgid "Direction of flipping" msgstr "ਪਲਟਣ ਦੀ ਦਿਸ਼ਾ" @@ -12663,15 +12672,11 @@ msgid "_Flip" msgstr "ਫਲਿਪ(_F)" #: ../app/tools/gimpfliptool.c:187 -#| msgctxt "drawable-action" -#| msgid "Flip horizontally" msgctxt "undo-type" msgid "Flip horizontally" msgstr "ਹਾਰੀਜ਼ਟਲ ਪਲਟੋ" #: ../app/tools/gimpfliptool.c:190 -#| msgctxt "drawable-action" -#| msgid "Flip vertically" msgctxt "undo-type" msgid "Flip vertically" msgstr "ਵਰਟੀਕਲ ਪਲਟੋ" @@ -12680,7 +12685,6 @@ msgstr "ਵਰਟੀਕਲ ਪਲਟੋ" #. * could be if someone defined FLIP_DIAGONAL, say... #. #: ../app/tools/gimpfliptool.c:196 -#| msgid "Flip" msgctxt "undo-desc" msgid "Flip" msgstr "ਪਲਟੋ" @@ -12775,19 +12779,19 @@ msgstr "ਫਾਰਗਰਾਊਂਡ ਚੋਣ ਟੂਲ: ਫਾਰਗਰਾਊ msgid "F_oreground Select" msgstr "ਫਾਰਗਰਾਊਂਡ ਚੋਣ(_o)" -#: ../app/tools/gimpforegroundselecttool.c:302 +#: ../app/tools/gimpforegroundselecttool.c:304 msgid "Add more strokes or press Enter to accept the selection" msgstr "ਹੋਰ ਸਟਰੋਕ ਸ਼ਾਮਲ ਕਰੋ ਜਾਂ ਚੋਣ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਐਂਟਰ ਦੱਬੋ" -#: ../app/tools/gimpforegroundselecttool.c:304 +#: ../app/tools/gimpforegroundselecttool.c:306 msgid "Mark foreground by painting on the object to extract" msgstr "ਆਬਜੈਕਟ ਤੋਂ ਪੇਂਟ ਰਾਹੀਂ ਵੱਖ ਕਰਨ ਲਈ ਫਾਰਗਰਾਊਂਡ ਨਿਸ਼ਾਨਬੱਧ (ਮਾਰਕ) ਕਰੋ" -#: ../app/tools/gimpforegroundselecttool.c:309 +#: ../app/tools/gimpforegroundselecttool.c:311 msgid "Roughly outline the object to extract" msgstr "ਅੱਡ ਕਰਨ ਵਾਸਤੇ ਆਬਜੈਕਟ ਦੇ ਦੁਆਲੇ ਇੱਕ ਕੱਚਾ ਚੱਕਰ ਵਾਹੋ" -#: ../app/tools/gimpforegroundselecttool.c:751 +#: ../app/tools/gimpforegroundselecttool.c:753 msgctxt "command" msgid "Foreground Select" msgstr "ਫਾਰਗਰਾਊਂਡ ਚੋਣ" @@ -12978,7 +12982,7 @@ msgstr "ਪਹਿਲਾਂ-ਸੈੱਟ(_s):" msgid "Settings saved to '%s'" msgstr "ਸੈਟਿੰਗ '%s' ਉੱਤੇ ਸੰਭਾਲੀ" -#: ../app/tools/gimpimagemaptool.c:362 +#: ../app/tools/gimpimagemaptool.c:363 msgid "_Preview" msgstr "ਝਲਕ(_P)" @@ -13010,7 +13014,6 @@ msgid "Tilt" msgstr "ਟਿਲਟ" #: ../app/tools/gimpinkoptions-gui.c:101 -#| msgid "Speed:" msgid "Speed" msgstr "ਸਪੀਡ" @@ -13048,32 +13051,32 @@ msgstr "ਛਾਂਗਣ ਚੋਣ ਟੂਲ: ਤੇਜ਼-ਤਰਾਰ ਕੋਨ msgid "Intelligent _Scissors" msgstr "ਮਾਹਰ ਛਾਂਗਣ(_S)" -#: ../app/tools/gimpiscissorstool.c:900 ../app/tools/gimpmeasuretool.c:605 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "ਇਹ ਪੁਆਇੰਟ ਹਿਲਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੌਪ ਕਰੋ" -#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpiscissorstool.c:967 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s: ਆਟੋ-ਸਨੈਪ ਆਯੋਗ ਕਰੋ" -#: ../app/tools/gimpiscissorstool.c:919 +#: ../app/tools/gimpiscissorstool.c:921 msgid "Click to close the curve" msgstr "ਕਰਵ ਬੰਦ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ" -#: ../app/tools/gimpiscissorstool.c:925 +#: ../app/tools/gimpiscissorstool.c:927 msgid "Click to add a point on this segment" msgstr "ਇਹ ਸਿਗਮੈਂਟ ਉੱਤੇ ਇੱਕ ਪੁਆਇੰਟ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ" -#: ../app/tools/gimpiscissorstool.c:939 +#: ../app/tools/gimpiscissorstool.c:941 msgid "Click or press Enter to convert to a selection" msgstr "ਇੱਕ ਚੋਣ ਵਿੱਚ ਕਨਵਰਟ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਐਂਟਰ ਦੱਬੋ" -#: ../app/tools/gimpiscissorstool.c:949 +#: ../app/tools/gimpiscissorstool.c:951 msgid "Press Enter to convert to a selection" msgstr "ਇੱਕ ਚੋਣ ਵਿੱਚ ਕਨਵਰਟ ਕਰਨ ਲਈ ਐਂਟਰ ਦੱਬੋ" -#: ../app/tools/gimpiscissorstool.c:964 +#: ../app/tools/gimpiscissorstool.c:966 msgid "Click or Click-Drag to add a point" msgstr "ਇੱਕ ਪੁਆਇੰਟ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਕਲਿੱਕ-ਡਰੌਪ ਕਰੋ" @@ -13159,7 +13162,6 @@ msgstr "ਆਟੋ-ਮੁੜ-ਆਕਾਰ ਵਿੰਡੋ" #. tool toggle #: ../app/tools/gimpmagnifyoptions.c:177 #, c-format -#| msgid "Direction" msgid "Direction (%s)" msgstr "ਦਿਸ਼ਾ (%s)" @@ -13172,8 +13174,6 @@ msgid "Zoom Tool: Adjust the zoom level" msgstr "ਜ਼ੂਮ ਟੂਲ: ਜ਼ੂਮ ਲੈਵਲ ਅਡਜੱਸਟ ਕਰੋ" #: ../app/tools/gimpmagnifytool.c:93 -#| msgctxt "view-action" -#| msgid "_Zoom" msgid "_Zoom" msgstr "ਜ਼ੂਮ(_Z)" @@ -13202,7 +13202,6 @@ msgid "Add Guides" msgstr "ਗਾਈਡ ਸ਼ਾਮਿਲ" #: ../app/tools/gimpmeasuretool.c:313 -#| msgid "Click-Drag to create a new selection" msgid "Drag to create a line" msgstr "ਲਾਈਨ ਬਣਾਉਣ ਲਈ ਡਰੈਗ ਕਰੋ" @@ -13228,7 +13227,7 @@ msgstr "ਸਭ ਪੁਆਇੰਟ ਹਿਲਾਉਣ ਲਈ ਕਲਿੱਕ-ਡ #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "ਪਿਕਸਲ" @@ -13318,7 +13317,6 @@ msgid "Mode:" msgstr "ਮੋਡ:" #: ../app/tools/gimppaintoptions-gui.c:123 -#| msgid "_Brush" msgid "Brush" msgstr "ਬੁਰਸ਼" @@ -13335,7 +13333,6 @@ msgid "Reset aspect ratio to brush's native" msgstr "" #: ../app/tools/gimppaintoptions-gui.c:200 -#| msgid "Reset all Filters" msgid "Reset angle to zero" msgstr "ਕੋਣ ਸਿਫਰ ਮੁੜ-ਸੈੱਟ ਕਰੋ" @@ -13352,12 +13349,10 @@ msgid "Dynamics Options" msgstr "ਡਾਇਨੇਮਿਕਸ ਚੋਣਾਂ" #: ../app/tools/gimppaintoptions-gui.c:291 -#| msgid "Saved Options" msgid "Fade Options" msgstr "ਫੇਡ ਚੋਣਾਂ" #: ../app/tools/gimppaintoptions-gui.c:305 -#| msgid "Fade out" msgid "Fade length" msgstr "ਫੇਡ ਲੰਬਾਈ" @@ -13367,12 +13362,10 @@ msgid "Reverse" msgstr "ਉੱਲਟ" #: ../app/tools/gimppaintoptions-gui.c:341 -#| msgid "Tool Options" msgid "Color Options" msgstr "ਰੰਗ ਚੋਣਾਂ" #: ../app/tools/gimppaintoptions-gui.c:367 -#| msgid "Amount:" msgid "Amount" msgstr "ਮਾਤਰਾ" @@ -13385,7 +13378,6 @@ msgid "Smooth stroke" msgstr "ਸਮੂਥ ਸਟਰੋਲ" #: ../app/tools/gimppaintoptions-gui.c:399 -#| msgid "Height" msgid "Weight" msgstr "ਭਾਰ" @@ -13407,7 +13399,7 @@ msgstr "ਇੱਕ ਰੰਗ ਚੁਣਨ ਲਈ %s" msgid "Cannot paint on layer groups." msgstr "ਲੇਅਰ ਮਾਸਕ ਦਾ ਨਾਂ ਨਹੀਂ ਬਦਲਿਆ ਜਾ ਸਕਦਾ" -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s ਲਈ ਸਿੱਧੀ ਲਾਇਨ" @@ -13451,7 +13443,6 @@ msgid "Transformation Matrix" msgstr "ਟਰਾਂਸਫਰਮੇਸ਼ਨ ਮੈਟਰਿਕਸ" #: ../app/tools/gimpperspectivetool.c:256 -#| msgid "Perspective" msgctxt "undo-type" msgid "Perspective" msgstr "ਅਵਲੋਕਣ" @@ -13698,39 +13689,39 @@ msgstr "ਐਟੀਲਾਈਸਿੰਗ" msgid "Feather edges" msgstr "ਖੰਭੀ ਕੰਢੇ" -#: ../app/tools/gimpselectiontool.c:250 +#: ../app/tools/gimpselectiontool.c:255 msgid "Click-Drag to replace the current selection" msgstr "ਮੌਜੂਦਾ ਚੋਣ ਘਟਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:258 +#: ../app/tools/gimpselectiontool.c:263 msgid "Click-Drag to create a new selection" msgstr "ਇੱਕ ਨਵੀਂ ਚੋਣ ਕਰਨ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:263 +#: ../app/tools/gimpselectiontool.c:268 msgid "Click-Drag to add to the current selection" msgstr "ਮੌਜੂਦਾ ਚੋਣ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:272 +#: ../app/tools/gimpselectiontool.c:277 msgid "Click-Drag to subtract from the current selection" msgstr "ਮੌਜੂਦਾ ਚੋਣ ਵਿੱਚੋਂ ਹਟਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:281 +#: ../app/tools/gimpselectiontool.c:286 msgid "Click-Drag to intersect with the current selection" msgstr "ਮੌਜੂਦਾ ਚੋਣ ਨਾਲ ਇੰਟਰਸੈਕਟ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:291 +#: ../app/tools/gimpselectiontool.c:296 msgid "Click-Drag to move the selection mask" msgstr "ਚੋਣ ਮਾਸਕ ਹਿਲਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੈਗ" -#: ../app/tools/gimpselectiontool.c:299 +#: ../app/tools/gimpselectiontool.c:304 msgid "Click-Drag to move the selected pixels" msgstr "ਚੁਣੇ ਪਿਕਸਲ ਹਿਲਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੋਪ" -#: ../app/tools/gimpselectiontool.c:303 +#: ../app/tools/gimpselectiontool.c:308 msgid "Click-Drag to move a copy of the selected pixels" msgstr "ਚੁਣੇ ਪਿਕਸਲਾਂ ਦੀ ਕਾਪੀ ਹਿਲਾਉਣ ਲਈ ਕਲਿੱਕ-ਡਰੋਪ" -#: ../app/tools/gimpselectiontool.c:307 +#: ../app/tools/gimpselectiontool.c:312 msgid "Click to anchor the floating selection" msgstr "ਫਲੋਟਿੰਗ ਚੋਣ ਐਂਕਰ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ" @@ -13794,7 +13785,6 @@ msgid "Font size unit" msgstr "ਫੋਂਟ ਆਕਾਰ ਯੂਨਿਟ" #: ../app/tools/gimptextoptions.c:136 -#| msgid "Fonts" msgid "Font size" msgstr "ਫੋਂਟ ਅਕਾਰ" @@ -13810,7 +13800,6 @@ msgid "The text language may have an effect on the way the text is rendered." msgstr "" #: ../app/tools/gimptextoptions.c:164 -#| msgid "Alignment:" msgid "Text alignment" msgstr "ਟੈਕਸਟ ਇਕਸਾਰ" @@ -13837,7 +13826,6 @@ msgid "Use an external editor window for text entry" msgstr "" #: ../app/tools/gimptextoptions.c:510 -#| msgid "Fonts" msgid "Font" msgstr "ਫੋਂਟ" @@ -13881,19 +13869,19 @@ msgstr "ਪਾਠ ਟੂਲ: ਪਾਠ ਲੇਅਰਾਂ ਬਣਾਓ ਜਾਂ msgid "Te_xt" msgstr "ਪਾਠ(_x)" -#: ../app/tools/gimptexttool.c:958 +#: ../app/tools/gimptexttool.c:959 msgid "Reshape Text Layer" msgstr "ਟੈਕਸਟ ਲੇਅਰ ਸ਼ੇਪ ਬਦਲੋ" -#: ../app/tools/gimptexttool.c:1512 ../app/tools/gimptexttool.c:1515 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "ਸ਼ਬਦ ਸੋਧ ਦੀ ਪੁਸ਼ਟੀ" -#: ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1520 msgid "Create _New Layer" msgstr "ਇੱਕ ਨਵੀਂ ਲੇਅਰ ਬਣਾਓ(_N)" -#: ../app/tools/gimptexttool.c:1543 +#: ../app/tools/gimptexttool.c:1544 msgid "" "The layer you selected is a text layer but it has been modified using other " "tools. Editing the layer with the text tool will discard these " @@ -13908,7 +13896,7 @@ msgstr "" "ਤੁਸੀਂ ਲੇਅਰ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ ਜਾਂ ਇਸ ਦੇ ਟੈਕਸਟ ਗੁਣਾਂ ਤੋਂ ਇੱਕ ਨਵੀ ਲੇਅਰ ਬਣਾ ਸਕਦੇ " "ਹੋ। \t" -#: ../app/tools/gimptexttool-editor.c:1172 +#: ../app/tools/gimptexttool-editor.c:1199 msgid "GIMP Text Editor" msgstr "ਜੈਮਪ ਟੈਕਸਟ ਐਡੀਟਰ" @@ -13945,7 +13933,6 @@ msgid "Can't work on an empty image, add a layer first" msgstr "ਖਾਲੀ ਚਿੱਤਰ ਉੱਤੇ ਕੰਮ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ, ਪਹਿਲਾਂ ਲੇਅਰ ਜੋੜੋ" #: ../app/tools/gimptransformoptions.c:99 -#| msgid "Perspective transformation" msgid "Direction of transformation" msgstr "ਟਰਾਂਸਫਰਮੇਸ਼ਨ ਦੀ ਦਿਸ਼ਾ" @@ -13956,7 +13943,6 @@ msgid "Interpolation method" msgstr "ਇੰਟਰਪੋਲਟੇਸ਼ਨ:" #: ../app/tools/gimptransformoptions.c:111 -#| msgid "Show _tooltips" msgid "How to clip" msgstr "ਕਲਿੱਪ ਕਿਵੇਂ" @@ -13996,20 +13982,15 @@ msgid "Clipping:" msgstr "ਕਲਿੱਪਿੰਗ:" #: ../app/tools/gimptransformoptions.c:310 -#| msgctxt "undo-type" -#| msgid "Image type" msgid "Image opacity" msgstr "ਚਿੱਤਰ ਧੁੰਦਲਾਪਨ" #: ../app/tools/gimptransformoptions.c:312 -#| msgid "Show image size" msgid "Show image preview" msgstr "ਚਿੱਤਰ ਝਲਕ ਵੇਖਾਓ" #. the guides frame #: ../app/tools/gimptransformoptions.c:318 -#| msgctxt "image-action" -#| msgid "_Guides" msgid "Guides" msgstr "ਗਾਈਡਾਂ" @@ -14031,19 +14012,19 @@ msgstr "ਅਕਾਰ ਅਨੁਪਾਤ (%s) ਰੱਖੋ" msgid "Keep the original aspect ratio" msgstr "" -#: ../app/tools/gimptransformtool.c:212 +#: ../app/tools/gimptransformtool.c:213 msgid "Transforming" msgstr "ਟਰਾਂਸਫਰਮੇਸ਼ਨ" -#: ../app/tools/gimptransformtool.c:1065 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "ਟਰਾਂਸਫਰ ਲਈ ਕੋਈ ਲੇਅਰ ਨਹੀਂ ਹੈ।" -#: ../app/tools/gimptransformtool.c:1078 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "ਟਰਾਂਸਫਰ ਲਈ ਕੋਈ ਮਾਰਗ ਨਹੀਂ ਹੈ।" -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "ਸਰਗਰਮ ਮਾਰਗ ਦੇ ਸਟਰੋਕ ਲਾਕ ਹਨ।" @@ -14415,51 +14396,50 @@ msgstr "ਖੋਜ(_S):" msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpactionview.c:338 #: ../app/widgets/gimpcontrollereditor.c:341 msgid "Action" msgstr "ਕਾਰਵਾਈ" -#: ../app/widgets/gimpactionview.c:366 +#: ../app/widgets/gimpactionview.c:367 msgid "Shortcut" msgstr "ਸ਼ਾਰਟਕੱਟ" -#: ../app/widgets/gimpactionview.c:392 +#: ../app/widgets/gimpactionview.c:393 msgid "Name" msgstr "ਨਾਂ" -#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "ਸ਼ਾਰਟਕੱਟ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।" -#: ../app/widgets/gimpactionview.c:669 +#: ../app/widgets/gimpactionview.c:670 msgid "Conflicting Shortcuts" msgstr "ਸ਼ਾਰਟਕੱਟ ਅਪਵਾਦ" -#: ../app/widgets/gimpactionview.c:675 +#: ../app/widgets/gimpactionview.c:676 msgid "_Reassign shortcut" msgstr "ਸ਼ਾਰਟਕੱਟ ਮੁੜ-ਜਾਰੀ(_R)" -#: ../app/widgets/gimpactionview.c:690 +#: ../app/widgets/gimpactionview.c:691 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "ਸ਼ਾਰਟਕੱਟ \"%s\" ਪਹਿਲਾਂ ਹੀ \"%s\" ਰਾਹੀਂ \"%s\" ਗਰੁੱਪ ਨੇ ਲੈ ਲਿਆ ਹੈ।" -#: ../app/widgets/gimpactionview.c:694 +#: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "ਮੁੜ-ਜਾਰੀ ਕਰਨ ਨਾਲ ਸ਼ਾਰਟਕੱਟ ਨੂੰ \"%s\" ਤੋਂ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।" -#: ../app/widgets/gimpactionview.c:767 +#: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." msgstr "ਗਲਤ ਸ਼ਾਰਟਕੱਟ ਹੈ।" -#: ../app/widgets/gimpactionview.c:856 +#: ../app/widgets/gimpactionview.c:867 msgid "Removing shortcut failed." msgstr "ਸ਼ਾਰਟਕੱਟ ਨੂੰ ਹਟਾਉਣਾ ਅਸਫ਼ਲ ਹੈ।" #: ../app/widgets/gimpbrusheditor.c:166 -#| msgid "Spikes:" msgid "Spikes" msgstr "ਗੁੱਛਾ" @@ -14483,7 +14463,7 @@ msgid "Percentage of width of brush" msgstr "ਬੁਰਸ਼ ਦੀ ਪ੍ਰਤੀਸ਼ਤ ਚੌੜਾਈ" #: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 -#: ../app/widgets/gimpeditor.c:748 +#: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(ਕੋਈ ਨਹੀ)" @@ -14491,37 +14471,37 @@ msgstr "(ਕੋਈ ਨਹੀ)" msgid "Add the current color to the color history" msgstr "ਮੌਜੂਦਾ ਰੰਗ ਨੂੰ ਰੰਗ ਅਤੀਤ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "ਉਪਲੱਬਧ ਫਿਲਟਰ" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "ਚੁਣੇ ਫਿਲਟਰ ਨੂੰ ਉੱਤੇ ਭੇਜੋ" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "ਚੁਣੇ ਫਿਲਟਰ ਨੂੰ ਹੇਠਾਂ ਭੇਜੋ" -#: ../app/widgets/gimpcolordisplayeditor.c:271 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "ਐਕਟਿਵ ਫਿਲਟਰ" -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "ਚੁਣੇ ਫਿਲਟਰ ਦਾ ਮੁੱਲ ਮੁੜ ਸੈੱਟ ਕਰੋ" -#: ../app/widgets/gimpcolordisplayeditor.c:496 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "ਐਕਟਿਵ ਫਿਲਟਰ ਦੀ ਲਿਸਟ ਵਿੱਚ '%s' ਫਿਲਟਰ ਨੂੰ ਜੋੜ੍ਹੋ" -#: ../app/widgets/gimpcolordisplayeditor.c:533 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "ਐਕਟਿਵ ਫਿਲਟਰ ਦੀ ਲਿਸਟ ਵਿਚੋਂ '%s' ਫਿਲਟਰ ਨੂੰ ਹਟਾਓ" -#: ../app/widgets/gimpcolordisplayeditor.c:564 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "ਕੋਈ ਫਿਲਟਰ ਨਹੀਂ ਚੁਣਿਆ" @@ -14602,11 +14582,11 @@ msgstr "ਕੇਵਲ ਇੰਡੈਕਸਡ ਚਿੱਤਰਾਂ ਲਈ ਹੀ msgid "Palette" msgstr "ਪੈਲਅਟ" -#: ../app/widgets/gimpcontainerpopup.c:591 +#: ../app/widgets/gimpcontainerpopup.c:595 msgid "Smaller Previews" msgstr "ਛੋਟੀ ਝਲਕ" -#: ../app/widgets/gimpcontainerpopup.c:596 +#: ../app/widgets/gimpcontainerpopup.c:600 msgid "Larger Previews" msgstr "ਵੱਡੀ ਝਲਕ" @@ -14818,8 +14798,6 @@ msgstr "ਇੰਪੁੱਟ ਕੰਟਰੋਲਰ ਸੰਰਚਨਾ" #: ../app/widgets/gimpcontrollermouse.c:85 #: ../app/widgets/gimpcontrollermouse.c:88 #: ../app/widgets/gimpcontrollermouse.c:91 -#| msgctxt "cap-style" -#| msgid "Butt" msgid "Button 8" msgstr "ਬਟਨ 8" @@ -14831,8 +14809,6 @@ msgstr "ਬਟਨ 8" #: ../app/widgets/gimpcontrollermouse.c:110 #: ../app/widgets/gimpcontrollermouse.c:113 #: ../app/widgets/gimpcontrollermouse.c:116 -#| msgctxt "cap-style" -#| msgid "Butt" msgid "Button 9" msgstr "ਬਟਨ 9" @@ -14844,8 +14820,6 @@ msgstr "ਬਟਨ 9" #: ../app/widgets/gimpcontrollermouse.c:135 #: ../app/widgets/gimpcontrollermouse.c:138 #: ../app/widgets/gimpcontrollermouse.c:141 -#| msgctxt "cap-style" -#| msgid "Butt" msgid "Button 10" msgstr "ਬਟਨ 10" @@ -14857,8 +14831,6 @@ msgstr "ਬਟਨ 10" #: ../app/widgets/gimpcontrollermouse.c:160 #: ../app/widgets/gimpcontrollermouse.c:163 #: ../app/widgets/gimpcontrollermouse.c:166 -#| msgctxt "cap-style" -#| msgid "Butt" msgid "Button 11" msgstr "ਬਟਨ 11" @@ -14870,18 +14842,14 @@ msgstr "ਬਟਨ 11" #: ../app/widgets/gimpcontrollermouse.c:185 #: ../app/widgets/gimpcontrollermouse.c:188 #: ../app/widgets/gimpcontrollermouse.c:191 -#| msgctxt "cap-style" -#| msgid "Butt" msgid "Button 12" msgstr "ਬਟਨ 12" #: ../app/widgets/gimpcontrollermouse.c:203 -#| msgid "Mouse Pointers" msgid "Mouse Buttons" msgstr "ਮਾਊਂਸ ਬਟਨ" #: ../app/widgets/gimpcontrollermouse.c:244 -#| msgid "Mouse Wheel Events" msgid "Mouse Button Events" msgstr "ਮਾਊਸ ਬਟਨ ਈਵੈਂਟ" @@ -14983,39 +14951,42 @@ msgstr "" msgid "Y tilt" msgstr "" -#: ../app/widgets/gimpdeviceinfoeditor.c:143 +#. Wheel as in mouse or input device wheel +#: ../app/widgets/gimpdeviceinfoeditor.c:144 #: ../app/widgets/gimpdynamicseditor.c:145 #: ../app/widgets/gimpdynamicsoutputeditor.c:73 msgid "Wheel" msgstr "ਪਹੀਆ" #. the axes -#: ../app/widgets/gimpdeviceinfoeditor.c:193 +#. The axes of an input device +#: ../app/widgets/gimpdeviceinfoeditor.c:195 msgid "Axes" msgstr "ਧੁਰੇ" #. the keys -#: ../app/widgets/gimpdeviceinfoeditor.c:267 +#: ../app/widgets/gimpdeviceinfoeditor.c:269 msgid "Keys" msgstr "ਸਵਿੱਚਾਂ" -#: ../app/widgets/gimpdeviceinfoeditor.c:364 -#: ../app/widgets/gimpdeviceinfoeditor.c:582 +#: ../app/widgets/gimpdeviceinfoeditor.c:366 +#: ../app/widgets/gimpdeviceinfoeditor.c:585 #, c-format msgid "none" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../app/widgets/gimpdeviceinfoeditor.c:412 +#. e.g. "Pressure Curve" for mapping input device axes +#: ../app/widgets/gimpdeviceinfoeditor.c:415 #, c-format msgid "%s Curve" msgstr "%s ਕਰਵ" -#: ../app/widgets/gimpdeviceinfoeditor.c:471 +#: ../app/widgets/gimpdeviceinfoeditor.c:474 #: ../app/widgets/gimpdynamicsoutputeditor.c:209 msgid "_Reset Curve" msgstr "ਕਰਵ ਮੁੜ-ਸੈੱਟ(_E)" -#: ../app/widgets/gimpdeviceinfoeditor.c:484 +#: ../app/widgets/gimpdeviceinfoeditor.c:487 #, c-format msgid "The axis '%s' has no curve" msgstr "" @@ -15034,24 +15005,24 @@ msgstr "ਫਾਰਗਰਾਊਂਡ: %d, %d, %d" msgid "Background: %d, %d, %d" msgstr "ਬੈਕਗਰਾਊਂਡ: %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:203 +#: ../app/widgets/gimpdnd-xds.c:204 msgid "The given filename does not have any known file extension." msgstr "ਦਿੱਤੇ ਫਾਇਲ ਨਾਂ ਵਿੱਚ ਕੋਈ ਜਾਣੀ ਫਾਇਲ ਐਕਸ਼ਟੇਸ਼ਨ ਨਹੀਂ ਹੈ।" -#: ../app/widgets/gimpdnd-xds.c:221 +#: ../app/widgets/gimpdnd-xds.c:222 msgid "File Exists" msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ" -#: ../app/widgets/gimpdnd-xds.c:226 +#: ../app/widgets/gimpdnd-xds.c:227 msgid "_Replace" msgstr "ਤਬਦੀਲ(_R)" -#: ../app/widgets/gimpdnd-xds.c:237 +#: ../app/widgets/gimpdnd-xds.c:238 #, c-format msgid "A file named '%s' already exists." msgstr "ਇੱਕ ਫਾਇਲ '%s' ਨਾਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" -#: ../app/widgets/gimpdnd-xds.c:242 +#: ../app/widgets/gimpdnd-xds.c:243 msgid "Do you want to replace it with the image you are saving?" msgstr "" "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਤੁਹਾਡੇ ਵਲੋਂ ਸੰਭਾਲੇ ਜਾ ਰਹੇ ਚਿੱਤਰ ਨਾਲ ਤਬਦੀਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?" @@ -15083,11 +15054,11 @@ msgid "Configure this tab" msgstr "ਇਸ ਟੈਬ ਦੀ ਸੰਰਚਨਾ" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "ਆਟੋ" -#: ../app/widgets/gimpdockwindow.c:393 +#: ../app/widgets/gimpdockwindow.c:397 msgid "" "When enabled the dialog automatically follows the image you are working on." msgstr "" @@ -15126,31 +15097,45 @@ msgstr "ਕਈ ਗਲਤੀਆਂ ਲੱਭੀਆਂ ਹਨ!" msgid "Messages are redirected to stderr." msgstr "ਸੁਨੇਹੇ stderr ਉੱਤੇ ਭੇਜੇ ਗਏ।" -#: ../app/widgets/gimperrordialog.c:170 +#. %s is a message domain, +#. * like "GIMP Message" or +#. * "PNG Message" +#. +#: ../app/widgets/gimperrordialog.c:174 #, c-format msgid "%s Message" msgstr "%s ਸੁਨੇਹਾ" -#: ../app/widgets/gimpfiledialog.c:327 +#: ../app/widgets/gimpfiledialog.c:330 msgid "Automatically Detected" msgstr "ਆਟੋਮੈਟਿਕ ਖੋਜ" -#: ../app/widgets/gimpfiledialog.c:344 +#: ../app/widgets/gimpfiledialog.c:347 msgid "By Extension" msgstr "ਇਕਸਟੇਸ਼ਨ ਨਾਲ" -#: ../app/widgets/gimpfiledialog.c:793 +#: ../app/widgets/gimpfiledialog.c:801 msgid "All files" msgstr "ਸਭ ਫਾਇਲਾਂ" -#: ../app/widgets/gimpfiledialog.c:798 +#: ../app/widgets/gimpfiledialog.c:806 msgid "All images" msgstr "ਸਭ ਚਿੱਤਰ" -#: ../app/widgets/gimpfiledialog.c:974 +#: ../app/widgets/gimpfiledialog.c:813 +#| msgid "All images" +msgid "All XCF images" +msgstr "ਸਭ XCF ਚਿੱਤਰ" + +#: ../app/widgets/gimpfiledialog.c:815 +#| msgid "All images" +msgid "All export images" +msgstr "ਸਭ ਐਕਸਪੋਰਟ ਚਿੱਤਰ" + +#: ../app/widgets/gimpfiledialog.c:999 #, c-format msgid "Select File _Type (%s)" -msgstr "ਫਾਇਲ ਟਾਈਪ (%s) ਚੁਣੋ" +msgstr "ਫਾਇਲ _ਟਾਈਪ (%s) ਚੁਣੋ" #: ../app/widgets/gimpfileprocview.c:185 msgid "File Type" @@ -15372,79 +15357,79 @@ msgstr "" msgid "Querying..." msgstr "ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "ਪਿਕਸਲ ਵਿੱਚ ਆਕਾਰ:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "ਪਰਿੰਟ ਸਾਈਜ਼:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "ਕਲਰ ਸਪੇਸ:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "ਫਾਇਲ ਨਾਂ:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "ਫਾਇਲ ਸਾਈਜ਼:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "ਫਾਇਲ ਟਾਇਪ:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "ਮੈਮੋਰੀ ਵਿੱਚ ਅਕਾਰ:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "ਵਾਪਸ ਸਟੈਪ:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "ਮੁੜ-ਵਾਪਸ ਸਟੈਪ:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "ਪਿਕਸਲਾਂ ਦੀ ਗਿਣਤੀ:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "ਲੇਅਰਾਂ ਦੀ ਗਿਣਤੀ:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "ਚੈਨਲਾਂ ਦੀ ਗਿਣਤੀ:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "ਮਾਰਗਾਂ ਦੀ ਗਿਣਤੀ:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "ਪਿਕਸਲ/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "ਰੰਗ" @@ -15598,7 +15583,7 @@ msgstr "ਟੈਗ ਦਿਓ" #. * IMPORTANT: use only one of Unicode terminal punctuation chars. #. * http://unicode.org/review/pr-23.html #. -#: ../app/widgets/gimptagentry.c:1734 +#: ../app/widgets/gimptagentry.c:1732 msgid "," msgstr "," @@ -15641,12 +15626,12 @@ msgstr "%d × %d ppi, %s" msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "" @@ -15687,7 +15672,6 @@ msgid "Change baseline of selected text" msgstr "ਲੇਅਰ ਭਾਗ ਦਾ ਆਕਾਰ ਬਦਲੋ" #: ../app/widgets/gimptextstyleeditor.c:328 -#| msgid "Blend" msgid "Bold" msgstr "ਗੂੜ੍ਹੇ" @@ -15696,7 +15680,6 @@ msgid "Italic" msgstr "ਤਿਰਛਾ" #: ../app/widgets/gimptextstyleeditor.c:334 -#| msgid "Undefined" msgid "Underline" msgstr "ਹੇਠਾਂ ਲਾਈਨ" @@ -15825,7 +15808,6 @@ msgid "Delete Tool Preset..." msgstr "...ਟੂਲ ਪ੍ਰੀਸੈੱਟ ਹਟਾਓ" #: ../app/widgets/gimptoolpreseteditor.c:148 -#| msgid "_Icon:" msgid "Icon:" msgstr "ਆਈਕਾਨ:" @@ -15861,7 +15843,6 @@ msgstr "ਸਟੋਰ ਕੀਤੇ ਫੋਂਟ ਲਾਗੂ ਕਰੋ" #: ../app/widgets/gimptoolpreseteditor.c:292 #, c-format -#| msgid "Tool Presets" msgid "%s Preset" msgstr "%s ਪ੍ਰੀ-ਸੈੱਟ" @@ -15900,7 +15881,6 @@ msgid "Open the brush selection dialog" msgstr "ਬੁਰਸ਼ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" #: ../app/widgets/gimpviewablebox.c:151 -#| msgid "Open the font selection dialog" msgid "Open the dynamics selection dialog" msgstr "ਡਾਇਨੇਮਿਕਸ ਚੋਣ ਡਾਈਲਾਗ ਖੋਲ੍ਹੋ" @@ -16045,7 +16025,7 @@ msgctxt "tab-style" msgid "Undefined" msgstr "ਨਾ-ਪਰਾਭਾਸ਼ਿਤ" -#: ../app/xcf/xcf-load.c:336 +#: ../app/xcf/xcf-load.c:339 msgid "" "This XCF file is corrupt! I have loaded as much of it as I can, but it is " "incomplete." @@ -16054,14 +16034,14 @@ msgstr "" "ਇਹ ਪੂਰੀ ਨਹੀਂ " "ਹੈ।" -#: ../app/xcf/xcf-load.c:347 +#: ../app/xcf/xcf-load.c:350 msgid "" "This XCF file is corrupt! I could not even salvage any partial image data " "from it." msgstr "" "ਇਹ XCF ਫਾਇਲ ਨਿਕਾਰ ਹੋ ਗਈ ਹੈ! ਮੈਂ ਇਸ ਤੋਂ ਅੱਧਾ-ਪਚੱਦਾ ਚਿੱਤਰ ਡਾਟਾ ਵੀ ਨਹੀਂ ਲੈ ਸਕਿਆ।" -#: ../app/xcf/xcf-load.c:420 +#: ../app/xcf/xcf-load.c:423 msgid "" "XCF warning: version 0 of XCF file format\n" "did not save indexed colormaps correctly.\n" @@ -16288,9 +16268,6 @@ msgstr "ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਤਸਵੀਰਾਂ ਸੋਧ #~ msgid "Instant update" #~ msgstr "ਤੁਰੰਤ ਅੱਪਡੇਟ" -#~ msgid "Set Item Exclusive Linked" -#~ msgstr "ਆਈਟਮ ਨੂੰ ਨਿਵੇਕਲਾਂ ਸੰਬੰਧਿਤ ਸੈੱਟ ਕਰੋ" - #~ msgid "Message repeated %d times." #~ msgstr "ਸੁਨੇਹਾ %d ਵਾਰ ਮੁੜ ਵੇਖਾਉ" diff --git a/po/pl.po b/po/pl.po index ef09698598..b204ca5824 100644 --- a/po/pl.po +++ b/po/pl.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 18:28+0200\n" -"PO-Revision-Date: 2013-05-25 18:30+0200\n" +"POT-Creation-Date: 2013-11-21 01:04+0100\n" +"PO-Revision-Date: 2013-11-21 01:05+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -87,7 +87,7 @@ msgstr "" "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "- proszę odwiedzić stronę internetową http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -993,7 +993,7 @@ msgid "Use the composite color of all visible layers" msgstr "Używa połączonych kolorów wszystkich widocznych warstw" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2388,8 +2388,8 @@ msgstr "Zapisuje ten obraz i zamyka jego okno" #: ../app/actions/file-actions.c:146 msgctxt "file-action" -msgid "Export to" -msgstr "Eksportuj do" +msgid "Export" +msgstr "Wyeksportuj" #: ../app/actions/file-actions.c:147 msgctxt "file-action" @@ -2409,8 +2409,8 @@ msgstr "" #: ../app/actions/file-actions.c:158 msgctxt "file-action" -msgid "Export..." -msgstr "Wyeksportuj..." +msgid "Export As..." +msgstr "Wyeksportuj jako..." #: ../app/actions/file-actions.c:159 msgctxt "file-action" @@ -2420,7 +2420,7 @@ msgstr "Eksportuje obraz do różnych formatów plików, takich jak PNG i JPEG" #: ../app/actions/file-actions.c:292 #, c-format msgid "Export to %s" -msgstr "Eksportowanie do %s" +msgstr "Wyeksportuj do %s" #: ../app/actions/file-actions.c:298 #, c-format @@ -2428,52 +2428,53 @@ msgid "Over_write %s" msgstr "_Zastąp %s" #: ../app/actions/file-actions.c:306 -msgid "Export to" -msgstr "Wyeksportuj do" +msgid "Export" +msgstr "Wyeksportuj" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Otwarcie obrazu" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Otwiera obraz jako warstwy" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Brak niezapisanych zmian" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Zapis obrazu" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Zapis kopii obrazu" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Utworzenie nowego szablonu" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Proszę wprowadzić nazwę tego szablonu" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "Przywrócenie się nie powiodło. Obrazowi nie nadano nazwy." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Przywrócenie obrazu" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Przywrócić \"%s\" do wersji \"%s\"?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2481,11 +2482,11 @@ msgstr "" "Przywrócenie obrazu do stanu zapisanego w pliku spowoduje utratę wszystkich " "dokonanych w nim zmian, wraz z informacjami o historii działań." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Szablon bez nazwy)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3226,7 +3227,7 @@ msgid "Set Image Canvas Size" msgstr "Ustawienie wymiarów płótna obrazu" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Zmienianie wymiarów" @@ -3253,21 +3254,21 @@ msgstr "Obracanie" msgid "Cannot crop because the current selection is empty." msgstr "Nie można wykadrować, ponieważ bieżące zaznaczenie jest puste." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Zmień rozmiar wydruku" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Skalowanie obrazu" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 #: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/layer-cmds.c:330 ../app/pdb/layer-cmds.c:375 #: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Skalowanie" @@ -4614,7 +4615,7 @@ msgstr "Otwiera plik tekstowy (UTF-8)" #: ../app/actions/text-editor-commands.c:143 #: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:443 #: ../app/core/gimpbrushgenerated-load.c:73 #: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 #: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 @@ -5612,11 +5613,11 @@ msgstr "I_nne (%s) ..." msgid "_Zoom (%s)" msgstr "_Powiększenie (%s)" -#: ../app/actions/view-commands.c:605 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Ustawienie koloru wyściółki płótna" -#: ../app/actions/view-commands.c:607 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Ustawienie dowolnego koloru wyściółki płótna" @@ -7527,8 +7528,8 @@ msgstr "" "Krytyczny błąd podczas przetwarzania pliku \"%s\" z pędzlami: nieznana " "wersja %d." -#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 -#: ../app/core/gimpbrush-load.c:727 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:410 +#: ../app/core/gimpbrush-load.c:744 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "" @@ -7547,7 +7548,22 @@ msgstr "Nieprawidłowy ciąg UTF-8 w pliku z pędzlami \"%s\"." msgid "Unnamed" msgstr "Bez nazwy" -#: ../app/core/gimpbrush-load.c:382 +#: ../app/core/gimpbrush-load.c:354 +#, c-format +msgid "" +"Fatal parse error in brush file '%s': Unsupported brush depth %d\n" +"GIMP brushes must be GRAY or RGBA.\n" +"This might be an obsolete GIMP brush file, try loading it as image and save " +"it again." +msgstr "" +"Krytyczny błąd podczas przetwarzania pliku \"%s\" z pędzlami: nieobsługiwana " +"głębia pędzla %d\n" +"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub w " +"formacie RGBA.\n" +"Może to być przestarzały plik z pędzlami programu GIMP, proszę spróbować " +"wczytać go jako obraz i zapisać ponownie." + +#: ../app/core/gimpbrush-load.c:399 #, c-format msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" @@ -7558,7 +7574,7 @@ msgstr "" "Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości lub w " "formacie RGBA." -#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:471 ../app/core/gimpbrush-load.c:871 #, c-format msgid "" "Fatal parse error in brush file '%s': unable to decode abr format version %d." @@ -7566,7 +7582,7 @@ msgstr "" "Krytyczny błąd podczas przetwarzania pliku \"%s\" z pędzlami: nie można " "dekodować wersji formatu abr %d." -#: ../app/core/gimpbrush-load.c:621 +#: ../app/core/gimpbrush-load.c:638 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "" @@ -7640,7 +7656,6 @@ msgid "Brush Angle" msgstr "Nachylenie pędzla" #: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 -#: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." msgstr "" @@ -7828,7 +7843,7 @@ msgstr "Krycie" msgid "Paint Mode" msgstr "Tryb rysowania" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Nie można usunąć \"%s\": %s" @@ -7974,7 +7989,7 @@ msgid "Posterize" msgstr "Redukcja kolorów" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Niewystarczająca ilość punktów do narysowania" @@ -8160,12 +8175,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Ustawienie palety kolorów" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Cofnięcie ustawienia palety kolorów" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Zmiana elementu palety kolorów" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Dodanie koloru do palety kolorów" @@ -8253,39 +8273,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Połączenie widocznych warstw" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Spłaszczenie obrazu" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Nie można spłaszczyć obrazu bez żadnej widocznej warstwy." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Nie można połączyć w dół do grupy warstw." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Warstwa do połączenia w dół jest zablokowana." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Nie ma widocznych warstw do połączenia w dół." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Połączenie w dół" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Połączenie grupy warstw" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Połączenie widocznych ścieżek" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Niewystarczająca liczba widocznych ścieżek do połączenia. Potrzebne są co " @@ -8320,7 +8344,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Przesunięcie punktu wzorcowego" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Skalowanie obrazu" @@ -8430,7 +8454,7 @@ msgid "(Preview may be out of date)" msgstr "(Podgląd może być nieaktualny)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -8919,7 +8943,7 @@ msgctxt "plural" msgid "percent" msgstr "procent" -#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 msgid "About GIMP" msgstr "Informacje o programie GIMP" @@ -9105,15 +9129,15 @@ msgstr "Otwarcie położenia" msgid "Enter location (URI):" msgstr "Położenie (adres URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Eksport obrazu" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "Wy_eksportuj" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9123,7 +9147,11 @@ msgstr "" "podstawie jego rozszerzenia. Proszę wpisać rozszerzenie pliku, które pasuje " "do podanego pliku lub nie wpisywać żadnego." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "Podana nazwa pliku nie może być używana do eksportowania" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9132,7 +9160,15 @@ msgstr "" "Należy użyć polecenia \"Plik→Zapisz\", aby zapisać plik w formacie XCF " "programu GIMP." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Przejdź do okna dialogowego zapisywania" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "Podana nazwa pliku nie może być używana do zapisywania" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9141,7 +9177,15 @@ msgstr "" "Należy użyć polecenia \"Plik→Wyeksportuj\", aby wyeksportować obraz do " "innych formatów." -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Przejdź do okna dialogowego eksportowania" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Niezgodność rozszerzeń" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9149,23 +9193,19 @@ msgstr "" "Podany plik nie ma żadnego znanego rozszerzenia. Proszę wpisać lub wybrać " "rozszerzenie z listy." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Niezgodność rozszerzeń" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "Podane rozszerzenie nie pasuje do wybranego typu pliku." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Zapisać obraz pod tą nazwą mimo to?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Anulowano zapisywanie" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10048,7 +10088,7 @@ msgid "Vertical" msgstr "Pionowo" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10366,23 +10406,23 @@ msgstr "Rozdzielczość _Y:" msgid "pixels/%a" msgstr "pikseli/%a" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Quit GIMP" msgstr "Zakończenie działania programu GIMP" -#: ../app/dialogs/quit-dialog.c:104 +#: ../app/dialogs/quit-dialog.c:144 msgid "Close All Images" msgstr "Zamknij wszystkie obrazy" -#: ../app/dialogs/quit-dialog.c:163 +#: ../app/dialogs/quit-dialog.c:212 msgid "If you quit GIMP now, these changes will be lost." msgstr "Zakończenie działania programu GIMP spowoduje utracenie tych zmian." -#: ../app/dialogs/quit-dialog.c:166 +#: ../app/dialogs/quit-dialog.c:215 msgid "If you close these images now, changes will be lost." msgstr "Jeśli obrazy zostaną teraz zamknięte, to zostaną utracone zmiany." -#: ../app/dialogs/quit-dialog.c:213 +#: ../app/dialogs/quit-dialog.c:300 #, c-format msgid "There is one image with unsaved changes:" msgid_plural "There are %d images with unsaved changes:" @@ -10390,10 +10430,36 @@ msgstr[0] "Nie zapisano zmian w jednym obrazie:" msgstr[1] "Nie zapisano zmian w %d obrazach:" msgstr[2] "Nie zapisano zmian w %d obrazach:" -#: ../app/dialogs/quit-dialog.c:235 +#: ../app/dialogs/quit-dialog.c:311 +#, c-format +msgid "Press %s to quit." +msgstr "Naciśnięcie %s zakończy działanie." + +#: ../app/dialogs/quit-dialog.c:314 +#, c-format +msgid "Press %s to close all images." +msgstr "Naciśnięcie %s zamknie wszystkie obrazy." + +#: ../app/dialogs/quit-dialog.c:330 +#, c-format +msgid "Press %s to discard all changes and quit." +msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zakończy działanie." + +#: ../app/dialogs/quit-dialog.c:333 +#, c-format +msgid "Press %s to discard all changes and close all images." +msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zamknie wszystkie obrazy." + +#: ../app/dialogs/quit-dialog.c:341 +#: ../app/display/gimpdisplayshell-close.c:181 msgid "_Discard Changes" msgstr "_Porzuć zmiany" +#: ../app/dialogs/quit-dialog.c:423 +#, c-format +msgid "Exported to %s" +msgstr "Wyeksportowano do %s" + #: ../app/dialogs/resize-dialog.c:119 msgid "Canvas Size" msgstr "Wymiary płótna" @@ -10663,22 +10729,23 @@ msgstr "Kontroluje wyświetlanie obrazu" msgid "Drop image files here to open them" msgstr "Upuszczenie plików obrazów w tym miejscu otworzy je" -#: ../app/display/gimpdisplayshell-close.c:156 -#: ../app/display/gimpdisplayshell-close.c:229 +#: ../app/display/gimpdisplayshell-close.c:170 +#: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "Close %s" msgstr "Zamknięcie %s" -#: ../app/display/gimpdisplayshell-close.c:167 -msgid "Close _without Saving" -msgstr "Zamknij bez zapisy_wania" +#: ../app/display/gimpdisplayshell-close.c:218 +#, c-format +msgid "Press %s to discard all changes and close the image." +msgstr "Naciśnięcie %s porzuci wszystkie zmiany i zamknie obraz." -#: ../app/display/gimpdisplayshell-close.c:237 +#: ../app/display/gimpdisplayshell-close.c:278 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Zapisać zmiany w obrazie \"%s\" przed zamknięciem?" -#: ../app/display/gimpdisplayshell-close.c:270 +#: ../app/display/gimpdisplayshell-close.c:311 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." msgid_plural "" @@ -10693,7 +10760,7 @@ msgstr[2] "" "Jeśli obraz nie zostanie zapisany, to zmiany z %d ostatnich godzin zostaną " "utracone." -#: ../app/display/gimpdisplayshell-close.c:281 +#: ../app/display/gimpdisplayshell-close.c:322 #, c-format msgid "" "If you don't save the image, changes from the last hour and %d minute will " @@ -10711,7 +10778,7 @@ msgstr[2] "" "Jeśli obraz nie zostanie zapisany, to zmiany z ostatniej godziny i %d minut " "zostaną utracone." -#: ../app/display/gimpdisplayshell-close.c:293 +#: ../app/display/gimpdisplayshell-close.c:334 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." msgid_plural "" @@ -10726,7 +10793,7 @@ msgstr[2] "" "Jeśli obraz nie zostanie zapisany, to zmiany z ostatnich %d minut zostaną " "utracone." -#: ../app/display/gimpdisplayshell-close.c:311 +#: ../app/display/gimpdisplayshell-close.c:355 #, c-format msgid "The image has been exported to '%s'." msgstr "Wyeksportowano obraz do \"%s\"." @@ -10843,12 +10910,12 @@ msgstr "Wtyczka %s nie może otworzyć obrazu" msgid "Image doesn't contain any layers" msgstr "Obraz nie zawiera żadnych warstw" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:590 #, c-format msgid "Opening '%s' failed: %s" msgstr "Otwarcie pliku \"%s\" się nie powiodło: %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:700 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -11463,7 +11530,7 @@ msgstr "" msgid "Free Select" msgstr "Zaznaczenie odręczne" -#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 +#: ../app/pdb/layer-cmds.c:475 ../app/pdb/layer-cmds.c:513 msgid "Move Layer" msgstr "Przesunięcie warstwy" @@ -11492,29 +11559,29 @@ msgid "Close path stroke" msgstr "Zamknięcie rysowania wzdłuż ścieżki" # TO NIE JEST MIEJSCE NA WPISYWANIE TŁUMACZY! -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Przemieszczenie rysowania wzdłuż ścieżki" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Skalowanie rysowania wzdłuż ścieżki" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Obrót rysowania wzdłuż ścieżki" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Odbicie rysowania wzdłuż ścieżki" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Dodanie rysowania wzdłuż ścieżki" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Rozszerzenie rysowania wzdłuż ścieżki" @@ -11714,14 +11781,22 @@ msgstr "Przekształcenie warstwy tekstowej" msgid "Discard Text Information" msgstr "Porzucenie informacji o tekście" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "Funkcje tekstowe nie są dostępne z powodu braku czcionek." -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Pusta warstwa tekstowa" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"Tekst nie może zostać wyświetlony. Prawdopodobnie jest za duży. Proszę go " +"skrócić lub użyć mniejszej czcionki." + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" @@ -11738,6 +11813,14 @@ msgstr "" "Niektóre właściwości tekstu mogą być błędne. Jeśli tekst nie będzie " "modyfikowany, to nie ma to większego znaczenia." +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"Nie można utworzyć nowego układu tekstu. Prawdopodobnie rozmiar czcionki " +"jest za duży." + #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" msgid "Dynamic" @@ -11931,7 +12014,7 @@ msgstr "Gradient nie pracuje na warstwach indeksowanych." msgid "No gradient available for use with this tool." msgstr "Brak dostępnych gradientów dla tego narzędzia." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s dla wymuszonych kątów" @@ -12076,27 +12159,27 @@ msgctxt "command" msgid "Select by Color" msgstr "Zaznaczenie według koloru" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Przekształcenie klatki" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Przekształcenie klatki: zniekształca zaznaczenie za pomocą klatki" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "Przekształcenie _klatki" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Naciśnięcie klawisza Enter zatwierdzi przekształcenie" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Obliczanie współrzędnych klatki" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Przekształcenie klatki" @@ -12312,11 +12395,11 @@ msgstr "Po_branie koloru" msgid "Click in any image to view its color" msgstr "Kliknięcie na obraz wyświetli jego kolor" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Kliknięcie na dowolny obraz pobierze jego kolor pierwszoplanowy" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Kliknięcie na dowolny obraz pobierze jego kolor tła" @@ -13215,7 +13298,7 @@ msgstr "Kliknięcie i przeciągnięcie przemieści wszystkie punkty" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "piksele" @@ -13386,7 +13469,7 @@ msgstr "%s wybiera kolor" msgid "Cannot paint on layer groups." msgstr "Nie można narysować grup warstw." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s rysuje prostą linię" @@ -13775,7 +13858,7 @@ msgstr "" #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." -msgstr "Język tekstu może mieć wpływ na sposób jego renderowania." +msgstr "Język tekstu może mieć wpływ na sposób jego wyświetlania." #: ../app/tools/gimptextoptions.c:164 msgid "Text alignment" @@ -15332,79 +15415,79 @@ msgstr "" msgid "Querying..." msgstr "Odpytywanie..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Rozmiar w pikselach:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Rozmiar wydruku:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Rozdzielczość:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Przestrzeń kolorów:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Nazwa pliku:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Rozmiar pliku:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Typ pliku:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Rozmiar w pamięci:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Kroki cofnięcia:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Kroki ponowienia:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Liczba pikseli:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Liczba warstw:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Liczba kanałów:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Liczba ścieżek:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Brak" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pikseli/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "kolory" @@ -16063,6 +16146,40 @@ msgstr "zaokrąglony" msgid "fuzzy" msgstr "rozmyty" +#: ../desktop/gimp.appdata.xml.in.h:1 +msgid "" +"GIMP is an acronym for GNU Image Manipulation Program. It is a freely " +"distributed program for such tasks as photo retouching, image composition " +"and image authoring." +msgstr "" +"GIMP to program do manipulowania obrazami projektu GNU. Jest on wolnym " +"oprogramowaniem służącym do retuszowania zdjęć i tworzenia obrazów." + +#: ../desktop/gimp.appdata.xml.in.h:2 +msgid "" +"It has many capabilities. It can be used as a simple paint program, an " +"expert quality photo retouching program, an online batch processing system, " +"a mass production image renderer, an image format converter, etc." +msgstr "" +"Daje on wiele możliwości. Może być używany jako prosty program do rysowania, " +"narzędzie do retuszowania zdjęć dla ekspertów, system do masowego " +"przetwarzania plików obrazów przez sieć, program renderujący obrazy, " +"konwerter formatów obrazów itp." + +#: ../desktop/gimp.appdata.xml.in.h:3 +msgid "" +"GIMP is expandable and extensible. It is designed to be augmented with plug-" +"ins and extensions to do just about anything. The advanced scripting " +"interface allows everything from the simplest task to the most complex image " +"manipulation procedures to be easily scripted. GIMP is also available for " +"Microsoft Windows and OS X." +msgstr "" +"Program GIMP jest wysoce rozszerzalny. Za pomocą wtyczek i rozszerzeń można " +"osiągnąć niemalże wszystko. Zaawansowany interfejs skryptów umożliwia łatwe " +"automatyzowanie wszystkich działań, od najprostszych zadań do złożonych " +"procedur manipulacji obrazami. Program GIMP jest dostępny także dla systemów " +"Microsoft Windows i OS X." + #: ../desktop/gimp.desktop.in.in.h:2 msgid "Image Editor" msgstr "Edytor obrazów" diff --git a/po/pt_BR.po b/po/pt_BR.po index 2137b5c110..e759f73e18 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -10,22 +10,23 @@ # Joao S. O. Bueno , 2004, 2006, 2007, 2008, 2012. # Keven do Nascimento Carneiro , 2012. # Rafael Ferreira , 2013. +# Enrico Nicoletto , 2013. # msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-04-24 18:13+0000\n" -"PO-Revision-Date: 2013-04-26 23:02-0300\n" -"Last-Translator: Rafael Ferreira \n" +"POT-Creation-Date: 2013-09-18 14:38+0000\n" +"PO-Revision-Date: 2013-09-19 11:41-0300\n" +"Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Poedit 1.5.4\n" #: ../app/about.h:23 msgid "GIMP" @@ -33,7 +34,7 @@ msgstr "GIMP" #: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 msgid "GNU Image Manipulation Program" -msgstr "GNU Image Manipulation Program" +msgstr "Programa de manipulação de imagem do GNU" #. The year of the last commit (UTC) will be inserted into this string. #: ../app/about.h:30 @@ -42,7 +43,7 @@ msgid "" "Copyright © 1995-%s\n" "Spencer Kimball, Peter Mattis and the GIMP Development Team" msgstr "" -"Copyright © 1995-%s\n" +"Direitos autorais © 1995-%s\n" "Spencer Kimball, Peter Mattis e a equipe de desenvolvedores do GIMP" #: ../app/about.h:34 @@ -60,20 +61,19 @@ msgid "" "You should have received a copy of the GNU General Public License along with " "GIMP. If not, see http://www.gnu.org/licenses/." msgstr "" -"O GIMP é software livre; você pode redistribuí-lo e/ou modificá-lo sob os " -"termos da Licença Pública Geral da GNU (GNU General Public License), " -"conforme publicada pela Free Software Foundation; quer a versão 3 da " -"Licença, ou (se você preferir) qualquer versão posterior.\n" +"O GIMP é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os " +"termos da Licença Pública Geral GNU (GNU General Public License), conforme " +"publicada pela Free Software Foundation; quer a versão 3 da Licença, ou (a " +"seu critério) qualquer versão posterior.\n" "\n" -"O GIMP é distribuído com esperanças de que seja útil, porém SEM NENHUMA " -"GARANTIA; nem mesmo garantia implícita de MERCANTIBILIDADE ou SERVENTIA PARA " -"UM PROPÓSITO PARTICULAR. Veja a Licença Pública Geral da GNU para maiores " -"detalhes.\n" +"O GIMP é distribuído na expectativa de que seja útil, porém SEM NENHUMA " +"GARANTIA; sem mesmo implicar garantias de COMERCIALIZAÇÃO ou ADEQUAÇÃO A UM " +"FIM ESPECÍFICO. Veja a Licença Pública Geral GNU para maiores detalhes.\n" "\n" -"Você deve ter recebido uma cópia da Licença Pública Geral da GNU junto com o " +"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com o " "GIMP; senão, veja http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" @@ -443,7 +443,7 @@ msgstr "Editor de texto" msgid "Tool Options" msgstr "Opções de ferramentas" -#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Ferramentas" @@ -972,7 +972,7 @@ msgid "Use the composite color of all visible layers" msgstr "Calcular a seleção com base em todas as camadas visíveis" #: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 @@ -2421,49 +2421,50 @@ msgstr "_Sobrescrever %s" msgid "Export to" msgstr "Exportar para" -#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Abrir imagem" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Abrir imagem como camadas" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Nenhuma modificação precisa ser salva" -#: ../app/actions/file-commands.c:273 ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Salvar imagem" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Salvar uma cópia da imagem" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Criar um novo modelo" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Informe um nome para este modelo" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "A reversão falhou. Não há um nome de arquivo associado a esta imagem." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Reverter imagem" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Reverter '%s' para '%s'?" -#: ../app/actions/file-commands.c:442 +#: ../app/actions/file-commands.c:448 msgid "" "By reverting the image to the state saved on disk, you will lose all " "changes, including all undo information." @@ -2471,11 +2472,11 @@ msgstr "" "Ao reverter a imagem para o estado salvo em disco você perderá todas as " "modificações, inclusive as informações de desfazer." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Modelo sem nome)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -3217,7 +3218,7 @@ msgid "Set Image Canvas Size" msgstr "Ajusta tamanho da tela de imagem" #: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Redimensionando" @@ -3244,16 +3245,16 @@ msgstr "Rotacionando" msgid "Cannot crop because the current selection is empty." msgstr "Impossível cortar porque a seleção atual está vazia." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Alterar tamanho para a impressão" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Redimensionar imagem" #. Scaling -#: ../app/actions/image-commands.c:682 ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 #: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 @@ -5184,13 +5185,13 @@ msgstr "Cria uma nova janela para esta imagem" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "_Fechar" +msgid "_Close View" +msgstr "_Fechar visualização" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Fecha esta janela de imagem" +msgid "Close the active image view" +msgstr "Fecha a visualização atual de imagem" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5628,11 +5629,11 @@ msgstr "Out_ro (%s)..." msgid "_Zoom (%s)" msgstr "_Zoom (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Define a cor de preenchimento da janela" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Cor personalizada de preenchimento da janela" @@ -7366,7 +7367,7 @@ msgid "Jitter" msgstr "Espalhar" #: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 ../app/menus/menus.c:464 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" @@ -7843,7 +7844,7 @@ msgstr "Opacidade" msgid "Paint Mode" msgstr "_Modo de pintura" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Impossível remover '%s': %s" @@ -7990,7 +7991,7 @@ msgid "Posterize" msgstr "Posterizar" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Não há pontos suficientes para a pincelada" @@ -8180,12 +8181,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Estabelecer mapa de cores" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Dissociar mapa de cores" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Alterar entrada no mapa de cores" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Adicionar cor ao mapa de cores" @@ -8272,40 +8278,44 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Combinar camadas visíveis." -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Achatar imagem" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Não é possível achatar uma imagem sem qualquer camada visível." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "" "Não é possível combinar camadas tendo como destino um grupo de camadas." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "A camada a ser combinada está travada." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Não há nenhuma camada visível para a qual combinar." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Combinar com a de baixo" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Combinar grupo de camadas" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Combinar vetores visíveis" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "" "Não há vetores visíveis suficientes para combinar. Deve haver no mínimo dois." @@ -8339,7 +8349,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Mover ponto de amostragem" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Redimensionar imagem" @@ -8449,7 +8459,7 @@ msgid "(Preview may be out of date)" msgstr "(A pré-visualização pode estar desatualizada)" #. pixel size -#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:441 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 #: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" @@ -9116,15 +9126,15 @@ msgstr "Abrir URL" msgid "Enter location (URI):" msgstr "Digite o local (URL):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Exportar imagem" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Exportar" -#: ../app/dialogs/file-save-dialog.c:419 +#: ../app/dialogs/file-save-dialog.c:458 msgid "" "Saving remote files needs to determine the file format from the file " "extension. Please enter a file extension that matches the selected file " @@ -9134,7 +9144,11 @@ msgstr "" "arquivo a partir da extensão. Por favor, entre com uma extensão de arquivos " "que corresponda ao formato selecionado ou não ponha nenhuma extensão." -#: ../app/dialogs/file-save-dialog.c:546 +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "O nome de arquivo fornecido não pode ser usado para exportar" + +#: ../app/dialogs/file-save-dialog.c:606 msgid "" "You can use this dialog to export to various file formats. If you want to " "save the image to the GIMP XCF format, use File→Save instead." @@ -9143,7 +9157,15 @@ msgstr "" "imagem. Se você quer salvar a imagem para o formato XCF do GIMP, use " "Arquivo→Salvar em vez desta opção." -#: ../app/dialogs/file-save-dialog.c:553 +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Leve-me a caixa de diálogo de salvar" + +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "O nome de arquivo fornecido não pode ser usado para salvar" + +#: ../app/dialogs/file-save-dialog.c:614 msgid "" "You can use this dialog to save to the GIMP XCF format. Use File→Export to " "export to other file formats." @@ -9152,7 +9174,15 @@ msgstr "" "a opção Arquivo→Exportar para gravar a imagem em outros formatos (JPG, PNG, " "GIF, etc...)" -#: ../app/dialogs/file-save-dialog.c:559 +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Leve-me a caixa de diálogo de exportar" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 +msgid "Extension Mismatch" +msgstr "Erro no nome (Extensão)" + +#: ../app/dialogs/file-save-dialog.c:678 msgid "" "The given filename does not have any known file extension. Please enter a " "known file extension or select a file format from the file format list." @@ -9161,23 +9191,19 @@ msgstr "" "favor, entre com uma extensão conhecida, ou escolha um formato de arquivos " "da lista." -#: ../app/dialogs/file-save-dialog.c:573 -msgid "Extension Mismatch" -msgstr "Erro no nome (Extensão)" - -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "A extensão dada não corresponde ao tipo de arquivo escolhido." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Você deseja salvar a imagem com esse nome mesmo assim?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Gravação cancelada" -#: ../app/dialogs/file-save-dialog.c:659 ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -10065,7 +10091,7 @@ msgid "Vertical" msgstr "Vertical" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppp" @@ -10849,12 +10875,12 @@ msgstr "O plug-in %s não pôde abrir a imagem" msgid "Image doesn't contain any layers" msgstr "A imagem não contém nenhuma camada" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Falha ao abrir '%s': %s" -#: ../app/file/file-open.c:690 +#: ../app/file/file-open.c:696 msgid "" "Color management has been disabled. It can be enabled again in the " "Preferences dialog." @@ -10871,12 +10897,12 @@ msgstr "Tipo de arquivo desconhecido" msgid "%s plug-in could not save image" msgstr "O plug-in %s não pôde salvar a imagem" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s' não é um esquema de URL válido" -#: ../app/file/file-utils.c:90 ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Seqüencia de caracteres inválida na URL" @@ -10890,15 +10916,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Deforme a gaiola para deformar a imagem" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "Não é um arquivo de curvas do GIMP" -#: ../app/gegl/gimpcurvesconfig.c:403 ../app/gegl/gimplevelsconfig.c:800 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "erro de análise" -#: ../app/gegl/gimplevelsconfig.c:753 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "Não é um arquivo de níveis do GIMP" @@ -11492,29 +11518,29 @@ msgstr "Remover componente de vetor" msgid "Close path stroke" msgstr "Fechar segmento de vetor" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Transladar componente de vetor" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Selecionar componente de vetor" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Rotacionar componente de vetor" -#: ../app/pdb/vectors-cmds.c:521 ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Espelhar componente de vetor" -#: ../app/pdb/vectors-cmds.c:694 ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Adicionar componente de vetor" -#: ../app/pdb/vectors-cmds.c:870 ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Extender componente de vetor" @@ -11611,7 +11637,7 @@ msgstr "Interpretadores de plug-ins" msgid "Plug-In Environment" msgstr "Ambiente de plug-in" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11620,7 +11646,7 @@ msgstr "" "Erro de chamada para '%s':\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11932,7 +11958,7 @@ msgstr "Degradê não funciona em camadas indexadas." msgid "No gradient available for use with this tool." msgstr "Não há degradês disponíveis para uso com esta ferramenta." -#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s para restringir ângulos" @@ -12079,7 +12105,7 @@ msgctxt "command" msgid "Select by Color" msgstr "Seleção por cor" -#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:152 ../app/tools/gimpcagetool.c:1156 msgid "Cage Transform" msgstr "Transformação com gaiola" @@ -12091,15 +12117,15 @@ msgstr "Transformação com gaiola: Deforma uma seleção usando uma gaiola" msgid "_Cage Transform" msgstr "_Transformar com gaiola" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:353 msgid "Press ENTER to commit the transform" msgstr "Pressione Enter para realizar as transformações" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1097 msgid "Computing Cage Coefficients" msgstr "Calculando coeficientes da gaiola" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1274 msgid "Cage transform" msgstr "Transformar com gaiola" @@ -12317,11 +12343,11 @@ msgstr "Selet_or de cores" msgid "Click in any image to view its color" msgstr "Clique em qualquer imagem para ver sua cor" -#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Clique em qualquer imagem para pegar a cor de frente" -#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Clique em qualquer imagem para pegar a cor de fundo" @@ -13227,7 +13253,7 @@ msgstr "Clique e arraste para mover todos os pontos" #: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 #: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "pixels" @@ -13398,7 +13424,7 @@ msgstr "%s para escolher uma cor" msgid "Cannot paint on layer groups." msgstr "Não é possível pintar em grupos de camada" -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s para uma linha reta" @@ -15350,79 +15376,79 @@ msgstr "" msgid "Querying..." msgstr "Consultando..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Tamanho em pixels:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Tamanho de impressão:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Resolução:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Espaço de cor:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Nome do arquivo: " -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Tamanho do arquivo:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Tipo de arquivo:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Tamanho na memória:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Passos de desfazer:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Passos de refazer:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Número de pixels:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Número de camadas:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Número de canais:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Número de vetores:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Nenhum" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "pixels/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g x %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "cores" diff --git a/po/ru.po b/po/ru.po index 30023fbb4c..4467dfc537 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,22 +10,24 @@ msgid "" msgstr "" "Project-Id-Version: GIMP 2.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-26 11:18+0400\n" -"PO-Revision-Date: 2013-01-27 12:08+0300\n" +"POT-Creation-Date: 2013-10-11 06:35+0400\n" +"PO-Revision-Date: 2013-10-11 10:34+0300\n" "Last-Translator: Александр Прокудин \n" "Language-Team: русский \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"%100>=20) ? 1: 2);\n" +"X-Generator: Poedit 1.5.4\n" #: ../app/about.h:23 msgid "GIMP" msgstr "GIMP" -#: ../app/about.h:26 -#: ../desktop/gimp.desktop.in.in.h:1 +#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 msgid "GNU Image Manipulation Program" msgstr "GNU Image Manipulation Program" @@ -41,39 +43,60 @@ msgstr "" #: ../app/about.h:34 msgid "" -"GIMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\n" +"GIMP is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 3 of the License, or (at your option) any later " +"version.\n" "\n" -"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" +"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details.\n" "\n" -"You should have received a copy of the GNU General Public License along with GIMP. If not, see http://www.gnu.org/licenses/." +"You should have received a copy of the GNU General Public License along with " +"GIMP. If not, see http://www.gnu.org/licenses/." msgstr "" -"GIMP является свободным программным обеспечением; вы можете распространять и/или изменять его согласно условиям Стандартной Общественной Лицензии GNU (GNU GPL), опубликованной Фондом свободного программного обеспечения (FSF), либо Лицензии версии 3, либо (на ваше усмотрение) любой более поздней версии.\n" +"GIMP является свободным программным обеспечением; вы можете распространять и/" +"или изменять его согласно условиям Стандартной Общественной Лицензии GNU " +"(GNU GPL), опубликованной Фондом свободного программного обеспечения (FSF), " +"либо Лицензии версии 3, либо (на ваше усмотрение) любой более поздней " +"версии.\n" "\n" -"Программа распространяется в надежде, что она будет полезной, но БЕЗ КАКИХ БЫ ТО НИ БЫЛО ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; даже без косвенных гарантийных обязательств, связанных с ПОТРЕБИТЕЛЬСКИМИ СВОЙСТВАМИ и ПРИГОДНОСТЬЮ ДЛЯ ОПРЕДЕЛЕННЫХ ЦЕЛЕЙ. Для подробностей смотрите Стандартную Общественную Лицензию GNU.\n" +"Программа распространяется в надежде, что она будет полезной, но БЕЗ КАКИХ " +"БЫ ТО НИ БЫЛО ГАРАНТИЙНЫХ ОБЯЗАТЕЛЬСТВ; даже без косвенных гарантийных " +"обязательств, связанных с ПОТРЕБИТЕЛЬСКИМИ СВОЙСТВАМИ и ПРИГОДНОСТЬЮ ДЛЯ " +"ОПРЕДЕЛЕННЫХ ЦЕЛЕЙ. Для подробностей смотрите Стандартную Общественную " +"Лицензию GNU.\n" "\n" -"Вы должны были получить копию Стандартной Общественной Лицензии GNU вместе с этой программой. Если это не так, напишите в Фонд Свободного ПО (Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA" +"Вы должны были получить копию Стандартной Общественной Лицензии GNU вместе с " +"этой программой. Если это не так, напишите в Фонд Свободного ПО (Free " +"Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA" -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" "\n" -"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")." +"To avoid data loss, please check the location and permissions of the swap " +"directory defined in your Preferences (currently \"%s\")." msgstr "" "Невозможно открыть тестовый файл подкачки.\n" "\n" -"Чтобы избежать потери данных, проверьте в настройках расположение файла подкачки и права на него. (сейчас \"%s\")." +"Чтобы избежать потери данных, проверьте в настройках расположение файла " +"подкачки и права на него. (сейчас \"%s\")." #: ../app/batch.c:75 #, c-format msgid "No batch interpreter specified, using the default '%s'.\n" -msgstr "Интерпретатор пакетной обработки не указан, используется исходный '%s'.\n" +msgstr "" +"Интерпретатор пакетной обработки не указан, используется исходный '%s'.\n" -#: ../app/batch.c:93 -#: ../app/batch.c:111 +#: ../app/batch.c:93 ../app/batch.c:111 #, c-format msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "Интерпретатор пакетной обработки '%s' недоступен, использование пакетного режима невозможно." +msgstr "" +"Интерпретатор пакетной обработки '%s' недоступен, использование пакетного " +"режима невозможно." #: ../app/main.c:148 msgid "Show version information and exit" @@ -212,17 +235,22 @@ msgstr "" #: ../app/sanity.c:452 #, c-format msgid "" -"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n" +"The name of the directory holding the GIMP user configuration cannot be " +"converted to UTF-8: %s\n" "\n" -"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING." +"Your filesystem probably stores files in an encoding other than UTF-8 and " +"you didn't tell GLib about this. Please set the environment variable " +"G_FILENAME_ENCODING." msgstr "" -"Название каталога, содержащего пользовательские предпочтения GIMP, невозможно перекодировать в UTF-8: %s\n" +"Название каталога, содержащего пользовательские предпочтения GIMP, " +"невозможно перекодировать в UTF-8: %s\n" "\n" -"Скорее всего в вашей файловой системе используется кодировка, отличная от UTF-8, и вы не сказали об этом GLib. Установите правильное значение переменной окружения G_FILENAME_ENCODING." +"Скорее всего в вашей файловой системе используется кодировка, отличная от " +"UTF-8, и вы не сказали об этом GLib. Установите правильное значение " +"переменной окружения G_FILENAME_ENCODING." #. show versions of libraries used by GIMP -#: ../app/version.c:63 -#: ../app/version.c:130 +#: ../app/version.c:63 ../app/version.c:130 #, c-format msgid "using %s version %s (compiled against version %s)" msgstr "используя %s версии %s (собранной с версией %s)" @@ -232,32 +260,26 @@ msgstr "используя %s версии %s (собранной с верси msgid "%s version %s" msgstr "%s версии %s" -#: ../app/actions/actions.c:109 -#: ../app/dialogs/dialogs.c:388 +#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 #: ../app/widgets/gimpbrusheditor.c:88 msgid "Brush Editor" msgstr "Редактор кисти" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:112 -#: ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 -#: ../app/dialogs/preferences-dialog.c:2739 +#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2739 msgid "Brushes" msgstr "Кисти" -#: ../app/actions/actions.c:115 -#: ../app/dialogs/dialogs.c:327 +#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327 msgid "Buffers" msgstr "Буферы" -#: ../app/actions/actions.c:118 -#: ../app/dialogs/dialogs.c:346 +#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346 msgid "Channels" msgstr "Каналы" -#: ../app/actions/actions.c:121 -#: ../app/dialogs/convert-dialog.c:174 +#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 #: ../app/dialogs/dialogs.c:354 msgid "Colormap" msgstr "Цветовая карта" @@ -270,8 +292,7 @@ msgstr "Настройка" msgid "Context" msgstr "Контекст" -#: ../app/actions/actions.c:130 -#: ../app/dialogs/dialogs.c:310 +#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310 msgid "Pointer Information" msgstr "Информация об указателе" @@ -292,8 +313,7 @@ msgid "Dockable" msgstr "Панель" #. Document History -#: ../app/actions/actions.c:145 -#: ../app/dialogs/dialogs.c:329 +#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 #: ../app/dialogs/preferences-dialog.c:1573 msgid "Document History" msgstr "Недавние изображения" @@ -303,13 +323,11 @@ msgid "Drawable" msgstr "Изображение" #. Some things do not have grids, so just list -#: ../app/actions/actions.c:151 -#: ../app/dialogs/dialogs.c:335 +#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:335 msgid "Paint Dynamics" msgstr "Динамика рисования" -#: ../app/actions/actions.c:154 -#: ../app/dialogs/dialogs.c:392 +#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 #: ../app/widgets/gimpdynamicseditor.c:92 msgid "Paint Dynamics Editor" msgstr "Редактор динамики рисования" @@ -318,8 +336,7 @@ msgstr "Редактор динамики рисования" msgid "Edit" msgstr "Правка" -#: ../app/actions/actions.c:160 -#: ../app/dialogs/dialogs.c:306 +#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306 msgid "Error Console" msgstr "Консоль ошибок" @@ -327,35 +344,28 @@ msgstr "Консоль ошибок" msgid "File" msgstr "Файл" -#: ../app/actions/actions.c:166 -#: ../app/dialogs/dialogs.c:325 +#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 #: ../app/dialogs/preferences-dialog.c:2759 msgid "Fonts" msgstr "Шрифты" -#: ../app/actions/actions.c:169 -#: ../app/dialogs/dialogs.c:396 +#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 #: ../app/widgets/gimpgradienteditor.c:269 msgid "Gradient Editor" msgstr "Редактор градиентов" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:172 -#: ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2755 msgid "Gradients" msgstr "Градиенты" -#: ../app/actions/actions.c:175 -#: ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2763 msgid "Tool Presets" msgstr "Профили инструментов" -#: ../app/actions/actions.c:178 -#: ../app/dialogs/dialogs.c:404 +#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 #: ../app/widgets/gimptoolpreseteditor.c:92 msgid "Tool Preset Editor" msgstr "Редактор профилей инструментов" @@ -369,53 +379,43 @@ msgid "Image" msgstr "Изображение" #. list & grid views -#: ../app/actions/actions.c:187 -#: ../app/dialogs/dialogs.c:315 +#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:315 msgid "Images" msgstr "Изображения" -#: ../app/actions/actions.c:190 -#: ../app/dialogs/dialogs.c:342 +#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 #: ../app/dialogs/resize-dialog.c:287 msgid "Layers" msgstr "Слои" -#: ../app/actions/actions.c:193 -#: ../app/dialogs/dialogs.c:400 +#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 #: ../app/widgets/gimppaletteeditor.c:143 msgid "Palette Editor" msgstr "Редактор палитры образцов" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:196 -#: ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2751 msgid "Palettes" msgstr "Палитры образцов" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:199 -#: ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2747 msgid "Patterns" msgstr "Текстуры" -#: ../app/actions/actions.c:202 -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2767 msgid "Plug-Ins" msgstr "Расширения" #. Quick Mask Color -#: ../app/actions/actions.c:205 -#: ../app/core/gimpchannel.c:386 +#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 #: ../app/dialogs/preferences-dialog.c:2025 msgid "Quick Mask" msgstr "Быстрая маска" -#: ../app/actions/actions.c:208 -#: ../app/dialogs/dialogs.c:370 +#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370 msgid "Sample Points" msgstr "Образцовые точки" @@ -424,8 +424,7 @@ msgid "Select" msgstr "Выделение" #. initialize the template list -#: ../app/actions/actions.c:214 -#: ../app/core/gimp.c:989 +#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 #: ../app/dialogs/dialogs.c:331 msgid "Templates" msgstr "Шаблоны" @@ -438,20 +437,16 @@ msgstr "Текст" msgid "Text Editor" msgstr "Редактор текста" -#: ../app/actions/actions.c:223 -#: ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1854 -#: ../app/gui/gui.c:424 +#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 +#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:424 msgid "Tool Options" msgstr "Параметры инструментов" -#: ../app/actions/actions.c:226 -#: ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Инструменты" -#: ../app/actions/actions.c:229 -#: ../app/dialogs/dialogs.c:350 +#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 #: ../app/tools/gimpvectortool.c:160 msgid "Paths" msgstr "Контуры" @@ -759,8 +754,7 @@ msgstr "Правка цвета канала" msgid "_Fill opacity:" msgstr "_Непрозрачность заливки:" -#: ../app/actions/channels-commands.c:116 -#: ../app/core/gimpchannel.c:272 +#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 #: ../app/widgets/gimpchanneltreeview.c:331 msgid "Channel" msgstr "Канал" @@ -779,8 +773,7 @@ msgstr "Параметры нового канала" msgid "New Channel Color" msgstr "Цвет нового канала" -#: ../app/actions/channels-commands.c:244 -#: ../app/core/gimpimage-new.c:257 +#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 #: ../app/display/gimpdisplayshell-dnd.c:646 #: ../app/widgets/gimpchanneltreeview.c:258 #: ../app/widgets/gimplayertreeview.c:776 @@ -977,16 +970,13 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Использовать все видимые слои при выделении области" -#: ../app/actions/data-commands.c:89 -#: ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 -#: ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 #: ../app/display/gimpdisplayshell-dnd.c:592 -#: ../app/widgets/gimplayertreeview.c:736 -#: ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 #: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" @@ -1000,12 +990,9 @@ msgstr "" #: ../app/actions/data-commands.c:118 #: ../app/actions/tool-options-commands.c:72 -#: ../app/core/gimpbrushgenerated-load.c:125 -#: ../app/core/gimpimage.c:1529 -#: ../app/core/gimppalette-import.c:211 -#: ../app/core/gimppalette-load.c:224 -#: ../app/core/gimppalette.c:399 -#: ../app/dialogs/palette-import-dialog.c:771 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 +#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 +#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 msgid "Untitled" msgstr "Без имени" @@ -1366,8 +1353,7 @@ msgid "About GIMP" msgstr "О GIMP" #: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1944 -#: ../app/widgets/gimptoolbox.c:540 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "Панель инструментов" @@ -1513,8 +1499,7 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "_Состояние и текст" -#: ../app/actions/dockable-actions.c:116 -#: ../app/widgets/widgets-enums.c:224 +#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 msgctxt "tab-style" msgid "Automatic" msgstr "Автоматический" @@ -1648,8 +1633,12 @@ msgid "Clear the Recent Documents list?" msgstr "Очистить весь журнал открывавшихся документов?" #: ../app/actions/documents-commands.c:218 -msgid "Clearing the document history will permanently remove all images from the recent documents list." -msgstr "Очистка журнала открывавшихся документов навсегда уберет изображения из списка недавних документов." +msgid "" +"Clearing the document history will permanently remove all images from the " +"recent documents list." +msgstr "" +"Очистка журнала открывавшихся документов навсегда уберет изображения из " +"списка недавних документов." #: ../app/actions/drawable-actions.c:45 msgctxt "drawable-action" @@ -1907,7 +1896,8 @@ msgstr "Строгая отмена" #: ../app/actions/edit-actions.c:85 msgctxt "edit-action" msgid "Undo the last operation, skipping visibility changes" -msgstr "Отменить последнее действие, пропустив изменения в статусе видимости объектов" +msgstr "" +"Отменить последнее действие, пропустив изменения в статусе видимости объектов" #: ../app/actions/edit-actions.c:90 msgctxt "edit-action" @@ -1917,7 +1907,9 @@ msgstr "Строгий повтор" #: ../app/actions/edit-actions.c:92 msgctxt "edit-action" msgid "Redo the last operation that was undone, skipping visibility changes" -msgstr "Повторить последнее отмененное действие, пропустив изменения в статусе видимости объектов" +msgstr "" +"Повторить последнее отмененное действие, пропустив изменения в статусе " +"видимости объектов" #: ../app/actions/edit-actions.c:97 msgctxt "edit-action" @@ -1995,8 +1987,7 @@ msgctxt "edit-action" msgid "From _Clipboard" msgstr "_Из буфера обмена" -#: ../app/actions/edit-actions.c:142 -#: ../app/actions/edit-actions.c:148 +#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" msgstr "Создать новое изображение из содержимого буфера обмена" @@ -2141,21 +2132,17 @@ msgstr "Очистка истории действий с этим изобра msgid "Cut pixels to the clipboard" msgstr "Вырезать пикселы в буфер обмена" -#: ../app/actions/edit-commands.c:236 -#: ../app/actions/edit-commands.c:265 +#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 msgid "Copied pixels to the clipboard" msgstr "Пикселы скопированы в буфер обмена" -#: ../app/actions/edit-commands.c:325 -#: ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 #: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." msgstr "В буфере обмена ничего нет." -#: ../app/actions/edit-commands.c:348 -#: ../app/core/gimpbrushclipboard.c:172 -#: ../app/core/gimppatternclipboard.c:172 -#: ../app/widgets/gimpclipboard.c:345 +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 +#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Буфер обмена" @@ -2163,8 +2150,7 @@ msgstr "Буфер обмена" msgid "Cut Named" msgstr "Вырезать в буфер с именем" -#: ../app/actions/edit-commands.c:377 -#: ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 #: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" msgstr "Введите имя для этого буфера" @@ -2181,8 +2167,7 @@ msgstr "Скопировать видимое с именем" msgid "There is no active layer or channel to cut from." msgstr "Нет активного слоя или канала для вырезания." -#: ../app/actions/edit-commands.c:565 -#: ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 #: ../app/actions/edit-commands.c:621 msgid "(Unnamed Buffer)" msgstr "(Безымянный буфер)" @@ -2365,7 +2350,9 @@ msgstr "Сохранить коп_ию..." #: ../app/actions/file-actions.c:135 msgctxt "file-action" -msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image" +msgid "" +"Save a copy of this image, without affecting the source file (if any) or the " +"current state of the image" msgstr "Сохранить копию этого изображения, не переходя к работе с ней" #: ../app/actions/file-actions.c:140 @@ -2422,61 +2409,64 @@ msgstr "Пере_записать %s" msgid "Export to" msgstr "Экспортировать в" -#: ../app/actions/file-commands.c:113 -#: ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Открыть изображение" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Открыть изображение как слои" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Нет сохраняемых изменений" -#: ../app/actions/file-commands.c:273 -#: ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Сохранить изображение" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Сохранить копию изображения" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Создать новый шаблон" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Введите имя для этого шаблона" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "" "Сбой восстановления.\n" "Нет имени файла, связанного с этим изображением." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Восстановить изображение" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Восстановить '%s' до '%s'?" -#: ../app/actions/file-commands.c:442 -msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information." -msgstr "Восстановив изображение до его состояния на диске, вы потеряете все изменения, включая информацию для отката." +#: ../app/actions/file-commands.c:448 +msgid "" +"By reverting the image to the state saved on disk, you will lose all " +"changes, including all undo information." +msgstr "" +"Восстановив изображение до его состояния на диске, вы потеряете все " +"изменения, включая информацию для отката." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(Безымянный шаблон)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2941,8 +2931,7 @@ msgstr "Изменить градиент" msgid "Save '%s' as POV-Ray" msgstr "Сохранить '%s' как файл POV-Ray" -#: ../app/actions/help-actions.c:37 -#: ../app/actions/help-actions.c:40 +#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 msgctxt "help-action" msgid "_Help" msgstr "_Справка" @@ -2962,8 +2951,7 @@ msgctxt "help-action" msgid "Show the help for a specific user interface item" msgstr "Показать справку по той или иной части интерфейса" -#: ../app/actions/image-actions.c:48 -#: ../app/actions/image-actions.c:52 +#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 msgctxt "image-action" msgid "Image Menu" msgstr "Меню изображения" @@ -3217,9 +3205,8 @@ msgstr "Повернуть изображение на 90 градусов вл msgid "Set Image Canvas Size" msgstr "Установка размера холста" -#: ../app/actions/image-commands.c:266 -#: ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Изменяется размер..." @@ -3236,42 +3223,34 @@ msgstr "Производится отражение..." #: ../app/actions/image-commands.c:403 #: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 -#: ../app/pdb/image-cmds.c:534 -#: ../app/pdb/item-transform-cmds.c:433 -#: ../app/pdb/transform-tools-cmds.c:245 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 +#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" msgstr "Производится вращение..." -#: ../app/actions/image-commands.c:429 -#: ../app/actions/layers-commands.c:691 +#: ../app/actions/image-commands.c:429 ../app/actions/layers-commands.c:691 msgid "Cannot crop because the current selection is empty." msgstr "" "Не удалось вырезать из-за того,\n" "что выделенная область пуста." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Изменить размер при печати" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Смена размера изображения" #. Scaling -#: ../app/actions/image-commands.c:682 -#: ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 -#: ../app/pdb/image-cmds.c:406 -#: ../app/pdb/image-cmds.c:442 -#: ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 -#: ../app/pdb/layer-cmds.c:378 -#: ../app/pdb/transform-tools-cmds.c:334 -#: ../app/tools/gimpscaletool.c:118 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Изменяется размер изображения" @@ -3375,8 +3354,7 @@ msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Правка названия слоя" -#: ../app/actions/layers-actions.c:82 -#: ../app/actions/layers-actions.c:610 +#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 msgctxt "layers-action" msgid "_New Layer..." msgstr "_Создать слой..." @@ -3386,8 +3364,7 @@ msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Создать новый слой и добавить его в изображение" -#: ../app/actions/layers-actions.c:88 -#: ../app/actions/layers-actions.c:611 +#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 msgctxt "layers-action" msgid "_New Layer" msgstr "_Создать слой" @@ -3605,7 +3582,9 @@ msgstr "Добавить _маску слоя..." #: ../app/actions/layers-actions.c:218 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" -msgstr "Добавить маску, с помощью которой можно неразрушающе редактировать прозрачность" +msgstr "" +"Добавить маску, с помощью которой можно неразрушающе редактировать " +"прозрачность" #: ../app/actions/layers-actions.c:223 msgctxt "layers-action" @@ -3702,8 +3681,7 @@ msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Добавить маску слоя к текущему выделению" -#: ../app/actions/layers-actions.c:296 -#: ../app/actions/layers-actions.c:325 +#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "Вы_честь из выделения" @@ -3713,8 +3691,7 @@ msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Вычесть маску слоя из текущего выделения" -#: ../app/actions/layers-actions.c:302 -#: ../app/actions/layers-actions.c:332 +#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_Пересечь с выделением" @@ -3808,8 +3785,7 @@ msgstr "Комбинация:" msgid "-Click on thumbnail in Layers dockable" msgstr "-щелчок по миниатюре в диалог слоёв" -#: ../app/actions/layers-actions.c:605 -#: ../app/actions/layers-actions.c:606 +#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 msgctxt "layers-action" msgid "To _New Layer" msgstr "В _новый слой" @@ -3822,13 +3798,11 @@ msgstr "Атрибуты слоя" msgid "Edit Layer Attributes" msgstr "Правка атрибутов слоя" -#: ../app/actions/layers-commands.c:250 -#: ../app/core/gimplayer.c:267 +#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:267 msgid "Layer" msgstr "Слой" -#: ../app/actions/layers-commands.c:252 -#: ../app/actions/layers-commands.c:320 +#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 #: ../app/widgets/gimpdrawabletreeview.c:326 #: ../app/widgets/gimplayertreeview.c:837 msgid "New Layer" @@ -4214,7 +4188,8 @@ msgstr "_Повторить последний" #: ../app/actions/plug-in-actions.c:135 msgctxt "plug-in-action" msgid "Rerun the last used plug-in using the same settings" -msgstr "Применить последний использованный фильтр или сценарий с теми же параметрами" +msgstr "" +"Применить последний использованный фильтр или сценарий с теми же параметрами" #: ../app/actions/plug-in-actions.c:140 msgctxt "plug-in-action" @@ -4371,7 +4346,9 @@ msgstr "_Растушевать..." #: ../app/actions/select-actions.c:76 msgctxt "select-action" msgid "Blur the selection border so that it fades out smoothly" -msgstr "Размыть границу выделения так, чтобы переход между выделенным и невыделенным был постепенным" +msgstr "" +"Размыть границу выделения так, чтобы переход между выделенным и невыделенным " +"был постепенным" #: ../app/actions/select-actions.c:81 msgctxt "select-action" @@ -4489,10 +4466,8 @@ msgstr "_Растушевать края" msgid "_Lock selection to image edges" msgstr "_Прикреплять выделение к краям изображения" -#: ../app/actions/select-commands.c:345 -#: ../app/actions/select-commands.c:378 -#: ../app/actions/vectors-commands.c:386 -#: ../app/actions/vectors-commands.c:420 +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 +#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:281 msgid "There is no active layer or channel to stroke to." msgstr "Нет активного слоя или канала для обводки" @@ -4575,7 +4550,8 @@ msgstr "Удалить шаблон" #: ../app/actions/templates-commands.c:237 #, c-format -msgid "Are you sure you want to delete template '%s' from the list and from disk?" +msgid "" +"Are you sure you want to delete template '%s' from the list and from disk?" msgstr "Вы уверены в том, что хотите удалить шаблон '%s' из списка и с диска?" #: ../app/actions/text-editor-actions.c:43 @@ -4624,23 +4600,15 @@ msgid "Open Text File (UTF-8)" msgstr "Открыть текствый файл (UTF-8)" #: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:226 -#: ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 -#: ../app/core/gimpbrush-load.c:426 +#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 #: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 -#: ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 -#: ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 -#: ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 -#: ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 -#: ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:649 -#: ../app/tools/gimplevelstool.c:747 +#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 +#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 +#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 +#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 +#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 +#: ../app/tools/gimpcurvestool.c:649 ../app/tools/gimplevelstool.c:747 #: ../app/xcf/xcf.c:329 #, c-format msgid "Could not open '%s' for reading: %s" @@ -4777,7 +4745,8 @@ msgstr "Сбросить все параметры инструмента" #: ../app/actions/tool-options-commands.c:209 msgid "Do you really want to reset all tool options to default values?" -msgstr "Вы действительно хотите вернуться к исходным параметрам всех инструментов?" +msgstr "" +"Вы действительно хотите вернуться к исходным параметрам всех инструментов?" #: ../app/actions/tool-presets-actions.c:44 msgctxt "tool-presets-action" @@ -5115,8 +5084,7 @@ msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "Выделение в _контур" -#: ../app/actions/vectors-actions.c:202 -#: ../app/actions/vectors-actions.c:208 +#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 msgctxt "vectors-action" msgid "Selection to path" msgstr "Превратить выделение в контур" @@ -5144,8 +5112,7 @@ msgstr "Атрибуты контура" msgid "Edit Path Attributes" msgstr "Правка атрибутов контура" -#: ../app/actions/vectors-commands.c:164 -#: ../app/vectors/gimpvectors.c:207 +#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 #: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "Контур" @@ -5158,8 +5125,7 @@ msgstr "Новый контур" msgid "New Path Options" msgstr "Параметры нового контура" -#: ../app/actions/vectors-commands.c:392 -#: ../app/tools/gimpvectoroptions.c:199 +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 #: ../app/tools/gimpvectortool.c:1975 msgid "Stroke Path" msgstr "Обводка по контуру" @@ -5196,13 +5162,13 @@ msgstr "Открыть еще одно окно с тем же изображе #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" +msgid "_Close View" msgstr "_Закрыть" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Закрыть это окно изображения" +msgid "Close the active image view" +msgstr "Закрыть активное окно изображения" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5222,7 +5188,9 @@ msgstr "Уместить по _высоте окна" #: ../app/actions/view-actions.c:95 msgctxt "view-action" msgid "Adjust the zoom ratio so that the entire window is used" -msgstr "Подобрать масштаб отображения так, чтобы пространство окна использовалось оптимально" +msgstr "" +"Подобрать масштаб отображения так, чтобы пространство окна использовалось " +"оптимально" #: ../app/actions/view-actions.c:100 msgctxt "view-action" @@ -5439,8 +5407,7 @@ msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "У_меньшить масштаб" -#: ../app/actions/view-actions.c:264 -#: ../app/actions/view-actions.c:276 +#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Отдалить" @@ -5450,8 +5417,7 @@ msgctxt "view-zoom-action" msgid "Zoom _In" msgstr "У_величить масштаб" -#: ../app/actions/view-actions.c:270 -#: ../app/actions/view-actions.c:282 +#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Приблизить" @@ -5466,62 +5432,52 @@ msgctxt "view-zoom-action" msgid "Zoom In" msgstr "Увеличить" -#: ../app/actions/view-actions.c:300 -#: ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (1600%)" -#: ../app/actions/view-actions.c:301 -#: ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "Масштаб 16:1" -#: ../app/actions/view-actions.c:312 -#: ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (800%)" -#: ../app/actions/view-actions.c:313 -#: ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "Масштаб 8:1" -#: ../app/actions/view-actions.c:324 -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (400%)" -#: ../app/actions/view-actions.c:325 -#: ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "Масштаб 4:1" -#: ../app/actions/view-actions.c:336 -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (200%)" -#: ../app/actions/view-actions.c:337 -#: ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "Масштаб 2:1" -#: ../app/actions/view-actions.c:348 -#: ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (100%)" -#: ../app/actions/view-actions.c:349 -#: ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "Масштаб 1:1" @@ -5645,11 +5601,11 @@ msgstr "_Другой (%s) ..." msgid "_Zoom (%s)" msgstr "_Масштаб (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Цвет фона вокруг изображения" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Установить цвет фона вокруг изображения" @@ -5705,8 +5661,11 @@ msgstr "Скрыть стыкуемые диалоги" #: ../app/actions/windows-actions.c:116 msgctxt "windows-action" -msgid "When enabled docks and other dialogs are hidden, leaving only image windows." -msgstr "Скрыть все диалоги и панели, оставить видимыми только окна с изображениями" +msgid "" +"When enabled, docks and other dialogs are hidden, leaving only image windows." +msgstr "" +"Если включено, cкрыть все диалоги и панели, оставить видимыми только окна с " +"изображениями" #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -5714,10 +5673,9 @@ msgid "Single-Window Mode" msgstr "Однооконный режим" #: ../app/actions/windows-actions.c:123 -#, fuzzy msgctxt "windows-action" -msgid "When enabled GIMP is in a single-window mode." -msgstr "Использовать GIMP в однооконном режиме" +msgid "When enabled, GIMP is in a single-window mode." +msgstr "Если включено, использовать GIMP в однооконном режиме" #: ../app/base/base-enums.c:23 msgctxt "curve-type" @@ -5890,8 +5848,17 @@ msgid "Anti erase" msgstr "Антиластик" #: ../app/base/tile-swap.c:710 -msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences." -msgstr "Невозможно открыть файл подкачки. GIMP использовал всю доступную оперативную память и не может использовать файл подкачки. Некоторые части ваших изображений могут оказаться поврежденными. Сохраните файлы под другими именами, перезапустите GIMP и проверьте путь к файлу подкачки в параметрах программы." +msgid "" +"Unable to open swap file. GIMP has run out of memory and cannot use the swap " +"file. Some parts of your images may be corrupted. Try to save your work " +"using different filenames, restart GIMP and check the location of the swap " +"directory in your Preferences." +msgstr "" +"Невозможно открыть файл подкачки. GIMP использовал всю доступную оперативную " +"память и не может использовать файл подкачки. Некоторые части ваших " +"изображений могут оказаться поврежденными. Сохраните файлы под другими " +"именами, перезапустите GIMP и проверьте путь к файлу подкачки в параметрах " +"программы." #: ../app/base/tile-swap.c:725 #, c-format @@ -6003,23 +5970,17 @@ msgctxt "handedness" msgid "Right-handed" msgstr "Для правшей" -#: ../app/config/gimpconfig-file.c:67 -#: ../app/core/gimpbrushgenerated-save.c:62 -#: ../app/core/gimpcurve-save.c:52 -#: ../app/core/gimpgradient-save.c:50 -#: ../app/core/gimpgradient-save.c:144 -#: ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:243 -#: ../app/tools/gimpcurvestool.c:702 -#: ../app/tools/gimplevelstool.c:800 -#: ../app/vectors/gimpvectors-export.c:81 +#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 +#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 +#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 +#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:702 +#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:422 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "Невозможно открыть '%s' для записи: %s" -#: ../app/config/gimpconfig-file.c:78 -#: ../app/config/gimpconfig-file.c:101 +#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101 #, c-format msgid "Error writing '%s': %s" msgstr "Ошибка при записи файла '%s': %s" @@ -6031,25 +5992,38 @@ msgstr "Ошибка при чтении файла '%s': %s" #: ../app/config/gimpconfig-file.c:131 #, c-format -msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'." -msgstr "Произошла ошибка при чтении файла '%s'. Будут использованы параметры по умолчанию. Резервная копия вашей конфигурации была создана в '%s'." +msgid "" +"There was an error parsing your '%s' file. Default values will be used. A " +"backup of your configuration has been created at '%s'." +msgstr "" +"Произошла ошибка при чтении файла '%s'. Будут использованы параметры по " +"умолчанию. Резервная копия вашей конфигурации была создана в '%s'." #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should #. * be marked for translation. #. #: ../app/config/gimprc-blurbs.h:13 -msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"." -msgstr "Если включено, изображение становится активным, когда его окно получает фокус. Это полезно в работе с оконными менеджерами, в которых для придания фокуса окну его нужно щёлкнуть мышкой." +msgid "" +"When enabled, an image will become the active image when its image window " +"receives the focus. This is useful for window managers using \"click to focus" +"\"." +msgstr "" +"Если включено, изображение становится активным, когда его окно получает " +"фокус. Это полезно в работе с оконными менеджерами, в которых для придания " +"фокуса окну его нужно щёлкнуть мышкой." -#: ../app/config/gimprc-blurbs.h:23 -#: ../app/config/gimprc-blurbs.h:28 +#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 msgid "Sets the dynamics search path." msgstr "" #: ../app/config/gimprc-blurbs.h:33 -msgid "Sets the canvas padding color used if the padding mode is set to custom color." -msgstr "Определяет цвет фона окна вокруг изображения, если в режиме заливки фона окна указано \"Выбранный цвет\"." +msgid "" +"Sets the canvas padding color used if the padding mode is set to custom " +"color." +msgstr "" +"Определяет цвет фона окна вокруг изображения, если в режиме заливки фона " +"окна указано \"Выбранный цвет\"." #: ../app/config/gimprc-blurbs.h:37 msgid "Specifies how the area around the image should be drawn." @@ -6076,24 +6050,47 @@ msgid "Sets the handedness for cursor positioning." msgstr "Устанавливает направление стрелки курсора" #: ../app/config/gimprc-blurbs.h:58 -msgid "Context-dependent mouse pointers are helpful. They are enabled by default. However, they require overhead that you may want to do without." -msgstr "Значок курсора, меняющийся в зависимости от выбранного инструмента — это очень удобно. Опция включена по умолчанию." +msgid "" +"Context-dependent mouse pointers are helpful. They are enabled by default. " +"However, they require overhead that you may want to do without." +msgstr "" +"Значок курсора, меняющийся в зависимости от выбранного инструмента — это " +"очень удобно. Опция включена по умолчанию." #: ../app/config/gimprc-blurbs.h:74 -msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen." -msgstr "Если включено, каждый пиксел изображения соответствует экранному пикселу." +msgid "" +"When enabled, this will ensure that each pixel of an image gets mapped to a " +"pixel on the screen." +msgstr "" +"Если включено, каждый пиксел изображения соответствует экранному пикселу." #: ../app/config/gimprc-blurbs.h:96 msgid "This is the distance in pixels where Guide and Grid snapping activates." -msgstr "Это расстояние в пикселах, на котором срабатывает функция прилипания к сетке и направляющим." +msgstr "" +"Это расстояние в пикселах, на котором срабатывает функция прилипания к сетке " +"и направляющим." #: ../app/config/gimprc-blurbs.h:112 -msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm. The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold." -msgstr "Такие инструменты, как «Заливка» или «Свободное выделение», при работе используют алгоритм зернового заполнения. Зерновое заполнение начинается с изначально выбранного пиксела и продолжается до тех пор, пока разница между изначально выбранным и заполняемым пикселами не превысит определенного порога. Число, указываемое здесь, определяет этот порог по умолчанию." +msgid "" +"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " +"algorithm. The seed fill starts at the initially selected pixel and " +"progresses in all directions until the difference of pixel intensity from " +"the original is greater than a specified threshold. This value represents " +"the default threshold." +msgstr "" +"Такие инструменты, как «Заливка» или «Свободное выделение», при работе " +"используют алгоритм зернового заполнения. Зерновое заполнение начинается с " +"изначально выбранного пиксела и продолжается до тех пор, пока разница между " +"изначально выбранным и заполняемым пикселами не превысит определенного " +"порога. Число, указываемое здесь, определяет этот порог по умолчанию." #: ../app/config/gimprc-blurbs.h:125 -msgid "The window type hint that is set on dock windows and the toolbox window. This may affect the way your window manager decorates and handles these windows." -msgstr "От этого параметра зависит то, какой вид оконный менеджер придаст панелям." +msgid "" +"The window type hint that is set on dock windows and the toolbox window. " +"This may affect the way your window manager decorates and handles these " +"windows." +msgstr "" +"От этого параметра зависит то, какой вид оконный менеджер придаст панелям." #: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected brush will be used for all tools." @@ -6124,12 +6121,19 @@ msgid "Sets the text to appear in image window titles." msgstr "Установите форму текста, отображающегося в заголовке окна изображения" #: ../app/config/gimprc-blurbs.h:200 -msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1." -msgstr "Если включено, масштаб открываемого изображения установлен по размеру окна или в масштабе 1:1." +msgid "" +"When enabled, this will ensure that the full image is visible after a file " +"is opened, otherwise it will be displayed with a scale of 1:1." +msgstr "" +"Если включено, масштаб открываемого изображения установлен по размеру окна " +"или в масштабе 1:1." #: ../app/config/gimprc-blurbs.h:204 -msgid "Sets the level of interpolation used for scaling and other transformations." -msgstr "Установить уровень интерполяции, используемый при масштабировании и подобных изменениях." +msgid "" +"Sets the level of interpolation used for scaling and other transformations." +msgstr "" +"Установить уровень интерполяции, используемый при масштабировании и подобных " +"изменениях." #: ../app/config/gimprc-blurbs.h:211 msgid "Specifies the language to use for the user interface." @@ -6140,31 +6144,55 @@ msgid "How many recently opened image filenames to keep on the File menu." msgstr "Количество названий ранее открывавшихся файлов, отображаемых в меню." #: ../app/config/gimprc-blurbs.h:217 -msgid "Speed of marching ants in the selection outline. This value is in milliseconds (less time indicates faster marching)." +msgid "" +"Speed of marching ants in the selection outline. This value is in " +"milliseconds (less time indicates faster marching)." msgstr "" "Скорость муравьиной дорожки в выделенной области. Значение указывается\n" "в миллисекундах (чем меньше значение, тем быстрее движется граница\n" "выделенной области)." #: ../app/config/gimprc-blurbs.h:221 -msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here." -msgstr "При попытке создать файл, размер которого превышает указанное здесь значение, GIMP предупредит вас об этом." +msgid "" +"GIMP will warn the user if an attempt is made to create an image that would " +"take more memory than the size specified here." +msgstr "" +"При попытке создать файл, размер которого превышает указанное здесь " +"значение, GIMP предупредит вас об этом." #: ../app/config/gimprc-blurbs.h:231 -msgid "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Установить горизонтальное разрешение монитора в точках на дюйм. При нулевом значении устанавливается системное значение." +msgid "" +"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Установить горизонтальное разрешение монитора в точках на дюйм. При нулевом " +"значении устанавливается системное значение." #: ../app/config/gimprc-blurbs.h:236 -msgid "Sets the monitor's vertical resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Установить вертикальное разрешение монитора в точках на дюйм. При нулевом значении устанавливается системное значение." +msgid "" +"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Установить вертикальное разрешение монитора в точках на дюйм. При нулевом " +"значении устанавливается системное значение." #: ../app/config/gimprc-blurbs.h:241 -msgid "If enabled, the move tool sets the edited layer or path as active. This used to be the default behaviour in older versions." -msgstr "Если включено, инструмент «Перемещение» делает активным перемещаемый слой или контур. В прошлых версиях такое поведение было включено по умолчанию." +msgid "" +"If enabled, the move tool sets the edited layer or path as active. This " +"used to be the default behaviour in older versions." +msgstr "" +"Если включено, инструмент «Перемещение» делает активным перемещаемый слой " +"или контур. В прошлых версиях такое поведение было включено по умолчанию." #: ../app/config/gimprc-blurbs.h:245 -msgid "Sets the size of the navigation preview available in the lower right corner of the image window." -msgstr "Установить размер окна навигации, находящегося в правом нижнем углу окна изображения." +msgid "" +"Sets the size of the navigation preview available in the lower right corner " +"of the image window." +msgstr "" +"Установить размер окна навигации, находящегося в правом нижнем углу окна " +"изображения." #: ../app/config/gimprc-blurbs.h:249 msgid "Sets how many processors GIMP should try to use simultaneously." @@ -6172,15 +6200,32 @@ msgstr "Установить количество процессоров, исп #: ../app/config/gimprc-blurbs.h:262 #, fuzzy -msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint. This means painting with large brushes should be more accurate, but it may be slower. Conversely, on some X servers enabling this option results in faster painting." -msgstr "Если включено, X-сервер определяет позицию мыши после каждого движения. Это означает, что рисование большими кистями будет более точным, но медленным. Однако на некоторых Х-серверах включение этой опции обеспечивает более быструю работу." +msgid "" +"When enabled, the X server is queried for the mouse's current position on " +"each motion event, rather than relying on the position hint. This means " +"painting with large brushes should be more accurate, but it may be slower. " +"Conversely, on some X servers enabling this option results in faster " +"painting." +msgstr "" +"Если включено, X-сервер определяет позицию мыши после каждого движения. Это " +"означает, что рисование большими кистями будет более точным, но медленным. " +"Однако на некоторых Х-серверах включение этой опции обеспечивает более " +"быструю работу." #: ../app/config/gimprc-blurbs.h:278 -msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images." -msgstr "Указывает, надо ли создавать миниатюру слоев и каналов. Миниатюра слоев и каналов — приятная вещь, но ее использование может существенно замедлить работу с большими изображениями." +msgid "" +"Sets whether GIMP should create previews of layers and channels. Previews in " +"the layers and channels dialog are nice to have but they can slow things " +"down when working with large images." +msgstr "" +"Указывает, надо ли создавать миниатюру слоев и каналов. Миниатюра слоев и " +"каналов — приятная вещь, но ее использование может существенно замедлить " +"работу с большими изображениями." #: ../app/config/gimprc-blurbs.h:283 -msgid "Sets the preview size used for layers and channel previews in newly created dialogs." +msgid "" +"Sets the preview size used for layers and channel previews in newly created " +"dialogs." msgstr "Устанавливает размер миниатюры слоев и каналов." #: ../app/config/gimprc-blurbs.h:287 @@ -6188,24 +6233,33 @@ msgid "Sets the default quick mask color." msgstr "" #: ../app/config/gimprc-blurbs.h:290 -msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes." +msgid "" +"When enabled, the image window will automatically resize itself whenever the " +"physical image size changes." msgstr "Размер окна автоматически изменяется при масштабировании изображения." #: ../app/config/gimprc-blurbs.h:294 -msgid "When enabled, the image window will automatically resize itself when zooming into and out of images." -msgstr "Размер окна автоматически изменяется при масштабировании вида изображения." +msgid "" +"When enabled, the image window will automatically resize itself when zooming " +"into and out of images." +msgstr "" +"Размер окна автоматически изменяется при масштабировании вида изображения." #: ../app/config/gimprc-blurbs.h:298 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "Восстанавливать последнюю сохраненную позицию окон при каждом запуске." #: ../app/config/gimprc-blurbs.h:301 -msgid "Remember the current tool, pattern, color, and brush across GIMP sessions." +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." msgstr "Запомнить текущие инструменты, текстуры, цвета и кисти." #: ../app/config/gimprc-blurbs.h:305 -msgid "Keep a permanent record of all opened and saved files in the Recent Documents list." -msgstr "Добавлять все открываемые и сохраняемые файлы в список недавних изображений." +msgid "" +"Keep a permanent record of all opened and saved files in the Recent " +"Documents list." +msgstr "" +"Добавлять все открываемые и сохраняемые файлы в список недавних изображений." #: ../app/config/gimprc-blurbs.h:309 msgid "Save the positions and sizes of the main dialogs when GIMP exits." @@ -6216,52 +6270,100 @@ msgid "Save the tool options when GIMP exits." msgstr "Сохранить параметры инструментов при выходе из GIMP." #: ../app/config/gimprc-blurbs.h:318 -msgid "When enabled, all paint tools will show a preview of the current brush's outline." -msgstr "Если включено, все инструменты для рисования показывают очертания активной кисти." +msgid "" +"When enabled, all paint tools will show a preview of the current brush's " +"outline." +msgstr "" +"Если включено, все инструменты для рисования показывают очертания активной " +"кисти." #: ../app/config/gimprc-blurbs.h:322 -msgid "When enabled, dialogs will show a help button that gives access to the related help page. Without this button, the help page can still be reached by pressing F1." -msgstr "Если включено, во всех диалогах отображается кнопка «Справка», по нажатию которой вызывается система помощи. Если выключено, справочную систему можно вызвать нажатием клавиши F1." +msgid "" +"When enabled, dialogs will show a help button that gives access to the " +"related help page. Without this button, the help page can still be reached " +"by pressing F1." +msgstr "" +"Если включено, во всех диалогах отображается кнопка «Справка», по нажатию " +"которой вызывается система помощи. Если выключено, справочную систему можно " +"вызвать нажатием клавиши F1." #: ../app/config/gimprc-blurbs.h:327 -msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool." +msgid "" +"When enabled, the mouse pointer will be shown over the image while using a " +"paint tool." msgstr "Если включено, при рисовании виден курсор инструмента." #: ../app/config/gimprc-blurbs.h:331 -msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command." -msgstr "Если включено, панель меню по умолчанию отображается. Это также можно сделать командой «Вид > Показывать панель меню»." +msgid "" +"When enabled, the menubar is visible by default. This can also be toggled " +"with the \"View->Show Menubar\" command." +msgstr "" +"Если включено, панель меню по умолчанию отображается. Это также можно " +"сделать командой «Вид > Показывать панель меню»." #: ../app/config/gimprc-blurbs.h:335 -msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command." -msgstr "Если включено, линейки по умолчанию отображаются. Это также можно сделать командой «Вид > Показывать линейки»." +msgid "" +"When enabled, the rulers are visible by default. This can also be toggled " +"with the \"View->Show Rulers\" command." +msgstr "" +"Если включено, линейки по умолчанию отображаются. Это также можно сделать " +"командой «Вид > Показывать линейки»." #: ../app/config/gimprc-blurbs.h:339 -msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command." -msgstr "Если включено, полосы прокрутки по умолчанию отображаются. Это также можно сделать командой «Вид > Показывать полосы прокрутки»." +msgid "" +"When enabled, the scrollbars are visible by default. This can also be " +"toggled with the \"View->Show Scrollbars\" command." +msgstr "" +"Если включено, полосы прокрутки по умолчанию отображаются. Это также можно " +"сделать командой «Вид > Показывать полосы прокрутки»." #: ../app/config/gimprc-blurbs.h:343 -msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command." -msgstr "Если включено, строка состояния по умолчанию отображается. Это также можно сделать командой «Вид > Показывать строку состояния»." +msgid "" +"When enabled, the statusbar is visible by default. This can also be toggled " +"with the \"View->Show Statusbar\" command." +msgstr "" +"Если включено, строка состояния по умолчанию отображается. Это также можно " +"сделать командой «Вид > Показывать строку состояния»." #: ../app/config/gimprc-blurbs.h:347 -msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command." -msgstr "Если включено, выделение области по умолчанию отображается. Это также можно сделать командой «Вид > Показывать выделение»." +msgid "" +"When enabled, the selection is visible by default. This can also be toggled " +"with the \"View->Show Selection\" command." +msgstr "" +"Если включено, выделение области по умолчанию отображается. Это также можно " +"сделать командой «Вид > Показывать выделение»." #: ../app/config/gimprc-blurbs.h:351 -msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command." -msgstr "Если включено, граница слоя по умолчанию отображается. Это также можно сделать командой «Вид > Показывать границы слоя»." +msgid "" +"When enabled, the layer boundary is visible by default. This can also be " +"toggled with the \"View->Show Layer Boundary\" command." +msgstr "" +"Если включено, граница слоя по умолчанию отображается. Это также можно " +"сделать командой «Вид > Показывать границы слоя»." #: ../app/config/gimprc-blurbs.h:355 -msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command." -msgstr "Если включено, направляющие по умолчанию отображаются. Это также можно сделать командой «Вид > Показывать направляющие»." +msgid "" +"When enabled, the guides are visible by default. This can also be toggled " +"with the \"View->Show Guides\" command." +msgstr "" +"Если включено, направляющие по умолчанию отображаются. Это также можно " +"сделать командой «Вид > Показывать направляющие»." #: ../app/config/gimprc-blurbs.h:359 -msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command." -msgstr "Если включено, сетка по умолчанию отображается. Это также можно сделать командой «Вид > Показывать сетку»." +msgid "" +"When enabled, the grid is visible by default. This can also be toggled with " +"the \"View->Show Grid\" command." +msgstr "" +"Если включено, сетка по умолчанию отображается. Это также можно сделать " +"командой «Вид > Показывать сетку»." #: ../app/config/gimprc-blurbs.h:363 -msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command." -msgstr "Если включено, образцовые точки по умолчанию отображаются. Это также можно сделать командой «Вид > Показывать образцовые точки»." +msgid "" +"When enabled, the sample points are visible by default. This can also be " +"toggled with the \"View->Show Sample Points\" command." +msgstr "" +"Если включено, образцовые точки по умолчанию отображаются. Это также можно " +"сделать командой «Вид > Показывать образцовые точки»." #: ../app/config/gimprc-blurbs.h:367 msgid "Show a tooltip when the pointer hovers over an item." @@ -6280,16 +6382,31 @@ msgid "What to do when the space bar is pressed in the image window." msgstr "Что делать, когда в окне изображения нажимают пробел." #: ../app/config/gimprc-blurbs.h:379 -msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS. For these reasons, it may be desirable to put your swap file in \"/tmp\"." -msgstr "Устанавливает местонахождение файла подкачки. GIMP использует мозаичный тип подкачки. Обратите внимание на то, что файл подкачки может стать очень большим, если работать с большими изображениями. Кроме того, работа может замедлиться, если файл подкачки создан в папке, которая смонтирована поверх NFS. В этом случае, возможно, лучше всего поместить файл подкачки в \"/tmp\"." +msgid "" +"Sets the swap file location. GIMP uses a tile based memory allocation " +"scheme. The swap file is used to quickly and easily swap tiles out to disk " +"and back in. Be aware that the swap file can easily get very large if GIMP " +"is used with large images. Also, things can get horribly slow if the swap " +"file is created on a folder that is mounted over NFS. For these reasons, it " +"may be desirable to put your swap file in \"/tmp\"." +msgstr "" +"Устанавливает местонахождение файла подкачки. GIMP использует мозаичный тип " +"подкачки. Обратите внимание на то, что файл подкачки может стать очень " +"большим, если работать с большими изображениями. Кроме того, работа может " +"замедлиться, если файл подкачки создан в папке, которая смонтирована поверх " +"NFS. В этом случае, возможно, лучше всего поместить файл подкачки в \"/tmp\"." #: ../app/config/gimprc-blurbs.h:388 msgid "When enabled, menus can be torn off." msgstr "Если включено, меню можно отцепить от панели инструментов." #: ../app/config/gimprc-blurbs.h:391 -msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted." -msgstr "Если включено, комбинации клавиш для быстрого доступа к подсвеченному пункту меню можно менять «на лету»." +msgid "" +"When enabled, you can change keyboard shortcuts for menu items by hitting a " +"key combination while the menu item is highlighted." +msgstr "" +"Если включено, комбинации клавиш для быстрого доступа к подсвеченному пункту " +"меню можно менять «на лету»." #: ../app/config/gimprc-blurbs.h:395 msgid "Save changed keyboard shortcuts when GIMP exits." @@ -6300,24 +6417,45 @@ msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Восстановить сохраненные комбинации клавиш при запуске GIMP." #: ../app/config/gimprc-blurbs.h:401 -msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP. Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users." -msgstr "Определяет временный каталог. Здесь будут содержаться временные файлы, с которыми работает GIMP. Большинство из них будет удаляться сразу после окончания работы с GIMP, однако некоторые останутся, поэтому не стоит давать другим пользователям права на просмотр и изменение этого каталога." +msgid "" +"Sets the folder for temporary storage. Files will appear here during the " +"course of running GIMP. Most files will disappear when GIMP exits, but some " +"files are likely to remain, so it is best if this folder not be one that is " +"shared by other users." +msgstr "" +"Определяет временный каталог. Здесь будут содержаться временные файлы, с " +"которыми работает GIMP. Большинство из них будет удаляться сразу после " +"окончания работы с GIMP, однако некоторые останутся, поэтому не стоит давать " +"другим пользователям права на просмотр и изменение этого каталога." #: ../app/config/gimprc-blurbs.h:413 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "Установить размер миниатюры в диалоге открытия файлов." #: ../app/config/gimprc-blurbs.h:416 -msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here." -msgstr "Если размер файла предпросмотра окажется меньше указанного здесь значения, то предпросмотр в диалоге открытия будет обновлен автоматически." +msgid "" +"The thumbnail in the Open dialog will be automatically updated if the file " +"being previewed is smaller than the size set here." +msgstr "" +"Если размер файла предпросмотра окажется меньше указанного здесь значения, " +"то предпросмотр в диалоге открытия будет обновлен автоматически." #: ../app/config/gimprc-blurbs.h:420 -msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise. If you have a lot of RAM, you may want to set this to a higher value." -msgstr "Когда объем растровых данных превышает установленное значение, GIMP начинает сохранять данные на диск. Это несколько замедляет работу, но позволяет обрабатывать данные, не помещающиеся в оперативную память. Если оперативной памяти много, это значение лучше увеличить." +msgid "" +"When the amount of pixel data exceeds this limit, GIMP will start to swap " +"tiles to disk. This is a lot slower but it makes it possible to work on " +"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " +"you may want to set this to a higher value." +msgstr "" +"Когда объем растровых данных превышает установленное значение, GIMP начинает " +"сохранять данные на диск. Это несколько замедляет работу, но позволяет " +"обрабатывать данные, не помещающиеся в оперативную память. Если оперативной " +"памяти много, это значение лучше увеличить." #: ../app/config/gimprc-blurbs.h:426 msgid "Show the current foreground and background colors in the toolbox." -msgstr "Показывать текущий цвет переднего и заднего плана в панели инструментов." +msgstr "" +"Показывать текущий цвет переднего и заднего плана в панели инструментов." #: ../app/config/gimprc-blurbs.h:429 msgid "Show the currently selected brush, pattern and gradient in the toolbox." @@ -6336,16 +6474,30 @@ msgid "Sets the size of the checkerboard used to display transparency." msgstr "Устанавливает размер клеток, отображающих прозрачность." #: ../app/config/gimprc-blurbs.h:444 -msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened." -msgstr "Если включено, файлы, не изменившиеся после загрузки, не будут сохраняться." +msgid "" +"When enabled, GIMP will not save an image if it has not been changed since " +"it was opened." +msgstr "" +"Если включено, файлы, не изменившиеся после загрузки, не будут сохраняться." #: ../app/config/gimprc-blurbs.h:448 -msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached." -msgstr "Устанавливает минимальное количество возможных отмен. Большее количество отмен возможно до тех пор, пока не использована вся память, отведенная для этого." +msgid "" +"Sets the minimal number of operations that can be undone. More undo levels " +"are kept available until the undo-size limit is reached." +msgstr "" +"Устанавливает минимальное количество возможных отмен. Большее количество " +"отмен возможно до тех пор, пока не использована вся память, отведенная для " +"этого." #: ../app/config/gimprc-blurbs.h:452 -msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone." -msgstr "Устанавливает предельное значение памяти, используемый для отмен в каждом изображении. Предел может быть превышен для использования количества отмен, указанного в настройках." +msgid "" +"Sets an upper limit to the memory that is used per image to keep operations " +"on the undo stack. Regardless of this setting, at least as many undo-levels " +"as configured can be undone." +msgstr "" +"Устанавливает предельное значение памяти, используемый для отмен в каждом " +"изображении. Предел может быть превышен для использования количества отмен, " +"указанного в настройках." #: ../app/config/gimprc-blurbs.h:457 msgid "Sets the size of the previews in the Undo History." @@ -6355,10 +6507,8 @@ msgstr "Устанавливает размер просмотра для ист msgid "When enabled, pressing F1 will open the help browser." msgstr "Когда эта опция включена, кнопкой F1 вызывается система помощи." -#: ../app/config/gimprc-deserialize.c:135 -#: ../app/core/gimp-modules.c:136 -#: ../app/core/gimp-units.c:167 -#: ../app/gui/session.c:286 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "неисправимая ошибка лекс.анализа" @@ -6753,51 +6903,43 @@ msgctxt "undo-type" msgid "Quick Mask" msgstr "Быстрая маска" -#: ../app/core/core-enums.c:844 -#: ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 #: ../app/core/gimpimage-grid.c:63 msgctxt "undo-type" msgid "Grid" msgstr "Сетка" -#: ../app/core/core-enums.c:845 -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876 msgctxt "undo-type" msgid "Guide" msgstr "Направляющая" -#: ../app/core/core-enums.c:846 -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877 msgctxt "undo-type" msgid "Sample Point" msgstr "Образцовая точка" -#: ../app/core/core-enums.c:847 -#: ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Слой/Канал" -#: ../app/core/core-enums.c:848 -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Изменение слоя/канала" -#: ../app/core/core-enums.c:849 -#: ../app/core/core-enums.c:880 +#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880 msgctxt "undo-type" msgid "Selection mask" msgstr "Маска выделения" -#: ../app/core/core-enums.c:850 -#: ../app/core/core-enums.c:884 +#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Item visibility" msgstr "Видимость объекта" -#: ../app/core/core-enums.c:851 -#: ../app/core/core-enums.c:885 +#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "(Рас)соединение объекта" @@ -6807,8 +6949,7 @@ msgctxt "undo-type" msgid "Item properties" msgstr "Свойства элемента" -#: ../app/core/core-enums.c:853 -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Move item" msgstr "Перемещение объекта" @@ -6828,20 +6969,17 @@ msgctxt "undo-type" msgid "Add layer" msgstr "Добавление слоя" -#: ../app/core/core-enums.c:857 -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896 msgctxt "undo-type" msgid "Add layer mask" msgstr "Добавление маски слоя" -#: ../app/core/core-enums.c:858 -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Применение маски слоя" -#: ../app/core/core-enums.c:859 -#: ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Плавающее выделение в слой" @@ -6856,14 +6994,12 @@ msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Прицепить плавающее выделение" -#: ../app/core/core-enums.c:862 -#: ../app/core/gimp-edit.c:293 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "Вставить" -#: ../app/core/core-enums.c:863 -#: ../app/core/gimp-edit.c:534 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "Вырезать" @@ -6873,27 +7009,23 @@ msgctxt "undo-type" msgid "Text" msgstr "Текст" -#: ../app/core/core-enums.c:865 -#: ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 #: ../app/core/gimpdrawable-transform.c:589 msgctxt "undo-type" msgid "Transform" msgstr "Преобразование" -#: ../app/core/core-enums.c:866 -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Paint" msgstr "Рисование" -#: ../app/core/core-enums.c:867 -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Attach parasite" msgstr "Добавить паразита" -#: ../app/core/core-enums.c:868 -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Remove parasite" msgstr "Убрать паразита" @@ -7163,17 +7295,14 @@ msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Дрожание" -#: ../app/core/gimp-contexts.c:154 -#: ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 -#: ../app/menus/menus.c:464 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "Невозможно удалить \"%s\": %s" -#: ../app/core/gimp-edit.c:190 -#: ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "Вставленный слой" @@ -7243,27 +7372,33 @@ msgstr "tips-locale:ru" #: ../app/core/gimp-user-install.c:173 #, c-format -msgid "It seems you have used GIMP %s before. GIMP will now migrate your user settings to '%s'." -msgstr "Похоже, вы уже использовали GIMP %s ранее. GIMP перенесёт ваши пользовательские предпочтения в '%s'." +msgid "" +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." +msgstr "" +"Похоже, вы уже использовали GIMP %s ранее. GIMP перенесёт ваши " +"пользовательские предпочтения в '%s'." #: ../app/core/gimp-user-install.c:178 #, c-format -msgid "It appears that you are using GIMP for the first time. GIMP will now create a folder named '%s' and copy some files to it." -msgstr "Похоже, что вы впервые используете GIMP. Сейчас программа создаст каталог с именем '%s' и скопирует туда некоторые файлы." +msgid "" +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." +msgstr "" +"Похоже, что вы впервые используете GIMP. Сейчас программа создаст каталог с " +"именем '%s' и скопирует туда некоторые файлы." #: ../app/core/gimp-user-install.c:329 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "Копирование файла '%s' из '%s'..." -#: ../app/core/gimp-user-install.c:344 -#: ../app/core/gimp-user-install.c:370 +#: ../app/core/gimp-user-install.c:344 ../app/core/gimp-user-install.c:370 #, c-format msgid "Creating folder '%s'..." msgstr "Создание папки '%s'..." -#: ../app/core/gimp-user-install.c:355 -#: ../app/core/gimp-user-install.c:381 +#: ../app/core/gimp-user-install.c:355 ../app/core/gimp-user-install.c:381 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Не удается создать папку '%s': %s" @@ -7287,8 +7422,7 @@ msgid "Parasites" msgstr "Паразиты" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2743 #: ../app/tools/gimppaintoptions-gui.c:203 msgid "Dynamics" msgstr "Динамика рисования" @@ -7299,8 +7433,7 @@ msgid "Fonts (this may take a while)" msgstr "Шрифты (их загрузка может длиться долго)" #. initialize the module list -#: ../app/core/gimp.c:993 -#: ../app/dialogs/preferences-dialog.c:2775 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2775 msgid "Modules" msgstr "Модули" @@ -7342,22 +7475,19 @@ msgstr "Неисправимая ошибка разбора файла кист msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "Неисправимая ошибка разбора файла кисти '%s': неизвестная версия %d." -#: ../app/core/gimpbrush-load.c:273 -#: ../app/core/gimpbrush-load.c:393 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 #: ../app/core/gimpbrush-load.c:727 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "Неисправимая ошибка разбора файла кисти '%s': файл, вероятно, оборван." -#: ../app/core/gimpbrush-load.c:281 -#: ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Недопустимая строка UTF-8 в файле кисти '%s'." -#: ../app/core/gimpbrush-load.c:288 -#: ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 #: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" @@ -7369,19 +7499,24 @@ msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Неисправимая ошибка разбора файла кисти '%s': неподдерживаемая глубина цвета кисти %d\n" +"Неисправимая ошибка разбора файла кисти '%s': неподдерживаемая глубина цвета " +"кисти %d\n" "Кисти GIMP должны быть в режиме RGBA или градации серого." -#: ../app/core/gimpbrush-load.c:454 -#: ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 #, c-format -msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d." -msgstr "Неисправимая ошибка разбора файла кисти '%s': неизвестная версия формата abr '%d'." +msgid "" +"Fatal parse error in brush file '%s': unable to decode abr format version %d." +msgstr "" +"Неисправимая ошибка разбора файла кисти '%s': неизвестная версия формата abr " +"'%d'." #: ../app/core/gimpbrush-load.c:621 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgstr "Неисправимая ошибка разбора файла кисти '%s': широкие кисти не поддерживаются." +msgstr "" +"Неисправимая ошибка разбора файла кисти '%s': широкие кисти не " +"поддерживаются." #: ../app/core/gimpbrush.c:148 msgid "Brush Spacing" @@ -7394,13 +7529,19 @@ msgstr "Неисправимая ошибка разбора файла кист #: ../app/core/gimpbrushgenerated-load.c:104 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." -msgstr "Неисправимая ошибка разбора файла кисти '%s': неизвестная версия кисти GIMP в строке %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." +msgstr "" +"Неисправимая ошибка разбора файла кисти '%s': неизвестная версия кисти GIMP " +"в строке %d." #: ../app/core/gimpbrushgenerated-load.c:150 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." -msgstr "Неисправимая ошибка разбора файла кисти '%s': неизвестная форма кисти GIMP в строке %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." +msgstr "" +"Неисправимая ошибка разбора файла кисти '%s': неизвестная форма кисти GIMP в " +"строке %d." #: ../app/core/gimpbrushgenerated-load.c:226 #, c-format @@ -7433,18 +7574,15 @@ msgstr "Лучи кисти" msgid "Brush Hardness" msgstr "Жесткость кисти" -#: ../app/core/gimpbrushgenerated.c:159 -#: ../app/paint/gimppaintoptions.c:150 +#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:150 msgid "Brush Aspect Ratio" msgstr "Соотношение сторон кисти" -#: ../app/core/gimpbrushgenerated.c:166 -#: ../app/paint/gimppaintoptions.c:154 +#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:154 msgid "Brush Angle" msgstr "Угол кисти" -#: ../app/core/gimpbrushpipe-load.c:113 -#: ../app/core/gimpbrushpipe-load.c:133 +#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 #: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." @@ -7465,8 +7603,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Прямоугольное закругленное выделение" -#: ../app/core/gimpchannel-select.c:407 -#: ../app/core/gimplayer.c:275 +#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Альфа-канал в выделение" @@ -7517,8 +7654,7 @@ msgctxt "undo-type" msgid "Rotate Channel" msgstr "Вращение канала" -#: ../app/core/gimpchannel.c:279 -#: ../app/core/gimpdrawable-transform.c:904 +#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904 msgctxt "undo-type" msgid "Transform Channel" msgstr "Преобразование канала" @@ -7529,8 +7665,7 @@ msgctxt "undo-type" msgid "Stroke Channel" msgstr "Обвести канал" -#: ../app/core/gimpchannel.c:281 -#: ../app/core/gimpselection.c:582 +#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Канал в выделение" @@ -7623,15 +7758,12 @@ msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Изменение непрозрачности канала" -#: ../app/core/gimpchannel.c:1932 -#: ../app/core/gimpselection.c:154 +#: ../app/core/gimpchannel.c:1932 ../app/core/gimpselection.c:154 msgid "Selection Mask" msgstr "Маска выделенной области" -#: ../app/core/gimpcontext.c:639 -#: ../app/tools/gimppaintoptions-gui.c:111 -#: ../app/widgets/gimpbrushselect.c:177 -#: ../app/widgets/gimplayertreeview.c:284 +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:111 +#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 msgid "Opacity" msgstr "Непрозрачность" @@ -7639,15 +7771,13 @@ msgstr "Непрозрачность" msgid "Paint Mode" msgstr "Режим рисования" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Невозможно удалить '%s': %s" -#: ../app/core/gimpdatafactory.c:428 -#: ../app/core/gimpdatafactory.c:457 -#: ../app/core/gimpdatafactory.c:623 -#: ../app/core/gimpdatafactory.c:645 +#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 +#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 #, c-format msgid "" "Failed to save data:\n" @@ -7658,27 +7788,30 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:537 -#: ../app/core/gimpdatafactory.c:540 -#: ../app/core/gimpitem.c:493 -#: ../app/core/gimpitem.c:496 +#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 +#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496 msgid "copy" msgstr "копия" -#: ../app/core/gimpdatafactory.c:549 -#: ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:505 #, c-format msgid "%s copy" msgstr "Копия %s" #: ../app/core/gimpdatafactory.c:742 #, c-format -msgid "You have a writable data folder configured (%s), but this folder does not exist. Please create the folder or fix your configuation in the Preferences dialog's 'Folders' section." +msgid "" +"You have a writable data folder configured (%s), but this folder does not " +"exist. Please create the folder or fix your configuation in the Preferences " +"dialog's 'Folders' section." msgstr "" #: ../app/core/gimpdatafactory.c:763 #, c-format -msgid "You have a writable data folder configured, but this folder is not part of your data search path. You probably edited the gimprc file manually, please fix it in the Preferences dialog's 'Folders' section." +msgid "" +"You have a writable data folder configured, but this folder is not part of " +"your data search path. You probably edited the gimprc file manually, please " +"fix it in the Preferences dialog's 'Folders' section." msgstr "" #: ../app/core/gimpdatafactory.c:773 @@ -7729,8 +7862,7 @@ msgctxt "undo-type" msgid "Colorize" msgstr "Тонирование" -#: ../app/core/gimpdrawable-curves.c:162 -#: ../app/core/gimpdrawable-curves.c:179 +#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179 msgctxt "undo-type" msgid "Curves" msgstr "Кривые" @@ -7759,13 +7891,11 @@ msgstr "Тон-Насыщенность" msgid "Hue_Saturation" msgstr "Тон_Насыщенность" -#: ../app/core/gimpdrawable-invert.c:54 -#: ../app/core/gimpdrawable-invert.c:62 +#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62 msgid "Invert" msgstr "Инвертировать" -#: ../app/core/gimpdrawable-levels.c:153 -#: ../app/core/gimpdrawable-levels.c:169 +#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 #: ../app/tools/gimplevelstool.c:150 msgid "Levels" msgstr "Уровни" @@ -7777,14 +7907,12 @@ msgid "Offset Drawable" msgstr "Сдвиг изображения" #: ../app/core/gimpdrawable-posterize.c:69 -#: ../app/core/gimpdrawable-posterize.c:79 -#: ../app/tools/gimpposterizetool.c:84 +#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 msgid "Posterize" msgstr "Постеризация" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 -#: ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Недостаточно точек для обводки" @@ -7799,8 +7927,7 @@ msgid "Render Stroke" msgstr "Отрисовка обводки" #: ../app/core/gimpdrawable-threshold.c:70 -#: ../app/core/gimpdrawable-threshold.c:81 -#: ../app/tools/gimpblendoptions.c:275 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 #: ../app/tools/gimpbucketfilloptions.c:285 #: ../app/tools/gimpregionselectoptions.c:216 #: ../app/tools/gimpthresholdtool.c:90 @@ -7817,8 +7944,7 @@ msgctxt "undo-type" msgid "Rotate" msgstr "Вращение" -#: ../app/core/gimpdrawable-transform.c:902 -#: ../app/core/gimplayer.c:274 +#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274 msgctxt "undo-type" msgid "Transform Layer" msgstr "Преобразование слоя" @@ -7836,18 +7962,18 @@ msgstr "Масштабирование" msgid "Output type" msgstr "Тип выхода" -#: ../app/core/gimpgradient-load.c:72 -#: ../app/core/gimpgradient-load.c:97 -#: ../app/core/gimpgradient-load.c:118 -#: ../app/core/gimpgradient-load.c:169 +#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 +#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 #, c-format msgid "Fatal parse error in gradient file '%s': Read error in line %d." -msgstr "Неисправимая ошибка разбора файла градиента '%s': ошибка чтения в строке %d" +msgstr "" +"Неисправимая ошибка разбора файла градиента '%s': ошибка чтения в строке %d" #: ../app/core/gimpgradient-load.c:82 #, c-format msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." -msgstr "Неисправимая ошибка разбора файла градиента '%s': это не файл градиента GIMP." +msgstr "" +"Неисправимая ошибка разбора файла градиента '%s': это не файл градиента GIMP." #: ../app/core/gimpgradient-load.c:110 #, c-format @@ -7859,17 +7985,18 @@ msgstr "Недопустимая строка UTF-8 в файле градиен msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." msgstr "Неисправимая ошибка разбора файла '%s': файл повреждён в строке %d." -#: ../app/core/gimpgradient-load.c:219 -#: ../app/core/gimpgradient-load.c:230 +#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 #, c-format msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." -msgstr "Неисправимая ошибка разбора файла градиента '%s': повреждённый сегмент %d в строке %d." +msgstr "" +"Неисправимая ошибка разбора файла градиента '%s': повреждённый сегмент %d в " +"строке %d." -#: ../app/core/gimpgradient-load.c:242 -#: ../app/core/gimpgradient-load.c:256 +#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256 #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." -msgstr "Файл градиента '%s' повреждён: сегменты не находятся в промежутке от 0 до 1." +msgstr "" +"Файл градиента '%s' повреждён: сегменты не находятся в промежутке от 0 до 1." #: ../app/core/gimpgradient-load.c:336 #, c-format @@ -7890,7 +8017,8 @@ msgid "The foreground color of the grid." msgstr "Цвет переднего плана сетки." #: ../app/core/gimpgrid.c:95 -msgid "The background color of the grid; only used in double dashed line style." +msgid "" +"The background color of the grid; only used in double dashed line style." msgstr "Цвет фона сетки (для стиля \"Двойной пунктир\")" #: ../app/core/gimpgrid.c:101 @@ -7902,12 +8030,17 @@ msgid "Vertical spacing of grid lines." msgstr "Расстояние между вертикальными линиями" #: ../app/core/gimpgrid.c:115 -msgid "Horizontal offset of the first grid line; this may be a negative number." -msgstr "Смещение по горизонтали для первой линии сетки. Значение может быть отрицательным." +msgid "" +"Horizontal offset of the first grid line; this may be a negative number." +msgstr "" +"Смещение по горизонтали для первой линии сетки. Значение может быть " +"отрицательным." #: ../app/core/gimpgrid.c:122 msgid "Vertical offset of the first grid line; this may be a negative number." -msgstr "Смещение по вертикали для первой линии сетки. Значение может быть отрицательным." +msgstr "" +"Смещение по вертикали для первой линии сетки. Значение может быть " +"отрицательным." #: ../app/core/gimpgrouplayer.c:219 msgid "Layer Group" @@ -7963,12 +8096,18 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Установка цветовой карты" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +#, fuzzy +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Установка цветовой карты" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Изменение элемента цветовой карты" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Добавление цвета в цветовую карту" @@ -8005,8 +8144,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Кадрирование изображения" -#: ../app/core/gimpimage-crop.c:132 -#: ../app/core/gimpimage-resize.c:86 +#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86 msgctxt "undo-type" msgid "Resize Image" msgstr "Смена размера изображения" @@ -8056,41 +8194,46 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Сведение видимых слоев" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Сведение изображения" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Невозможно свети изображение, в котором нет видимых слоёв." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Невозможно выполнить сведение в группу слоёв." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Слой, в который должно быть выполнено сведение, заперт" -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Нет видимого слоя, в который можно выполнить сведение." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Сведение с предыдущим" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Сведение группы слоёв" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Сведение видимых контуров" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." -msgstr "Недостаточно видимых контуров для объединения. Должно быть хотя бы два." +msgstr "" +"Недостаточно видимых контуров для объединения. Должно быть хотя бы два." #: ../app/core/gimpimage-new.c:140 msgid "Background" @@ -8121,7 +8264,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Перемещение образцовой точки" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Смена размера изображения" @@ -8168,8 +8311,7 @@ msgctxt "undo-type" msgid "Add Layer" msgstr "Добавление слоя" -#: ../app/core/gimpimage.c:3787 -#: ../app/core/gimpimage.c:3807 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "Удаление слоя" @@ -8184,8 +8326,7 @@ msgctxt "undo-type" msgid "Add Channel" msgstr "Добавление канала" -#: ../app/core/gimpimage.c:4007 -#: ../app/core/gimpimage.c:4020 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "Удаление канала" @@ -8200,8 +8341,7 @@ msgctxt "undo-type" msgid "Remove Path" msgstr "Удаление контура" -#: ../app/core/gimpimagefile.c:697 -#: ../app/dialogs/preferences-dialog.c:1711 +#: ../app/core/gimpimagefile.c:697 ../app/dialogs/preferences-dialog.c:1711 msgid "Folder" msgstr "Каталог" @@ -8234,10 +8374,8 @@ msgid "(Preview may be out of date)" msgstr "(Возможно, миниатюра устарела)" #. pixel size -#: ../app/core/gimpimagefile.c:774 -#: ../app/widgets/gimpimagepropview.c:441 -#: ../app/widgets/gimpsizebox.c:427 -#: ../app/widgets/gimptemplateeditor.c:565 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 +#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" @@ -8245,8 +8383,7 @@ msgstr[0] "%d × %d точка растра" msgstr[1] "%d × %d точки растра" msgstr[2] "%d × %d точек растра" -#: ../app/core/gimpimagefile.c:797 -#: ../app/display/gimpdisplayshell-title.c:317 +#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8269,8 +8406,7 @@ msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Присоединение паразита к объекту" -#: ../app/core/gimpitem.c:1876 -#: ../app/core/gimpitem.c:1883 +#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Удаление паразита из объекта" @@ -8288,9 +8424,10 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Прикрепление плавающего выделения" -#: ../app/core/gimplayer-floating-sel.c:126 -#: ../app/core/gimplayer.c:620 -msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel." +#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." msgstr "" "Невозможно создать новый слой из плавающего\n" "выделения, потому что оно принадлежит\n" @@ -8364,8 +8501,7 @@ msgstr "Cлой невозможно поднять выше." msgid "Layer cannot be lowered more." msgstr "Слой невозможно опустить ниже." -#: ../app/core/gimplayer.c:450 -#: ../app/core/gimplayer.c:1528 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1528 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8465,14 +8601,13 @@ msgstr "Индекс %d" msgid "Unknown type of palette file: %s" msgstr "Неизвестный тип файла палитры: %s" -#: ../app/core/gimppalette-load.c:86 -#: ../app/core/gimppalette-load.c:112 -#: ../app/core/gimppalette-load.c:133 -#: ../app/core/gimppalette-load.c:162 +#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 +#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 #: ../app/core/gimppalette-load.c:238 #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." -msgstr "Неисправимая ошибка разбора файла палитры '%s': ошибка чтения в строке %d." +msgstr "" +"Неисправимая ошибка разбора файла палитры '%s': ошибка чтения в строке %d." #: ../app/core/gimppalette-load.c:96 #, c-format @@ -8486,8 +8621,12 @@ msgstr "Недопустимая строка UTF-8 файле палитры \" #: ../app/core/gimppalette-load.c:149 #, c-format -msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value." -msgstr "Загружается палитра '%s': неправильное число столбцов в строке %d. Используется значение по умолчанию." +msgid "" +"Reading palette file '%s': Invalid number of columns in line %d. Using " +"default value." +msgstr "" +"Загружается палитра '%s': неправильное число столбцов в строке %d. " +"Используется значение по умолчанию." #: ../app/core/gimppalette-load.c:185 #, c-format @@ -8507,30 +8646,33 @@ msgstr "Загружается палитра '%s': в строке %d отсу #: ../app/core/gimppalette-load.c:211 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." -msgstr "Загружается палитра '%s': значение RGB вне допустимого диапазона в строке %d." +msgstr "" +"Загружается палитра '%s': значение RGB вне допустимого диапазона в строке %d." #: ../app/core/gimppalette-load.c:478 #, c-format msgid "Could not read header from palette file '%s'" msgstr "Невозможно прочесть заголовок из файла палитры '%s'" -#: ../app/core/gimppalette-load.c:501 -#: ../app/core/gimppalette-load.c:589 +#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589 #, c-format msgid "Fatal parse error in palette file '%s'" msgstr "Неисправимая ошибка разбора файла палитры '%s'" -#: ../app/core/gimppattern-load.c:85 -#: ../app/core/gimppattern-load.c:131 +#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 #: ../app/core/gimppattern-load.c:162 #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." -msgstr "Неисправимая ошибка разбора файла текстуры '%s': вероятно, файл оборван." +msgstr "" +"Неисправимая ошибка разбора файла текстуры '%s': вероятно, файл оборван." #: ../app/core/gimppattern-load.c:104 #, c-format -msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d." -msgstr "Неисправимая ошибка разбора файла текстуры '%s': неизвестная версия формата %d." +msgid "" +"Fatal parse error in pattern file '%s': Unknown pattern format version %d." +msgstr "" +"Неисправимая ошибка разбора файла текстуры '%s': неизвестная версия формата " +"%d." #: ../app/core/gimppattern-load.c:114 #, c-format @@ -8538,7 +8680,8 @@ msgid "" "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Неисправимая ошибка разбора файла текстуры '%s': неподдерживаемая глубина %d.\n" +"Неисправимая ошибка разбора файла текстуры '%s': неподдерживаемая глубина " +"%d.\n" "Текстуры GIMP должны быть в оттенках серого или RGB." #: ../app/core/gimppattern-load.c:139 @@ -8546,14 +8689,12 @@ msgstr "" msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Недопустимая строка UTF-8 файле текстуры '%s'" -#: ../app/core/gimppdbprogress.c:279 -#: ../app/widgets/gimppdbdialog.c:331 +#: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." msgstr "Не удалось вызвать %s. Возможно, запрашиваемое расширение рухнуло." -#: ../app/core/gimpprogress.c:106 -#: ../app/core/gimpprogress.c:153 +#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 msgid "Please wait" msgstr "Подождите пожалуйста" @@ -8631,8 +8772,13 @@ msgid "Floated Layer" msgstr "Плавающий слой" #: ../app/core/gimpstrokeoptions.c:181 -msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point." -msgstr "Преобразовать острое соединение в фасочное, если острое может расшириться до расстояние больше, чем предел острого, помноженного на толщину линии от актуальной точки соединения." +msgid "" +"Convert a mitered join to a bevelled join if the miter would extend to a " +"distance of more than miter-limit * line-width from the actual join point." +msgstr "" +"Преобразовать острое соединение в фасочное, если острое может расшириться до " +"расстояние больше, чем предел острого, помноженного на толщину линии от " +"актуальной точки соединения." #: ../app/core/gimptemplate.c:129 msgid "The unit used for coordinate display when not in dot-for-dot mode." @@ -8706,8 +8852,7 @@ msgctxt "plural" msgid "percent" msgstr "проценты" -#: ../app/dialogs/about-dialog.c:114 -#: ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 msgid "About GIMP" msgstr "О GIMP" @@ -8761,8 +8906,7 @@ msgid "_Remove unused colors from colormap" msgstr "_Удалить неиспользуемые цвета из цветовой карты" #. dithering -#: ../app/dialogs/convert-dialog.c:234 -#: ../app/tools/gimpblendoptions.c:254 +#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254 msgid "Dithering" msgstr "Размывание" @@ -8778,8 +8922,7 @@ msgstr "Включить размывание прозрачности" msgid "Converting to indexed colors" msgstr "Преобразование в индексированное" -#: ../app/dialogs/convert-dialog.c:416 -#: ../app/pdb/convert-cmds.c:153 +#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Невозможно преобразовать в палитру больше 256 цветов." @@ -8794,11 +8937,11 @@ msgstr "Удалить '%s'?" #: ../app/dialogs/data-delete-dialog.c:107 #, c-format -msgid "Are you sure you want to remove '%s' from the list and delete it on disk?" +msgid "" +"Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Вы действительно хотите удалить '%s' из списка и с диска?" -#: ../app/dialogs/dialogs-constructors.c:203 -#: ../app/gui/gui.c:161 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161 #: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "Сообщение GIMP" @@ -8872,8 +9015,7 @@ msgstr "Ослабить %s" msgid "_Fade" msgstr "_Ослабить" -#: ../app/dialogs/fade-dialog.c:156 -#: ../app/widgets/gimpdeviceinfoeditor.c:346 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "_Режим:" @@ -8893,48 +9035,82 @@ msgstr "Адрес изображения" msgid "Enter location (URI):" msgstr "Введите путь (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Экспорт изображения" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Экспортировать" -#: ../app/dialogs/file-save-dialog.c:419 -msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all." -msgstr "При сохранении удаленного файла необходимо определить его формат. Укажите расширение файла или выберите формат из списка." +#: ../app/dialogs/file-save-dialog.c:458 +msgid "" +"Saving remote files needs to determine the file format from the file " +"extension. Please enter a file extension that matches the selected file " +"format or enter no file extension at all." +msgstr "" +"При сохранении удаленного файла необходимо определить его формат. Укажите " +"расширение файла или выберите формат из списка." -#: ../app/dialogs/file-save-dialog.c:546 -msgid "You can use this dialog to export to various file formats. If you want to save the image to the GIMP XCF format, use File→Save instead." -msgstr "Вы можете использовать этот диалог для экспорта в различные форматы данных. Если же вам нужно сохранить файл в формате GIMP XCF, воспользуйтесь командой «Файл > Сохранить»." +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "Это имя файла не может быть использовано для экспорта" -#: ../app/dialogs/file-save-dialog.c:553 -msgid "You can use this dialog to save to the GIMP XCF format. Use File→Export to export to other file formats." -msgstr "Вы можете использовать этот диалог для сохранения файлов в формате GIMP XCF. Используйте команду «Файл > Экспортировать» для экспорта в прочие форматы данных." +#: ../app/dialogs/file-save-dialog.c:606 +msgid "" +"You can use this dialog to export to various file formats. If you want to " +"save the image to the GIMP XCF format, use File→Save instead." +msgstr "" +"Вы можете использовать этот диалог для экспорта в различные форматы данных. " +"Если же вам нужно сохранить файл в формате GIMP XCF, воспользуйтесь командой " +"«Файл > Сохранить»." -#: ../app/dialogs/file-save-dialog.c:559 -msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list." -msgstr "В данном имени файла отсутствует какое-либо известное расширение. Укажите расширение в имени файла, или выберите формат из списка." +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Перейти к диалогу сохранения" -#: ../app/dialogs/file-save-dialog.c:573 +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "Это имя файла не может быть использовано для сохранения" + +#: ../app/dialogs/file-save-dialog.c:614 +msgid "" +"You can use this dialog to save to the GIMP XCF format. Use File→Export to " +"export to other file formats." +msgstr "" +"Вы можете использовать этот диалог для сохранения файлов в формате GIMP XCF. " +"Используйте команду «Файл > Экспортировать» для экспорта в прочие форматы " +"данных." + +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Перейти к диалогу экспорта" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 msgid "Extension Mismatch" msgstr "Неправильное расширение" -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:678 +msgid "" +"The given filename does not have any known file extension. Please enter a " +"known file extension or select a file format from the file format list." +msgstr "" +"В данном имени файла отсутствует какое-либо известное расширение. Укажите " +"расширение в имени файла, или выберите формат из списка." + +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "Указанное расширение не соответствует выбранному типу файла." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Вы все равно хотите сохранить файл с таким именем?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Сохранение прервано" -#: ../app/dialogs/file-save-dialog.c:659 -#: ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -9014,8 +9190,12 @@ msgstr "Вы пытаетесь создать изображение разме #: ../app/dialogs/image-new-dialog.c:337 #, c-format -msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Изображение такого размера займет больше памяти, чем указано в разделе диалога настройки «Максимальный размер изображения» (%s)." +msgid "" +"An image of the chosen size will use more memory than what is configured as " +"\"Maximum Image Size\" in the Preferences dialog (currently %s)." +msgstr "" +"Изображение такого размера займет больше памяти, чем указано в разделе " +"диалога настройки «Максимальный размер изображения» (%s)." #: ../app/dialogs/image-properties-dialog.c:60 #: ../app/dialogs/image-properties-dialog.c:63 @@ -9045,11 +9225,18 @@ msgstr "Подтвердить масштабирование" #: ../app/dialogs/image-scale-dialog.c:245 #, c-format -msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Если изменить размер изображения с такими параметрами, то оно займет больше места, чем это указано в параметре настроек «Максимальный размер изображения» (%s)." +msgid "" +"Scaling the image to the chosen size will make it use more memory than what " +"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " +"%s)." +msgstr "" +"Если изменить размер изображения с такими параметрами, то оно займет больше " +"места, чем это указано в параметре настроек «Максимальный размер " +"изображения» (%s)." #: ../app/dialogs/image-scale-dialog.c:260 -msgid "Scaling the image to the chosen size will shrink some layers completely away." +msgid "" +"Scaling the image to the chosen size will shrink some layers completely away." msgstr "Выбранный размер изображения сократит некоторые слои до исчезновения." #: ../app/dialogs/image-scale-dialog.c:264 @@ -9065,8 +9252,12 @@ msgid "Configure Keyboard Shortcuts" msgstr "Настройка комбинаций клавиш" #: ../app/dialogs/keyboard-shortcuts-dialog.c:73 -msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear." -msgstr "Укажите строку для редактирования, нажмите сочетание клавиш или Backspace для отмены" +msgid "" +"To edit a shortcut key, click on the corresponding row and type a new " +"accelerator, or press backspace to clear." +msgstr "" +"Укажите строку для редактирования, нажмите сочетание клавиш или Backspace " +"для отмены" #: ../app/dialogs/keyboard-shortcuts-dialog.c:81 msgid "S_ave keyboard shortcuts on exit" @@ -9162,10 +9353,8 @@ msgid "Offset Channel" msgstr "Смещение канала" #. The offset frame -#: ../app/dialogs/offset-dialog.c:118 -#: ../app/dialogs/offset-dialog.c:152 -#: ../app/dialogs/resize-dialog.c:198 -#: ../app/tools/gimpblendoptions.c:247 +#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 +#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 #: ../app/widgets/gimpgrideditor.c:206 msgid "Offset" msgstr "Смещение" @@ -9175,13 +9364,11 @@ msgstr "Смещение" msgid "_Offset" msgstr "_Смещение" -#: ../app/dialogs/offset-dialog.c:184 -#: ../app/dialogs/resize-dialog.c:227 +#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227 msgid "_X:" msgstr "_X:" -#: ../app/dialogs/offset-dialog.c:186 -#: ../app/dialogs/resize-dialog.c:228 +#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 msgid "_Y:" msgstr "_Y:" @@ -9294,8 +9481,11 @@ msgstr "" "подействовали следующие изменения:" #: ../app/dialogs/preferences-dialog.c:536 -msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP." -msgstr "При следующем запуске GIMP будут использованы типовые комбинации клавиш." +msgid "" +"Your keyboard shortcuts will be reset to default values the next time you " +"start GIMP." +msgstr "" +"При следующем запуске GIMP будут использованы типовые комбинации клавиш." #: ../app/dialogs/preferences-dialog.c:547 msgid "Remove all Keyboard Shortcuts" @@ -9306,16 +9496,28 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Действительно удалить все комбинации клавиш из всех меню?" #: ../app/dialogs/preferences-dialog.c:610 -msgid "Your window setup will be reset to default values the next time you start GIMP." -msgstr "При следующем запуске GIMP для окон будут использованы предпочтения по умолчанию." +msgid "" +"Your window setup will be reset to default values the next time you start " +"GIMP." +msgstr "" +"При следующем запуске GIMP для окон будут использованы предпочтения по " +"умолчанию." #: ../app/dialogs/preferences-dialog.c:645 -msgid "Your input device settings will be reset to default values the next time you start GIMP." -msgstr "При следующем запуске GIMP для устройств ввода будут использованы предпочтения по умолчанию." +msgid "" +"Your input device settings will be reset to default values the next time you " +"start GIMP." +msgstr "" +"При следующем запуске GIMP для устройств ввода будут использованы " +"предпочтения по умолчанию." #: ../app/dialogs/preferences-dialog.c:680 -msgid "Your tool options will be reset to default values the next time you start GIMP." -msgstr "При следующем запуске GIMP для параметров инструментов будут использованы исходные параметры." +msgid "" +"Your tool options will be reset to default values the next time you start " +"GIMP." +msgstr "" +"При следующем запуске GIMP для параметров инструментов будут использованы " +"исходные параметры." #: ../app/dialogs/preferences-dialog.c:1266 msgid "Show _menubar" @@ -9777,8 +9979,7 @@ msgstr "Разрешение монитора" #. Pixels #: ../app/dialogs/preferences-dialog.c:2328 -#: ../app/display/gimpcursorview.c:206 -#: ../app/widgets/gimpgrideditor.c:199 +#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 #: ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "px" @@ -9792,7 +9993,7 @@ msgid "Vertical" msgstr "Вертикальное" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10084,33 +10285,28 @@ msgid "Print Size" msgstr "Размер при печати" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 -#: ../app/widgets/gimpsizebox.c:193 +#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 #: ../app/widgets/gimptemplateeditor.c:180 msgid "_Width:" msgstr "_Ширина:" -#: ../app/dialogs/print-size-dialog.c:172 -#: ../app/widgets/gimpsizebox.c:197 +#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 #: ../app/widgets/gimptemplateeditor.c:187 msgid "H_eight:" msgstr "_Высота:" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 -#: ../app/widgets/gimpsizebox.c:255 +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255 #: ../app/widgets/gimptemplateeditor.c:309 msgid "_X resolution:" msgstr "Разрешение по X:" -#: ../app/dialogs/print-size-dialog.c:229 -#: ../app/widgets/gimpsizebox.c:258 +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258 #: ../app/widgets/gimptemplateeditor.c:316 msgid "_Y resolution:" msgstr "Разрешение по Y:" -#: ../app/dialogs/print-size-dialog.c:240 -#: ../app/widgets/gimpsizebox.c:251 +#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:251 #, c-format msgid "pixels/%a" msgstr "пикселов/%a" @@ -10129,7 +10325,8 @@ msgstr "Если выйти из GIMP, то несохраненные изме #: ../app/dialogs/quit-dialog.c:166 msgid "If you close these images now, changes will be lost." -msgstr "Если вы сейчас закроете эти изображения, изменения в них будут потеряны." +msgstr "" +"Если вы сейчас закроете эти изображения, изменения в них будут потеряны." #: ../app/dialogs/quit-dialog.c:213 #, c-format @@ -10147,8 +10344,7 @@ msgstr "_Забыть изменения" msgid "Canvas Size" msgstr "Размер холста" -#: ../app/dialogs/resize-dialog.c:130 -#: ../app/dialogs/scale-dialog.c:109 +#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109 msgid "Layer Size" msgstr "Размер слоя" @@ -10173,13 +10369,11 @@ msgid "_Vertical:" msgstr "Вертикальная:" #. Image size frame -#: ../app/dialogs/scale-dialog.c:98 -#: ../app/widgets/gimptemplateeditor.c:158 +#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158 msgid "Image Size" msgstr "Размер изображения" -#: ../app/dialogs/scale-dialog.c:176 -#: ../app/tools/gimppaintoptions-gui.c:393 +#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:393 msgid "Quality" msgstr "Качество" @@ -10188,8 +10382,12 @@ msgid "I_nterpolation:" msgstr "И_нтерполяция:" #: ../app/dialogs/scale-dialog.c:207 -msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only." -msgstr "Размер индексированных слоев всегда меняется без интерполяции. При выбранном типе интерполяции будут отмасштабированы только каналы и маски." +msgid "" +"Indexed color layers are always scaled without interpolation. The chosen " +"interpolation type will affect channels and layer masks only." +msgstr "" +"Размер индексированных слоев всегда меняется без интерполяции. При выбранном " +"типе интерполяции будут отмасштабированы только каналы и маски." #: ../app/dialogs/stroke-dialog.c:97 msgid "Choose Stroke Style" @@ -10256,7 +10454,9 @@ msgstr "Установка не удалась!" #: ../app/dialogs/user-install-dialog.c:95 msgid "The GIMP user installation failed; see the log for details." -msgstr "Не удалось произвести пользовательскую установку GIMP; подробности — в журнале." +msgstr "" +"Не удалось произвести пользовательскую установку GIMP; подробности — в " +"журнале." #: ../app/dialogs/user-install-dialog.c:98 msgid "Installation Log" @@ -10339,35 +10539,25 @@ msgctxt "guides-type" msgid "Line spacing" msgstr "Интервал между линиями" -#: ../app/display/gimpcursorview.c:216 -#: ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 -#: ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 -#: ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 -#: ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 -#: ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 -#: ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 -#: ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 -#: ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 +#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 +#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 +#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 +#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 +#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 +#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 +#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "н/д" -#: ../app/display/gimpcursorview.c:219 -#: ../app/display/gimpcursorview.c:244 +#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 #: ../app/display/gimpcursorview.c:269 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 -#: ../app/display/gimpcursorview.c:250 +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 #: ../app/display/gimpcursorview.c:275 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" @@ -10414,8 +10604,7 @@ msgid "Navigate the image display" msgstr "Навигация по изображению" #: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1327 -#: ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Перетащите сюда изображения, которые хотите открыть" @@ -10437,26 +10626,50 @@ msgstr "Сохранить изменения в изображениии '%s' #: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." -msgid_plural "If you don't save the image, changes from the last %d hours will be lost." -msgstr[0] "Если вы не сохраните изображение, все изменения за последний %d час будут утеряны." -msgstr[1] "Если вы не сохраните изображение, все изменения за последние %d часа будут утеряны." -msgstr[2] "Если вы не сохраните изображение, все изменения за последние %d часов будут утеряны." +msgid_plural "" +"If you don't save the image, changes from the last %d hours will be lost." +msgstr[0] "" +"Если вы не сохраните изображение, все изменения за последний %d час будут " +"утеряны." +msgstr[1] "" +"Если вы не сохраните изображение, все изменения за последние %d часа будут " +"утеряны." +msgstr[2] "" +"Если вы не сохраните изображение, все изменения за последние %d часов будут " +"утеряны." #: ../app/display/gimpdisplayshell-close.c:281 #, c-format -msgid "If you don't save the image, changes from the last hour and %d minute will be lost." -msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost." -msgstr[0] "Если вы не сохраните изображение, все изменения за последний час и %d минуту будут утеряны." -msgstr[1] "Если вы не сохраните изображение, все изменения за последний час и %d минуты будут утеряны." -msgstr[2] "Если вы не сохраните изображение, все изменения за последний час и %d минут будут утеряны." +msgid "" +"If you don't save the image, changes from the last hour and %d minute will " +"be lost." +msgid_plural "" +"If you don't save the image, changes from the last hour and %d minutes will " +"be lost." +msgstr[0] "" +"Если вы не сохраните изображение, все изменения за последний час и %d минуту " +"будут утеряны." +msgstr[1] "" +"Если вы не сохраните изображение, все изменения за последний час и %d минуты " +"будут утеряны." +msgstr[2] "" +"Если вы не сохраните изображение, все изменения за последний час и %d минут " +"будут утеряны." #: ../app/display/gimpdisplayshell-close.c:293 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." -msgid_plural "If you don't save the image, changes from the last %d minutes will be lost." -msgstr[0] "Если вы не сохраните изображение, все изменения за последнюю %d минуту будут утеряны." -msgstr[1] "Если вы не сохраните изображение, все изменения за последние %d минуты будут утеряны." -msgstr[2] "Если вы не сохраните изображение, все изменения за последние %d минут будут утеряны." +msgid_plural "" +"If you don't save the image, changes from the last %d minutes will be lost." +msgstr[0] "" +"Если вы не сохраните изображение, все изменения за последнюю %d минуту будут " +"утеряны." +msgstr[1] "" +"Если вы не сохраните изображение, все изменения за последние %d минуты будут " +"утеряны." +msgstr[2] "" +"Если вы не сохраните изображение, все изменения за последние %d минут будут " +"утеряны." #: ../app/display/gimpdisplayshell-close.c:311 #, c-format @@ -10474,24 +10687,18 @@ msgid "Drop New Path" msgstr "Новый контур извне" #: ../app/display/gimpdisplayshell-dnd.c:361 -#: ../app/display/gimpdisplayshell-dnd.c:463 -#: ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 -#: ../app/tools/gimpimagemaptool.c:280 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 #: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Невозможно изменять точки растра группы слоёв" #: ../app/display/gimpdisplayshell-dnd.c:369 -#: ../app/display/gimpdisplayshell-dnd.c:471 -#: ../app/tools/gimpblendtool.c:180 -#: ../app/tools/gimpbucketfilltool.c:143 -#: ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:287 -#: ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:247 -#: ../app/tools/gimptransformtool.c:1067 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 +#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Точки растра активного слоя заблокированы от изменений" @@ -10502,16 +10709,15 @@ msgstr "Новые слои извне" #: ../app/display/gimpdisplayshell-dnd.c:682 #: ../app/display/gimpdisplayshell-dnd.c:699 -#: ../app/widgets/gimplayertreeview.c:802 -#: ../app/widgets/gimptoolbox-dnd.c:264 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Перемещенный буфер" -#: ../app/display/gimpdisplayshell-filter-dialog.c:78 +#: ../app/display/gimpdisplayshell-filter-dialog.c:83 msgid "Color Display Filters" msgstr "Цветные экранные фильтры" -#: ../app/display/gimpdisplayshell-filter-dialog.c:81 +#: ../app/display/gimpdisplayshell-filter-dialog.c:86 msgid "Configure Color Display Filters" msgstr "Настроить цветные экранные фильтры" @@ -10564,8 +10770,7 @@ msgstr "(Нет)" msgid "Cancel %s" msgstr "Отменить %s" -#: ../app/file/file-open.c:136 -#: ../app/file/file-save.c:115 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "Необычный файл" @@ -10583,14 +10788,18 @@ msgstr "Расширение %s не может открыть изображе msgid "Image doesn't contain any layers" msgstr "Изображение не содержит слоев" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Невозможно открыть '%s': %s" -#: ../app/file/file-open.c:690 -msgid "Color management has been disabled. It can be enabled again in the Preferences dialog." -msgstr "Управление цветом отключено. Его можно снова включить через диалог параметров GIMP." +#: ../app/file/file-open.c:696 +msgid "" +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." +msgstr "" +"Управление цветом отключено. Его можно снова включить через диалог " +"параметров GIMP." #: ../app/file/file-procedure.c:195 msgid "Unknown file type" @@ -10601,13 +10810,12 @@ msgstr "Неизвестный тип файлов" msgid "%s plug-in could not save image" msgstr "Расширение %s не может сохранить изображение" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s:' некорректная схема URI" -#: ../app/file/file-utils.c:90 -#: ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Неправильная последовательность символов в URI" @@ -10621,16 +10829,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Деформировать рамку и её содержимое" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "не файл кривых GIMP" -#: ../app/gegl/gimpcurvesconfig.c:403 -#: ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "ошибка при синтаксическом разборе" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "не файл цветовых уровней GIMP" @@ -10639,7 +10846,9 @@ msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "" #: ../app/gegl/gimpoperationcagetransform.c:106 -msgid "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage tool" +msgid "" +"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " +"tool" msgstr "" #: ../app/gegl/gimpoperationcagetransform.c:128 @@ -10660,8 +10869,7 @@ msgstr "Документы" msgid "GIMP Startup" msgstr "Запуск GIMP" -#: ../app/paint/gimpairbrush.c:73 -#: ../app/tools/gimpairbrushtool.c:54 +#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54 msgid "Airbrush" msgstr "Аэрограф" @@ -10671,10 +10879,10 @@ msgstr "Нет кистей, доступных для использовани #: ../app/paint/gimpbrushcore.c:394 msgid "No paint dynamics available for use with this tool." -msgstr "Нет динамик рисования, доступных для использования с этим инструментом." +msgstr "" +"Нет динамик рисования, доступных для использования с этим инструментом." -#: ../app/paint/gimpclone.c:102 -#: ../app/tools/gimpclonetool.c:60 +#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60 msgid "Clone" msgstr "Штамп" @@ -10690,13 +10898,11 @@ msgstr "Размывание" msgid "Dodge/Burn" msgstr "Осветление/Затемнение" -#: ../app/paint/gimperaser.c:63 -#: ../app/tools/gimperasertool.c:65 +#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65 msgid "Eraser" msgstr "Ластик" -#: ../app/paint/gimpheal.c:131 -#: ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Лечебная кисть" @@ -10704,8 +10910,7 @@ msgstr "Лечебная кисть" msgid "Healing does not operate on indexed layers." msgstr "Выравнивание не действует на индексированные слои." -#: ../app/paint/gimpink.c:97 -#: ../app/tools/gimpinktool.c:54 +#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54 msgid "Ink" msgstr "Перо" @@ -10721,8 +10926,7 @@ msgstr "Соотношение сторон капли Пера" msgid "Ink Blob Angle" msgstr "Угол Пера" -#: ../app/paint/gimppaintbrush.c:66 -#: ../app/tools/gimppaintbrushtool.c:50 +#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50 msgid "Paintbrush" msgstr "Кисть" @@ -10775,8 +10979,7 @@ msgstr "Глубина сглаживания" msgid "Gravity of the pen" msgstr "Гравитация пера" -#: ../app/paint/gimppencil.c:41 -#: ../app/tools/gimppenciltool.c:50 +#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50 msgid "Pencil" msgstr "Карандаш" @@ -10789,8 +10992,7 @@ msgstr "Штамп по перспективе" msgid "Perspective Clone does not operate on indexed layers." msgstr "Инструмент Штамп по перспективе не работает с индексированными слоями." -#: ../app/paint/gimpsmudge.c:84 -#: ../app/tools/gimpsmudgetool.c:53 +#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 msgid "Smudge" msgstr "Размазывание" @@ -10863,23 +11065,20 @@ msgstr "Расширение" #: ../app/pdb/drawable-transform-cmds.c:345 #: ../app/pdb/drawable-transform-cmds.c:443 -#: ../app/pdb/item-transform-cmds.c:262 -#: ../app/pdb/transform-tools-cmds.c:163 +#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 #: ../app/tools/gimpperspectivetool.c:82 msgid "Perspective" msgstr "Перспектива" #: ../app/pdb/drawable-transform-cmds.c:957 #: ../app/pdb/drawable-transform-cmds.c:1042 -#: ../app/pdb/item-transform-cmds.c:611 -#: ../app/pdb/transform-tools-cmds.c:418 +#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 #: ../app/tools/gimpsheartool.c:112 msgid "Shearing" msgstr "Наклон" #: ../app/pdb/drawable-transform-cmds.c:1138 -#: ../app/pdb/item-transform-cmds.c:709 -#: ../app/pdb/transform-tools-cmds.c:507 +#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 msgid "2D Transform" msgstr "2D преобразование" @@ -10890,8 +11089,7 @@ msgstr "2D преобразование" msgid "2D Transforming" msgstr "2D преобразование" -#: ../app/pdb/edit-cmds.c:725 -#: ../app/tools/gimpblendtool.c:249 +#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:249 msgid "Blending" msgstr "Заливка" @@ -10906,11 +11104,14 @@ msgstr "" "это не плавающее выделение." #: ../app/pdb/floating-sel-cmds.c:131 -msgid "Cannot convert this layer to a normal layer because it is not a floating selection." -msgstr "Невозможно преобразовать этот слой в обычный, потому что это не плавающее выделение." +msgid "" +"Cannot convert this layer to a normal layer because it is not a floating " +"selection." +msgstr "" +"Невозможно преобразовать этот слой в обычный, потому что это не плавающее " +"выделение." -#: ../app/pdb/gimppdb-query.c:299 -#: ../app/pdb/gimppdb.c:305 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:305 #: ../app/pdb/gimppdb.c:375 #, c-format msgid "Procedure '%s' not found" @@ -11017,22 +11218,34 @@ msgstr "Метод рисования '%s' не существует" #: ../app/pdb/gimppdb-utils.c:353 #, c-format msgid "Item '%s' (%d) cannot be used because it has not been added to an image" -msgstr "Невозможно использовать элемент '%s' (%d), потому что он не добавлен в изображение" +msgstr "" +"Невозможно использовать элемент '%s' (%d), потому что он не добавлен в " +"изображение" #: ../app/pdb/gimppdb-utils.c:363 #, c-format msgid "Item '%s' (%d) cannot be used because it is attached to another image" -msgstr "Невозможно использовать элемент '%s' (%d), потому что он входит в другое изображение" +msgstr "" +"Невозможно использовать элемент '%s' (%d), потому что он входит в другое " +"изображение" #: ../app/pdb/gimppdb-utils.c:392 #, fuzzy, c-format -msgid "Item '%s' (%d) cannot be used because it is not a direct child of an item tree" -msgstr "Невозможно использовать элемент '%s' (%d), потому что он не добавлен в изображение" +msgid "" +"Item '%s' (%d) cannot be used because it is not a direct child of an item " +"tree" +msgstr "" +"Невозможно использовать элемент '%s' (%d), потому что он не добавлен в " +"изображение" #: ../app/pdb/gimppdb-utils.c:420 #, fuzzy, c-format -msgid "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the same item tree" -msgstr "Невозможно использовать элемент '%s' (%d), потому что он не добавлен в изображение" +msgid "" +"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " +"the same item tree" +msgstr "" +"Невозможно использовать элемент '%s' (%d), потому что он не добавлен в " +"изображение" #: ../app/pdb/gimppdb-utils.c:445 #, c-format @@ -11052,7 +11265,9 @@ msgstr "Попытка добавить элемент '%s' (%d) в неправ #: ../app/pdb/gimppdb-utils.c:496 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "Невозможно изменить элемент '%s' (%d), потому что его содержимое заперто от изменений" +msgstr "" +"Невозможно изменить элемент '%s' (%d), потому что его содержимое заперто от " +"изменений" #: ../app/pdb/gimppdb-utils.c:516 #, fuzzy, c-format @@ -11067,12 +11282,16 @@ msgstr "Невозможно изменить элемент '%s' (%d), пото #: ../app/pdb/gimppdb-utils.c:557 #, fuzzy, c-format msgid "Layer '%s' (%d) cannot be used because it is not a text layer" -msgstr "Невозможно использовать объект '%s' (%d), потому что он не является текстовым слоем" +msgstr "" +"Невозможно использовать объект '%s' (%d), потому что он не является " +"текстовым слоем" #: ../app/pdb/gimppdb-utils.c:598 #, c-format msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected" -msgstr "Изображение '%s' (%d) относится к типу '%s', хотя ожидалось изображение типа '%s'" +msgstr "" +"Изображение '%s' (%d) относится к типу '%s', хотя ожидалось изображение типа " +"'%s'" #: ../app/pdb/gimppdb-utils.c:621 #, c-format @@ -11086,8 +11305,12 @@ msgstr "Векторный объект %d не содержит обводку #: ../app/pdb/gimppdb.c:410 #, c-format -msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s." -msgstr "Процедура '%s' вызвана с некорректным типом аргумента #%d. Ожидалось %s, получено %s." +msgid "" +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." +msgstr "" +"Процедура '%s' вызвана с некорректным типом аргумента #%d. Ожидалось %s, " +"получено %s." #: ../app/pdb/gimppdbcontext.c:89 #: ../app/tools/gimpforegroundselectoptions.c:79 @@ -11095,66 +11318,96 @@ msgstr "Процедура '%s' вызвана с некорректным ти msgid "Smooth edges" msgstr "Сгладить края" -#: ../app/pdb/gimpprocedure.c:372 -#: ../app/plug-in/gimppluginprocframe.c:208 +#: ../app/pdb/gimpprocedure.c:372 ../app/plug-in/gimppluginprocframe.c:208 #, c-format msgid "Procedure '%s' returned no return values" msgstr "Процедура '%s' не вернула какое-либо возвращаемое значение" #: ../app/pdb/gimpprocedure.c:642 #, c-format -msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s." -msgstr "Процедура '%s' вернула некорректный тип значения для возвратного значения '%s' (#%d). Ожидалось %s, получено %s." +msgid "" +"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " +"Expected %s, got %s." +msgstr "" +"Процедура '%s' вернула некорректный тип значения для возвратного значения " +"'%s' (#%d). Ожидалось %s, получено %s." #: ../app/pdb/gimpprocedure.c:654 #, c-format -msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s." -msgstr "Процедура '%s' вызвана с некорректным значением аргумента '%s' (#%d). Ожидалось %s, получено %s." +msgid "" +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." +msgstr "" +"Процедура '%s' вызвана с некорректным значением аргумента '%s' (#%d). " +"Ожидалось %s, получено %s." #: ../app/pdb/gimpprocedure.c:687 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Процедура '%s' вернула некорректный идентификатор для аргумента '%s'. Скорее всего, модуль пытается работать с слоем, который уже не существует." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Процедура '%s' вернула некорректный идентификатор для аргумента '%s'. Скорее " +"всего, модуль пытается работать с слоем, который уже не существует." #: ../app/pdb/gimpprocedure.c:700 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Процедура '%s' вызвана с некорректным идентификатором для аргумента '%s'. Скорее всего, модуль пытается работать со слоем, который уже не существует." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Процедура '%s' вызвана с некорректным идентификатором для аргумента '%s'. " +"Скорее всего, модуль пытается работать со слоем, который уже не существует." #: ../app/pdb/gimpprocedure.c:717 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Процедура '%s' вернула некорректный идентификатор аргумента '%s'. Скорее всего, модуль пытается работать с изображением, которое уже не существует." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Процедура '%s' вернула некорректный идентификатор аргумента '%s'. Скорее " +"всего, модуль пытается работать с изображением, которое уже не существует." #: ../app/pdb/gimpprocedure.c:730 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Процедура '%s' вызвана с некорректным идентификатором аргумента '%s'. Скорее всего, модуль пытается работать с изображением, которое уже не существует." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Процедура '%s' вызвана с некорректным идентификатором аргумента '%s'. Скорее " +"всего, модуль пытается работать с изображением, которое уже не существует." #: ../app/pdb/gimpprocedure.c:751 #, c-format -msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range." -msgstr "Процедура '%s' вернула '%s' как значение '%s' (#%d, тип %s). Значение выходит из допустимого диапазона" +msgid "" +"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " +"is out of range." +msgstr "" +"Процедура '%s' вернула '%s' как значение '%s' (#%d, тип %s). Значение " +"выходит из допустимого диапазона" #: ../app/pdb/gimpprocedure.c:765 #, c-format -msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range." -msgstr "Процедура '%s' вызвана со значением '%s' аргумента '%s' (#%d, тип %s). Значение выходит из допустимого диапазона." +msgid "" +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." +msgstr "" +"Процедура '%s' вызвана со значением '%s' аргумента '%s' (#%d, тип %s). " +"Значение выходит из допустимого диапазона." #: ../app/pdb/image-cmds.c:2365 -msgid "Image resolution is out of bounds, using the default resolution instead." +msgid "" +"Image resolution is out of bounds, using the default resolution instead." msgstr "" "Разрешение изображения вне допустимых параметров,\n" "используется значение по умолчанию." -#: ../app/pdb/image-select-cmds.c:297 -#: ../app/pdb/selection-tools-cmds.c:219 +#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 #: ../app/tools/gimpfreeselecttool.c:196 msgid "Free Select" msgstr "Свободное выделение" -#: ../app/pdb/layer-cmds.c:478 -#: ../app/pdb/layer-cmds.c:516 +#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 msgid "Move Layer" msgstr "Перемещение слоя" @@ -11163,20 +11416,13 @@ msgstr "Перемещение слоя" msgid "Failed to create text layer" msgstr "Не удалось создать текстовый слой" -#: ../app/pdb/text-layer-cmds.c:164 -#: ../app/pdb/text-layer-cmds.c:274 -#: ../app/pdb/text-layer-cmds.c:353 -#: ../app/pdb/text-layer-cmds.c:426 -#: ../app/pdb/text-layer-cmds.c:498 -#: ../app/pdb/text-layer-cmds.c:570 -#: ../app/pdb/text-layer-cmds.c:642 -#: ../app/pdb/text-layer-cmds.c:714 -#: ../app/pdb/text-layer-cmds.c:786 -#: ../app/pdb/text-layer-cmds.c:856 -#: ../app/pdb/text-layer-cmds.c:928 -#: ../app/pdb/text-layer-cmds.c:1000 -#: ../app/pdb/text-layer-cmds.c:1072 -#: ../app/pdb/text-layer-cmds.c:1114 +#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 +#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 +#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 +#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714 +#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 +#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 +#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 #: ../app/pdb/text-layer-cmds.c:1196 msgid "Set text layer attribute" msgstr "Смена атрибутов текстового слоя" @@ -11189,36 +11435,33 @@ msgstr "Удаление обводки контура" msgid "Close path stroke" msgstr "" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 #, fuzzy msgid "Scale path stroke" msgstr "Масштабирование контура" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 #, fuzzy msgid "Rotate path stroke" msgstr "Вращать контур" -#: ../app/pdb/vectors-cmds.c:521 -#: ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 #, fuzzy msgid "Flip path stroke" msgstr "Отразить контур" -#: ../app/pdb/vectors-cmds.c:694 -#: ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 #, fuzzy msgid "Add path stroke" msgstr "Добавить контур" -#: ../app/pdb/vectors-cmds.c:870 -#: ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "" @@ -11270,12 +11513,14 @@ msgid "" "Plug-in crashed: \"%s\"\n" "(%s)\n" "\n" -"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side." +"The dying plug-in may have messed up GIMP's internal state. You may want to " +"save your images and restart GIMP to be on the safe side." msgstr "" "Рухнуло расширение: \"%s\"\n" "(%s)\n" "\n" -"Умершее расширение может испортить внутреннее состояние GIMP. Возможно, для обеспечения безопасности стоит сохранить изображения и перезапустить GIMP." +"Умершее расширение может испортить внутреннее состояние GIMP. Возможно, для " +"обеспечения безопасности стоит сохранить изображения и перезапустить GIMP." #: ../app/plug-in/gimppluginmanager-call.c:173 #: ../app/plug-in/gimppluginmanager-call.c:223 @@ -11312,7 +11557,7 @@ msgstr "Интерпретаторы расширений" msgid "Plug-In Environment" msgstr "Окружение расширений" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11321,7 +11566,7 @@ msgstr "" "Ошибка вызова '%s':\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11330,16 +11575,21 @@ msgstr "" "Ошибка выполнения '%s':\n" "%s" -#: ../app/plug-in/plug-in-icc-profile.c:112 -#: ../app/plug-in/plug-in-icc-profile.c:187 -#: ../app/plug-in/plug-in-icc-profile.c:246 +#: ../app/plug-in/plug-in-icc-profile.c:74 +#, c-format +msgid "Can't apply color profile to grayscale image (%s)" +msgstr "" + +#: ../app/plug-in/plug-in-icc-profile.c:117 +#: ../app/plug-in/plug-in-icc-profile.c:192 +#: ../app/plug-in/plug-in-icc-profile.c:251 #, c-format msgid "Error running '%s'" msgstr "Ошибка при выполнении '%s'" -#: ../app/plug-in/plug-in-icc-profile.c:136 -#: ../app/plug-in/plug-in-icc-profile.c:197 -#: ../app/plug-in/plug-in-icc-profile.c:256 +#: ../app/plug-in/plug-in-icc-profile.c:141 +#: ../app/plug-in/plug-in-icc-profile.c:202 +#: ../app/plug-in/plug-in-icc-profile.c:261 #, c-format msgid "Plug-In missing (%s)" msgstr "Расширение отсутствует (%s)" @@ -11369,8 +11619,7 @@ msgstr "" "В чащах юга жил-был цитрус.\n" "Да, но фальшивый экземпляръ!" -#: ../app/text/gimptext-compat.c:105 -#: ../app/tools/gimptexttool.c:1401 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "Добавить текстовый слой" @@ -11424,7 +11673,8 @@ msgid "" "Problems parsing the text parasite for layer '%s':\n" "%s\n" "\n" -"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this." +"Some text properties may be wrong. Unless you want to edit the text layer, " +"you don't need to worry about this." msgstr "" "Неполадки при синтаксическом разборе текстовых паразитов для слоя '%s':\n" "%s\n" @@ -11462,8 +11712,7 @@ msgstr "_Аэрограф" msgid "Motion only" msgstr "Только движение" -#: ../app/tools/gimpairbrushtool.c:91 -#: ../app/tools/gimpconvolvetool.c:228 +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 #: ../app/tools/gimpsmudgetool.c:91 msgid "Rate" msgstr "Скорость" @@ -11477,16 +11726,14 @@ msgid "Reference image object a layer will be aligned on" msgstr "" #: ../app/tools/gimpalignoptions.c:98 -#, fuzzy msgid "Horizontal offset for distribution" -msgstr "Цветовой баланс: коррекция распределения цвета" +msgstr "Горизонтальное смещение при распределении" #: ../app/tools/gimpalignoptions.c:104 msgid "Vertical offset for distribution" -msgstr "" +msgstr "Вертикальное смещение при распределении" -#: ../app/tools/gimpalignoptions.c:272 -#: ../app/tools/gimpaligntool.c:124 +#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124 msgid "Align" msgstr "Выравнивание" @@ -11560,7 +11807,9 @@ msgstr "_Выравнивание" #: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "Щёлкните слой, контур или направляющую, либо используйте щелчок и перетаскивание для выбора нескольких слоев" +msgstr "" +"Щёлкните слой, контур или направляющую, либо используйте щелчок и " +"перетаскивание для выбора нескольких слоев" #: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" @@ -11586,18 +11835,15 @@ msgstr "Щёлкните, чтобы сделать этот контур пер msgid "Click to add this path to the list" msgstr "Щёлкните, чтобы добавить этот контур в список" -#: ../app/tools/gimpblendoptions.c:211 -#: ../app/tools/gimppaintoptions-gui.c:346 +#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:346 msgid "Gradient" msgstr "Градиент" -#: ../app/tools/gimpblendoptions.c:231 -#: ../app/widgets/gimpbrusheditor.c:139 +#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139 msgid "Shape:" msgstr "Форма:" -#: ../app/tools/gimpblendoptions.c:238 -#: ../app/tools/gimppaintoptions-gui.c:325 +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:325 msgid "Repeat:" msgstr "Повтор:" @@ -11629,8 +11875,7 @@ msgstr "Градиентная заливка не действует на ин msgid "No gradient available for use with this tool." msgstr "Нет градиентов, доступных для использования с этим инструментом." -#: ../app/tools/gimpblendtool.c:452 -#: ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s для ограничения шага угла" @@ -11686,7 +11931,7 @@ msgstr "Изменить эти параметры как уровни" #: ../app/tools/gimpbucketfilloptions.c:93 msgid "Which area will be filled" -msgstr "" +msgstr "Какую область заполнить" #: ../app/tools/gimpbucketfilloptions.c:98 msgid "Allow completely transparent regions to be filled" @@ -11703,7 +11948,7 @@ msgstr "Максимальное различие цветов" #: ../app/tools/gimpbucketfilloptions.c:115 msgid "Criterion used for determining color similarity" -msgstr "" +msgstr "Критерий определения схожести цветов" #. fill type #: ../app/tools/gimpbucketfilloptions.c:229 @@ -11733,10 +11978,8 @@ msgstr "Поиск похожих цветов" msgid "Fill transparent areas" msgstr "Залить прозрачные области" -#: ../app/tools/gimpbucketfilloptions.c:279 -#: ../app/tools/gimpclonetool.c:114 -#: ../app/tools/gimpcolorpickeroptions.c:158 -#: ../app/tools/gimphealtool.c:100 +#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 #: ../app/tools/gimpperspectiveclonetool.c:904 #: ../app/tools/gimpregionselectoptions.c:210 msgid "Sample merged" @@ -11775,46 +12018,44 @@ msgctxt "command" msgid "Select by Color" msgstr "Выделение по цвету" -#: ../app/tools/gimpcagetool.c:152 -#: ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Преобразование по рамке" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Трансформация по рамке: деформация выделения" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "Преобразование по _рамке" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Нажмите Ввод для применения трансформации" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Вычисляются коэффициенты рамки" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Преобразование по рамке" #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "Штамп: выборочное копирование из изображения или текстуры при помощи кисти" +msgstr "" +"Штамп: выборочное копирование из изображения или текстуры при помощи кисти" #: ../app/tools/gimpclonetool.c:62 msgid "_Clone" msgstr "_Штамп" -#: ../app/tools/gimpclonetool.c:85 -#: ../app/tools/gimpclonetool.c:88 +#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88 msgid "Click to clone" msgstr "Нажмите для штамповки" -#: ../app/tools/gimpclonetool.c:86 -#: ../app/tools/gimpclonetool.c:91 +#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 #, c-format msgid "%s to set a new clone source" msgstr "%s для создания источника штампа" @@ -11829,8 +12070,7 @@ msgstr "Нажмите для получения источника штампа msgid "Source" msgstr "Источник" -#: ../app/tools/gimpclonetool.c:128 -#: ../app/tools/gimphealtool.c:109 +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 #: ../app/tools/gimpperspectiveclonetool.c:918 msgid "Alignment:" msgstr "Выравнивание:" @@ -11867,8 +12107,7 @@ msgstr "Цветовой баланс действует только на из msgid "Select Range to Adjust" msgstr "Выберите изменяемый диапазон" -#: ../app/tools/gimpcolorbalancetool.c:275 -#: ../app/tools/gimplevelstool.c:172 +#: ../app/tools/gimpcolorbalancetool.c:275 ../app/tools/gimplevelstool.c:172 msgid "Adjust Color Levels" msgstr "Коррекция цветовых уровней" @@ -11973,16 +12212,16 @@ msgid "Sample average" msgstr "Выборочное среднее" #: ../app/tools/gimpcolorpickeroptions.c:68 -#, fuzzy msgid "Use accumulated color value from all composited visible layers" -msgstr "Использовать все видимые слои при выделении области" +msgstr "Использовать цвет, получаемый при сведении всех слоёв" #: ../app/tools/gimpcolorpickeroptions.c:74 msgid "Choose what color picker will do" msgstr "" #: ../app/tools/gimpcolorpickeroptions.c:80 -msgid "Open a floating dialog to view picked color values in various color models" +msgid "" +"Open a floating dialog to view picked color values in various color models" msgstr "" #. the pick FG/BG frame @@ -12013,13 +12252,11 @@ msgstr "_Пипетка" msgid "Click in any image to view its color" msgstr "Щёлкните любое изображение для просмотра его цвета" -#: ../app/tools/gimpcolorpickertool.c:238 -#: ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Щёлкните любое изображение, чтобы снять с него цвет переднего плана" -#: ../app/tools/gimpcolorpickertool.c:246 -#: ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Щёлкните любое изображение, чтобы снять с него цвет фона" @@ -12031,8 +12268,7 @@ msgstr "Щёлкните любое изображение, чтобы доба msgid "Color Picker Information" msgstr "Информация о цвете" -#: ../app/tools/gimpcolortool.c:230 -#: ../app/tools/gimpcolortool.c:403 +#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 msgid "Move Sample Point: " msgstr "Сместить образцовую точку: " @@ -12054,7 +12290,8 @@ msgstr "Размывание-Резкость" #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "Резкость-Размывание: выборочное размывание или увеличение резкости кистью" +msgstr "" +"Резкость-Размывание: выборочное размывание или увеличение резкости кистью" #: ../app/tools/gimpconvolvetool.c:75 msgid "Bl_ur / Sharpen" @@ -12171,25 +12408,23 @@ msgstr "Щёлкните, чтобы добавить контрольные т #: ../app/tools/gimpcurvestool.c:350 msgid "Click to locate on curve (try Shift, Ctrl)" -msgstr "Щёлкните мышкой для помещения точки под курсором на кривую (попробуйте с Shift, Ctrl)" +msgstr "" +"Щёлкните мышкой для помещения точки под курсором на кривую (попробуйте с " +"Shift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:463 -#: ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:463 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "_Канал:" -#: ../app/tools/gimpcurvestool.c:489 -#: ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:489 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "_Восстановить" -#: ../app/tools/gimpcurvestool.c:583 -#: ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Тип _кривой:" -#: ../app/tools/gimpcurvestool.c:658 -#: ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Невозможно прочесть заголовок из '%s': %s" @@ -12343,8 +12578,11 @@ msgid "Flip" msgstr "Зеркало" #: ../app/tools/gimpfliptool.c:85 -msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "Зеркало: горизонтальное или вертикальное отражение слоя, выделения или контура" +msgid "" +"Flip Tool: Reverse the layer, selection or path horizontally or vertically" +msgstr "" +"Зеркало: горизонтальное или вертикальное отражение слоя, выделения или " +"контура" #: ../app/tools/gimpfliptool.c:87 msgid "_Flip" @@ -12373,7 +12611,9 @@ msgid "Select a single contiguous area" msgstr "Выделить одну смежную областей" #: ../app/tools/gimpforegroundselectoptions.c:91 -msgid "Paint over areas to mark color values for inclusion or exclusion from selection" +msgid "" +"Paint over areas to mark color values for inclusion or exclusion from " +"selection" msgstr "" #: ../app/tools/gimpforegroundselectoptions.c:98 @@ -12381,8 +12621,12 @@ msgid "Size of the brush used for refinements" msgstr "Размер кисти для выделения" #: ../app/tools/gimpforegroundselectoptions.c:104 -msgid "Smaller values give a more accurate selection border but may introduce holes in the selection" -msgstr "При меньших значениях граница выделения будет более аккуратной, однако в самом выделении могут появиться «дыры»." +msgid "" +"Smaller values give a more accurate selection border but may introduce holes " +"in the selection" +msgstr "" +"При меньших значениях граница выделения будет более аккуратной, однако в " +"самом выделении могут появиться «дыры»." #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -12446,7 +12690,9 @@ msgstr "Выделение переднего плана" #: ../app/tools/gimpforegroundselecttool.c:145 msgid "Foreground Select Tool: Select a region containing foreground objects" -msgstr "Выделение переднего плана: выделение области, содержащей объекты на переднем плане" +msgstr "" +"Выделение переднего плана: выделение области, содержащей объекты на переднем " +"плане" #: ../app/tools/gimpforegroundselecttool.c:146 msgid "F_oreground Select" @@ -12470,8 +12716,10 @@ msgid "Foreground Select" msgstr "Выделение переднего плана" #: ../app/tools/gimpfreeselecttool.c:197 -msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "Свободное выделение: выделение области произвольными линиями или отрезками" +msgid "" +"Free Select Tool: Select a hand-drawn region with free and polygonal segments" +msgstr "" +"Свободное выделение: выделение области произвольными линиями или отрезками" #: ../app/tools/gimpfreeselecttool.c:198 msgid "_Free Select" @@ -12487,11 +12735,15 @@ msgstr "Щёлкните и потащите, чтобы переместить #: ../app/tools/gimpfreeselecttool.c:1039 msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "Ввод завершает выделение, Escape отменяет его, Забой убирает последний сегмент" +msgstr "" +"Ввод завершает выделение, Escape отменяет его, Забой убирает последний " +"сегмент" #: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "Щелчок и перетаскивание рисует произвольную линию, щелчок добавляет прямой отрезок" +msgstr "" +"Щелчок и перетаскивание рисует произвольную линию, щелчок добавляет прямой " +"отрезок" #: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" @@ -12504,7 +12756,9 @@ msgstr "Выделение смежных областей" #: ../app/tools/gimpfuzzyselecttool.c:66 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color" -msgstr "Выделение смежных областей: выделение соседних областей области по схожести цвета" +msgstr "" +"Выделение смежных областей: выделение соседних областей области по схожести " +"цвета" #: ../app/tools/gimpfuzzyselecttool.c:67 msgid "Fu_zzy Select" @@ -12515,8 +12769,7 @@ msgctxt "command" msgid "Fuzzy Select" msgstr "Выделение смежных областей" -#: ../app/tools/gimpgegltool.c:93 -#: ../app/tools/gimpgegltool.c:112 +#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112 msgid "GEGL Operation" msgstr "Операция GEGL" @@ -12553,13 +12806,11 @@ msgstr "Лечебная кисть: излечение дефектов в из msgid "_Heal" msgstr "_Лечебная кисть" -#: ../app/tools/gimphealtool.c:76 -#: ../app/tools/gimphealtool.c:79 +#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79 msgid "Click to heal" msgstr "Нажмите, чтобы залечить" -#: ../app/tools/gimphealtool.c:77 -#: ../app/tools/gimphealtool.c:82 +#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82 #, c-format msgid "%s to set a new heal source" msgstr "%s для выбора источника лечащего штампа" @@ -12663,8 +12914,7 @@ msgstr "Пр_едварительный просмотр" msgid "Adjustment" msgstr "Коррекция" -#: ../app/tools/gimpinkoptions-gui.c:64 -#: ../app/tools/gimpinkoptions-gui.c:87 +#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 #: ../app/tools/gimppaintoptions-gui.c:134 msgid "Size" msgstr "Размер" @@ -12704,9 +12954,8 @@ msgid "In_k" msgstr "П_еро" #: ../app/tools/gimpiscissorsoptions.c:68 -#, fuzzy msgid "Display future selection segment as you drag a control node" -msgstr "Показывать границу выделения" +msgstr "Показывать будущую границу выделения при перемещении узла" #: ../app/tools/gimpiscissorsoptions.c:127 msgid "Interactive boundary" @@ -12724,13 +12973,11 @@ msgstr "Умные ножницы: выделение фигур при помо msgid "Intelligent _Scissors" msgstr "_Умные ножницы" -#: ../app/tools/gimpiscissorstool.c:902 -#: ../app/tools/gimpmeasuretool.c:605 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "Нажмите и потащите, чтобы переместить точку" -#: ../app/tools/gimpiscissorstool.c:904 -#: ../app/tools/gimpiscissorstool.c:969 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s: отключить автоприлипание" @@ -12806,8 +13053,7 @@ msgstr "Уровни на выходе" msgid "All Channels" msgstr "Все каналы" -#: ../app/tools/gimplevelstool.c:657 -#: ../app/tools/gimpthresholdtool.c:268 +#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268 msgid "_Auto" msgstr "_Авто" @@ -12902,11 +13148,9 @@ msgstr "Щёлкните и потащите, чтобы добавить нов msgid "Click-Drag to move all points" msgstr "Щёлкните и потащите, чтобы переместить все точки" -#: ../app/tools/gimpmeasuretool.c:939 -#: ../app/tools/gimpmeasuretool.c:1084 -#: ../app/tools/gimpmeasuretool.c:1140 -#: ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 +#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "точки растра" @@ -12965,8 +13209,7 @@ msgstr "Перемещение: перемещение слоев, выделе msgid "_Move" msgstr "_Перемещение" -#: ../app/tools/gimpmovetool.c:249 -#: ../app/tools/gimpmovetool.c:554 +#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 msgid "Move Guide: " msgstr "Переместить направляющую:" @@ -12992,8 +13235,7 @@ msgstr "_Кисть" #: ../app/tools/gimppaintoptions-gui.c:92 #: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 -#: ../app/widgets/gimplayertreeview.c:268 +#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Режим:" @@ -13079,7 +13321,7 @@ msgstr "%s, чтобы взять пипеткой цвет" msgid "Cannot paint on layer groups." msgstr "Невозможно рисовать на группе слоев" -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s для рисования прямой линии" @@ -13093,8 +13335,12 @@ msgid "Pe_ncil" msgstr "Кара_ндаш" #: ../app/tools/gimpperspectiveclonetool.c:134 -msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation" -msgstr "Штамп по перспективе: применение инструмента «Штамп» с учетом перспективы изображения" +msgid "" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" +msgstr "" +"Штамп по перспективе: применение инструмента «Штамп» с учетом перспективы " +"изображения" #: ../app/tools/gimpperspectiveclonetool.c:136 msgid "_Perspective Clone" @@ -13223,8 +13469,7 @@ msgstr "Фикс.:" msgid "Position:" msgstr "Позиция:" -#: ../app/tools/gimprectangleoptions.c:1020 -#: ../app/tools/gimptextoptions.c:525 +#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:525 msgid "Size:" msgstr "Размер:" @@ -13265,8 +13510,7 @@ msgstr "Прямоугольное выделение: выделение пря msgid "_Rectangle Select" msgstr "Пр_ямоугольное выделение" -#: ../app/tools/gimprectangletool.c:1146 -#: ../app/tools/gimprectangletool.c:2016 +#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 msgid "Rectangle: " msgstr "Прямоугольник: " @@ -13350,8 +13594,7 @@ msgstr "Включить растушёвку краёв выделения" msgid "Radius of feathering" msgstr "Радиус растушёвки" -#: ../app/tools/gimpselectionoptions.c:264 -#: ../app/tools/gimptextoptions.c:538 +#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:538 msgid "Antialiasing" msgstr "Сглаживание" @@ -13459,8 +13702,11 @@ msgid "Font size" msgstr "Кегль шрифта" #: ../app/tools/gimptextoptions.c:145 -msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes" -msgstr "Инструктирование изменяет контуры символа, чтобы выдать более чёткие растры при маленьких размерах" +msgid "" +"Hinting alters the font outline to produce a crisp bitmap at small sizes" +msgstr "" +"Инструктирование изменяет контуры символа, чтобы выдать более чёткие растры " +"при маленьких размерах" #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." @@ -13483,12 +13729,16 @@ msgid "Adjust letter spacing" msgstr "Интервал между буквами" #: ../app/tools/gimptextoptions.c:188 -msgid "Whether text flows into rectangular shape or moves into a new line when you press Enter" +msgid "" +"Whether text flows into rectangular shape or moves into a new line when you " +"press Enter" msgstr "" #: ../app/tools/gimptextoptions.c:196 msgid "Use an external editor window for text entry" -msgstr "Использовать окно с редактором текста вместо редактирования текста прямо на холсте" +msgstr "" +"Использовать окно с редактором текста вместо редактирования текста прямо на " +"холсте" #: ../app/tools/gimptextoptions.c:510 msgid "Font" @@ -13538,22 +13788,24 @@ msgstr "_Текст" msgid "Reshape Text Layer" msgstr "Смена размера текстового слоя" -#: ../app/tools/gimptexttool.c:1512 -#: ../app/tools/gimptexttool.c:1515 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "Подтвердите изменение текста" -#: ../app/tools/gimptexttool.c:1519 +#: ../app/tools/gimptexttool.c:1520 msgid "Create _New Layer" msgstr "_Создать новый слой" -#: ../app/tools/gimptexttool.c:1543 +#: ../app/tools/gimptexttool.c:1544 msgid "" -"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n" +"The layer you selected is a text layer but it has been modified using other " +"tools. Editing the layer with the text tool will discard these " +"modifications.\n" "\n" "You can edit the layer or create a new text layer from its text attributes." msgstr "" -"Вы выбрали текстовый слой, но он был изменен с помощью других инструментов. Редактирование слоя инструментом Текст приведет к потере этих изменений. \n" +"Вы выбрали текстовый слой, но он был изменен с помощью других инструментов. " +"Редактирование слоя инструментом Текст приведет к потере этих изменений. \n" "\n" "Вы можете продолжить редактировать этот слой или создать новый." @@ -13672,15 +13924,15 @@ msgstr "Сохранить исходное соотношение сторон" msgid "Transforming" msgstr "Преобразование" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Нет слоя для преобразования." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Нет контура для преобразования." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Элементы активного контура заблокированы от изменений" @@ -13794,13 +14046,11 @@ msgstr "Нажмите, чтобы создать новый компонент msgid "Click or Click-Drag to create a new anchor" msgstr "Щёлкните или щёлкните и потащите для создания нового узла" -#: ../app/tools/gimpvectortool.c:1229 -#: ../app/tools/gimpvectortool.c:1236 +#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the anchor around" msgstr "Щёлкните и потащите, чтобы переместить узел" -#: ../app/tools/gimpvectortool.c:1240 -#: ../app/tools/gimpvectortool.c:1263 +#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 msgid "Click-Drag to move the anchors around" msgstr "Щёлкните и потащите, чтобы переместить узлы" @@ -14065,8 +14315,7 @@ msgstr "Комбинация" msgid "Name" msgstr "Название" -#: ../app/widgets/gimpactionview.c:633 -#: ../app/widgets/gimpactionview.c:843 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "Не удалось изменить комбинацию клавиш." @@ -14081,12 +14330,14 @@ msgstr "Назначить" #: ../app/widgets/gimpactionview.c:691 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." -msgstr "Клавиши быстрого доступа \"%s\" использованы в пункте \"%s\" меню \"%s\"." +msgstr "" +"Клавиши быстрого доступа \"%s\" использованы в пункте \"%s\" меню \"%s\"." #: ../app/widgets/gimpactionview.c:695 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." -msgstr "Назначая эти клавиши вы отказываетесь от доступа по ним к пункту \"%s\"." +msgstr "" +"Назначая эти клавиши вы отказываетесь от доступа по ним к пункту \"%s\"." #: ../app/widgets/gimpactionview.c:778 msgid "Invalid shortcut." @@ -14119,8 +14370,7 @@ msgstr "Интервал" msgid "Percentage of width of brush" msgstr "Скорость рисования" -#: ../app/widgets/gimpbufferview.c:179 -#: ../app/widgets/gimpbufferview.c:264 +#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 #: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(Нет)" @@ -14129,65 +14379,65 @@ msgstr "(Нет)" msgid "Add the current color to the color history" msgstr "Добавить текущий цвет к истории цвета" -#: ../app/widgets/gimpcolordisplayeditor.c:154 +#: ../app/widgets/gimpcolordisplayeditor.c:157 msgid "Available Filters" msgstr "Доступные фильтры" -#: ../app/widgets/gimpcolordisplayeditor.c:216 +#: ../app/widgets/gimpcolordisplayeditor.c:219 msgid "Move the selected filter up" msgstr "Переместить выбранный фильтр вверх" -#: ../app/widgets/gimpcolordisplayeditor.c:225 +#: ../app/widgets/gimpcolordisplayeditor.c:228 msgid "Move the selected filter down" msgstr "Переместить выбранный фильтр вниз" -#: ../app/widgets/gimpcolordisplayeditor.c:271 +#: ../app/widgets/gimpcolordisplayeditor.c:274 msgid "Active Filters" msgstr "Активные фильтры" -#: ../app/widgets/gimpcolordisplayeditor.c:322 +#: ../app/widgets/gimpcolordisplayeditor.c:325 msgid "Reset the selected filter to default values" msgstr "Восстановить для выбранного фильтра параметры по умолчанию" -#: ../app/widgets/gimpcolordisplayeditor.c:503 +#: ../app/widgets/gimpcolordisplayeditor.c:527 #, c-format msgid "Add '%s' to the list of active filters" msgstr "Добавить '%s' в список активных фильтров" -#: ../app/widgets/gimpcolordisplayeditor.c:540 +#: ../app/widgets/gimpcolordisplayeditor.c:564 #, c-format msgid "Remove '%s' from the list of active filters" msgstr "Удалить '%s' из списка активных фильтров" -#: ../app/widgets/gimpcolordisplayeditor.c:571 +#: ../app/widgets/gimpcolordisplayeditor.c:595 msgid "No filter selected" msgstr "Фильтр не выбран" #: ../app/widgets/gimpcoloreditor.c:260 -msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names." -msgstr "Шестнадцатеричная нотация цветов, принятая в HTML и CSS. Сюда также можно ввести название цвета по CSS." +msgid "" +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." +msgstr "" +"Шестнадцатеричная нотация цветов, принятая в HTML и CSS. Сюда также можно " +"ввести название цвета по CSS." #: ../app/widgets/gimpcolorframe.c:511 msgid "Index:" msgstr "Номер:" -#: ../app/widgets/gimpcolorframe.c:524 -#: ../app/widgets/gimpcolorframe.c:550 +#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550 msgid "Red:" msgstr "Красный:" -#: ../app/widgets/gimpcolorframe.c:525 -#: ../app/widgets/gimpcolorframe.c:551 +#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 msgid "Green:" msgstr "Зеленый:" -#: ../app/widgets/gimpcolorframe.c:526 -#: ../app/widgets/gimpcolorframe.c:552 +#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 msgid "Blue:" msgstr "Синий:" -#: ../app/widgets/gimpcolorframe.c:539 -#: ../app/widgets/gimpcolorframe.c:572 +#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572 msgid "Value:" msgstr "Яркость" @@ -14432,13 +14682,16 @@ msgstr "Удалить контроллер '%s'?" #: ../app/widgets/gimpcontrollerlist.c:583 msgid "" -"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n" +"Removing this controller from the list of active controllers will " +"permanently delete all event mappings you have configured.\n" "\n" -"Selecting \"Disable Controller\" will disable the controller without removing it." +"Selecting \"Disable Controller\" will disable the controller without " +"removing it." msgstr "" "При удалении контроллера из списка будут уничтожены все параметры событий.\n" "\n" -"Функция «Отключить контроллер» отключит выбранный контроллер, не удаляя предпочтения." +"Функция «Отключить контроллер» отключит выбранный контроллер, не удаляя " +"предпочтения." #: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" @@ -14709,13 +14962,17 @@ msgid "Configure this tab" msgstr "Настроить эту вкладку" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Авто" -#: ../app/widgets/gimpdockwindow.c:393 -msgid "When enabled the dialog automatically follows the image you are working on." -msgstr "Если включено, содержимое диалога меняется в соответствии с тем, какое изображение активно в данный момент." +#: ../app/widgets/gimpdockwindow.c:397 +#, fuzzy +msgid "" +"When enabled, the dialog automatically follows the image you are working on." +msgstr "" +"Если включено, содержимое диалога меняется в соответствии с тем, какое " +"изображение активно в данный момент." #: ../app/widgets/gimpdrawabletreeview.c:122 msgid "Lock pixels" @@ -14904,13 +15161,11 @@ msgstr "Изменить цвет фона сетки" msgid "_Background color:" msgstr "Цвет _фона:" -#: ../app/widgets/gimpgrideditor.c:195 -#: ../app/widgets/gimpgrideditor.c:227 +#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227 msgid "Width" msgstr "Ширина" -#: ../app/widgets/gimpgrideditor.c:197 -#: ../app/widgets/gimpgrideditor.c:229 +#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229 msgid "Height" msgstr "Высота" @@ -14923,8 +15178,12 @@ msgid "The GIMP help browser is not available." msgstr "Программа для просмотра руководства по GIMP отсутствует." #: ../app/widgets/gimphelp.c:295 -msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages." -msgstr "Встроенный просмотрщик справки GIMP отсутствует. Вы можете использовать вместо него обычный веб-браузер." +msgid "" +"The GIMP help browser plug-in appears to be missing from your installation. " +"You may instead use the web browser for reading the help pages." +msgstr "" +"Встроенный просмотрщик справки GIMP отсутствует. Вы можете использовать " +"вместо него обычный веб-браузер." #: ../app/widgets/gimphelp.c:336 msgid "Help browser doesn't start" @@ -14951,8 +15210,12 @@ msgid "The GIMP user manual is not installed on your computer." msgstr "Руководство пользователя GIMP не установлено на этом компьютере" #: ../app/widgets/gimphelp.c:644 -msgid "You may either install the additional help package or change your preferences to use the online version." -msgstr "Вам стоит либо установить пакет со справкой, либо изменить параметры программы, чтобы использовать справку из Интернета" +msgid "" +"You may either install the additional help package or change your " +"preferences to use the online version." +msgstr "" +"Вам стоит либо установить пакет со справкой, либо изменить параметры " +"программы, чтобы использовать справку из Интернета" #: ../app/widgets/gimphistogrameditor.c:99 msgid "Mean:" @@ -14988,86 +15251,90 @@ msgid "Use default comment" msgstr "Использовать типовой комментарий" #: ../app/widgets/gimpimagecommenteditor.c:109 -msgid "Replace the current image comment with the default comment set in Edit→Preferences→Default Image." -msgstr "Заменить текущий комментарий к изображению на указанный в параметрах программы типовой («Правка > Параметры > Изображение по умолчанию»)." +msgid "" +"Replace the current image comment with the default comment set in " +"Edit→Preferences→Default Image." +msgstr "" +"Заменить текущий комментарий к изображению на указанный в параметрах " +"программы типовой («Правка > Параметры > Изображение по умолчанию»)." #: ../app/widgets/gimpimageprofileview.c:200 msgid "Querying..." msgstr "Запрос..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Размер в пикселах:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Размер при печати:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Разрешение:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Цветовой режим:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Имя файла:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Размер файла:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Тип файла:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Размер в памяти:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Число отмен:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Число повторов:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Число пикселов:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Число слоев:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Число каналов:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Число контуров:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "Нет" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "пикселов/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "цветов" @@ -15264,12 +15531,12 @@ msgstr "%d × %d ppi, %s" msgid "%d ppi, %s" msgstr "%d точек на дюйм, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "В этом контексте атрибут \"%s\" некорректен для элемента <%s>" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "" @@ -15337,19 +15604,16 @@ msgstr "" msgid "Pr_eview" msgstr "_Предпросмотр" -#: ../app/widgets/gimpthumbbox.c:404 -#: ../app/widgets/gimpthumbbox.c:468 +#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468 msgid "No selection" msgstr "Нет выделения" -#: ../app/widgets/gimpthumbbox.c:596 -#: ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 #, c-format msgid "Thumbnail %d of %d" msgstr "Миниатюра %d из %d" -#: ../app/widgets/gimpthumbbox.c:730 -#: ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 msgid "Creating preview..." msgstr "Создание пред. просмотра..." @@ -15658,11 +15922,16 @@ msgid "Undefined" msgstr "Не определено" #: ../app/xcf/xcf-load.c:339 -msgid "This XCF file is corrupt! I have loaded as much of it as I can, but it is incomplete." -msgstr "Этот файл XCF поврежден! Некоторую его часть все же удалось восстановить." +msgid "" +"This XCF file is corrupt! I have loaded as much of it as I can, but it is " +"incomplete." +msgstr "" +"Этот файл XCF поврежден! Некоторую его часть все же удалось восстановить." #: ../app/xcf/xcf-load.c:350 -msgid "This XCF file is corrupt! I could not even salvage any partial image data from it." +msgid "" +"This XCF file is corrupt! I could not even salvage any partial image data " +"from it." msgstr "Этот файл XCF поврежден! Не удалось восстановить даже малую его часть!" #: ../app/xcf/xcf-load.c:423 @@ -15684,15 +15953,12 @@ msgstr "Недопустимая строка UTF-8 в XCF файле." msgid "Error writing XCF: %s" msgstr "Ошибка записи XCF: %s" -#: ../app/xcf/xcf-seek.c:43 -#: ../app/xcf/xcf-seek.c:60 -#: ../app/xcf/xcf-seek.c:71 +#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71 #, c-format msgid "Could not seek in XCF file: %s" msgstr "Не удалось открыть XCF файл: %s" -#: ../app/xcf/xcf.c:99 -#: ../app/xcf/xcf.c:167 +#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167 msgid "GIMP XCF image" msgstr "Файл GIMP XCF" @@ -15734,35 +16000,34 @@ msgid "Create images and edit photographs" msgstr "Создание изображений и редактирование фотографий" #~ msgctxt "view-action" - #~ msgid "Zoom out" #~ msgstr "Уменьшить масштаб просмотра" -#~ msgctxt "view-action" +#~ msgctxt "view-action" #~ msgid "Zoom in" #~ msgstr "Увеличить масштаб просмотра" -#~ msgctxt "windows-action" +#~ msgctxt "windows-action" #~ msgid "" #~ "When enabled GIMP is in a single-window mode. Far from completely " #~ "implemented!" #~ msgstr "" #~ "Если включено, GIMP работает в однооконном режиме. Текущая реализация " #~ "пока что далека от завершённости!" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Brightness_Contrast" #~ msgstr "Яркость-Контраст" -#~ msgctxt "ink-blob-type" +#~ msgctxt "ink-blob-type" #~ msgid "Квадрат" #~ msgstr "Квадратные" -#~ msgctxt "tool" +#~ msgctxt "tool" #~ msgid "_Zoom" #~ msgstr "_Лупа" -#~ msgctxt "tool-preset-action" +#~ msgctxt "tool-preset-action" #~ msgid "_Delete Tool Preset" #~ msgstr "_Удалить профиль инструмента" @@ -15782,24 +16047,24 @@ msgstr "Создание изображений и редактирование #~ msgid "Fill from first point" #~ msgstr "Заполнять от первой точки" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Flip" #~ msgstr "Зеркало" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Perspective" #~ msgstr "Перспектива" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Rotate" #~ msgstr "Вращение" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Scale" #~ msgstr "Масштаб" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Shear" #~ msgstr "Искривление" @@ -15813,20 +16078,20 @@ msgstr "Создание изображений и редактирование #~ msgid "Preview:" #~ msgstr "Вид:" -#~ msgctxt "transform-preview-type" +#~ msgctxt "transform-preview-type" #~ msgid "Outline" #~ msgstr "Контур" -#~ msgctxt "transform-preview-type" +#~ msgctxt "transform-preview-type" #~ msgid "Grid" #~ msgstr "Сетка" -#~ msgctxt "transform-preview-type" +#~ msgctxt "transform-preview-type" #~ msgid "Image" #~ msgstr "Изображение" -#~ msgctxt "transform-preview-type" +#~ msgctxt "transform-preview-type" #~ msgid "Image + Grid" #~ msgstr "Изображение + Сетка" @@ -15851,24 +16116,24 @@ msgstr "Создание изображений и редактирование #~ msgid "Couldn't start '%s': %s" #~ msgstr "Невозможно запустить '%s': %s" -#~ msgctxt "tool-options-action" +#~ msgctxt "tool-options-action" #~ msgid "_Save Options To" #~ msgstr "_Сохранить параметры в" -#~ msgctxt "tool-options-action" +#~ msgctxt "tool-options-action" #~ msgid "_Restore Options From" #~ msgstr "_Загрузить параметры из" -#~ msgctxt "tool-options-action" +#~ msgctxt "tool-options-action" #~ msgid "Re_name Saved Options" #~ msgstr "_Переименовать сохраненные параметры" -#~ msgctxt "tool-options-action" +#~ msgctxt "tool-options-action" #~ msgid "_Delete Saved Options" #~ msgstr "_Удалить сохраненные параметры" -#~ msgctxt "tool-options-action" +#~ msgctxt "tool-options-action" #~ msgid "_New Entry..." #~ msgstr "_Новую запись..." @@ -15981,34 +16246,34 @@ msgstr "Создание изображений и редактирование #~ msgid "Channel to Selection" #~ msgstr "Канал в выделение" -#~ msgctxt "file-action" +#~ msgctxt "file-action" #~ msgid "Save this image with a different name, but keep its current name" #~ msgstr "" #~ "Сохранить это изображение под другим именем, продолжив пользоваться " #~ "оригиналом" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Te_xt to Selection" #~ msgstr "Текст в в_ыделение" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "_Text to Selection" #~ msgstr "Текст в в_ыделение" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Replace the selection with the text layer's outline" #~ msgstr "Создать выделение из контура текстового слоя" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Add the text layer's outline to the current selection" #~ msgstr "Добавить к выделению контур текстового слоя" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Subtract the text layer's outline from the current selection" #~ msgstr "Вычесть контур текстового слоя из выделения" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Intersect the text layer's outline with the current selection" #~ msgstr "Пересечь контур текстового слоя с выделением" @@ -16020,31 +16285,31 @@ msgstr "Создание изображений и редактирование #~ msgid "Cut" #~ msgstr "Вырезать" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Rectangle Select" #~ msgstr "Прямоугольное выделение" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Ellipse Select" #~ msgstr "Эллиптическое выделение" -#~ msgctxt "command" +#~ msgctxt "command" #~ msgid "Bucket Fill" #~ msgstr "Заливка" #~ msgid "Pressure:" #~ msgstr "Нажим:" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reorder layer" #~ msgstr "Реорганизация слоев" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reorder channel" #~ msgstr "Реорганизация каналов" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reorder path" #~ msgstr "Реорганизация контуров" @@ -16087,12 +16352,12 @@ msgstr "Создание изображений и редактирование #, fuzzy #~ msgid "Lower this tool Lower this tool to the bottom" #~ msgstr "Опустить инструмент до низа" -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "_New Group Layer..." #~ msgstr "Создать _группу слоев..." -#~ msgctxt "layers-action" +#~ msgctxt "layers-action" #~ msgid "Create a new group layer and add it to the image" #~ msgstr "Создать новую группу слоя и добавить её в изображение" @@ -16121,16 +16386,16 @@ msgstr "Создание изображений и редактирование #~ "можно указать полный путь или только команду для выполнения. Если команда " #~ "содержит '%s', вместо этого выражения будет подставлен URL, если нет, то " #~ "URL будет добавлен к команде через пробел." -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reposition layer" #~ msgstr "Перестановка слоя" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reposition channel" #~ msgstr "Перестановка канала" -#~ msgctxt "undo-type" +#~ msgctxt "undo-type" #~ msgid "Reposition path" #~ msgstr "Смещение контура" @@ -16139,40 +16404,40 @@ msgstr "Создание изображений и редактирование #~ msgid "_Web browser to use:" #~ msgstr "Используемый _браузер:" -#~ msgctxt "dialogs-action" +#~ msgctxt "dialogs-action" #~ msgid "T_ools" #~ msgstr "_Инструменты" -#~ msgctxt "dialogs-action" +#~ msgctxt "dialogs-action" #~ msgid "Open the tools dialog" #~ msgstr "Открыть диалог выбора отображаемых инструментов" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "Tools Menu" #~ msgstr "Меню панели инструментов" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "R_aise Tool" #~ msgstr "Опустить до _верха" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "Ra_ise to Top" #~ msgstr "Поднять до _верха" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "L_ower Tool" #~ msgstr "_Опустить инструмент" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "Lo_wer to Bottom" #~ msgstr "Опустить до _низа" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "_Reset Order & Visibility" #~ msgstr "Исходные _порядок/видимость" -#~ msgctxt "tools-action" +#~ msgctxt "tools-action" #~ msgid "_Show in Toolbox" #~ msgstr "_Показывать на панели инструментов" @@ -16193,16 +16458,16 @@ msgstr "Создание изображений и редактирование #~ msgid "Toolbox and other docks are transient to the active image window" #~ msgstr "Все панели сверху окна изображения" -#~ msgctxt "edit-action" +#~ msgctxt "edit-action" #~ msgid "Copy the selected region to a named buffer" #~ msgstr "Скопировать выделенную область в именованный буфер обмена" -#~ msgctxt "edit-action" +#~ msgctxt "edit-action" #~ msgid "Fill with P_attern" #~ msgstr "Залить _текстурой" -#~ msgctxt "file-action" +#~ msgctxt "file-action" #~ msgid "Save as _Template..." #~ msgstr "Сохранить как _шаблон..." diff --git a/po/sl.po b/po/sl.po index 50c873405c..1e77f6b94e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -9,26 +9,26 @@ msgid "" msgstr "" "Project-Id-Version: GIMP 2.8\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-18 12:50+0000\n" -"PO-Revision-Date: 2013-03-18 16:24+0100\n" -"Last-Translator: filmsi\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gimp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-28 22:59+0000\n" +"PO-Revision-Date: 2013-10-29 13:51+0100\n" +"Last-Translator: filmsi \n" "Language-Team: Martin Srebotnjak \n" -"Language: \n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -"X-Poedit-Language: Slovenian\n" -"X-Poedit-Country: SLOVENIA\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.7\n" #: ../app/about.h:23 msgid "GIMP" msgstr "GIMP" -#: ../app/about.h:26 -#: ../desktop/gimp.desktop.in.in.h:1 +#: ../app/about.h:26 ../desktop/gimp.desktop.in.in.h:1 msgid "GNU Image Manipulation Program" msgstr "GIMP - program GNU za obdelavo slik" @@ -44,39 +44,55 @@ msgstr "" #: ../app/about.h:34 msgid "" -"GIMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.\n" +"GIMP is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation; either version 3 of the License, or (at your option) any later " +"version.\n" "\n" -"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n" +"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details.\n" "\n" -"You should have received a copy of the GNU General Public License along with GIMP. If not, see http://www.gnu.org/licenses/." +"You should have received a copy of the GNU General Public License along with " +"GIMP. If not, see http://www.gnu.org/licenses/." msgstr "" -"GIMP je prosta programska oprema: lahko jo razširjate in/ali spreminjate pod pogoji Splošne javne licence GNU, ki jo je objavila Free Software Foundation; in sicer tako pod pogoji 3. različice licence kot (če želite) katere koli novejše različice.\n" +"GIMP je prosta programska oprema: lahko jo razširjate in/ali spreminjate pod " +"pogoji Splošne javne licence GNU, ki jo je objavila Free Software " +"Foundation; in sicer tako pod pogoji 3. različice licence kot (če želite) " +"katere koli novejše različice.\n" "\n" -"GIMP razširjamo v upanju, da bo uporaben, vendar BREZ KAKRŠNIH KOLI ZAGOTOVIL ALI GARANCIJE; celo brez implicirane garancije PRODANEGA IZDELKA ali USTREZNOSTI ZA DOLOČEN NAMEN. Če vas zanima več podrobnosti, si oglejte Splošno javno licenco GNU.\n" +"GIMP razširjamo v upanju, da bo uporaben, vendar BREZ KAKRŠNIH KOLI " +"ZAGOTOVIL ALI GARANCIJE; celo brez implicirane garancije PRODANEGA IZDELKA " +"ali USTREZNOSTI ZA DOLOČEN NAMEN. Če vas zanima več podrobnosti, si oglejte " +"Splošno javno licenco GNU.\n" "\n" -"Kopijo Splošne javne licence GIMP ste prejeli s programom GIMP; če je niste prejeli, si oglejte http://www.gnu.org/licenses/." +"Kopijo Splošne javne licence GIMP ste prejeli s programom GIMP; če je niste " +"prejeli, si oglejte http://www.gnu.org/licenses/." -#: ../app/app.c:224 +#: ../app/app.c:225 #, c-format msgid "" "Unable to open a test swap file.\n" "\n" -"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")." +"To avoid data loss, please check the location and permissions of the swap " +"directory defined in your Preferences (currently \"%s\")." msgstr "" "Preizkusne izmenjalne datoteke ni mogoče odpreti.\n" "\n" -"V izogib izgubi podatkov preverite mesto in pravice izmenjalne mape, kot je določena v Nastavitvah (trenutno je to \"%s\")." +"V izogib izgubi podatkov preverite mesto in pravice izmenjalne mape, kot je " +"določena v Nastavitvah (trenutno je to \"%s\")." #: ../app/batch.c:75 #, c-format msgid "No batch interpreter specified, using the default '%s'.\n" msgstr "Naveden ni noben paketni prevajalnik, uporabljen bo privzeti '%s'.\n" -#: ../app/batch.c:93 -#: ../app/batch.c:111 +#: ../app/batch.c:93 ../app/batch.c:111 #, c-format msgid "The batch interpreter '%s' is not available. Batch mode disabled." -msgstr "Paketni prevajalnik ukazov '%s' ni na voljo. Paketni način je onemogočen." +msgstr "" +"Paketni prevajalnik ukazov '%s' ni na voljo. Paketni način je onemogočen." #: ../app/main.c:148 msgid "Show version information and exit" @@ -208,24 +224,30 @@ msgid "" "\n" "Please check the value of the environment variable G_FILENAME_ENCODING." msgstr "" -"Nastavljenega kodnega nabora imena datoteke ni mogoče pretvoriti v UTF-8: %s\n" +"Nastavljenega kodnega nabora imena datoteke ni mogoče pretvoriti v UTF-8: " +"%s\n" "\n" "Preverite vrednost okoljske spremenljivke G_FILENAME_ENCODING." #: ../app/sanity.c:452 #, c-format msgid "" -"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n" +"The name of the directory holding the GIMP user configuration cannot be " +"converted to UTF-8: %s\n" "\n" -"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING." +"Your filesystem probably stores files in an encoding other than UTF-8 and " +"you didn't tell GLib about this. Please set the environment variable " +"G_FILENAME_ENCODING." msgstr "" -"Imena mape, ki vsebuje uporabniške prilagoditve GIMPa, ni mogoče pretvoriti v UTF-8: %s\n" +"Imena mape, ki vsebuje uporabniške prilagoditve GIMPa, ni mogoče pretvoriti " +"v UTF-8: %s\n" "\n" -"Vaš datotečni sistem najverjetneje shranjuje datoteke v drugi kodni tabeli kot UTF-8, a GLib tega ne razpozna. Prosimo, da ustrezno nastavite okoljsko spremenljivko G_FILENAME_ENCODING." +"Vaš datotečni sistem najverjetneje shranjuje datoteke v drugi kodni tabeli " +"kot UTF-8, a GLib tega ne razpozna. Prosimo, da ustrezno nastavite okoljsko " +"spremenljivko G_FILENAME_ENCODING." #. show versions of libraries used by GIMP -#: ../app/version.c:63 -#: ../app/version.c:130 +#: ../app/version.c:63 ../app/version.c:130 #, c-format msgid "using %s version %s (compiled against version %s)" msgstr "uporablja %s različice %s (prevedeno z različico %s)" @@ -235,32 +257,26 @@ msgstr "uporablja %s različice %s (prevedeno z različico %s)" msgid "%s version %s" msgstr "%s različice %s" -#: ../app/actions/actions.c:109 -#: ../app/dialogs/dialogs.c:388 +#: ../app/actions/actions.c:109 ../app/dialogs/dialogs.c:388 #: ../app/widgets/gimpbrusheditor.c:88 msgid "Brush Editor" msgstr "Urejevalnik čopiča" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:112 -#: ../app/core/gimp.c:951 -#: ../app/dialogs/dialogs.c:317 -#: ../app/dialogs/preferences-dialog.c:2739 +#: ../app/actions/actions.c:112 ../app/core/gimp.c:951 +#: ../app/dialogs/dialogs.c:317 ../app/dialogs/preferences-dialog.c:2739 msgid "Brushes" msgstr "Čopiči" -#: ../app/actions/actions.c:115 -#: ../app/dialogs/dialogs.c:327 +#: ../app/actions/actions.c:115 ../app/dialogs/dialogs.c:327 msgid "Buffers" msgstr "Medpomnilniki" -#: ../app/actions/actions.c:118 -#: ../app/dialogs/dialogs.c:346 +#: ../app/actions/actions.c:118 ../app/dialogs/dialogs.c:346 msgid "Channels" msgstr "Kanali" -#: ../app/actions/actions.c:121 -#: ../app/dialogs/convert-dialog.c:174 +#: ../app/actions/actions.c:121 ../app/dialogs/convert-dialog.c:174 #: ../app/dialogs/dialogs.c:354 msgid "Colormap" msgstr "Katalog barv" @@ -273,8 +289,7 @@ msgstr "Prilagoditev" msgid "Context" msgstr "Kontekst" -#: ../app/actions/actions.c:130 -#: ../app/dialogs/dialogs.c:310 +#: ../app/actions/actions.c:130 ../app/dialogs/dialogs.c:310 msgid "Pointer Information" msgstr "Podatki o kazalcu" @@ -295,8 +310,7 @@ msgid "Dockable" msgstr "Sidranje omogočeno" #. Document History -#: ../app/actions/actions.c:145 -#: ../app/dialogs/dialogs.c:329 +#: ../app/actions/actions.c:145 ../app/dialogs/dialogs.c:329 #: ../app/dialogs/preferences-dialog.c:1573 msgid "Document History" msgstr "Zgodovina dokumenta" @@ -306,13 +320,11 @@ msgid "Drawable" msgstr "Risalno" #. Some things do not have grids, so just list -#: ../app/actions/actions.c:151 -#: ../app/dialogs/dialogs.c:335 +#: ../app/actions/actions.c:151 ../app/dialogs/dialogs.c:335 msgid "Paint Dynamics" msgstr "Dinamika slikanja" -#: ../app/actions/actions.c:154 -#: ../app/dialogs/dialogs.c:392 +#: ../app/actions/actions.c:154 ../app/dialogs/dialogs.c:392 #: ../app/widgets/gimpdynamicseditor.c:92 msgid "Paint Dynamics Editor" msgstr "Urejevalnik dinamike slikanja" @@ -321,8 +333,7 @@ msgstr "Urejevalnik dinamike slikanja" msgid "Edit" msgstr "Uredi" -#: ../app/actions/actions.c:160 -#: ../app/dialogs/dialogs.c:306 +#: ../app/actions/actions.c:160 ../app/dialogs/dialogs.c:306 msgid "Error Console" msgstr "Konzola za napake" @@ -330,35 +341,28 @@ msgstr "Konzola za napake" msgid "File" msgstr "Datoteka" -#: ../app/actions/actions.c:166 -#: ../app/dialogs/dialogs.c:325 +#: ../app/actions/actions.c:166 ../app/dialogs/dialogs.c:325 #: ../app/dialogs/preferences-dialog.c:2759 msgid "Fonts" msgstr "Pisave" -#: ../app/actions/actions.c:169 -#: ../app/dialogs/dialogs.c:396 +#: ../app/actions/actions.c:169 ../app/dialogs/dialogs.c:396 #: ../app/widgets/gimpgradienteditor.c:269 msgid "Gradient Editor" msgstr "Urejevalnik prelivov" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:172 -#: ../app/core/gimp.c:971 -#: ../app/dialogs/dialogs.c:321 -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/actions/actions.c:172 ../app/core/gimp.c:971 +#: ../app/dialogs/dialogs.c:321 ../app/dialogs/preferences-dialog.c:2755 msgid "Gradients" msgstr "Prelivi" -#: ../app/actions/actions.c:175 -#: ../app/core/gimp.c:983 -#: ../app/dialogs/dialogs.c:337 -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/actions/actions.c:175 ../app/core/gimp.c:983 +#: ../app/dialogs/dialogs.c:337 ../app/dialogs/preferences-dialog.c:2763 msgid "Tool Presets" msgstr "Prednastavitve orodja" -#: ../app/actions/actions.c:178 -#: ../app/dialogs/dialogs.c:404 +#: ../app/actions/actions.c:178 ../app/dialogs/dialogs.c:404 #: ../app/widgets/gimptoolpreseteditor.c:92 msgid "Tool Preset Editor" msgstr "Urejevalnik prednastavitev orodja" @@ -372,53 +376,43 @@ msgid "Image" msgstr "Slika" #. list & grid views -#: ../app/actions/actions.c:187 -#: ../app/dialogs/dialogs.c:315 +#: ../app/actions/actions.c:187 ../app/dialogs/dialogs.c:315 msgid "Images" msgstr "Slike" -#: ../app/actions/actions.c:190 -#: ../app/dialogs/dialogs.c:342 +#: ../app/actions/actions.c:190 ../app/dialogs/dialogs.c:342 #: ../app/dialogs/resize-dialog.c:287 msgid "Layers" msgstr "Plasti" -#: ../app/actions/actions.c:193 -#: ../app/dialogs/dialogs.c:400 +#: ../app/actions/actions.c:193 ../app/dialogs/dialogs.c:400 #: ../app/widgets/gimppaletteeditor.c:143 msgid "Palette Editor" msgstr "Urejevalnik palet" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:196 -#: ../app/core/gimp.c:966 -#: ../app/dialogs/dialogs.c:323 -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/actions/actions.c:196 ../app/core/gimp.c:966 +#: ../app/dialogs/dialogs.c:323 ../app/dialogs/preferences-dialog.c:2751 msgid "Palettes" msgstr "Palete" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:199 -#: ../app/core/gimp.c:961 -#: ../app/dialogs/dialogs.c:319 -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/actions/actions.c:199 ../app/core/gimp.c:961 +#: ../app/dialogs/dialogs.c:319 ../app/dialogs/preferences-dialog.c:2747 msgid "Patterns" msgstr "Vzorci" -#: ../app/actions/actions.c:202 -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/actions/actions.c:202 ../app/dialogs/preferences-dialog.c:2767 msgid "Plug-Ins" msgstr "Vtičniki" #. Quick Mask Color -#: ../app/actions/actions.c:205 -#: ../app/core/gimpchannel.c:386 +#: ../app/actions/actions.c:205 ../app/core/gimpchannel.c:386 #: ../app/dialogs/preferences-dialog.c:2025 msgid "Quick Mask" msgstr "Hitra maska" -#: ../app/actions/actions.c:208 -#: ../app/dialogs/dialogs.c:370 +#: ../app/actions/actions.c:208 ../app/dialogs/dialogs.c:370 msgid "Sample Points" msgstr "Vzorčne točke" @@ -427,8 +421,7 @@ msgid "Select" msgstr "Izberi" #. initialize the template list -#: ../app/actions/actions.c:214 -#: ../app/core/gimp.c:989 +#: ../app/actions/actions.c:214 ../app/core/gimp.c:989 #: ../app/dialogs/dialogs.c:331 msgid "Templates" msgstr "Predloge" @@ -441,20 +434,16 @@ msgstr "Orodje za besedilo" msgid "Text Editor" msgstr "Urejevalnik besedila" -#: ../app/actions/actions.c:223 -#: ../app/dialogs/dialogs.c:298 -#: ../app/dialogs/preferences-dialog.c:1854 -#: ../app/gui/gui.c:424 +#: ../app/actions/actions.c:223 ../app/dialogs/dialogs.c:298 +#: ../app/dialogs/preferences-dialog.c:1854 ../app/gui/gui.c:424 msgid "Tool Options" msgstr "Možnosti orodja" -#: ../app/actions/actions.c:226 -#: ../app/widgets/gimptoolpalette.c:390 +#: ../app/actions/actions.c:226 ../app/widgets/gimptoolpalette.c:391 msgid "Tools" msgstr "Orodja" -#: ../app/actions/actions.c:229 -#: ../app/dialogs/dialogs.c:350 +#: ../app/actions/actions.c:229 ../app/dialogs/dialogs.c:350 #: ../app/tools/gimpvectortool.c:160 msgid "Paths" msgstr "Poti" @@ -762,8 +751,7 @@ msgstr "Uredi barvo kanala" msgid "_Fill opacity:" msgstr "Pro_sojnost polnila:" -#: ../app/actions/channels-commands.c:116 -#: ../app/core/gimpchannel.c:272 +#: ../app/actions/channels-commands.c:116 ../app/core/gimpchannel.c:272 #: ../app/widgets/gimpchanneltreeview.c:331 msgid "Channel" msgstr "Kanal" @@ -782,8 +770,7 @@ msgstr "Možnosti novega kanala" msgid "New Channel Color" msgstr "Barva novega kanala" -#: ../app/actions/channels-commands.c:244 -#: ../app/core/gimpimage-new.c:257 +#: ../app/actions/channels-commands.c:244 ../app/core/gimpimage-new.c:257 #: ../app/display/gimpdisplayshell-dnd.c:646 #: ../app/widgets/gimpchanneltreeview.c:258 #: ../app/widgets/gimplayertreeview.c:776 @@ -980,16 +967,13 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Uporabi sestavljeno barvo vseh vidnih plasti" -#: ../app/actions/data-commands.c:89 -#: ../app/actions/documents-commands.c:344 -#: ../app/actions/file-commands.c:195 -#: ../app/dialogs/file-open-dialog.c:232 +#: ../app/actions/data-commands.c:89 ../app/actions/documents-commands.c:344 +#: ../app/actions/file-commands.c:201 ../app/dialogs/file-open-dialog.c:232 #: ../app/dialogs/file-open-dialog.c:277 #: ../app/dialogs/file-open-location-dialog.c:213 #: ../app/dialogs/file-open-location-dialog.c:225 #: ../app/display/gimpdisplayshell-dnd.c:592 -#: ../app/widgets/gimplayertreeview.c:736 -#: ../app/widgets/gimptoolbox-dnd.c:168 +#: ../app/widgets/gimplayertreeview.c:736 ../app/widgets/gimptoolbox-dnd.c:168 #: ../app/widgets/gimptoolbox.c:818 #, c-format msgid "" @@ -1003,12 +987,9 @@ msgstr "" #: ../app/actions/data-commands.c:118 #: ../app/actions/tool-options-commands.c:72 -#: ../app/core/gimpbrushgenerated-load.c:125 -#: ../app/core/gimpimage.c:1529 -#: ../app/core/gimppalette-import.c:211 -#: ../app/core/gimppalette-load.c:224 -#: ../app/core/gimppalette.c:399 -#: ../app/dialogs/palette-import-dialog.c:771 +#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1529 +#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:224 +#: ../app/core/gimppalette.c:399 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:94 msgid "Untitled" msgstr "Neimenovano" @@ -1369,8 +1350,7 @@ msgid "About GIMP" msgstr "O programu GIMP" #: ../app/actions/dialogs-actions.c:328 -#: ../app/dialogs/preferences-dialog.c:1944 -#: ../app/widgets/gimptoolbox.c:540 +#: ../app/dialogs/preferences-dialog.c:1944 ../app/widgets/gimptoolbox.c:540 msgid "Toolbox" msgstr "Orodjarna" @@ -1516,8 +1496,7 @@ msgctxt "tab-style" msgid "St_atus & Text" msgstr "St_anje in besedilo" -#: ../app/actions/dockable-actions.c:116 -#: ../app/widgets/widgets-enums.c:224 +#: ../app/actions/dockable-actions.c:116 ../app/widgets/widgets-enums.c:224 msgctxt "tab-style" msgid "Automatic" msgstr "Samodejno" @@ -1651,8 +1630,12 @@ msgid "Clear the Recent Documents list?" msgstr "Želite počistiti seznam nazadnje odprtih dokumentov?" #: ../app/actions/documents-commands.c:218 -msgid "Clearing the document history will permanently remove all images from the recent documents list." -msgstr "Če počistite zgodovino dokumentov, boste za vedno odstranili vse trenutno navedene vnose za vse programe." +msgid "" +"Clearing the document history will permanently remove all images from the " +"recent documents list." +msgstr "" +"Če počistite zgodovino dokumentov, boste za vedno odstranili vse trenutno " +"navedene vnose za vse programe." #: ../app/actions/drawable-actions.c:45 msgctxt "drawable-action" @@ -1692,7 +1675,8 @@ msgstr "_Zamik ..." #: ../app/actions/drawable-actions.c:65 msgctxt "drawable-action" msgid "Shift the pixels, optionally wrapping them at the borders" -msgstr "Zamakne slikovne točke in jih po želji na robovih prelomi v novo vrstico" +msgstr "" +"Zamakne slikovne točke in jih po želji na robovih prelomi v novo vrstico" #: ../app/actions/drawable-actions.c:73 msgctxt "drawable-action" @@ -1920,7 +1904,9 @@ msgstr "Krepko ponavljanje" #: ../app/actions/edit-actions.c:92 msgctxt "edit-action" msgid "Redo the last operation that was undone, skipping visibility changes" -msgstr "Ponovi zadnje dejanje, ki je bilo razveljavljeno, preskoči spremembe v vidnosti" +msgstr "" +"Ponovi zadnje dejanje, ki je bilo razveljavljeno, preskoči spremembe v " +"vidnosti" #: ../app/actions/edit-actions.c:97 msgctxt "edit-action" @@ -1940,7 +1926,8 @@ msgstr "Poje_manje ..." #: ../app/actions/edit-actions.c:105 msgctxt "edit-action" msgid "Modify paint mode and opacity of the last pixel manipulation" -msgstr "Spremeni način slikanja in prekrivnosti za zadnje dejanje nad slikovno točko" +msgstr "" +"Spremeni način slikanja in prekrivnosti za zadnje dejanje nad slikovno točko" #: ../app/actions/edit-actions.c:110 msgctxt "edit-action" @@ -1998,8 +1985,7 @@ msgctxt "edit-action" msgid "From _Clipboard" msgstr "Z _odložišča" -#: ../app/actions/edit-actions.c:142 -#: ../app/actions/edit-actions.c:148 +#: ../app/actions/edit-actions.c:142 ../app/actions/edit-actions.c:148 msgctxt "edit-action" msgid "Create a new image from the content of the clipboard" msgstr "Ustvari novo sliko iz vsebine odložišča" @@ -2138,27 +2124,24 @@ msgstr "Želite res pobrisati vso zgodovino razveljavitev za to sliko?" #: ../app/actions/edit-commands.c:176 #, c-format msgid "Clearing the undo history of this image will gain %s of memory." -msgstr "Čiščenje zgodovine razveljavitev za to sliko bi sprostilo %s pomnilnika." +msgstr "" +"Čiščenje zgodovine razveljavitev za to sliko bi sprostilo %s pomnilnika." #: ../app/actions/edit-commands.c:206 msgid "Cut pixels to the clipboard" msgstr "Izreži slikovne točke na odložišče" -#: ../app/actions/edit-commands.c:236 -#: ../app/actions/edit-commands.c:265 +#: ../app/actions/edit-commands.c:236 ../app/actions/edit-commands.c:265 msgid "Copied pixels to the clipboard" msgstr "Kopirane slikovne točke na odložišče" -#: ../app/actions/edit-commands.c:325 -#: ../app/actions/edit-commands.c:360 +#: ../app/actions/edit-commands.c:325 ../app/actions/edit-commands.c:360 #: ../app/actions/edit-commands.c:543 msgid "There is no image data in the clipboard to paste." msgstr "Na odložišču ni nikakršnih slikovnih podatkov za lepljenje." -#: ../app/actions/edit-commands.c:348 -#: ../app/core/gimpbrushclipboard.c:172 -#: ../app/core/gimppatternclipboard.c:172 -#: ../app/widgets/gimpclipboard.c:345 +#: ../app/actions/edit-commands.c:348 ../app/core/gimpbrushclipboard.c:172 +#: ../app/core/gimppatternclipboard.c:172 ../app/widgets/gimpclipboard.c:345 msgid "Clipboard" msgstr "Odložišče" @@ -2166,8 +2149,7 @@ msgstr "Odložišče" msgid "Cut Named" msgstr "Kopiraj imenovano" -#: ../app/actions/edit-commands.c:377 -#: ../app/actions/edit-commands.c:418 +#: ../app/actions/edit-commands.c:377 ../app/actions/edit-commands.c:418 #: ../app/actions/edit-commands.c:438 msgid "Enter a name for this buffer" msgstr "Vnesite ime za ta medpomnilnik" @@ -2184,8 +2166,7 @@ msgstr "Kopiraj vidno v imenovano" msgid "There is no active layer or channel to cut from." msgstr "Ni aktivne plasti ali kanala, da bi z njih izrezali." -#: ../app/actions/edit-commands.c:565 -#: ../app/actions/edit-commands.c:597 +#: ../app/actions/edit-commands.c:565 ../app/actions/edit-commands.c:597 #: ../app/actions/edit-commands.c:621 msgid "(Unnamed Buffer)" msgstr "(neimenovan medpomnilnik)" @@ -2368,8 +2349,12 @@ msgstr "Shrani kopij_o ..." #: ../app/actions/file-actions.c:135 msgctxt "file-action" -msgid "Save a copy of this image, without affecting the source file (if any) or the current state of the image" -msgstr "Shrani kopijo te slike brez vplivanja na izvorno datoteko (če obstaja) ali trenutno stanje slike" +msgid "" +"Save a copy of this image, without affecting the source file (if any) or the " +"current state of the image" +msgstr "" +"Shrani kopijo te slike brez vplivanja na izvorno datoteko (če obstaja) ali " +"trenutno stanje slike" #: ../app/actions/file-actions.c:140 msgctxt "file-action" @@ -2425,59 +2410,62 @@ msgstr "Prepi_ši %s" msgid "Export to" msgstr "Izvozi v" -#: ../app/actions/file-commands.c:113 -#: ../app/actions/file-commands.c:490 +#: ../app/actions/file-commands.c:119 ../app/actions/file-commands.c:496 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Odpri sliko" -#: ../app/actions/file-commands.c:134 +#: ../app/actions/file-commands.c:140 msgid "Open Image as Layers" msgstr "Odpri sliko kot plasti" -#: ../app/actions/file-commands.c:266 +#: ../app/actions/file-commands.c:272 msgid "No changes need to be saved" msgstr "Nobenih sprememb ni potrebno shraniti" -#: ../app/actions/file-commands.c:273 -#: ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:279 ../app/actions/file-commands.c:700 +#: ../app/dialogs/file-save-dialog.c:103 msgid "Save Image" msgstr "Shrani sliko" -#: ../app/actions/file-commands.c:279 +#: ../app/actions/file-commands.c:285 msgid "Save a Copy of the Image" msgstr "Shrani kopijo slike" -#: ../app/actions/file-commands.c:364 +#: ../app/actions/file-commands.c:370 msgid "Create New Template" msgstr "Ustvari novo predlogo" -#: ../app/actions/file-commands.c:368 +#: ../app/actions/file-commands.c:374 msgid "Enter a name for this template" msgstr "Vnesite ime za predlogo" -#: ../app/actions/file-commands.c:398 +#: ../app/actions/file-commands.c:404 msgid "Revert failed. No file name associated with this image." msgstr "Povrnitev ni uspela. Nobena datoteka ni povezana s to sliko." -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:416 msgid "Revert Image" msgstr "Povrni sliko" -#: ../app/actions/file-commands.c:436 +#: ../app/actions/file-commands.c:442 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Želite povrniti '%s' v '%s'?" -#: ../app/actions/file-commands.c:442 -msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information." -msgstr "S povrnitvijo slike v zadnje shranjeno stanje boste izgubili vse spremembe in podatke za razveljavitve." +#: ../app/actions/file-commands.c:448 +msgid "" +"By reverting the image to the state saved on disk, you will lose all " +"changes, including all undo information." +msgstr "" +"S povrnitvijo slike v zadnje shranjeno stanje boste izgubili vse spremembe " +"in podatke za razveljavitve." -#: ../app/actions/file-commands.c:652 +#: ../app/actions/file-commands.c:730 msgid "(Unnamed Template)" msgstr "(neimenovana predloga)" -#: ../app/actions/file-commands.c:703 +#: ../app/actions/file-commands.c:781 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2942,8 +2930,7 @@ msgstr "Uredi preliv" msgid "Save '%s' as POV-Ray" msgstr "Shrani '%s' kot žarek POV" -#: ../app/actions/help-actions.c:37 -#: ../app/actions/help-actions.c:40 +#: ../app/actions/help-actions.c:37 ../app/actions/help-actions.c:40 msgctxt "help-action" msgid "_Help" msgstr "Po_moč" @@ -2963,8 +2950,7 @@ msgctxt "help-action" msgid "Show the help for a specific user interface item" msgstr "Pokaži pomoč za določen element uporabniškega vmesnika" -#: ../app/actions/image-actions.c:48 -#: ../app/actions/image-actions.c:52 +#: ../app/actions/image-actions.c:48 ../app/actions/image-actions.c:52 msgctxt "image-action" msgid "Image Menu" msgstr "Meni slike" @@ -3218,9 +3204,8 @@ msgstr "Zasukaj sliko za 90 stopinj v nasprotni smeri urinega kazalca" msgid "Set Image Canvas Size" msgstr "Nastavite velikost platna slike" -#: ../app/actions/image-commands.c:266 -#: ../app/actions/image-commands.c:290 -#: ../app/actions/image-commands.c:583 +#: ../app/actions/image-commands.c:266 ../app/actions/image-commands.c:290 +#: ../app/actions/image-commands.c:594 msgid "Resizing" msgstr "Spreminjanje velikosti ..." @@ -3237,40 +3222,32 @@ msgstr "Prevračanje ..." #: ../app/actions/image-commands.c:403 #: ../app/pdb/drawable-transform-cmds.c:602 -#: ../app/pdb/drawable-transform-cmds.c:694 -#: ../app/pdb/image-cmds.c:534 -#: ../app/pdb/item-transform-cmds.c:433 -#: ../app/pdb/transform-tools-cmds.c:245 +#: ../app/pdb/drawable-transform-cmds.c:694 ../app/pdb/image-cmds.c:534 +#: ../app/pdb/item-transform-cmds.c:433 ../app/pdb/transform-tools-cmds.c:245 #: ../app/tools/gimprotatetool.c:125 msgid "Rotating" msgstr "Sukanje ..." -#: ../app/actions/image-commands.c:429 -#: ../app/actions/layers-commands.c:691 +#: ../app/actions/image-commands.c:429 ../app/actions/layers-commands.c:691 msgid "Cannot crop because the current selection is empty." msgstr "Obrezava ni možna, ker je trenutni izbor prazen." -#: ../app/actions/image-commands.c:630 +#: ../app/actions/image-commands.c:641 msgid "Change Print Size" msgstr "Spremeni velikost tiskanja" -#: ../app/actions/image-commands.c:671 +#: ../app/actions/image-commands.c:682 msgid "Scale Image" msgstr "Spremeni merilo slike" #. Scaling -#: ../app/actions/image-commands.c:682 -#: ../app/actions/layers-commands.c:1145 +#: ../app/actions/image-commands.c:693 ../app/actions/layers-commands.c:1145 #: ../app/dialogs/preferences-dialog.c:1899 #: ../app/pdb/drawable-transform-cmds.c:783 -#: ../app/pdb/drawable-transform-cmds.c:872 -#: ../app/pdb/image-cmds.c:406 -#: ../app/pdb/image-cmds.c:442 -#: ../app/pdb/item-transform-cmds.c:524 -#: ../app/pdb/layer-cmds.c:333 -#: ../app/pdb/layer-cmds.c:378 -#: ../app/pdb/transform-tools-cmds.c:334 -#: ../app/tools/gimpscaletool.c:118 +#: ../app/pdb/drawable-transform-cmds.c:872 ../app/pdb/image-cmds.c:406 +#: ../app/pdb/image-cmds.c:442 ../app/pdb/item-transform-cmds.c:524 +#: ../app/pdb/layer-cmds.c:333 ../app/pdb/layer-cmds.c:378 +#: ../app/pdb/transform-tools-cmds.c:334 ../app/tools/gimpscaletool.c:118 msgid "Scaling" msgstr "Spreminjanje merila" @@ -3374,8 +3351,7 @@ msgctxt "layers-action" msgid "Edit the layer's name" msgstr "Uredi ime plasti" -#: ../app/actions/layers-actions.c:82 -#: ../app/actions/layers-actions.c:610 +#: ../app/actions/layers-actions.c:82 ../app/actions/layers-actions.c:610 msgctxt "layers-action" msgid "_New Layer..." msgstr "_Nova plast ..." @@ -3385,8 +3361,7 @@ msgctxt "layers-action" msgid "Create a new layer and add it to the image" msgstr "Ustvari novo plast in jo dodaj sliki" -#: ../app/actions/layers-actions.c:88 -#: ../app/actions/layers-actions.c:611 +#: ../app/actions/layers-actions.c:88 ../app/actions/layers-actions.c:611 msgctxt "layers-action" msgid "_New Layer" msgstr "_Nova plast" @@ -3701,8 +3676,7 @@ msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Dodaj masko plasti trenutnemu izboru" -#: ../app/actions/layers-actions.c:296 -#: ../app/actions/layers-actions.c:325 +#: ../app/actions/layers-actions.c:296 ../app/actions/layers-actions.c:325 msgctxt "layers-action" msgid "_Subtract from Selection" msgstr "_Odštej od izbora" @@ -3712,8 +3686,7 @@ msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Odštej masko plasti od trenutnega izbora" -#: ../app/actions/layers-actions.c:302 -#: ../app/actions/layers-actions.c:332 +#: ../app/actions/layers-actions.c:302 ../app/actions/layers-actions.c:332 msgctxt "layers-action" msgid "_Intersect with Selection" msgstr "_Presekaj z izborom" @@ -3807,8 +3780,7 @@ msgstr "Tipka za bližnjico: " msgid "-Click on thumbnail in Layers dockable" msgstr "-klik na predogledno sličico v Plasteh z omogočenim sidranjem" -#: ../app/actions/layers-actions.c:605 -#: ../app/actions/layers-actions.c:606 +#: ../app/actions/layers-actions.c:605 ../app/actions/layers-actions.c:606 msgctxt "layers-action" msgid "To _New Layer" msgstr "V _novo plast" @@ -3821,13 +3793,11 @@ msgstr "Lastnosti plasti" msgid "Edit Layer Attributes" msgstr "Uredi lastnosti plasti" -#: ../app/actions/layers-commands.c:250 -#: ../app/core/gimplayer.c:267 +#: ../app/actions/layers-commands.c:250 ../app/core/gimplayer.c:267 msgid "Layer" msgstr "Plast" -#: ../app/actions/layers-commands.c:252 -#: ../app/actions/layers-commands.c:320 +#: ../app/actions/layers-commands.c:252 ../app/actions/layers-commands.c:320 #: ../app/widgets/gimpdrawabletreeview.c:326 #: ../app/widgets/gimplayertreeview.c:837 msgid "New Layer" @@ -4488,10 +4458,8 @@ msgstr "_Operjeni rob" msgid "_Lock selection to image edges" msgstr "_Zakleni izbor na robove slike" -#: ../app/actions/select-commands.c:345 -#: ../app/actions/select-commands.c:378 -#: ../app/actions/vectors-commands.c:386 -#: ../app/actions/vectors-commands.c:420 +#: ../app/actions/select-commands.c:345 ../app/actions/select-commands.c:378 +#: ../app/actions/vectors-commands.c:386 ../app/actions/vectors-commands.c:420 #: ../app/dialogs/stroke-dialog.c:281 msgid "There is no active layer or channel to stroke to." msgstr "Ni aktivne plasti ali kanala, da nanje risali s potezami." @@ -4574,7 +4542,8 @@ msgstr "Izbriši predlogo" #: ../app/actions/templates-commands.c:237 #, c-format -msgid "Are you sure you want to delete template '%s' from the list and from disk?" +msgid "" +"Are you sure you want to delete template '%s' from the list and from disk?" msgstr "Ste prepričani, da želite zbrisati predlogo '%s' s seznama in z diska?" #: ../app/actions/text-editor-actions.c:43 @@ -4623,23 +4592,15 @@ msgid "Open Text File (UTF-8)" msgstr "Odpri datoteko z besedilom (UTF-8)" #: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:226 -#: ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:142 -#: ../app/core/gimpbrush-load.c:426 +#: ../app/actions/text-tool-commands.c:226 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:142 ../app/core/gimpbrush-load.c:426 #: ../app/core/gimpbrushgenerated-load.c:73 -#: ../app/core/gimpbrushpipe-load.c:81 -#: ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:63 -#: ../app/core/gimppalette-load.c:77 -#: ../app/core/gimppalette-load.c:274 -#: ../app/core/gimppalette-load.c:320 -#: ../app/core/gimppalette-load.c:377 -#: ../app/core/gimppalette-load.c:467 -#: ../app/core/gimppalette-load.c:634 -#: ../app/core/gimppattern-load.c:76 -#: ../app/tools/gimpcurvestool.c:649 -#: ../app/tools/gimplevelstool.c:747 +#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:54 +#: ../app/core/gimpgradient-load.c:63 ../app/core/gimppalette-load.c:77 +#: ../app/core/gimppalette-load.c:274 ../app/core/gimppalette-load.c:320 +#: ../app/core/gimppalette-load.c:377 ../app/core/gimppalette-load.c:467 +#: ../app/core/gimppalette-load.c:634 ../app/core/gimppattern-load.c:76 +#: ../app/tools/gimpcurvestool.c:649 ../app/tools/gimplevelstool.c:747 #: ../app/xcf/xcf.c:329 #, c-format msgid "Could not open '%s' for reading: %s" @@ -5114,8 +5075,7 @@ msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "Izbo_r v pot" -#: ../app/actions/vectors-actions.c:202 -#: ../app/actions/vectors-actions.c:208 +#: ../app/actions/vectors-actions.c:202 ../app/actions/vectors-actions.c:208 msgctxt "vectors-action" msgid "Selection to path" msgstr "Izbor v pot" @@ -5143,8 +5103,7 @@ msgstr "Lastnosti poti" msgid "Edit Path Attributes" msgstr "Uredi lastnosti poti" -#: ../app/actions/vectors-commands.c:164 -#: ../app/vectors/gimpvectors.c:207 +#: ../app/actions/vectors-commands.c:164 ../app/vectors/gimpvectors.c:207 #: ../app/widgets/gimpvectorstreeview.c:250 msgid "Path" msgstr "Pot" @@ -5157,8 +5116,7 @@ msgstr "Nova pot" msgid "New Path Options" msgstr "Možnosti nove poti" -#: ../app/actions/vectors-commands.c:392 -#: ../app/tools/gimpvectoroptions.c:199 +#: ../app/actions/vectors-commands.c:392 ../app/tools/gimpvectoroptions.c:199 #: ../app/tools/gimpvectortool.c:1975 msgid "Stroke Path" msgstr "Vleci poteze po poti" @@ -5195,13 +5153,13 @@ msgstr "Ustvari nov pogled slike" #: ../app/actions/view-actions.c:82 msgctxt "view-action" -msgid "_Close" -msgstr "_Zapri" +msgid "_Close View" +msgstr "_Zapri pogled" #: ../app/actions/view-actions.c:83 msgctxt "view-action" -msgid "Close this image window" -msgstr "Zapri to okno s sliko" +msgid "Close the active image view" +msgstr "Zapri aktivni pogled slike" #: ../app/actions/view-actions.c:88 msgctxt "view-action" @@ -5438,8 +5396,7 @@ msgctxt "view-zoom-action" msgid "Zoom _Out" msgstr "_Oddalji" -#: ../app/actions/view-actions.c:264 -#: ../app/actions/view-actions.c:276 +#: ../app/actions/view-actions.c:264 ../app/actions/view-actions.c:276 msgctxt "view-zoom-action" msgid "Zoom out" msgstr "Pomanjšaj" @@ -5449,8 +5406,7 @@ msgctxt "view-zoom-action" msgid "Zoom _In" msgstr "_Približaj" -#: ../app/actions/view-actions.c:270 -#: ../app/actions/view-actions.c:282 +#: ../app/actions/view-actions.c:270 ../app/actions/view-actions.c:282 msgctxt "view-zoom-action" msgid "Zoom in" msgstr "Povečaj" @@ -5465,62 +5421,52 @@ msgctxt "view-zoom-action" msgid "Zoom In" msgstr "Povečaj" -#: ../app/actions/view-actions.c:300 -#: ../app/actions/view-actions.c:306 +#: ../app/actions/view-actions.c:300 ../app/actions/view-actions.c:306 msgctxt "view-zoom-action" msgid "1_6:1 (1600%)" msgstr "1_6:1 (1600%)" -#: ../app/actions/view-actions.c:301 -#: ../app/actions/view-actions.c:307 +#: ../app/actions/view-actions.c:301 ../app/actions/view-actions.c:307 msgctxt "view-zoom-action" msgid "Zoom 16:1" msgstr "16:1" -#: ../app/actions/view-actions.c:312 -#: ../app/actions/view-actions.c:318 +#: ../app/actions/view-actions.c:312 ../app/actions/view-actions.c:318 msgctxt "view-zoom-action" msgid "_8:1 (800%)" msgstr "_8:1 (800%)" -#: ../app/actions/view-actions.c:313 -#: ../app/actions/view-actions.c:319 +#: ../app/actions/view-actions.c:313 ../app/actions/view-actions.c:319 msgctxt "view-zoom-action" msgid "Zoom 8:1" msgstr "8:1" -#: ../app/actions/view-actions.c:324 -#: ../app/actions/view-actions.c:330 +#: ../app/actions/view-actions.c:324 ../app/actions/view-actions.c:330 msgctxt "view-zoom-action" msgid "_4:1 (400%)" msgstr "_4:1 (400%)" -#: ../app/actions/view-actions.c:325 -#: ../app/actions/view-actions.c:331 +#: ../app/actions/view-actions.c:325 ../app/actions/view-actions.c:331 msgctxt "view-zoom-action" msgid "Zoom 4:1" msgstr "4:1" -#: ../app/actions/view-actions.c:336 -#: ../app/actions/view-actions.c:342 +#: ../app/actions/view-actions.c:336 ../app/actions/view-actions.c:342 msgctxt "view-zoom-action" msgid "_2:1 (200%)" msgstr "_2:1 (200%)" -#: ../app/actions/view-actions.c:337 -#: ../app/actions/view-actions.c:343 +#: ../app/actions/view-actions.c:337 ../app/actions/view-actions.c:343 msgctxt "view-zoom-action" msgid "Zoom 2:1" msgstr "2:1" -#: ../app/actions/view-actions.c:348 -#: ../app/actions/view-actions.c:354 +#: ../app/actions/view-actions.c:348 ../app/actions/view-actions.c:354 msgctxt "view-zoom-action" msgid "_1:1 (100%)" msgstr "_1:1 (100%)" -#: ../app/actions/view-actions.c:349 -#: ../app/actions/view-actions.c:355 +#: ../app/actions/view-actions.c:349 ../app/actions/view-actions.c:355 msgctxt "view-zoom-action" msgid "Zoom 1:1" msgstr "1:1" @@ -5644,11 +5590,11 @@ msgstr "D_rugo (%s) ..." msgid "_Zoom (%s)" msgstr "_Povečava (%s)" -#: ../app/actions/view-commands.c:585 +#: ../app/actions/view-commands.c:603 msgid "Set Canvas Padding Color" msgstr "Nastavite barvo polnila platna" -#: ../app/actions/view-commands.c:587 +#: ../app/actions/view-commands.c:605 msgid "Set Custom Canvas Padding Color" msgstr "Izberi lastne barve polnila platna oz. podlage" @@ -5704,8 +5650,11 @@ msgstr "Skrij sidrišča" #: ../app/actions/windows-actions.c:116 msgctxt "windows-action" -msgid "When enabled docks and other dialogs are hidden, leaving only image windows." -msgstr "Če je vključeno, so sidrišča in druga pogovorna okna skrita, ostanejo le okna s slikami." +msgid "" +"When enabled docks and other dialogs are hidden, leaving only image windows." +msgstr "" +"Če je vključeno, so sidrišča in druga pogovorna okna skrita, ostanejo le " +"okna s slikami." #: ../app/actions/windows-actions.c:122 msgctxt "windows-action" @@ -5888,8 +5837,16 @@ msgid "Anti erase" msgstr "Razveljavi brisanje" #: ../app/base/tile-swap.c:710 -msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences." -msgstr "Izmenjalne datoteke ni mogoče odpreti. GIMP-u je zmanjkalo pomnilnika, zato izmenjalna datoteka ni uporabna. Nekateri deli slike bodo morda okvarjeni. Poskusite shraniti svoje delo pod drugimi imeni datotek, ponovno zagnati GIMP-a in preveriti nastavitve izmenjalne datoteke v svojih nastavitvah." +msgid "" +"Unable to open swap file. GIMP has run out of memory and cannot use the swap " +"file. Some parts of your images may be corrupted. Try to save your work " +"using different filenames, restart GIMP and check the location of the swap " +"directory in your Preferences." +msgstr "" +"Izmenjalne datoteke ni mogoče odpreti. GIMP-u je zmanjkalo pomnilnika, zato " +"izmenjalna datoteka ni uporabna. Nekateri deli slike bodo morda okvarjeni. " +"Poskusite shraniti svoje delo pod drugimi imeni datotek, ponovno zagnati " +"GIMP-a in preveriti nastavitve izmenjalne datoteke v svojih nastavitvah." #: ../app/base/tile-swap.c:725 #, c-format @@ -6001,23 +5958,17 @@ msgctxt "handedness" msgid "Right-handed" msgstr "Desno-ročno" -#: ../app/config/gimpconfig-file.c:67 -#: ../app/core/gimpbrushgenerated-save.c:62 -#: ../app/core/gimpcurve-save.c:52 -#: ../app/core/gimpgradient-save.c:50 -#: ../app/core/gimpgradient-save.c:144 -#: ../app/core/gimppalette-save.c:56 -#: ../app/gui/themes.c:243 -#: ../app/tools/gimpcurvestool.c:702 -#: ../app/tools/gimplevelstool.c:800 -#: ../app/vectors/gimpvectors-export.c:81 +#: ../app/config/gimpconfig-file.c:67 ../app/core/gimpbrushgenerated-save.c:62 +#: ../app/core/gimpcurve-save.c:52 ../app/core/gimpgradient-save.c:50 +#: ../app/core/gimpgradient-save.c:144 ../app/core/gimppalette-save.c:56 +#: ../app/gui/themes.c:243 ../app/tools/gimpcurvestool.c:702 +#: ../app/tools/gimplevelstool.c:800 ../app/vectors/gimpvectors-export.c:81 #: ../app/xcf/xcf.c:422 #, c-format msgid "Could not open '%s' for writing: %s" msgstr "'%s' ni mogoče odpreti za pisanje: %s" -#: ../app/config/gimpconfig-file.c:78 -#: ../app/config/gimpconfig-file.c:101 +#: ../app/config/gimpconfig-file.c:78 ../app/config/gimpconfig-file.c:101 #, c-format msgid "Error writing '%s': %s" msgstr "Napaka pri pisanju '%s': %s" @@ -6029,25 +5980,37 @@ msgstr "Napaka pri branju '%s': %s" #: ../app/config/gimpconfig-file.c:131 #, c-format -msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'." -msgstr "Napaka pri razčlenjevanju datoteke '%s'. Uporabljene bodo privzete vrednosti. Varnostna kopija nastavitev je bila shranjena v '%s'." +msgid "" +"There was an error parsing your '%s' file. Default values will be used. A " +"backup of your configuration has been created at '%s'." +msgstr "" +"Napaka pri razčlenjevanju datoteke '%s'. Uporabljene bodo privzete " +"vrednosti. Varnostna kopija nastavitev je bila shranjena v '%s'." #. Not all strings defined here are used in the user interface #. * (the preferences dialog mainly) and only those that are should #. * be marked for translation. #. #: ../app/config/gimprc-blurbs.h:13 -msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"." -msgstr "Če je omogočeno, bo slika postala aktivna, ko njeno okno dobi pozornost. To je uporabno za upravljalnike oken, ki uporabljajo \"klikni za pozornost\". (angl. \"click to focus\")." +msgid "" +"When enabled, an image will become the active image when its image window " +"receives the focus. This is useful for window managers using \"click to focus" +"\"." +msgstr "" +"Če je omogočeno, bo slika postala aktivna, ko njeno okno dobi pozornost. To " +"je uporabno za upravljalnike oken, ki uporabljajo \"klikni za pozornost\". " +"(angl. \"click to focus\")." -#: ../app/config/gimprc-blurbs.h:23 -#: ../app/config/gimprc-blurbs.h:28 +#: ../app/config/gimprc-blurbs.h:23 ../app/config/gimprc-blurbs.h:28 msgid "Sets the dynamics search path." msgstr "Določi pot iskanja dinamike." #: ../app/config/gimprc-blurbs.h:33 -msgid "Sets the canvas padding color used if the padding mode is set to custom color." -msgstr "Nastavi barvo zapolnjevanja platna, če je le-ta nastavljena na barvo po meri." +msgid "" +"Sets the canvas padding color used if the padding mode is set to custom " +"color." +msgstr "" +"Nastavi barvo zapolnjevanja platna, če je le-ta nastavljena na barvo po meri." #: ../app/config/gimprc-blurbs.h:37 msgid "Specifies how the area around the image should be drawn." @@ -6074,24 +6037,49 @@ msgid "Sets the handedness for cursor positioning." msgstr "Določa levo- oz. desnoročnost pri umeščanju kazalca." #: ../app/config/gimprc-blurbs.h:58 -msgid "Context-dependent mouse pointers are helpful. They are enabled by default. However, they require overhead that you may want to do without." -msgstr "Od konteksta odvisni kazalci miške so v veliko pomoč. Privzeto so omogočeni, vendar obenem lahko pomenijo dodatno motnjo, ki je lahko komu v napoto." +msgid "" +"Context-dependent mouse pointers are helpful. They are enabled by default. " +"However, they require overhead that you may want to do without." +msgstr "" +"Od konteksta odvisni kazalci miške so v veliko pomoč. Privzeto so omogočeni, " +"vendar obenem lahko pomenijo dodatno motnjo, ki je lahko komu v napoto." #: ../app/config/gimprc-blurbs.h:74 -msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen." -msgstr "Če je vključeno, bo vsaka točka slike zagotovo preslikana na slikovno točko zaslona." +msgid "" +"When enabled, this will ensure that each pixel of an image gets mapped to a " +"pixel on the screen." +msgstr "" +"Če je vključeno, bo vsaka točka slike zagotovo preslikana na slikovno točko " +"zaslona." #: ../app/config/gimprc-blurbs.h:96 msgid "This is the distance in pixels where Guide and Grid snapping activates." -msgstr "Na tej razdalji (v slikovnih točkah) se vključi lepljenje na vodila ali mrežo." +msgstr "" +"Na tej razdalji (v slikovnih točkah) se vključi lepljenje na vodila ali " +"mrežo." #: ../app/config/gimprc-blurbs.h:112 -msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm. The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold." -msgstr "Orodja, kot sta mehki izbor in zapolni s kanglico, uporabljajo algoritem polnjenja s sejanjem. To pomeni, da se polnjenje začne v prvi izbrani točki in se izvaja v vse smeri na soležnih točkah, dokler ni razlika v intenzivnosti slikovnih točk od izvirnika večja od nastavljene vrednosti praga. Ta vrednost predstavlja privzeti prag." +msgid "" +"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill " +"algorithm. The seed fill starts at the initially selected pixel and " +"progresses in all directions until the difference of pixel intensity from " +"the original is greater than a specified threshold. This value represents " +"the default threshold." +msgstr "" +"Orodja, kot sta mehki izbor in zapolni s kanglico, uporabljajo algoritem " +"polnjenja s sejanjem. To pomeni, da se polnjenje začne v prvi izbrani točki " +"in se izvaja v vse smeri na soležnih točkah, dokler ni razlika v " +"intenzivnosti slikovnih točk od izvirnika večja od nastavljene vrednosti " +"praga. Ta vrednost predstavlja privzeti prag." #: ../app/config/gimprc-blurbs.h:125 -msgid "The window type hint that is set on dock windows and the toolbox window. This may affect the way your window manager decorates and handles these windows." -msgstr "Namig okenske vrste, nastavljen na sidrana okna in okno orodjarne. To lahko vpliva na način, kako vaš upravljalnik oken opremlja in upravlja ta okna." +msgid "" +"The window type hint that is set on dock windows and the toolbox window. " +"This may affect the way your window manager decorates and handles these " +"windows." +msgstr "" +"Namig okenske vrste, nastavljen na sidrana okna in okno orodjarne. To lahko " +"vpliva na način, kako vaš upravljalnik oken opremlja in upravlja ta okna." #: ../app/config/gimprc-blurbs.h:157 msgid "When enabled, the selected brush will be used for all tools." @@ -6122,12 +6110,19 @@ msgid "Sets the text to appear in image window titles." msgstr "Nastavi besedilo, ki naj se prikaže v naslovu okna slike." #: ../app/config/gimprc-blurbs.h:200 -msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1." -msgstr "Če je vključeno, bo po odpiranju datoteke vidna celotna slika, sicer bo prikazana v merilu 1:1." +msgid "" +"When enabled, this will ensure that the full image is visible after a file " +"is opened, otherwise it will be displayed with a scale of 1:1." +msgstr "" +"Če je vključeno, bo po odpiranju datoteke vidna celotna slika, sicer bo " +"prikazana v merilu 1:1." #: ../app/config/gimprc-blurbs.h:204 -msgid "Sets the level of interpolation used for scaling and other transformations." -msgstr "Nastavi stopnjo interpolacije, uporabljeno pri spreminjanju merila in drugih transformacijah." +msgid "" +"Sets the level of interpolation used for scaling and other transformations." +msgstr "" +"Nastavi stopnjo interpolacije, uporabljeno pri spreminjanju merila in drugih " +"transformacijah." #: ../app/config/gimprc-blurbs.h:211 msgid "Specifies the language to use for the user interface." @@ -6135,127 +6130,240 @@ msgstr "Določa jezik uporabniškega vmesnika." #: ../app/config/gimprc-blurbs.h:214 msgid "How many recently opened image filenames to keep on the File menu." -msgstr "Koliko nedavno odprtih dokumentov naj bo prikazanih na seznamu menija Datoteka." +msgstr "" +"Koliko nedavno odprtih dokumentov naj bo prikazanih na seznamu menija " +"Datoteka." #: ../app/config/gimprc-blurbs.h:217 -msgid "Speed of marching ants in the selection outline. This value is in milliseconds (less time indicates faster marching)." -msgstr "Hitrost korakanja mravljic po orisu izbora. Vrednost je v milisekundah (manj časa pomeni hitrejše korakanje)." +msgid "" +"Speed of marching ants in the selection outline. This value is in " +"milliseconds (less time indicates faster marching)." +msgstr "" +"Hitrost korakanja mravljic po orisu izbora. Vrednost je v milisekundah (manj " +"časa pomeni hitrejše korakanje)." #: ../app/config/gimprc-blurbs.h:221 -msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here." -msgstr "GIMP uporabnika opozori, če poskuša ustvariti sliko, ki bi zahtevala več pomnilnika od tukaj nastavljene velikosti." +msgid "" +"GIMP will warn the user if an attempt is made to create an image that would " +"take more memory than the size specified here." +msgstr "" +"GIMP uporabnika opozori, če poskuša ustvariti sliko, ki bi zahtevala več " +"pomnilnika od tukaj nastavljene velikosti." #: ../app/config/gimprc-blurbs.h:231 -msgid "Sets the monitor's horizontal resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Nastavi vodoravno ločljivost zaslona v pikah na palec. Če jo nastavite na 0, bo podatke o vodoravni in navpični ločljivosti podal strežnik X." +msgid "" +"Sets the monitor's horizontal resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Nastavi vodoravno ločljivost zaslona v pikah na palec. Če jo nastavite na 0, " +"bo podatke o vodoravni in navpični ločljivosti podal strežnik X." #: ../app/config/gimprc-blurbs.h:236 -msgid "Sets the monitor's vertical resolution, in dots per inch. If set to 0, forces the X server to be queried for both horizontal and vertical resolution information." -msgstr "Nastavi navpično ločljivost zaslona v pikah na palec. Če jo nastavite na 0, bo podatke o vodoravni in navpični ločljivosti podal strežnik X." +msgid "" +"Sets the monitor's vertical resolution, in dots per inch. If set to 0, " +"forces the X server to be queried for both horizontal and vertical " +"resolution information." +msgstr "" +"Nastavi navpično ločljivost zaslona v pikah na palec. Če jo nastavite na 0, " +"bo podatke o vodoravni in navpični ločljivosti podal strežnik X." #: ../app/config/gimprc-blurbs.h:241 -msgid "If enabled, the move tool sets the edited layer or path as active. This used to be the default behaviour in older versions." -msgstr "Če je vključeno, orodje za premikanje nastavi urejevano plast ali pot kot aktivno. To je bilo v starejših različicah privzeto vedenje." +msgid "" +"If enabled, the move tool sets the edited layer or path as active. This " +"used to be the default behaviour in older versions." +msgstr "" +"Če je vključeno, orodje za premikanje nastavi urejevano plast ali pot kot " +"aktivno. To je bilo v starejših različicah privzeto vedenje." #: ../app/config/gimprc-blurbs.h:245 -msgid "Sets the size of the navigation preview available in the lower right corner of the image window." -msgstr "Nastavi velikost krmarja predogleda, ki se nahaja v spodnjem desnem kotu okna slike." +msgid "" +"Sets the size of the navigation preview available in the lower right corner " +"of the image window." +msgstr "" +"Nastavi velikost krmarja predogleda, ki se nahaja v spodnjem desnem kotu " +"okna slike." #: ../app/config/gimprc-blurbs.h:249 msgid "Sets how many processors GIMP should try to use simultaneously." msgstr "Koliko procesorjev naj GIMP poskusi uporabljati vzporedno." #: ../app/config/gimprc-blurbs.h:262 -msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint. This means painting with large brushes should be more accurate, but it may be slower. Conversely, on some X servers enabling this option results in faster painting." -msgstr "Če je vključeno, bo o položaju kazalca pri premiku miške ali kak drug dogodek vedno povprašan strežnik X, namig o položaju bo prezrt. Tako bo risanje z velikimi čopiči natančnejše, a počasnejše. Neverjetno, a na nekaterih strežnikih X to pomeni tudi hitrejše delovanje." +msgid "" +"When enabled, the X server is queried for the mouse's current position on " +"each motion event, rather than relying on the position hint. This means " +"painting with large brushes should be more accurate, but it may be slower. " +"Conversely, on some X servers enabling this option results in faster " +"painting." +msgstr "" +"Če je vključeno, bo o položaju kazalca pri premiku miške ali kak drug " +"dogodek vedno povprašan strežnik X, namig o položaju bo prezrt. Tako bo " +"risanje z velikimi čopiči natančnejše, a počasnejše. Neverjetno, a na " +"nekaterih strežnikih X to pomeni tudi hitrejše delovanje." #: ../app/config/gimprc-blurbs.h:278 -msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images." -msgstr "Nastavi, ali naj GIMP ustvari predoglede plasti in kanalov. Ti so uporabni, a lahko ob delu z velikimi slikami upočasnijo delovanje." +msgid "" +"Sets whether GIMP should create previews of layers and channels. Previews in " +"the layers and channels dialog are nice to have but they can slow things " +"down when working with large images." +msgstr "" +"Nastavi, ali naj GIMP ustvari predoglede plasti in kanalov. Ti so uporabni, " +"a lahko ob delu z velikimi slikami upočasnijo delovanje." #: ../app/config/gimprc-blurbs.h:283 -msgid "Sets the preview size used for layers and channel previews in newly created dialogs." -msgstr "Nastavi privzeto velikost predogledov plasti in kanalov v novo ustvarjenih pogovornih oknih." +msgid "" +"Sets the preview size used for layers and channel previews in newly created " +"dialogs." +msgstr "" +"Nastavi privzeto velikost predogledov plasti in kanalov v novo ustvarjenih " +"pogovornih oknih." #: ../app/config/gimprc-blurbs.h:287 msgid "Sets the default quick mask color." msgstr "Določa privzeto barvo za hitro maskiranje." #: ../app/config/gimprc-blurbs.h:290 -msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes." -msgstr "Če je vklopljeno, se bodo okna slik samodejno prilagajala spreminjajočim velikostim slik." +msgid "" +"When enabled, the image window will automatically resize itself whenever the " +"physical image size changes." +msgstr "" +"Če je vklopljeno, se bodo okna slik samodejno prilagajala spreminjajočim " +"velikostim slik." #: ../app/config/gimprc-blurbs.h:294 -msgid "When enabled, the image window will automatically resize itself when zooming into and out of images." -msgstr "Če je vklopljeno, se bodo okna slik samodejno prilagajala slikam ob približevanju in oddaljevanju pogleda." +msgid "" +"When enabled, the image window will automatically resize itself when zooming " +"into and out of images." +msgstr "" +"Če je vklopljeno, se bodo okna slik samodejno prilagajala slikam ob " +"približevanju in oddaljevanju pogleda." #: ../app/config/gimprc-blurbs.h:298 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "GIMP naj ob vsakem zagonu poskusi obnoviti nazadnje shranjeno sejo." #: ../app/config/gimprc-blurbs.h:301 -msgid "Remember the current tool, pattern, color, and brush across GIMP sessions." -msgstr "GIMP si med sejami lahko zapomni trenutno uporabljeno orodje, vzorec, barvo in čopič." +msgid "" +"Remember the current tool, pattern, color, and brush across GIMP sessions." +msgstr "" +"GIMP si med sejami lahko zapomni trenutno uporabljeno orodje, vzorec, barvo " +"in čopič." #: ../app/config/gimprc-blurbs.h:305 -msgid "Keep a permanent record of all opened and saved files in the Recent Documents list." -msgstr "Ohrani informacije o vseh odprtih in shranjenih datotekah v seznamu nedavno odprtih." +msgid "" +"Keep a permanent record of all opened and saved files in the Recent " +"Documents list." +msgstr "" +"Ohrani informacije o vseh odprtih in shranjenih datotekah v seznamu nedavno " +"odprtih." #: ../app/config/gimprc-blurbs.h:309 msgid "Save the positions and sizes of the main dialogs when GIMP exits." -msgstr "Ob izhodu iz programa GIMP shrani položaje in velikosti glavnih pogovornih oken." +msgstr "" +"Ob izhodu iz programa GIMP shrani položaje in velikosti glavnih pogovornih " +"oken." #: ../app/config/gimprc-blurbs.h:312 msgid "Save the tool options when GIMP exits." msgstr "Ob izhodu iz programa GIMP shrani spremenjene nastavitve orodja." #: ../app/config/gimprc-blurbs.h:318 -msgid "When enabled, all paint tools will show a preview of the current brush's outline." -msgstr "Če je vklopljeno, bodo orodja za risanje kazala predoglede z obrobo trenutnega čopiča." +msgid "" +"When enabled, all paint tools will show a preview of the current brush's " +"outline." +msgstr "" +"Če je vklopljeno, bodo orodja za risanje kazala predoglede z obrobo " +"trenutnega čopiča." #: ../app/config/gimprc-blurbs.h:322 -msgid "When enabled, dialogs will show a help button that gives access to the related help page. Without this button, the help page can still be reached by pressing F1." -msgstr "Če je vklopljeno, bodo pogovorna okna kazala gumb za pomoč, ki vas usmeri na ustrezno stran pomoči. Do nje lahko dostopate tudi brez gumba, če pritisnete F1." +msgid "" +"When enabled, dialogs will show a help button that gives access to the " +"related help page. Without this button, the help page can still be reached " +"by pressing F1." +msgstr "" +"Če je vklopljeno, bodo pogovorna okna kazala gumb za pomoč, ki vas usmeri na " +"ustrezno stran pomoči. Do nje lahko dostopate tudi brez gumba, če " +"pritisnete F1." #: ../app/config/gimprc-blurbs.h:327 -msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool." -msgstr "Če je vključeno, bo kazalec miške ob uporabi orodja barvanja prikazan nad sliko." +msgid "" +"When enabled, the mouse pointer will be shown over the image while using a " +"paint tool." +msgstr "" +"Če je vključeno, bo kazalec miške ob uporabi orodja barvanja prikazan nad " +"sliko." #: ../app/config/gimprc-blurbs.h:331 -msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command." -msgstr "Če je vklopljeno, bo menijska vrstica po privzeti nastavitvi prikazana. Nastavitev spremenite z ukazom \"Pogled->Pokaži menijsko vrstico\"." +msgid "" +"When enabled, the menubar is visible by default. This can also be toggled " +"with the \"View->Show Menubar\" command." +msgstr "" +"Če je vklopljeno, bo menijska vrstica po privzeti nastavitvi prikazana. " +"Nastavitev spremenite z ukazom \"Pogled->Pokaži menijsko vrstico\"." #: ../app/config/gimprc-blurbs.h:335 -msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command." -msgstr "Če je vklopljeno, bosta ravnili po privzeti nastavitvi vidna. To lahko spremenite z ukazom \"Pogled->Pokaži ravnili\"." +msgid "" +"When enabled, the rulers are visible by default. This can also be toggled " +"with the \"View->Show Rulers\" command." +msgstr "" +"Če je vklopljeno, bosta ravnili po privzeti nastavitvi vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži ravnili\"." #: ../app/config/gimprc-blurbs.h:339 -msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command." -msgstr "Če je vklopljeno, sta po privzeti nastavitvi drsnika vidna. To lahko spremenite z ukazom \"Pogled->Pokaži drsnika\"." +msgid "" +"When enabled, the scrollbars are visible by default. This can also be " +"toggled with the \"View->Show Scrollbars\" command." +msgstr "" +"Če je vklopljeno, sta po privzeti nastavitvi drsnika vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži drsnika\"." #: ../app/config/gimprc-blurbs.h:343 -msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command." -msgstr "Če je vklopljeno, bo po privzeti nastavitvi vrstica stanja vidna. To lahko spremenite z ukazom \"Pogled->Pokaži vrstico stanja\"." +msgid "" +"When enabled, the statusbar is visible by default. This can also be toggled " +"with the \"View->Show Statusbar\" command." +msgstr "" +"Če je vklopljeno, bo po privzeti nastavitvi vrstica stanja vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži vrstico stanja\"." #: ../app/config/gimprc-blurbs.h:347 -msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command." -msgstr "Če je vklopljeno, bo izbor po privzeti nastavitvi viden. To lahko spremenite z ukazom \"Pogled->Pokaži izbor\"." +msgid "" +"When enabled, the selection is visible by default. This can also be toggled " +"with the \"View->Show Selection\" command." +msgstr "" +"Če je vklopljeno, bo izbor po privzeti nastavitvi viden. To lahko spremenite " +"z ukazom \"Pogled->Pokaži izbor\"." #: ../app/config/gimprc-blurbs.h:351 -msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command." -msgstr "Če je vklopljeno, bo rob plasti po privzeti nastavitvi viden. Nastavitev spremenite z ukazom \"Pogled->Pokaži rob plasti\"." +msgid "" +"When enabled, the layer boundary is visible by default. This can also be " +"toggled with the \"View->Show Layer Boundary\" command." +msgstr "" +"Če je vklopljeno, bo rob plasti po privzeti nastavitvi viden. Nastavitev " +"spremenite z ukazom \"Pogled->Pokaži rob plasti\"." #: ../app/config/gimprc-blurbs.h:355 -msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command." -msgstr "Če je vklopljeno, bodo vodila po privzeti nastavitvi vidna. To lahko spremenite z ukazom \"Pogled->Pokaži vodila\"." +msgid "" +"When enabled, the guides are visible by default. This can also be toggled " +"with the \"View->Show Guides\" command." +msgstr "" +"Če je vklopljeno, bodo vodila po privzeti nastavitvi vidna. To lahko " +"spremenite z ukazom \"Pogled->Pokaži vodila\"." #: ../app/config/gimprc-blurbs.h:359 -msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command." -msgstr "Če je vklopljeno, bo mreža po privzeti nastavitvi prikazana. To lahko spremenite z ukazom \"Pogled->Pokaži mrežo\"." +msgid "" +"When enabled, the grid is visible by default. This can also be toggled with " +"the \"View->Show Grid\" command." +msgstr "" +"Če je vklopljeno, bo mreža po privzeti nastavitvi prikazana. To lahko " +"spremenite z ukazom \"Pogled->Pokaži mrežo\"." #: ../app/config/gimprc-blurbs.h:363 -msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command." -msgstr "Če je vključeno, so vzorčne točke privzeto vidne. To lahko vključite ali izključite tudi z ukazom\"Pogled->Pokaži vzorčne točke\"." +msgid "" +"When enabled, the sample points are visible by default. This can also be " +"toggled with the \"View->Show Sample Points\" command." +msgstr "" +"Če je vključeno, so vzorčne točke privzeto vidne. To lahko vključite ali " +"izključite tudi z ukazom\"Pogled->Pokaži vzorčne točke\"." #: ../app/config/gimprc-blurbs.h:367 msgid "Show a tooltip when the pointer hovers over an item." @@ -6274,16 +6382,32 @@ msgid "What to do when the space bar is pressed in the image window." msgstr "Kaj naj se zgodi, ko je v oknu slike pritisnjena preslednica." #: ../app/config/gimprc-blurbs.h:379 -msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS. For these reasons, it may be desirable to put your swap file in \"/tmp\"." -msgstr "Izberite mesto izmenjalne datoteke. GIMP uporablja porazdelitveno shemo določanja pomnilnika. Uporablja izmenjalno datoteko za enostavnejše izbiranje delov z diska in nazaj. Vedite, da lahko izmenjalna datoteka hitro zelo naraste, če delate z velikimi slikami. Delo lahko postane izjemno počasno, če jo ustvarite na omrežnem pogonu prek NFS. Zaradi tega priporočamo, da izmenjalni datoteki nastavite pot shranjevanja \"/tmp\"." +msgid "" +"Sets the swap file location. GIMP uses a tile based memory allocation " +"scheme. The swap file is used to quickly and easily swap tiles out to disk " +"and back in. Be aware that the swap file can easily get very large if GIMP " +"is used with large images. Also, things can get horribly slow if the swap " +"file is created on a folder that is mounted over NFS. For these reasons, it " +"may be desirable to put your swap file in \"/tmp\"." +msgstr "" +"Izberite mesto izmenjalne datoteke. GIMP uporablja porazdelitveno shemo " +"določanja pomnilnika. Uporablja izmenjalno datoteko za enostavnejše " +"izbiranje delov z diska in nazaj. Vedite, da lahko izmenjalna datoteka hitro " +"zelo naraste, če delate z velikimi slikami. Delo lahko postane izjemno " +"počasno, če jo ustvarite na omrežnem pogonu prek NFS. Zaradi tega " +"priporočamo, da izmenjalni datoteki nastavite pot shranjevanja \"/tmp\"." #: ../app/config/gimprc-blurbs.h:388 msgid "When enabled, menus can be torn off." msgstr "Če je vključeno, lahko menije odtrgate." #: ../app/config/gimprc-blurbs.h:391 -msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted." -msgstr "Če je vključeno, lahko spreminjate tipke za bližnjice s pritiskom na kombinacijo tipk, ko je izbira v meniju osvetljena." +msgid "" +"When enabled, you can change keyboard shortcuts for menu items by hitting a " +"key combination while the menu item is highlighted." +msgstr "" +"Če je vključeno, lahko spreminjate tipke za bližnjice s pritiskom na " +"kombinacijo tipk, ko je izbira v meniju osvetljena." #: ../app/config/gimprc-blurbs.h:395 msgid "Save changed keyboard shortcuts when GIMP exits." @@ -6294,20 +6418,40 @@ msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Ob vsakem zagonu programa GIMP obnovi shranjene tipke za bližnjice." #: ../app/config/gimprc-blurbs.h:401 -msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP. Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users." -msgstr "Nastavi mapo za začasno hrambo. Med poganjanjem GIMP-a se bodo v njej pojavile datoteke. Večina datotek bo ob zaprtju GIMP-a izginilo, nekatere pa bodo tudi ostale, zato je najbolje, da ta mapa ni v souporabi z drugimi uporabniki." +msgid "" +"Sets the folder for temporary storage. Files will appear here during the " +"course of running GIMP. Most files will disappear when GIMP exits, but some " +"files are likely to remain, so it is best if this folder not be one that is " +"shared by other users." +msgstr "" +"Nastavi mapo za začasno hrambo. Med poganjanjem GIMP-a se bodo v njej " +"pojavile datoteke. Večina datotek bo ob zaprtju GIMP-a izginilo, nekatere pa " +"bodo tudi ostale, zato je najbolje, da ta mapa ni v souporabi z drugimi " +"uporabniki." #: ../app/config/gimprc-blurbs.h:413 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "Nastavi velikost sličice predogleda v pogovornem oknu Odpri." #: ../app/config/gimprc-blurbs.h:416 -msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here." -msgstr "Predogledna sličica v pogovornem oknu Odpri se bo samodejno posodabljala, če bo predogledana slika manjša od tukaj nastavljene velikosti." +msgid "" +"The thumbnail in the Open dialog will be automatically updated if the file " +"being previewed is smaller than the size set here." +msgstr "" +"Predogledna sličica v pogovornem oknu Odpri se bo samodejno posodabljala, če " +"bo predogledana slika manjša od tukaj nastavljene velikosti." #: ../app/config/gimprc-blurbs.h:420 -msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk. This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise. If you have a lot of RAM, you may want to set this to a higher value." -msgstr "Ko število podatkov slikovnih točk preseže to mejo, bo GIMP pričel izmenjati tlakovce z diskom. To je veliko počasneje, vendar omogoča delo s slikami, ki sicer presegajo obseg pomnilnika. Če imate dovolj pomnilnika, je smiselno ta parameter nastaviti na višjo vrednost." +msgid "" +"When the amount of pixel data exceeds this limit, GIMP will start to swap " +"tiles to disk. This is a lot slower but it makes it possible to work on " +"images that wouldn't fit into memory otherwise. If you have a lot of RAM, " +"you may want to set this to a higher value." +msgstr "" +"Ko število podatkov slikovnih točk preseže to mejo, bo GIMP pričel izmenjati " +"tlakovce z diskom. To je veliko počasneje, vendar omogoča delo s slikami, ki " +"sicer presegajo obseg pomnilnika. Če imate dovolj pomnilnika, je smiselno ta " +"parameter nastaviti na višjo vrednost." #: ../app/config/gimprc-blurbs.h:426 msgid "Show the current foreground and background colors in the toolbox." @@ -6330,16 +6474,31 @@ msgid "Sets the size of the checkerboard used to display transparency." msgstr "Nastavi velikost kvadratov šahovnice, ki predstavlja prosojnost." #: ../app/config/gimprc-blurbs.h:444 -msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened." -msgstr "Če je vključeno, GIMP ne shrani slike, če ni bila spremenjena, odkar ste jo odprli." +msgid "" +"When enabled, GIMP will not save an image if it has not been changed since " +"it was opened." +msgstr "" +"Če je vključeno, GIMP ne shrani slike, če ni bila spremenjena, odkar ste jo " +"odprli." #: ../app/config/gimprc-blurbs.h:448 -msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached." -msgstr "Nastavi najmanjše število dejanj, ki jih je mogoče razveljaviti. Število možnih ravni razveljavitev se povečuje, dokler ne doseže nastavljenega števila operacij." +msgid "" +"Sets the minimal number of operations that can be undone. More undo levels " +"are kept available until the undo-size limit is reached." +msgstr "" +"Nastavi najmanjše število dejanj, ki jih je mogoče razveljaviti. Število " +"možnih ravni razveljavitev se povečuje, dokler ne doseže nastavljenega " +"števila operacij." #: ../app/config/gimprc-blurbs.h:452 -msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone." -msgstr "Nastavi zgornjo mejo pomnilnika, ki je na voljo vsaki sliki za shranjevanje operacij na skladu za razveljavitve. Ne glede na to nastavitev boste lahko izvedli vsaj toliko razveljavitev, kolikor ste jih nastavili." +msgid "" +"Sets an upper limit to the memory that is used per image to keep operations " +"on the undo stack. Regardless of this setting, at least as many undo-levels " +"as configured can be undone." +msgstr "" +"Nastavi zgornjo mejo pomnilnika, ki je na voljo vsaki sliki za shranjevanje " +"operacij na skladu za razveljavitve. Ne glede na to nastavitev boste lahko " +"izvedli vsaj toliko razveljavitev, kolikor ste jih nastavili." #: ../app/config/gimprc-blurbs.h:457 msgid "Sets the size of the previews in the Undo History." @@ -6349,10 +6508,8 @@ msgstr "Nastavi velikost predogledov v Zgodovini razveljavitev." msgid "When enabled, pressing F1 will open the help browser." msgstr "Če je vključeno, bo tipka F1 odprla brskalnik po pomoči." -#: ../app/config/gimprc-deserialize.c:135 -#: ../app/core/gimp-modules.c:136 -#: ../app/core/gimp-units.c:167 -#: ../app/gui/session.c:286 +#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:136 +#: ../app/core/gimp-units.c:167 ../app/gui/session.c:286 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "usodna razčlenitvena napaka" @@ -6747,51 +6904,43 @@ msgctxt "undo-type" msgid "Quick Mask" msgstr "Hitra maska" -#: ../app/core/core-enums.c:844 -#: ../app/core/core-enums.c:874 +#: ../app/core/core-enums.c:844 ../app/core/core-enums.c:874 #: ../app/core/gimpimage-grid.c:63 msgctxt "undo-type" msgid "Grid" msgstr "Mreža" -#: ../app/core/core-enums.c:845 -#: ../app/core/core-enums.c:876 +#: ../app/core/core-enums.c:845 ../app/core/core-enums.c:876 msgctxt "undo-type" msgid "Guide" msgstr "Vodilo" -#: ../app/core/core-enums.c:846 -#: ../app/core/core-enums.c:877 +#: ../app/core/core-enums.c:846 ../app/core/core-enums.c:877 msgctxt "undo-type" msgid "Sample Point" msgstr "Vzorčna točka" -#: ../app/core/core-enums.c:847 -#: ../app/core/core-enums.c:878 +#: ../app/core/core-enums.c:847 ../app/core/core-enums.c:878 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Plast/kanal" -#: ../app/core/core-enums.c:848 -#: ../app/core/core-enums.c:879 +#: ../app/core/core-enums.c:848 ../app/core/core-enums.c:879 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Sprememba plasti/kanala" -#: ../app/core/core-enums.c:849 -#: ../app/core/core-enums.c:880 +#: ../app/core/core-enums.c:849 ../app/core/core-enums.c:880 msgctxt "undo-type" msgid "Selection mask" msgstr "Maska izbora" -#: ../app/core/core-enums.c:850 -#: ../app/core/core-enums.c:884 +#: ../app/core/core-enums.c:850 ../app/core/core-enums.c:884 msgctxt "undo-type" msgid "Item visibility" msgstr "Vidljivost predmeta" -#: ../app/core/core-enums.c:851 -#: ../app/core/core-enums.c:885 +#: ../app/core/core-enums.c:851 ../app/core/core-enums.c:885 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "Poveži/Razveži element" @@ -6801,8 +6950,7 @@ msgctxt "undo-type" msgid "Item properties" msgstr "Lastnosti predmeta" -#: ../app/core/core-enums.c:853 -#: ../app/core/core-enums.c:883 +#: ../app/core/core-enums.c:853 ../app/core/core-enums.c:883 msgctxt "undo-type" msgid "Move item" msgstr "Premakni predmet" @@ -6822,20 +6970,17 @@ msgctxt "undo-type" msgid "Add layer" msgstr "Dodaj plast" -#: ../app/core/core-enums.c:857 -#: ../app/core/core-enums.c:896 +#: ../app/core/core-enums.c:857 ../app/core/core-enums.c:896 msgctxt "undo-type" msgid "Add layer mask" msgstr "Dodaj masko plasti" -#: ../app/core/core-enums.c:858 -#: ../app/core/core-enums.c:898 +#: ../app/core/core-enums.c:858 ../app/core/core-enums.c:898 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Uporabi masko plasti" -#: ../app/core/core-enums.c:859 -#: ../app/core/core-enums.c:906 +#: ../app/core/core-enums.c:859 ../app/core/core-enums.c:906 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Plavajoči izbor v plast" @@ -6850,14 +6995,12 @@ msgctxt "undo-type" msgid "Anchor floating selection" msgstr "Zasidraj plavajoči izbor" -#: ../app/core/core-enums.c:862 -#: ../app/core/gimp-edit.c:293 +#: ../app/core/core-enums.c:862 ../app/core/gimp-edit.c:293 msgctxt "undo-type" msgid "Paste" msgstr "Prilepi" -#: ../app/core/core-enums.c:863 -#: ../app/core/gimp-edit.c:534 +#: ../app/core/core-enums.c:863 ../app/core/gimp-edit.c:534 msgctxt "undo-type" msgid "Cut" msgstr "Izreži" @@ -6867,27 +7010,23 @@ msgctxt "undo-type" msgid "Text" msgstr "Besedilo" -#: ../app/core/core-enums.c:865 -#: ../app/core/core-enums.c:907 +#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:907 #: ../app/core/gimpdrawable-transform.c:589 msgctxt "undo-type" msgid "Transform" msgstr "Preoblikuj" -#: ../app/core/core-enums.c:866 -#: ../app/core/core-enums.c:908 +#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:908 msgctxt "undo-type" msgid "Paint" msgstr "Slikaj" -#: ../app/core/core-enums.c:867 -#: ../app/core/core-enums.c:911 +#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:911 msgctxt "undo-type" msgid "Attach parasite" msgstr "Pripni zajedalca" -#: ../app/core/core-enums.c:868 -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Remove parasite" msgstr "Odstrani zajedalca" @@ -7157,17 +7296,14 @@ msgctxt "dynamics-output-type" msgid "Jitter" msgstr "Razgibanost" -#: ../app/core/gimp-contexts.c:154 -#: ../app/core/gimptooloptions.c:375 -#: ../app/gui/session.c:399 -#: ../app/menus/menus.c:464 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:375 +#: ../app/gui/session.c:399 ../app/menus/menus.c:466 #: ../app/widgets/gimpdevices.c:208 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "Brisanje \"%s\" ni uspelo: %s" -#: ../app/core/gimp-edit.c:190 -#: ../app/core/gimpimage-new.c:309 +#: ../app/core/gimp-edit.c:190 ../app/core/gimpimage-new.c:309 msgid "Pasted Layer" msgstr "Prilepljena plast" @@ -7237,27 +7373,33 @@ msgstr "tips-locale:sl" #: ../app/core/gimp-user-install.c:173 #, c-format -msgid "It seems you have used GIMP %s before. GIMP will now migrate your user settings to '%s'." -msgstr "Kot kaže, ste uporabljali GIMP %s. GIMP bo zdaj prenesel vaše uporabniške nastavitve v '%s'." +msgid "" +"It seems you have used GIMP %s before. GIMP will now migrate your user " +"settings to '%s'." +msgstr "" +"Kot kaže, ste uporabljali GIMP %s. GIMP bo zdaj prenesel vaše uporabniške " +"nastavitve v '%s'." #: ../app/core/gimp-user-install.c:178 #, c-format -msgid "It appears that you are using GIMP for the first time. GIMP will now create a folder named '%s' and copy some files to it." -msgstr "Kot kaže, uporabljate GIMP prvič. GIMP bo ustvaril mapo '%s' in vanjo skopiral nekaj datotek." +msgid "" +"It appears that you are using GIMP for the first time. GIMP will now create " +"a folder named '%s' and copy some files to it." +msgstr "" +"Kot kaže, uporabljate GIMP prvič. GIMP bo ustvaril mapo '%s' in vanjo " +"skopiral nekaj datotek." #: ../app/core/gimp-user-install.c:329 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "Kopiranje datoteke '%s' iz '%s' ..." -#: ../app/core/gimp-user-install.c:344 -#: ../app/core/gimp-user-install.c:370 +#: ../app/core/gimp-user-install.c:344 ../app/core/gimp-user-install.c:370 #, c-format msgid "Creating folder '%s'..." msgstr "Ustvarjanje mape '%s' ..." -#: ../app/core/gimp-user-install.c:355 -#: ../app/core/gimp-user-install.c:381 +#: ../app/core/gimp-user-install.c:355 ../app/core/gimp-user-install.c:381 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Mape '%s' ni mogoče ustvariti: %s" @@ -7281,8 +7423,7 @@ msgid "Parasites" msgstr "Zajedalci" #. initialize the list of gimp dynamics -#: ../app/core/gimp.c:956 -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/core/gimp.c:956 ../app/dialogs/preferences-dialog.c:2743 #: ../app/tools/gimppaintoptions-gui.c:203 msgid "Dynamics" msgstr "Dinamika" @@ -7293,8 +7434,7 @@ msgid "Fonts (this may take a while)" msgstr "Pisave (to lahko traja dlje časa)" #. initialize the module list -#: ../app/core/gimp.c:993 -#: ../app/dialogs/preferences-dialog.c:2775 +#: ../app/core/gimp.c:993 ../app/dialogs/preferences-dialog.c:2775 msgid "Modules" msgstr "Gradniki" @@ -7330,29 +7470,30 @@ msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Bajtov = 0." #: ../app/core/gimpbrush-load.c:244 #, c-format msgid "Fatal parse error in brush file '%s': Unknown depth %d." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Neznana globina %d." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Neznana globina %d." #: ../app/core/gimpbrush-load.c:257 #, c-format msgid "Fatal parse error in brush file '%s': Unknown version %d." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Neznana različica %d." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Neznana različica %d." -#: ../app/core/gimpbrush-load.c:273 -#: ../app/core/gimpbrush-load.c:393 +#: ../app/core/gimpbrush-load.c:273 ../app/core/gimpbrush-load.c:393 #: ../app/core/gimpbrush-load.c:727 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je poškodovana." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je " +"poškodovana." -#: ../app/core/gimpbrush-load.c:281 -#: ../app/core/gimpbrushgenerated-load.c:128 +#: ../app/core/gimpbrush-load.c:281 ../app/core/gimpbrushgenerated-load.c:128 #: ../app/core/gimpbrushpipe-load.c:97 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Neveljaven niz UTF-8 v datoteki čopičev '%s'." -#: ../app/core/gimpbrush-load.c:288 -#: ../app/core/gimppattern-load.c:146 +#: ../app/core/gimpbrush-load.c:288 ../app/core/gimppattern-load.c:146 #: ../app/dialogs/template-options-dialog.c:83 #: ../app/tools/gimpvectortool.c:317 msgid "Unnamed" @@ -7364,19 +7505,24 @@ msgid "" "Fatal parse error in brush file '%s': Unsupported brush depth %d\n" "GIMP brushes must be GRAY or RGBA." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina čopiča %d\n" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Nepodprta globina " +"čopiča %d\n" "Čopiči za GIMP morajo biti sivinski ali RGBA." -#: ../app/core/gimpbrush-load.c:454 -#: ../app/core/gimpbrush-load.c:854 +#: ../app/core/gimpbrush-load.c:454 ../app/core/gimpbrush-load.c:854 #, c-format -msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d." -msgstr "Usodna napaka razhroščevanja datoteke čopiča '%s': zapisa abr različice %d ni mogoče odkodirati." +msgid "" +"Fatal parse error in brush file '%s': unable to decode abr format version %d." +msgstr "" +"Usodna napaka razhroščevanja datoteke čopiča '%s': zapisa abr različice %d " +"ni mogoče odkodirati." #: ../app/core/gimpbrush-load.c:621 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Široki čopiči niso podprti." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Široki čopiči niso " +"podprti." #: ../app/core/gimpbrush.c:148 msgid "Brush Spacing" @@ -7385,17 +7531,25 @@ msgstr "Razmik čopiča" #: ../app/core/gimpbrushgenerated-load.c:87 #, c-format msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka ni prava datoteka čopičev GIMP." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka ni prava " +"datoteka čopičev GIMP." #: ../app/core/gimpbrushgenerated-load.c:104 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." -msgstr "Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana različica čopiča GIMP v vrstici %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d." +msgstr "" +"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana različica čopiča " +"GIMP v vrstici %d." #: ../app/core/gimpbrushgenerated-load.c:150 #, c-format -msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." -msgstr "Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana oblika čopiča GIMP v vrstici %d." +msgid "" +"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d." +msgstr "" +"Usodna napaka razhroščevanja datoteke čopiča '%s': Neznana oblika čopiča " +"GIMP v vrstici %d." #: ../app/core/gimpbrushgenerated-load.c:226 #, c-format @@ -7428,22 +7582,21 @@ msgstr "Konice čopiča" msgid "Brush Hardness" msgstr "Trdota čopiča" -#: ../app/core/gimpbrushgenerated.c:159 -#: ../app/paint/gimppaintoptions.c:150 +#: ../app/core/gimpbrushgenerated.c:159 ../app/paint/gimppaintoptions.c:150 msgid "Brush Aspect Ratio" msgstr "Razmerje stranic čopiča" -#: ../app/core/gimpbrushgenerated.c:166 -#: ../app/paint/gimppaintoptions.c:154 +#: ../app/core/gimpbrushgenerated.c:166 ../app/paint/gimppaintoptions.c:154 msgid "Brush Angle" msgstr "Kot čopiča" -#: ../app/core/gimpbrushpipe-load.c:113 -#: ../app/core/gimpbrushpipe-load.c:133 +#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133 #: ../app/core/gimpbrushpipe-load.c:224 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." -msgstr "Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je okvarjena." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke čopičev '%s': Datoteka je " +"okvarjena." #: ../app/core/gimpchannel-select.c:60 msgctxt "undo-type" @@ -7460,8 +7613,7 @@ msgctxt "undo-type" msgid "Rounded Rectangle Select" msgstr "Zaobljeni pravokotni izbor" -#: ../app/core/gimpchannel-select.c:407 -#: ../app/core/gimplayer.c:275 +#: ../app/core/gimpchannel-select.c:407 ../app/core/gimplayer.c:275 msgctxt "undo-type" msgid "Alpha to Selection" msgstr "Alfa v izbor" @@ -7512,8 +7664,7 @@ msgctxt "undo-type" msgid "Rotate Channel" msgstr "Zasukaj kanal" -#: ../app/core/gimpchannel.c:279 -#: ../app/core/gimpdrawable-transform.c:904 +#: ../app/core/gimpchannel.c:279 ../app/core/gimpdrawable-transform.c:904 msgctxt "undo-type" msgid "Transform Channel" msgstr "Preoblikuj kanal" @@ -7523,8 +7674,7 @@ msgctxt "undo-type" msgid "Stroke Channel" msgstr "Vleci poteze po kanalu" -#: ../app/core/gimpchannel.c:281 -#: ../app/core/gimpselection.c:582 +#: ../app/core/gimpchannel.c:281 ../app/core/gimpselection.c:582 msgctxt "undo-type" msgid "Channel to Selection" msgstr "Kanal v izbor" @@ -7616,15 +7766,12 @@ msgctxt "undo-type" msgid "Set Channel Opacity" msgstr "Nastavi prekrivnost kanala" -#: ../app/core/gimpchannel.c:1932 -#: ../app/core/gimpselection.c:154 +#: ../app/core/gimpchannel.c:1932 ../app/core/gimpselection.c:154 msgid "Selection Mask" msgstr "Maska izbora" -#: ../app/core/gimpcontext.c:639 -#: ../app/tools/gimppaintoptions-gui.c:111 -#: ../app/widgets/gimpbrushselect.c:177 -#: ../app/widgets/gimplayertreeview.c:284 +#: ../app/core/gimpcontext.c:639 ../app/tools/gimppaintoptions-gui.c:111 +#: ../app/widgets/gimpbrushselect.c:177 ../app/widgets/gimplayertreeview.c:284 msgid "Opacity" msgstr "Prekrivnost" @@ -7632,15 +7779,13 @@ msgstr "Prekrivnost" msgid "Paint Mode" msgstr "Način slikanja" -#: ../app/core/gimpdata.c:670 +#: ../app/core/gimpdata.c:690 #, c-format msgid "Could not delete '%s': %s" msgstr "Ni mogoče izbrisati '%s': %s" -#: ../app/core/gimpdatafactory.c:428 -#: ../app/core/gimpdatafactory.c:457 -#: ../app/core/gimpdatafactory.c:623 -#: ../app/core/gimpdatafactory.c:645 +#: ../app/core/gimpdatafactory.c:428 ../app/core/gimpdatafactory.c:457 +#: ../app/core/gimpdatafactory.c:623 ../app/core/gimpdatafactory.c:645 #, c-format msgid "" "Failed to save data:\n" @@ -7651,28 +7796,37 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:537 -#: ../app/core/gimpdatafactory.c:540 -#: ../app/core/gimpitem.c:493 -#: ../app/core/gimpitem.c:496 +#: ../app/core/gimpdatafactory.c:537 ../app/core/gimpdatafactory.c:540 +#: ../app/core/gimpitem.c:493 ../app/core/gimpitem.c:496 msgid "copy" msgstr "kopija" -#: ../app/core/gimpdatafactory.c:549 -#: ../app/core/gimpitem.c:505 +#: ../app/core/gimpdatafactory.c:549 ../app/core/gimpitem.c:505 #, c-format msgid "%s copy" msgstr "Kopija %s" #: ../app/core/gimpdatafactory.c:742 #, c-format -msgid "You have a writable data folder configured (%s), but this folder does not exist. Please create the folder or fix your configuation in the Preferences dialog's 'Folders' section." -msgstr "Nastavljeno imate zapisljivo podatkovno mapo (%s), vendar ta mapa ne obstaja. Najprej ustvarite mapo ali pa popravite nastavitev v odseku Nastavite pogovornega okna 'Mape'." +msgid "" +"You have a writable data folder configured (%s), but this folder does not " +"exist. Please create the folder or fix your configuation in the Preferences " +"dialog's 'Folders' section." +msgstr "" +"Nastavljeno imate zapisljivo podatkovno mapo (%s), vendar ta mapa ne " +"obstaja. Najprej ustvarite mapo ali pa popravite nastavitev v odseku " +"Nastavite pogovornega okna 'Mape'." #: ../app/core/gimpdatafactory.c:763 #, c-format -msgid "You have a writable data folder configured, but this folder is not part of your data search path. You probably edited the gimprc file manually, please fix it in the Preferences dialog's 'Folders' section." -msgstr "Nastavljeno imate zapisljivo podatkovno mapo, vendar ta mapa ni del vaše poti iskanja podatkov. Najverjetneje ste ročno urejali datoteko gimprc, popravite jo v odseku Nastavite pogovornega okna 'Mape'." +msgid "" +"You have a writable data folder configured, but this folder is not part of " +"your data search path. You probably edited the gimprc file manually, please " +"fix it in the Preferences dialog's 'Folders' section." +msgstr "" +"Nastavljeno imate zapisljivo podatkovno mapo, vendar ta mapa ni del vaše " +"poti iskanja podatkov. Najverjetneje ste ročno urejali datoteko gimprc, " +"popravite jo v odseku Nastavite pogovornega okna 'Mape'." #: ../app/core/gimpdatafactory.c:773 #, c-format @@ -7722,8 +7876,7 @@ msgctxt "undo-type" msgid "Colorize" msgstr "Prebarvaj" -#: ../app/core/gimpdrawable-curves.c:162 -#: ../app/core/gimpdrawable-curves.c:179 +#: ../app/core/gimpdrawable-curves.c:162 ../app/core/gimpdrawable-curves.c:179 msgctxt "undo-type" msgid "Curves" msgstr "Krivulje" @@ -7752,13 +7905,11 @@ msgstr "Obarvanost-nasičenost" msgid "Hue_Saturation" msgstr "Obarvanost-_nasičenost" -#: ../app/core/gimpdrawable-invert.c:54 -#: ../app/core/gimpdrawable-invert.c:62 +#: ../app/core/gimpdrawable-invert.c:54 ../app/core/gimpdrawable-invert.c:62 msgid "Invert" msgstr "Preobrni" -#: ../app/core/gimpdrawable-levels.c:153 -#: ../app/core/gimpdrawable-levels.c:169 +#: ../app/core/gimpdrawable-levels.c:153 ../app/core/gimpdrawable-levels.c:169 #: ../app/tools/gimplevelstool.c:150 msgid "Levels" msgstr "Ravni" @@ -7769,14 +7920,12 @@ msgid "Offset Drawable" msgstr "Zamakni risano" #: ../app/core/gimpdrawable-posterize.c:69 -#: ../app/core/gimpdrawable-posterize.c:79 -#: ../app/tools/gimpposterizetool.c:84 +#: ../app/core/gimpdrawable-posterize.c:79 ../app/tools/gimpposterizetool.c:84 msgid "Posterize" msgstr "Posteriziraj" #: ../app/core/gimpdrawable-stroke.c:272 -#: ../app/paint/gimppaintcore-stroke.c:333 -#: ../app/vectors/gimpvectors.c:556 +#: ../app/paint/gimppaintcore-stroke.c:330 ../app/vectors/gimpvectors.c:556 msgid "Not enough points to stroke" msgstr "Premalo točk za potezo" @@ -7790,8 +7939,7 @@ msgid "Render Stroke" msgstr "Upodobi potezo" #: ../app/core/gimpdrawable-threshold.c:70 -#: ../app/core/gimpdrawable-threshold.c:81 -#: ../app/tools/gimpblendoptions.c:275 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpblendoptions.c:275 #: ../app/tools/gimpbucketfilloptions.c:285 #: ../app/tools/gimpregionselectoptions.c:216 #: ../app/tools/gimpthresholdtool.c:90 @@ -7808,8 +7956,7 @@ msgctxt "undo-type" msgid "Rotate" msgstr "Zasukaj" -#: ../app/core/gimpdrawable-transform.c:902 -#: ../app/core/gimplayer.c:274 +#: ../app/core/gimpdrawable-transform.c:902 ../app/core/gimplayer.c:274 msgctxt "undo-type" msgid "Transform Layer" msgstr "Preoblikuj plast" @@ -7827,18 +7974,20 @@ msgstr "Spremeni merilo" msgid "Output type" msgstr "Vrsta izhoda" -#: ../app/core/gimpgradient-load.c:72 -#: ../app/core/gimpgradient-load.c:97 -#: ../app/core/gimpgradient-load.c:118 -#: ../app/core/gimpgradient-load.c:169 +#: ../app/core/gimpgradient-load.c:72 ../app/core/gimpgradient-load.c:97 +#: ../app/core/gimpgradient-load.c:118 ../app/core/gimpgradient-load.c:169 #, c-format msgid "Fatal parse error in gradient file '%s': Read error in line %d." -msgstr "Usodna napaka pri razčlenjevanju datoteke preliva '%s': Napaka pri branju vrstice %d." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke preliva '%s': Napaka pri branju " +"vrstice %d." #: ../app/core/gimpgradient-load.c:82 #, c-format msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file." -msgstr "Usodna napaka pri razčlenjevanju datoteke preliva '%s': Datoteka ni prava datoteka prelivov GIMP." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke preliva '%s': Datoteka ni prava " +"datoteka prelivov GIMP." #: ../app/core/gimpgradient-load.c:110 #, c-format @@ -7848,19 +7997,23 @@ msgstr "Neveljaven niz UTF-8 v datoteki prelivov '%s'." #: ../app/core/gimpgradient-load.c:137 #, c-format msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d." -msgstr "Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka je okvarjena v vrstici %d." +msgstr "" +"Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka je okvarjena " +"v vrstici %d." -#: ../app/core/gimpgradient-load.c:219 -#: ../app/core/gimpgradient-load.c:230 +#: ../app/core/gimpgradient-load.c:219 ../app/core/gimpgradient-load.c:230 #, c-format msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d." -msgstr "Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka ima okvarjen segment %d v vrstici %d." +msgstr "" +"Usodna napaka razhroščevanja v datoteki preliva '%s': Datoteka ima okvarjen " +"segment %d v vrstici %d." -#: ../app/core/gimpgradient-load.c:242 -#: ../app/core/gimpgradient-load.c:256 +#: ../app/core/gimpgradient-load.c:242 ../app/core/gimpgradient-load.c:256 #, c-format msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1." -msgstr "Datoteka s prelivi '%s' je poškodovana. Odseki ne ustrezajo razponu od 0 do 1." +msgstr "" +"Datoteka s prelivi '%s' je poškodovana. Odseki ne ustrezajo razponu od 0 do " +"1." #: ../app/core/gimpgradient-load.c:336 #, c-format @@ -7881,7 +8034,8 @@ msgid "The foreground color of the grid." msgstr "Barva ospredja mreže." #: ../app/core/gimpgrid.c:95 -msgid "The background color of the grid; only used in double dashed line style." +msgid "" +"The background color of the grid; only used in double dashed line style." msgstr "Barva ozadja mreže; uporabljena je samo za dvojno črtkan slog črte." #: ../app/core/gimpgrid.c:101 @@ -7893,7 +8047,8 @@ msgid "Vertical spacing of grid lines." msgstr "Navpični razmik črt mreže." #: ../app/core/gimpgrid.c:115 -msgid "Horizontal offset of the first grid line; this may be a negative number." +msgid "" +"Horizontal offset of the first grid line; this may be a negative number." msgstr "Vodoravni zamik prve črte v mreži. Lahko je negativen." #: ../app/core/gimpgrid.c:122 @@ -7954,12 +8109,17 @@ msgctxt "undo-type" msgid "Set Colormap" msgstr "Nastavi katalog barv" -#: ../app/core/gimpimage-colormap.c:243 +#: ../app/core/gimpimage-colormap.c:210 +msgctxt "undo-type" +msgid "Unset Colormap" +msgstr "Prekliči nastavitev katalog barv" + +#: ../app/core/gimpimage-colormap.c:263 msgctxt "undo-type" msgid "Change Colormap entry" msgstr "Spremeni vnos kataloga barv" -#: ../app/core/gimpimage-colormap.c:271 +#: ../app/core/gimpimage-colormap.c:291 msgctxt "undo-type" msgid "Add Color to Colormap" msgstr "Dodaj barvo v katalog barv" @@ -7996,8 +8156,7 @@ msgctxt "undo-type" msgid "Crop Image" msgstr "Obreži sliko" -#: ../app/core/gimpimage-crop.c:132 -#: ../app/core/gimpimage-resize.c:86 +#: ../app/core/gimpimage-crop.c:132 ../app/core/gimpimage-resize.c:86 msgctxt "undo-type" msgid "Resize Image" msgstr "Spremeni velikost slike" @@ -8047,39 +8206,43 @@ msgctxt "undo-type" msgid "Merge Visible Layers" msgstr "Spoji vidne plasti" -#: ../app/core/gimpimage-merge.c:178 +#: ../app/core/gimpimage-merge.c:195 msgctxt "undo-type" msgid "Flatten Image" msgstr "Splošči sliko" -#: ../app/core/gimpimage-merge.c:248 +#: ../app/core/gimpimage-merge.c:217 +msgid "Cannot flatten an image without any visible layer." +msgstr "Slike ni mogoče sploščiti brez vsaj ene vidne plasti." + +#: ../app/core/gimpimage-merge.c:260 msgid "Cannot merge down to a layer group." msgstr "Na skupino plasti ni mogoče spajati." -#: ../app/core/gimpimage-merge.c:255 +#: ../app/core/gimpimage-merge.c:267 msgid "The layer to merge down to is locked." msgstr "Plast, na katero želite spajati, je zaklenjena." -#: ../app/core/gimpimage-merge.c:267 +#: ../app/core/gimpimage-merge.c:279 msgid "There is no visible layer to merge down to." msgstr "Ni vidne plasti, da bi nanjo spajali." -#: ../app/core/gimpimage-merge.c:277 +#: ../app/core/gimpimage-merge.c:289 msgctxt "undo-type" msgid "Merge Down" msgstr "Spoji s spodnjim" -#: ../app/core/gimpimage-merge.c:305 +#: ../app/core/gimpimage-merge.c:317 msgctxt "undo-type" msgid "Merge Layer Group" msgstr "Spoji skupino plasti" -#: ../app/core/gimpimage-merge.c:358 +#: ../app/core/gimpimage-merge.c:370 msgctxt "undo-type" msgid "Merge Visible Paths" msgstr "Spoji vidne poti" -#: ../app/core/gimpimage-merge.c:394 +#: ../app/core/gimpimage-merge.c:406 msgid "Not enough visible paths for a merge. There must be at least two." msgstr "Ni dovolj vidnih poti, da bi jih spojili. Potrebujete vsaj dve." @@ -8112,7 +8275,7 @@ msgctxt "undo-type" msgid "Move Sample Point" msgstr "Premakni vzorčno točko" -#: ../app/core/gimpimage-scale.c:87 +#: ../app/core/gimpimage-scale.c:88 msgctxt "undo-type" msgid "Scale Image" msgstr "Spremeni merilo slike" @@ -8159,8 +8322,7 @@ msgctxt "undo-type" msgid "Add Layer" msgstr "Dodaj plast" -#: ../app/core/gimpimage.c:3787 -#: ../app/core/gimpimage.c:3807 +#: ../app/core/gimpimage.c:3787 ../app/core/gimpimage.c:3807 msgctxt "undo-type" msgid "Remove Layer" msgstr "Odstrani plast" @@ -8175,8 +8337,7 @@ msgctxt "undo-type" msgid "Add Channel" msgstr "Dodaj kanal" -#: ../app/core/gimpimage.c:4007 -#: ../app/core/gimpimage.c:4020 +#: ../app/core/gimpimage.c:4007 ../app/core/gimpimage.c:4020 msgctxt "undo-type" msgid "Remove Channel" msgstr "Odstrani kanal" @@ -8191,8 +8352,7 @@ msgctxt "undo-type" msgid "Remove Path" msgstr "Odstrani pot" -#: ../app/core/gimpimagefile.c:697 -#: ../app/dialogs/preferences-dialog.c:1711 +#: ../app/core/gimpimagefile.c:697 ../app/dialogs/preferences-dialog.c:1711 msgid "Folder" msgstr "Mapa" @@ -8225,10 +8385,8 @@ msgid "(Preview may be out of date)" msgstr "(predogled je morda zastarel)" #. pixel size -#: ../app/core/gimpimagefile.c:774 -#: ../app/widgets/gimpimagepropview.c:441 -#: ../app/widgets/gimpsizebox.c:427 -#: ../app/widgets/gimptemplateeditor.c:565 +#: ../app/core/gimpimagefile.c:774 ../app/widgets/gimpimagepropview.c:440 +#: ../app/widgets/gimpsizebox.c:427 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" @@ -8237,8 +8395,7 @@ msgstr[1] "%d × %d slik. točka" msgstr[2] "%d × %d slik. točki" msgstr[3] "%d × %d slik. točke" -#: ../app/core/gimpimagefile.c:797 -#: ../app/display/gimpdisplayshell-title.c:317 +#: ../app/core/gimpimagefile.c:797 ../app/display/gimpdisplayshell-title.c:317 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8262,8 +8419,7 @@ msgctxt "undo-type" msgid "Attach Parasite to Item" msgstr "Elementu pripni zajedalca" -#: ../app/core/gimpitem.c:1876 -#: ../app/core/gimpitem.c:1883 +#: ../app/core/gimpitem.c:1876 ../app/core/gimpitem.c:1883 msgctxt "undo-type" msgid "Remove Parasite from Item" msgstr "Odstrani zajedalca z elementa" @@ -8281,10 +8437,13 @@ msgctxt "undo-type" msgid "Anchor Floating Selection" msgstr "Zasidraj plavajoči izbor" -#: ../app/core/gimplayer-floating-sel.c:126 -#: ../app/core/gimplayer.c:620 -msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel." -msgstr "Nove plasti iz plavajočega izbora ni mogoče ustvariti, ker ta pripada maski ali kanalu same plasti." +#: ../app/core/gimplayer-floating-sel.c:126 ../app/core/gimplayer.c:620 +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." +msgstr "" +"Nove plasti iz plavajočega izbora ni mogoče ustvariti, ker ta pripada maski " +"ali kanalu same plasti." #: ../app/core/gimplayer-floating-sel.c:133 msgctxt "undo-type" @@ -8354,8 +8513,7 @@ msgstr "Plasti ni mogoče dvigniti višje." msgid "Layer cannot be lowered more." msgstr "Plasti ni mogoče bolj spustiti." -#: ../app/core/gimplayer.c:450 -#: ../app/core/gimplayer.c:1528 +#: ../app/core/gimplayer.c:450 ../app/core/gimplayer.c:1528 #: ../app/core/gimplayermask.c:236 #, c-format msgid "%s mask" @@ -8453,19 +8611,20 @@ msgstr "Števec %d" msgid "Unknown type of palette file: %s" msgstr "Neznana vrsta datoteke palete: %s" -#: ../app/core/gimppalette-load.c:86 -#: ../app/core/gimppalette-load.c:112 -#: ../app/core/gimppalette-load.c:133 -#: ../app/core/gimppalette-load.c:162 +#: ../app/core/gimppalette-load.c:86 ../app/core/gimppalette-load.c:112 +#: ../app/core/gimppalette-load.c:133 ../app/core/gimppalette-load.c:162 #: ../app/core/gimppalette-load.c:238 #, c-format msgid "Fatal parse error in palette file '%s': Read error in line %d." -msgstr "Usodna napaka pri razčlenjevanju datoteke palete '%s': Napaka pri branju vrstice %d." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke palete '%s': Napaka pri branju " +"vrstice %d." #: ../app/core/gimppalette-load.c:96 #, c-format msgid "Fatal parse error in palette file '%s': Missing magic header." -msgstr "Usodna napaka pri razčlenjevanju datoteke palete '%s': Manjka čarobna glava." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke palete '%s': Manjka čarobna glava." #: ../app/core/gimppalette-load.c:125 #, c-format @@ -8474,51 +8633,62 @@ msgstr "Neveljaven niz UTF-8 v datoteki palete '%s'" #: ../app/core/gimppalette-load.c:149 #, c-format -msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value." -msgstr "Branje datoteke palete '%s': Nepravilno število stolpcev v vrstici %d. Uporabljena bo privzeta vrednost." +msgid "" +"Reading palette file '%s': Invalid number of columns in line %d. Using " +"default value." +msgstr "" +"Branje datoteke palete '%s': Nepravilno število stolpcev v vrstici %d. " +"Uporabljena bo privzeta vrednost." #: ../app/core/gimppalette-load.c:185 #, c-format msgid "Reading palette file '%s': Missing RED component in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d manjka rdeča komponenta (RED)." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d manjka rdeča komponenta (RED)." #: ../app/core/gimppalette-load.c:193 #, c-format msgid "Reading palette file '%s': Missing GREEN component in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d manjka zelena komponenta (GREEN)." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d manjka zelena komponenta (GREEN)." #: ../app/core/gimppalette-load.c:201 #, c-format msgid "Reading palette file '%s': Missing BLUE component in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d manjka modra komponenta (BLUE)." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d manjka modra komponenta (BLUE)." #: ../app/core/gimppalette-load.c:211 #, c-format msgid "Reading palette file '%s': RGB value out of range in line %d." -msgstr "Branje datoteke palete '%s': V vrstici %d je vrednost RGB izven dosega." +msgstr "" +"Branje datoteke palete '%s': V vrstici %d je vrednost RGB izven dosega." #: ../app/core/gimppalette-load.c:478 #, c-format msgid "Could not read header from palette file '%s'" msgstr "Ni mogoče brati glave iz datoteke palete '%s'" -#: ../app/core/gimppalette-load.c:501 -#: ../app/core/gimppalette-load.c:589 +#: ../app/core/gimppalette-load.c:501 ../app/core/gimppalette-load.c:589 #, c-format msgid "Fatal parse error in palette file '%s'" msgstr "Usodna napaka pri razčlenjevanju datoteke palete '%s'" -#: ../app/core/gimppattern-load.c:85 -#: ../app/core/gimppattern-load.c:131 +#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131 #: ../app/core/gimppattern-load.c:162 #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." -msgstr "Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Datoteka je poškodovana oz. odsekana." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Datoteka je " +"poškodovana oz. odsekana." #: ../app/core/gimppattern-load.c:104 #, c-format -msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d." -msgstr "Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Neznana oblika vzorca %d." +msgid "" +"Fatal parse error in pattern file '%s': Unknown pattern format version %d." +msgstr "" +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Neznana oblika " +"vzorca %d." #: ../app/core/gimppattern-load.c:114 #, c-format @@ -8526,7 +8696,8 @@ msgid "" "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n" "GIMP Patterns must be GRAY or RGB." msgstr "" -"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Nepodprta globina vzorca %d.\n" +"Usodna napaka pri razčlenjevanju datoteke vzorcev '%s': Nepodprta globina " +"vzorca %d.\n" "Vzorci za GIMP morajo biti sivinske slike ali slike RGB." #: ../app/core/gimppattern-load.c:139 @@ -8534,14 +8705,13 @@ msgstr "" msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Neveljaven niz UTF-8 v datoteki vzorca '%s'." -#: ../app/core/gimppdbprogress.c:279 -#: ../app/widgets/gimppdbdialog.c:331 +#: ../app/core/gimppdbprogress.c:279 ../app/widgets/gimppdbdialog.c:331 #, c-format msgid "Unable to run %s callback. The corresponding plug-in may have crashed." -msgstr "Povratnega klica %s ni mogoče pognati. Ustrezni vtičnik se je morda sesul." +msgstr "" +"Povratnega klica %s ni mogoče pognati. Ustrezni vtičnik se je morda sesul." -#: ../app/core/gimpprogress.c:106 -#: ../app/core/gimpprogress.c:153 +#: ../app/core/gimpprogress.c:106 ../app/core/gimpprogress.c:153 msgid "Please wait" msgstr "Malce potrpljenja ..." @@ -8617,12 +8787,18 @@ msgid "Floated Layer" msgstr "Plavajoča plast" #: ../app/core/gimpstrokeoptions.c:181 -msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point." -msgstr "Pretvori stikališče s sredico v izbočeno stikališče, če bi se sredica razširila do razdalje, ki presega vrednost meja-sredice * širina-črte od dejanske točke stikališča." +msgid "" +"Convert a mitered join to a bevelled join if the miter would extend to a " +"distance of more than miter-limit * line-width from the actual join point." +msgstr "" +"Pretvori stikališče s sredico v izbočeno stikališče, če bi se sredica " +"razširila do razdalje, ki presega vrednost meja-sredice * širina-črte od " +"dejanske točke stikališča." #: ../app/core/gimptemplate.c:129 msgid "The unit used for coordinate display when not in dot-for-dot mode." -msgstr "Uporabljena enota za prikaz koordinat, ko niste v načinu točka-za-točko." +msgstr "" +"Uporabljena enota za prikaz koordinat, ko niste v načinu točka-za-točko." #: ../app/core/gimptemplate.c:136 msgid "The horizontal image resolution." @@ -8692,8 +8868,7 @@ msgctxt "plural" msgid "percent" msgstr "odstotkov" -#: ../app/dialogs/about-dialog.c:114 -#: ../app/gui/gui.c:493 +#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:493 msgid "About GIMP" msgstr "O programu GIMP" @@ -8744,8 +8919,7 @@ msgid "_Remove unused colors from colormap" msgstr "_Odstrani neuporabljene barve iz kataloga barv" #. dithering -#: ../app/dialogs/convert-dialog.c:234 -#: ../app/tools/gimpblendoptions.c:254 +#: ../app/dialogs/convert-dialog.c:234 ../app/tools/gimpblendoptions.c:254 msgid "Dithering" msgstr "Stresanje" @@ -8761,8 +8935,7 @@ msgstr "Omogoči stresanje _prosojnosti" msgid "Converting to indexed colors" msgstr "Pretvarjanje slike v indeksirano ..." -#: ../app/dialogs/convert-dialog.c:416 -#: ../app/pdb/convert-cmds.c:153 +#: ../app/dialogs/convert-dialog.c:416 ../app/pdb/convert-cmds.c:153 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Ni mogoče pretvoriti v barvno paleto z več kot 256 barvami." @@ -8777,11 +8950,11 @@ msgstr "Želite izbrisati '%s'?" #: ../app/dialogs/data-delete-dialog.c:107 #, c-format -msgid "Are you sure you want to remove '%s' from the list and delete it on disk?" +msgid "" +"Are you sure you want to remove '%s' from the list and delete it on disk?" msgstr "Ste prepričani, da želite izbrisati '%s' s seznama in z diska?" -#: ../app/dialogs/dialogs-constructors.c:203 -#: ../app/gui/gui.c:161 +#: ../app/dialogs/dialogs-constructors.c:203 ../app/gui/gui.c:161 #: ../app/gui/gui-message.c:149 msgid "GIMP Message" msgstr "Sporočilo GIMP" @@ -8855,8 +9028,7 @@ msgstr "Pojemanje %s" msgid "_Fade" msgstr "_Pojemanje" -#: ../app/dialogs/fade-dialog.c:156 -#: ../app/widgets/gimpdeviceinfoeditor.c:346 +#: ../app/dialogs/fade-dialog.c:156 ../app/widgets/gimpdeviceinfoeditor.c:346 msgid "_Mode:" msgstr "_Način:" @@ -8876,48 +9048,81 @@ msgstr "Odpri naslov" msgid "Enter location (URI):" msgstr "Vnesite mesto (URI):" -#: ../app/dialogs/file-save-dialog.c:105 +#: ../app/dialogs/file-save-dialog.c:113 msgid "Export Image" msgstr "Izvozi sliko" -#: ../app/dialogs/file-save-dialog.c:106 +#: ../app/dialogs/file-save-dialog.c:114 msgid "_Export" msgstr "_Izvozi" -#: ../app/dialogs/file-save-dialog.c:419 -msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all." -msgstr "Za shranjevanje oddaljenih datotek je potrebno razločiti vrsto datoteke iz njene končnice. Vnesite končnico datoteke, ki se ujema z zapisom izbrane datoteke ali pa ne vnesite nobene končnice." +#: ../app/dialogs/file-save-dialog.c:458 +msgid "" +"Saving remote files needs to determine the file format from the file " +"extension. Please enter a file extension that matches the selected file " +"format or enter no file extension at all." +msgstr "" +"Za shranjevanje oddaljenih datotek je potrebno razločiti vrsto datoteke iz " +"njene končnice. Vnesite končnico datoteke, ki se ujema z zapisom izbrane " +"datoteke ali pa ne vnesite nobene končnice." -#: ../app/dialogs/file-save-dialog.c:546 -msgid "You can use this dialog to export to various file formats. If you want to save the image to the GIMP XCF format, use File→Save instead." -msgstr "S tem pogovornim oknom shranjujete v različne vrste datotek. Uporabite Datoteka→Shrani za izvoz v zapisu XCF GIMP." +#: ../app/dialogs/file-save-dialog.c:605 +msgid "The given filename cannot be used for exporting" +msgstr "Podano ime datoteke ni mogoče uporabiti za izvoz." -#: ../app/dialogs/file-save-dialog.c:553 -msgid "You can use this dialog to save to the GIMP XCF format. Use File→Export to export to other file formats." -msgstr "S tem pogovornim oknom shranjujete v zapisu XCF GIMP. Uporabite Datoteka→Izvozi za izvoz v druge vrste datotek." +#: ../app/dialogs/file-save-dialog.c:606 +msgid "" +"You can use this dialog to export to various file formats. If you want to " +"save the image to the GIMP XCF format, use File→Save instead." +msgstr "" +"S tem pogovornim oknom shranjujete v različne vrste datotek. Uporabite " +"Datoteka→Shrani za izvoz v zapisu XCF GIMP." -#: ../app/dialogs/file-save-dialog.c:559 -msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list." -msgstr "Podano ime datoteke je brez znane končnice. Vnesite znano končnico datoteke ali izberite vrsto datoteke s seznama vrst datotek." +#: ../app/dialogs/file-save-dialog.c:609 +msgid "Take me to the Save dialog" +msgstr "Popelji me k pogovornem oknu Shrani" -#: ../app/dialogs/file-save-dialog.c:573 +#: ../app/dialogs/file-save-dialog.c:613 +msgid "The given filename cannot be used for saving" +msgstr "Podanega imena datoteke ni mogoče uporabiti za shranjevanje." + +#: ../app/dialogs/file-save-dialog.c:614 +msgid "" +"You can use this dialog to save to the GIMP XCF format. Use File→Export to " +"export to other file formats." +msgstr "" +"S tem pogovornim oknom shranjujete v zapisu XCF GIMP. Uporabite " +"Datoteka→Izvozi za izvoz v druge vrste datotek." + +#: ../app/dialogs/file-save-dialog.c:616 +msgid "Take me to the Export dialog" +msgstr "Popelji me k pogovornem oknu Izvozi" + +#: ../app/dialogs/file-save-dialog.c:619 ../app/dialogs/file-save-dialog.c:694 msgid "Extension Mismatch" msgstr "Neujemanje s končnico" -#: ../app/dialogs/file-save-dialog.c:589 +#: ../app/dialogs/file-save-dialog.c:678 +msgid "" +"The given filename does not have any known file extension. Please enter a " +"known file extension or select a file format from the file format list." +msgstr "" +"Podano ime datoteke je brez znane končnice. Vnesite znano končnico datoteke " +"ali izberite vrsto datoteke s seznama vrst datotek." + +#: ../app/dialogs/file-save-dialog.c:710 msgid "The given file extension does not match the chosen file type." msgstr "Izbrana končnica datoteke se ne ujema z izbrano vrsto datoteke." -#: ../app/dialogs/file-save-dialog.c:593 +#: ../app/dialogs/file-save-dialog.c:714 msgid "Do you want to save the image using this name anyway?" msgstr "Želite kljub temu shraniti sliko s tem imenom?" -#: ../app/dialogs/file-save-dialog.c:651 +#: ../app/dialogs/file-save-dialog.c:776 msgid "Saving canceled" msgstr "Shranjevanje preklicano" -#: ../app/dialogs/file-save-dialog.c:659 -#: ../app/widgets/gimpdnd-xds.c:186 +#: ../app/dialogs/file-save-dialog.c:784 ../app/widgets/gimpdnd-xds.c:186 #, c-format msgid "" "Saving '%s' failed:\n" @@ -8997,8 +9202,13 @@ msgstr "Ustvariti želite sliko velikosti %s." #: ../app/dialogs/image-new-dialog.c:337 #, c-format -msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Slika izbrane velikosti bi zasedla več pomnilnika, kot je največ dovoljeno glede na nastavitev \"Največja velikost slike\" v pogovornem oknu \"Nastavitve\" (trenutno nastavljeno na %s)." +msgid "" +"An image of the chosen size will use more memory than what is configured as " +"\"Maximum Image Size\" in the Preferences dialog (currently %s)." +msgstr "" +"Slika izbrane velikosti bi zasedla več pomnilnika, kot je največ dovoljeno " +"glede na nastavitev \"Največja velikost slike\" v pogovornem oknu " +"\"Nastavitve\" (trenutno nastavljeno na %s)." #: ../app/dialogs/image-properties-dialog.c:60 #: ../app/dialogs/image-properties-dialog.c:63 @@ -9028,12 +9238,21 @@ msgstr "Potrdite spremembo merila" #: ../app/dialogs/image-scale-dialog.c:245 #, c-format -msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)." -msgstr "Sprememba merila slike na izbrano velikost bi zahtevala več pomnilnika, kot to dovoljuje nastavitev \"Največja velikost slike\" v pogovornem oknu \"Nastavitve\" (trenutno %s)." +msgid "" +"Scaling the image to the chosen size will make it use more memory than what " +"is configured as \"Maximum Image Size\" in the Preferences dialog (currently " +"%s)." +msgstr "" +"Sprememba merila slike na izbrano velikost bi zahtevala več pomnilnika, kot " +"to dovoljuje nastavitev \"Največja velikost slike\" v pogovornem oknu " +"\"Nastavitve\" (trenutno %s)." #: ../app/dialogs/image-scale-dialog.c:260 -msgid "Scaling the image to the chosen size will shrink some layers completely away." -msgstr "Sprememba merila slike na izbrano velikost slike bo skrčila nekatere plasti na ničelno velikost." +msgid "" +"Scaling the image to the chosen size will shrink some layers completely away." +msgstr "" +"Sprememba merila slike na izbrano velikost slike bo skrčila nekatere plasti " +"na ničelno velikost." #: ../app/dialogs/image-scale-dialog.c:264 msgid "Is this what you want to do?" @@ -9048,8 +9267,12 @@ msgid "Configure Keyboard Shortcuts" msgstr "Prilagodi tipke za bližnjice" #: ../app/dialogs/keyboard-shortcuts-dialog.c:73 -msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear." -msgstr "Za urejanje tipk za bližnjico kliknite ustrezno vrstico in vpišite novo kombinacijo tipk ali pritisnite vračalko za njen izbris." +msgid "" +"To edit a shortcut key, click on the corresponding row and type a new " +"accelerator, or press backspace to clear." +msgstr "" +"Za urejanje tipk za bližnjico kliknite ustrezno vrstico in vpišite novo " +"kombinacijo tipk ali pritisnite vračalko za njen izbris." #: ../app/dialogs/keyboard-shortcuts-dialog.c:81 msgid "S_ave keyboard shortcuts on exit" @@ -9096,7 +9319,8 @@ msgstr "Upravljalec gradnikov" #: ../app/dialogs/module-dialog.c:150 msgid "You will have to restart GIMP for the changes to take effect." -msgstr "Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale." +msgstr "" +"Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale." #: ../app/dialogs/module-dialog.c:191 msgid "Module" @@ -9143,10 +9367,8 @@ msgid "Offset Channel" msgstr "Zamakni kanal" #. The offset frame -#: ../app/dialogs/offset-dialog.c:118 -#: ../app/dialogs/offset-dialog.c:152 -#: ../app/dialogs/resize-dialog.c:198 -#: ../app/tools/gimpblendoptions.c:247 +#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 +#: ../app/dialogs/resize-dialog.c:198 ../app/tools/gimpblendoptions.c:247 #: ../app/widgets/gimpgrideditor.c:206 msgid "Offset" msgstr "Zamik" @@ -9156,13 +9378,11 @@ msgstr "Zamik" msgid "_Offset" msgstr "Od_makni" -#: ../app/dialogs/offset-dialog.c:184 -#: ../app/dialogs/resize-dialog.c:227 +#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:227 msgid "_X:" msgstr "_X:" -#: ../app/dialogs/offset-dialog.c:186 -#: ../app/dialogs/resize-dialog.c:228 +#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 msgid "_Y:" msgstr "_Y:" @@ -9270,11 +9490,16 @@ msgstr "Resnično želite ponastaviti vse možnosti na privzete vrednosti?" #: ../app/dialogs/preferences-dialog.c:354 msgid "You will have to restart GIMP for the following changes to take effect:" -msgstr "Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale:" +msgstr "" +"Morali boste ponovno zagnati GIMP, da bodo naslednje spremembe učinkovale:" #: ../app/dialogs/preferences-dialog.c:536 -msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP." -msgstr "Tipke za bližnjice bodo ponastavljene na privzete vrednosti ob naslednjem zagonu GIMP-a." +msgid "" +"Your keyboard shortcuts will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Tipke za bližnjice bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:547 msgid "Remove all Keyboard Shortcuts" @@ -9285,16 +9510,28 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Resnično želite odstraniti vse tipke za bližnjice iz vseh menijev?" #: ../app/dialogs/preferences-dialog.c:610 -msgid "Your window setup will be reset to default values the next time you start GIMP." -msgstr "Nastavitve oken bodo ponastavljene na privzete vrednosti ob naslednjem zagonu GIMP-a." +msgid "" +"Your window setup will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Nastavitve oken bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:645 -msgid "Your input device settings will be reset to default values the next time you start GIMP." -msgstr "Nastavitve vhodne naprave bodo ponastavljene na privzete vrednosti ob naslednjem zagonu GIMP-a." +msgid "" +"Your input device settings will be reset to default values the next time you " +"start GIMP." +msgstr "" +"Nastavitve vhodne naprave bodo ponastavljene na privzete vrednosti ob " +"naslednjem zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:680 -msgid "Your tool options will be reset to default values the next time you start GIMP." -msgstr "Nastavitve orodij bodo ponastavljene na privzete vrednosti ob naslednjem zagonu GIMP-a." +msgid "" +"Your tool options will be reset to default values the next time you start " +"GIMP." +msgstr "" +"Nastavitve orodij bodo ponastavljene na privzete vrednosti ob naslednjem " +"zagonu GIMP-a." #: ../app/dialogs/preferences-dialog.c:1266 msgid "Show _menubar" @@ -9756,8 +9993,7 @@ msgstr "Ločljivost zaslona" #. Pixels #: ../app/dialogs/preferences-dialog.c:2328 -#: ../app/display/gimpcursorview.c:206 -#: ../app/widgets/gimpgrideditor.c:199 +#: ../app/display/gimpcursorview.c:206 ../app/widgets/gimpgrideditor.c:199 #: ../app/widgets/gimpgrideditor.c:231 msgid "Pixels" msgstr "slikovnih točk" @@ -9771,7 +10007,7 @@ msgid "Vertical" msgstr "Navpično" #: ../app/dialogs/preferences-dialog.c:2350 -#: ../app/widgets/gimpimagepropview.c:470 +#: ../app/widgets/gimpimagepropview.c:469 msgid "ppi" msgstr "ppi" @@ -10063,33 +10299,28 @@ msgid "Print Size" msgstr "Velikost tiskanja" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 -#: ../app/widgets/gimpsizebox.c:193 +#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:193 #: ../app/widgets/gimptemplateeditor.c:180 msgid "_Width:" msgstr "_Širina:" -#: ../app/dialogs/print-size-dialog.c:172 -#: ../app/widgets/gimpsizebox.c:197 +#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:197 #: ../app/widgets/gimptemplateeditor.c:187 msgid "H_eight:" msgstr "V_išina:" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 -#: ../app/widgets/gimpsizebox.c:255 +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:255 #: ../app/widgets/gimptemplateeditor.c:309 msgid "_X resolution:" msgstr "Ločljivost _X:" -#: ../app/dialogs/print-size-dialog.c:229 -#: ../app/widgets/gimpsizebox.c:258 +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:258 #: ../app/widgets/gimptemplateeditor.c:316 msgid "_Y resolution:" msgstr "Ločljivost _Y:" -#: ../app/dialogs/print-size-dialog.c:240 -#: ../app/widgets/gimpsizebox.c:251 +#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:251 #, c-format msgid "pixels/%a" msgstr "slik. točk/%a" @@ -10127,8 +10358,7 @@ msgstr "_Zavrzi spremembe" msgid "Canvas Size" msgstr "Velikost platna" -#: ../app/dialogs/resize-dialog.c:130 -#: ../app/dialogs/scale-dialog.c:109 +#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109 msgid "Layer Size" msgstr "Velikost plasti" @@ -10153,13 +10383,11 @@ msgid "_Vertical:" msgstr "_Navpično:" #. Image size frame -#: ../app/dialogs/scale-dialog.c:98 -#: ../app/widgets/gimptemplateeditor.c:158 +#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:158 msgid "Image Size" msgstr "Velikost slike" -#: ../app/dialogs/scale-dialog.c:176 -#: ../app/tools/gimppaintoptions-gui.c:393 +#: ../app/dialogs/scale-dialog.c:176 ../app/tools/gimppaintoptions-gui.c:393 msgid "Quality" msgstr "Kakovost" @@ -10168,8 +10396,13 @@ msgid "I_nterpolation:" msgstr "I_nterpolacija:" #: ../app/dialogs/scale-dialog.c:207 -msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only." -msgstr "Indeksirane barvne plasti se pri spremembi merila spreminjajo brez interpolacije. Izbrana vrsta interpolacije bo učinkovala le na kanale in maske. " +msgid "" +"Indexed color layers are always scaled without interpolation. The chosen " +"interpolation type will affect channels and layer masks only." +msgstr "" +"Indeksirane barvne plasti se pri spremembi merila spreminjajo brez " +"interpolacije. Izbrana vrsta interpolacije bo učinkovala le na kanale in " +"maske. " #: ../app/dialogs/stroke-dialog.c:97 msgid "Choose Stroke Style" @@ -10236,7 +10469,8 @@ msgstr "Uporabniška namestitev ni uspela!" #: ../app/dialogs/user-install-dialog.c:95 msgid "The GIMP user installation failed; see the log for details." -msgstr "Uporabniška namestitev GIMP ni uspela; oglejte si zapisnik s podrobnostmi." +msgstr "" +"Uporabniška namestitev GIMP ni uspela; oglejte si zapisnik s podrobnostmi." #: ../app/dialogs/user-install-dialog.c:98 msgid "Installation Log" @@ -10319,35 +10553,25 @@ msgctxt "guides-type" msgid "Line spacing" msgstr "Razmik med črtami" -#: ../app/display/gimpcursorview.c:216 -#: ../app/display/gimpcursorview.c:222 -#: ../app/display/gimpcursorview.c:241 -#: ../app/display/gimpcursorview.c:247 -#: ../app/display/gimpcursorview.c:266 -#: ../app/display/gimpcursorview.c:272 -#: ../app/display/gimpcursorview.c:288 -#: ../app/display/gimpcursorview.c:295 -#: ../app/display/gimpcursorview.c:672 -#: ../app/display/gimpcursorview.c:673 -#: ../app/display/gimpcursorview.c:674 -#: ../app/display/gimpcursorview.c:675 -#: ../app/display/gimpcursorview.c:788 -#: ../app/display/gimpcursorview.c:789 -#: ../app/display/gimpcursorview.c:790 -#: ../app/display/gimpcursorview.c:791 +#: ../app/display/gimpcursorview.c:216 ../app/display/gimpcursorview.c:222 +#: ../app/display/gimpcursorview.c:241 ../app/display/gimpcursorview.c:247 +#: ../app/display/gimpcursorview.c:266 ../app/display/gimpcursorview.c:272 +#: ../app/display/gimpcursorview.c:288 ../app/display/gimpcursorview.c:295 +#: ../app/display/gimpcursorview.c:672 ../app/display/gimpcursorview.c:673 +#: ../app/display/gimpcursorview.c:674 ../app/display/gimpcursorview.c:675 +#: ../app/display/gimpcursorview.c:788 ../app/display/gimpcursorview.c:789 +#: ../app/display/gimpcursorview.c:790 ../app/display/gimpcursorview.c:791 #: ../app/widgets/gimpcolorframe.c:633 msgid "n/a" msgstr "ni na voljo" -#: ../app/display/gimpcursorview.c:219 -#: ../app/display/gimpcursorview.c:244 +#: ../app/display/gimpcursorview.c:219 ../app/display/gimpcursorview.c:244 #: ../app/display/gimpcursorview.c:269 #: ../app/widgets/gimpdeviceinfoeditor.c:138 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:225 -#: ../app/display/gimpcursorview.c:250 +#: ../app/display/gimpcursorview.c:225 ../app/display/gimpcursorview.c:250 #: ../app/display/gimpcursorview.c:275 #: ../app/widgets/gimpdeviceinfoeditor.c:139 msgid "Y" @@ -10394,8 +10618,7 @@ msgid "Navigate the image display" msgstr "Krmari po prikazu slike" #: ../app/display/gimpdisplayshell.c:746 -#: ../app/display/gimpdisplayshell.c:1327 -#: ../app/widgets/gimptoolbox.c:253 +#: ../app/display/gimpdisplayshell.c:1327 ../app/widgets/gimptoolbox.c:253 msgid "Drop image files here to open them" msgstr "Semkaj spustite datoteke slik, ki jih želite odpreti." @@ -10417,7 +10640,8 @@ msgstr "Želite shraniti spremembe slike '%s' pred zapiranjem?" #: ../app/display/gimpdisplayshell-close.c:270 #, c-format msgid "If you don't save the image, changes from the last hour will be lost." -msgid_plural "If you don't save the image, changes from the last %d hours will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d hours will be lost." msgstr[0] "Če ne shranite slike, bodo spremembe zadnjih %d ur izgubljene." msgstr[1] "Če ne shranite slike, bodo spremembe zadnje %d ure izgubljene." msgstr[2] "Če ne shranite slike, bodo spremembe zadnjih %d ur izgubljene." @@ -10425,17 +10649,26 @@ msgstr[3] "Če ne shranite slike, bodo spremembe zadnjih %d ur izgubljene." #: ../app/display/gimpdisplayshell-close.c:281 #, c-format -msgid "If you don't save the image, changes from the last hour and %d minute will be lost." -msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost." -msgstr[0] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." -msgstr[1] "Če ne shranite slike, bodo spremembe zadnje ure in %d minute izgubljene." -msgstr[2] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." -msgstr[3] "Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +msgid "" +"If you don't save the image, changes from the last hour and %d minute will " +"be lost." +msgid_plural "" +"If you don't save the image, changes from the last hour and %d minutes will " +"be lost." +msgstr[0] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +msgstr[1] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minute izgubljene." +msgstr[2] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." +msgstr[3] "" +"Če ne shranite slike, bodo spremembe zadnje ure in %d minut izgubljene." #: ../app/display/gimpdisplayshell-close.c:293 #, c-format msgid "If you don't save the image, changes from the last minute will be lost." -msgid_plural "If you don't save the image, changes from the last %d minutes will be lost." +msgid_plural "" +"If you don't save the image, changes from the last %d minutes will be lost." msgstr[0] "Če ne shranite slike, bodo spremembe zadnjih %d minut izgubljene." msgstr[1] "Če ne shranite slike, bodo spremembe zadnje %d minute izgubljene." msgstr[2] "Če ne shranite slike, bodo spremembe zadnjih %d minut izgubljene." @@ -10457,24 +10690,18 @@ msgid "Drop New Path" msgstr "Spusti novo pot" #: ../app/display/gimpdisplayshell-dnd.c:361 -#: ../app/display/gimpdisplayshell-dnd.c:463 -#: ../app/tools/gimpblendtool.c:173 -#: ../app/tools/gimpbucketfilltool.c:136 -#: ../app/tools/gimpimagemaptool.c:280 +#: ../app/display/gimpdisplayshell-dnd.c:463 ../app/tools/gimpblendtool.c:173 +#: ../app/tools/gimpbucketfilltool.c:136 ../app/tools/gimpimagemaptool.c:280 #: ../app/tools/gimpselectiontool.c:427 msgid "Cannot modify the pixels of layer groups." msgstr "Slikovnih točk skupin plasti ni mogoče spremeniti." #: ../app/display/gimpdisplayshell-dnd.c:369 -#: ../app/display/gimpdisplayshell-dnd.c:471 -#: ../app/tools/gimpblendtool.c:180 -#: ../app/tools/gimpbucketfilltool.c:143 -#: ../app/tools/gimpcroptool.c:325 -#: ../app/tools/gimpimagemaptool.c:287 -#: ../app/tools/gimppainttool.c:266 -#: ../app/tools/gimpselectiontool.c:432 -#: ../app/tools/gimptransformtool.c:247 -#: ../app/tools/gimptransformtool.c:1067 +#: ../app/display/gimpdisplayshell-dnd.c:471 ../app/tools/gimpblendtool.c:180 +#: ../app/tools/gimpbucketfilltool.c:143 ../app/tools/gimpcroptool.c:325 +#: ../app/tools/gimpimagemaptool.c:287 ../app/tools/gimppainttool.c:266 +#: ../app/tools/gimpselectiontool.c:432 ../app/tools/gimptransformtool.c:247 +#: ../app/tools/gimptransformtool.c:1070 msgid "The active layer's pixels are locked." msgstr "Slikovne točke aktivne plasti so zaklenjene." @@ -10485,8 +10712,7 @@ msgstr "Spusti plasti" #: ../app/display/gimpdisplayshell-dnd.c:682 #: ../app/display/gimpdisplayshell-dnd.c:699 -#: ../app/widgets/gimplayertreeview.c:802 -#: ../app/widgets/gimptoolbox-dnd.c:264 +#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:264 msgid "Dropped Buffer" msgstr "Spuščen medpomnilnik" @@ -10547,15 +10773,16 @@ msgstr "(brez)" msgid "Cancel %s" msgstr "Prekliči %s" -#: ../app/file/file-open.c:136 -#: ../app/file/file-save.c:115 +#: ../app/file/file-open.c:136 ../app/file/file-save.c:115 msgid "Not a regular file" msgstr "Ni veljavna datoteka" #: ../app/file/file-open.c:188 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" -msgstr "Vtičnik %s je vrnil niz SUCCESS (uspešno dokončana operacija), a ni vrnil slike" +msgstr "" +"Vtičnik %s je vrnil niz SUCCESS (uspešno dokončana operacija), a ni vrnil " +"slike" #: ../app/file/file-open.c:199 #, c-format @@ -10566,14 +10793,18 @@ msgstr "Z vtičnikom %s ni mogoče odpreti slike" msgid "Image doesn't contain any layers" msgstr "Slika ne vsebuje nobenih plasti" -#: ../app/file/file-open.c:583 +#: ../app/file/file-open.c:586 #, c-format msgid "Opening '%s' failed: %s" msgstr "Odpiranje '%s' ni uspelo: %s" -#: ../app/file/file-open.c:690 -msgid "Color management has been disabled. It can be enabled again in the Preferences dialog." -msgstr "Upravljanje barv je bilo onemogočeno. Znova ga lahko vključite v pogovornem oknu Nastavitve." +#: ../app/file/file-open.c:696 +msgid "" +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." +msgstr "" +"Upravljanje barv je bilo onemogočeno. Znova ga lahko vključite v pogovornem " +"oknu Nastavitve." #: ../app/file/file-procedure.c:195 msgid "Unknown file type" @@ -10584,13 +10815,12 @@ msgstr "Neznana vrsta datoteke" msgid "%s plug-in could not save image" msgstr "Z vtičnikom %s ni mogoče shraniti slike" -#: ../app/file/file-utils.c:74 +#: ../app/file/file-utils.c:72 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "'%s:' ni veljaven zapis URI" -#: ../app/file/file-utils.c:90 -#: ../app/file/file-utils.c:126 +#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:124 msgid "Invalid character sequence in URI" msgstr "Neveljavno zaporedje znakov v naslovu URI" @@ -10604,16 +10834,15 @@ msgctxt "cage-mode" msgid "Deform the cage to deform the image" msgstr "Deformirajte kletko in s tem deformirate sliko" -#: ../app/gegl/gimpcurvesconfig.c:388 +#: ../app/gegl/gimpcurvesconfig.c:395 msgid "not a GIMP Curves file" msgstr "ni datoteka krivulj GIMP" -#: ../app/gegl/gimpcurvesconfig.c:403 -#: ../app/gegl/gimplevelsconfig.c:789 +#: ../app/gegl/gimpcurvesconfig.c:410 ../app/gegl/gimplevelsconfig.c:811 msgid "parse error" msgstr "napaka razčlenjevanja" -#: ../app/gegl/gimplevelsconfig.c:742 +#: ../app/gegl/gimplevelsconfig.c:764 msgid "not a GIMP Levels file" msgstr "ni datoteka ravni GIMP" @@ -10622,8 +10851,12 @@ msgid "Compute a set of coefficient buffer for the GIMP cage tool" msgstr "Izračunaj nabor koeficientnega medpomnilnika za orodje kletke v Gimpu" #: ../app/gegl/gimpoperationcagetransform.c:106 -msgid "Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage tool" -msgstr "Pretvori nabor koeficientnega medpomnilnika v koordinatni medpomnilnik za orodje kletke v Gimpu" +msgid "" +"Convert a set of coefficient buffer to a coordinate buffer for the GIMP cage " +"tool" +msgstr "" +"Pretvori nabor koeficientnega medpomnilnika v koordinatni medpomnilnik za " +"orodje kletke v Gimpu" #: ../app/gegl/gimpoperationcagetransform.c:128 msgid "Fill with plain color" @@ -10643,8 +10876,7 @@ msgstr "Dokumenti" msgid "GIMP Startup" msgstr "Zagon GIMP-a" -#: ../app/paint/gimpairbrush.c:73 -#: ../app/tools/gimpairbrushtool.c:54 +#: ../app/paint/gimpairbrush.c:73 ../app/tools/gimpairbrushtool.c:54 msgid "Airbrush" msgstr "Barvna pršilka" @@ -10656,8 +10888,7 @@ msgstr "Za to orodje čopiči niso na voljo." msgid "No paint dynamics available for use with this tool." msgstr "Za to orodje dinamika slikanja ni na voljo." -#: ../app/paint/gimpclone.c:102 -#: ../app/tools/gimpclonetool.c:60 +#: ../app/paint/gimpclone.c:102 ../app/tools/gimpclonetool.c:60 msgid "Clone" msgstr "Kloniraj" @@ -10673,13 +10904,11 @@ msgstr "Konvolucija" msgid "Dodge/Burn" msgstr "Posvetli/potemni" -#: ../app/paint/gimperaser.c:63 -#: ../app/tools/gimperasertool.c:65 +#: ../app/paint/gimperaser.c:63 ../app/tools/gimperasertool.c:65 msgid "Eraser" msgstr "Radirka" -#: ../app/paint/gimpheal.c:131 -#: ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:131 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Zaceli" @@ -10687,8 +10916,7 @@ msgstr "Zaceli" msgid "Healing does not operate on indexed layers." msgstr "Celjenje ne deluje na indeksiranih plasteh." -#: ../app/paint/gimpink.c:97 -#: ../app/tools/gimpinktool.c:54 +#: ../app/paint/gimpink.c:97 ../app/tools/gimpinktool.c:54 msgid "Ink" msgstr "Črnilo" @@ -10704,8 +10932,7 @@ msgstr "Razmerje stranic kapljice črnila" msgid "Ink Blob Angle" msgstr "Kot kapljice črnila" -#: ../app/paint/gimppaintbrush.c:66 -#: ../app/tools/gimppaintbrushtool.c:50 +#: ../app/paint/gimppaintbrush.c:66 ../app/tools/gimppaintbrushtool.c:50 msgid "Paintbrush" msgstr "Slikarski čopič" @@ -10757,8 +10984,7 @@ msgstr "Globina glajenja" msgid "Gravity of the pen" msgstr "Težnost pisala" -#: ../app/paint/gimppencil.c:41 -#: ../app/tools/gimppenciltool.c:50 +#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50 msgid "Pencil" msgstr "Svinčnik" @@ -10771,8 +10997,7 @@ msgstr "Kloniranje v perspektivi" msgid "Perspective Clone does not operate on indexed layers." msgstr "Kloniranje v perspektivi ne deluje na indeksiranih plasteh." -#: ../app/paint/gimpsmudge.c:84 -#: ../app/tools/gimpsmudgetool.c:53 +#: ../app/paint/gimpsmudge.c:84 ../app/tools/gimpsmudgetool.c:53 msgid "Smudge" msgstr "Razmaži" @@ -10845,23 +11070,20 @@ msgstr "Vtičnik" #: ../app/pdb/drawable-transform-cmds.c:345 #: ../app/pdb/drawable-transform-cmds.c:443 -#: ../app/pdb/item-transform-cmds.c:262 -#: ../app/pdb/transform-tools-cmds.c:163 +#: ../app/pdb/item-transform-cmds.c:262 ../app/pdb/transform-tools-cmds.c:163 #: ../app/tools/gimpperspectivetool.c:82 msgid "Perspective" msgstr "Perspektiva" #: ../app/pdb/drawable-transform-cmds.c:957 #: ../app/pdb/drawable-transform-cmds.c:1042 -#: ../app/pdb/item-transform-cmds.c:611 -#: ../app/pdb/transform-tools-cmds.c:418 +#: ../app/pdb/item-transform-cmds.c:611 ../app/pdb/transform-tools-cmds.c:418 #: ../app/tools/gimpsheartool.c:112 msgid "Shearing" msgstr "Nagibanje ..." #: ../app/pdb/drawable-transform-cmds.c:1138 -#: ../app/pdb/item-transform-cmds.c:709 -#: ../app/pdb/transform-tools-cmds.c:507 +#: ../app/pdb/item-transform-cmds.c:709 ../app/pdb/transform-tools-cmds.c:507 msgid "2D Transform" msgstr "2D-preoblikovanje" @@ -10872,8 +11094,7 @@ msgstr "2D-preoblikovanje" msgid "2D Transforming" msgstr "2D-preoblikovanje ..." -#: ../app/pdb/edit-cmds.c:725 -#: ../app/tools/gimpblendtool.c:249 +#: ../app/pdb/edit-cmds.c:725 ../app/tools/gimpblendtool.c:249 msgid "Blending" msgstr "Zlivanje ..." @@ -10886,11 +11107,13 @@ msgid "Cannot anchor this layer because it is not a floating selection." msgstr "Te plasti ni mogoče zasidrati, ker ni plavajoči izbor." #: ../app/pdb/floating-sel-cmds.c:131 -msgid "Cannot convert this layer to a normal layer because it is not a floating selection." -msgstr "Te plasti ni mogoče pretvoriti v navadno plast, ker ni plavajoči izbor." +msgid "" +"Cannot convert this layer to a normal layer because it is not a floating " +"selection." +msgstr "" +"Te plasti ni mogoče pretvoriti v navadno plast, ker ni plavajoči izbor." -#: ../app/pdb/gimppdb-query.c:299 -#: ../app/pdb/gimppdb.c:305 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:305 #: ../app/pdb/gimppdb.c:375 #, c-format msgid "Procedure '%s' not found" @@ -11005,13 +11228,21 @@ msgstr "Elementa '%s' (%d) ni mogoče uporabiti, ker je pripet drugi sliki" #: ../app/pdb/gimppdb-utils.c:392 #, c-format -msgid "Item '%s' (%d) cannot be used because it is not a direct child of an item tree" -msgstr "Elementa '%s' (%d) ni mogoče uporabiti, ker ni neposreden otrok drevesa elementa" +msgid "" +"Item '%s' (%d) cannot be used because it is not a direct child of an item " +"tree" +msgstr "" +"Elementa '%s' (%d) ni mogoče uporabiti, ker ni neposreden otrok drevesa " +"elementa" #: ../app/pdb/gimppdb-utils.c:420 #, c-format -msgid "Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of the same item tree" -msgstr "Elementov '%s' (%d) in '%s' (%d) ni mogoče uporabiti, ker nista del drevesa istega elementa" +msgid "" +"Items '%s' (%d) and '%s' (%d) cannot be used because they are not part of " +"the same item tree" +msgstr "" +"Elementov '%s' (%d) in '%s' (%d) ni mogoče uporabiti, ker nista del drevesa " +"istega elementa" #: ../app/pdb/gimppdb-utils.c:445 #, c-format @@ -11031,7 +11262,8 @@ msgstr "Poskus dodajanja elementa '%s' (%d) napačni sliki" #: ../app/pdb/gimppdb-utils.c:496 #, c-format msgid "Item '%s' (%d) cannot be modified because its contents are locked" -msgstr "Elementa '%s' (%d) ni mogoče spremeniti, ker je njegova vsebina zaklenjena" +msgstr "" +"Elementa '%s' (%d) ni mogoče spremeniti, ker je njegova vsebina zaklenjena" #: ../app/pdb/gimppdb-utils.c:516 #, c-format @@ -11065,8 +11297,12 @@ msgstr "Vektorski predmet %d ne vsebuje poteze z identifikacijo %d" #: ../app/pdb/gimppdb.c:410 #, c-format -msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s." -msgstr "Procedura '%s' je bila klicana z napačno vrsto vrednosti argumenta #%d. Pričakovano %s, prejeto %s." +msgid "" +"Procedure '%s' has been called with a wrong type for argument #%d. Expected " +"%s, got %s." +msgstr "" +"Procedura '%s' je bila klicana z napačno vrsto vrednosti argumenta #%d. " +"Pričakovano %s, prejeto %s." #: ../app/pdb/gimppdbcontext.c:89 #: ../app/tools/gimpforegroundselectoptions.c:79 @@ -11074,64 +11310,96 @@ msgstr "Procedura '%s' je bila klicana z napačno vrsto vrednosti argumenta #%d. msgid "Smooth edges" msgstr "Zgladi robove" -#: ../app/pdb/gimpprocedure.c:372 -#: ../app/plug-in/gimppluginprocframe.c:208 +#: ../app/pdb/gimpprocedure.c:372 ../app/plug-in/gimppluginprocframe.c:208 #, c-format msgid "Procedure '%s' returned no return values" msgstr "Procedura '%s' ni vrnila nobenih vrednosti" #: ../app/pdb/gimpprocedure.c:642 #, c-format -msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s." -msgstr "Procedura '%s' je vrnila napačno vrsto vrnjene vrednosti '%s' (#%d). Pričakovana vrednost %s, prejeta %s." +msgid "" +"Procedure '%s' returned a wrong value type for return value '%s' (#%d). " +"Expected %s, got %s." +msgstr "" +"Procedura '%s' je vrnila napačno vrsto vrnjene vrednosti '%s' (#%d). " +"Pričakovana vrednost %s, prejeta %s." #: ../app/pdb/gimpprocedure.c:654 #, c-format -msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s." -msgstr "Procedura '%s' je bila priklicana z napačno vrsto vrednosti argumenta '%s' (#%d). Pričakovano %s, prejeto %s." +msgid "" +"Procedure '%s' has been called with a wrong value type for argument '%s' (#" +"%d). Expected %s, got %s." +msgstr "" +"Procedura '%s' je bila priklicana z napačno vrsto vrednosti argumenta '%s' (#" +"%d). Pričakovano %s, prejeto %s." #: ../app/pdb/gimpprocedure.c:687 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje je od vtičnika pričakovano delovanje na plasti, ki več ne obstaja." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje je od " +"vtičnika pričakovano delovanje na plasti, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:700 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer." -msgstr "Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje poskuša vtičnik delovati na plasti, ki več ne obstaja." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on a layer that doesn't exist any longer." +msgstr "" +"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na plasti, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:717 #, c-format -msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje poskuša vtičnik delovati na sliki, ki več ne obstaja." +msgid "" +"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-" +"in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Procedura '%s' je vrnila neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na sliki, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:730 #, c-format -msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer." -msgstr "Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje poskuša vtičnik delovati na sliki, ki več ne obstaja." +msgid "" +"Procedure '%s' has been called with an invalid ID for argument '%s'. Most " +"likely a plug-in is trying to work on an image that doesn't exist any longer." +msgstr "" +"Klic procedure '%s' ima neveljaven ID za argument '%s'. Najverjetneje " +"poskuša vtičnik delovati na sliki, ki več ne obstaja." #: ../app/pdb/gimpprocedure.c:751 #, c-format -msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range." -msgstr "Procedura '%s' je vrnila '%s' kot vrnjeno vrednost '%s' (#%d, vrsta %s). Ta vrednost je izven dovoljenega obsega." +msgid "" +"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value " +"is out of range." +msgstr "" +"Procedura '%s' je vrnila '%s' kot vrnjeno vrednost '%s' (#%d, vrsta %s). Ta " +"vrednost je izven dovoljenega obsega." #: ../app/pdb/gimpprocedure.c:765 #, c-format -msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range." -msgstr "Klic procedure '%s' ima vrednost '%s' za argument '%s' (#%d, vrsta %s). Ta vrednost je zunaj dovoljenega obsega." +msgid "" +"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type " +"%s). This value is out of range." +msgstr "" +"Klic procedure '%s' ima vrednost '%s' za argument '%s' (#%d, vrsta %s). Ta " +"vrednost je zunaj dovoljenega obsega." #: ../app/pdb/image-cmds.c:2365 -msgid "Image resolution is out of bounds, using the default resolution instead." -msgstr "Ločljivost slike je prekoračila meje, zato bo uporabljena privzeta ločljivost." +msgid "" +"Image resolution is out of bounds, using the default resolution instead." +msgstr "" +"Ločljivost slike je prekoračila meje, zato bo uporabljena privzeta " +"ločljivost." -#: ../app/pdb/image-select-cmds.c:297 -#: ../app/pdb/selection-tools-cmds.c:219 +#: ../app/pdb/image-select-cmds.c:297 ../app/pdb/selection-tools-cmds.c:219 #: ../app/tools/gimpfreeselecttool.c:196 msgid "Free Select" msgstr "Prosto izbiranje" -#: ../app/pdb/layer-cmds.c:478 -#: ../app/pdb/layer-cmds.c:516 +#: ../app/pdb/layer-cmds.c:478 ../app/pdb/layer-cmds.c:516 msgid "Move Layer" msgstr "Premakni plast" @@ -11140,20 +11408,13 @@ msgstr "Premakni plast" msgid "Failed to create text layer" msgstr "Ustvarjanje plasti besedila ni uspelo" -#: ../app/pdb/text-layer-cmds.c:164 -#: ../app/pdb/text-layer-cmds.c:274 -#: ../app/pdb/text-layer-cmds.c:353 -#: ../app/pdb/text-layer-cmds.c:426 -#: ../app/pdb/text-layer-cmds.c:498 -#: ../app/pdb/text-layer-cmds.c:570 -#: ../app/pdb/text-layer-cmds.c:642 -#: ../app/pdb/text-layer-cmds.c:714 -#: ../app/pdb/text-layer-cmds.c:786 -#: ../app/pdb/text-layer-cmds.c:856 -#: ../app/pdb/text-layer-cmds.c:928 -#: ../app/pdb/text-layer-cmds.c:1000 -#: ../app/pdb/text-layer-cmds.c:1072 -#: ../app/pdb/text-layer-cmds.c:1114 +#: ../app/pdb/text-layer-cmds.c:164 ../app/pdb/text-layer-cmds.c:274 +#: ../app/pdb/text-layer-cmds.c:353 ../app/pdb/text-layer-cmds.c:426 +#: ../app/pdb/text-layer-cmds.c:498 ../app/pdb/text-layer-cmds.c:570 +#: ../app/pdb/text-layer-cmds.c:642 ../app/pdb/text-layer-cmds.c:714 +#: ../app/pdb/text-layer-cmds.c:786 ../app/pdb/text-layer-cmds.c:856 +#: ../app/pdb/text-layer-cmds.c:928 ../app/pdb/text-layer-cmds.c:1000 +#: ../app/pdb/text-layer-cmds.c:1072 ../app/pdb/text-layer-cmds.c:1114 #: ../app/pdb/text-layer-cmds.c:1196 msgid "Set text layer attribute" msgstr "Določite atribute plasti besedila" @@ -11166,32 +11427,29 @@ msgstr "Odstrani potezo poti" msgid "Close path stroke" msgstr "Zapri potezo poti" -#: ../app/pdb/vectors-cmds.c:399 +#: ../app/pdb/vectors-cmds.c:401 msgid "Translate path stroke" msgstr "Premakni potezo poti" -#: ../app/pdb/vectors-cmds.c:439 +#: ../app/pdb/vectors-cmds.c:443 msgid "Scale path stroke" msgstr "Spremeni merilo poteze poti" -#: ../app/pdb/vectors-cmds.c:481 +#: ../app/pdb/vectors-cmds.c:487 msgid "Rotate path stroke" msgstr "Zasukaj potezo poti" -#: ../app/pdb/vectors-cmds.c:521 -#: ../app/pdb/vectors-cmds.c:565 +#: ../app/pdb/vectors-cmds.c:529 ../app/pdb/vectors-cmds.c:575 msgid "Flip path stroke" msgstr "Prezrcali potezo poti" -#: ../app/pdb/vectors-cmds.c:694 -#: ../app/pdb/vectors-cmds.c:817 -#: ../app/pdb/vectors-cmds.c:1037 +#: ../app/pdb/vectors-cmds.c:706 ../app/pdb/vectors-cmds.c:829 +#: ../app/pdb/vectors-cmds.c:1055 msgid "Add path stroke" msgstr "Dodaj potezo poti" -#: ../app/pdb/vectors-cmds.c:870 -#: ../app/pdb/vectors-cmds.c:923 -#: ../app/pdb/vectors-cmds.c:984 +#: ../app/pdb/vectors-cmds.c:882 ../app/pdb/vectors-cmds.c:937 +#: ../app/pdb/vectors-cmds.c:1000 msgid "Extend path stroke" msgstr "Razširi potezo poti" @@ -11243,12 +11501,15 @@ msgid "" "Plug-in crashed: \"%s\"\n" "(%s)\n" "\n" -"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side." +"The dying plug-in may have messed up GIMP's internal state. You may want to " +"save your images and restart GIMP to be on the safe side." msgstr "" "Vtičnik se je sesul: \"%s\"\n" "(%s)\n" "\n" -"Vtičnik je ob sesutju morda pokvaril notranje stanje GIMP-a. Morda je smiselno, da iz varnostnih razlogov shranite svoje slike in ponovno poženete GIMP-a." +"Vtičnik je ob sesutju morda pokvaril notranje stanje GIMP-a. Morda je " +"smiselno, da iz varnostnih razlogov shranite svoje slike in ponovno poženete " +"GIMP-a." #: ../app/plug-in/gimppluginmanager-call.c:173 #: ../app/plug-in/gimppluginmanager-call.c:223 @@ -11285,7 +11546,7 @@ msgstr "Prevajalniki vtičnikov" msgid "Plug-In Environment" msgstr "Okolje vtičnikov" -#: ../app/plug-in/gimppluginprocedure.c:976 +#: ../app/plug-in/gimppluginprocedure.c:978 #, c-format msgid "" "Calling error for '%s':\n" @@ -11294,7 +11555,7 @@ msgstr "" "Napaka klica pri '%s':\n" "%s" -#: ../app/plug-in/gimppluginprocedure.c:988 +#: ../app/plug-in/gimppluginprocedure.c:990 #, c-format msgid "" "Execution error for '%s':\n" @@ -11347,8 +11608,7 @@ msgstr "" "Priznam, bil sem že vegi,\n" "dihal češnje, tofu in bicikel." -#: ../app/text/gimptext-compat.c:105 -#: ../app/tools/gimptexttool.c:1402 +#: ../app/text/gimptext-compat.c:105 ../app/tools/gimptexttool.c:1402 msgid "Add Text Layer" msgstr "Dodaj plast besedila" @@ -11388,26 +11648,44 @@ msgstr "Preoblikuj plast besedila" msgid "Discard Text Information" msgstr "Zavrži besedilne podatke" -#: ../app/text/gimptextlayer.c:581 +#: ../app/text/gimptextlayer.c:582 msgid "Due to lack of any fonts, text functionality is not available." msgstr "Zaradi odsotnosti vseh pisav funkcionalnost besedila ni na voljo." -#: ../app/text/gimptextlayer.c:634 +#: ../app/text/gimptextlayer.c:640 msgid "Empty Text Layer" msgstr "Sprazni plast besedila" +#: ../app/text/gimptextlayer.c:696 +msgid "" +"Your text cannot be rendered. It is likely too big. Please make it shorter " +"or use a smaller font." +msgstr "" +"Besedila ni mogoče upodobiti, najverjetneje je preveliko. Skrajšajte ga ali " +"uporabite manjšo pisavo." + #: ../app/text/gimptextlayer-xcf.c:76 #, c-format msgid "" "Problems parsing the text parasite for layer '%s':\n" "%s\n" "\n" -"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this." +"Some text properties may be wrong. Unless you want to edit the text layer, " +"you don't need to worry about this." msgstr "" "Težava pri razčlenjevanju besedilnega zajedalca za plast '%s':\n" "%s\n" "\n" -"Nekatere lastnosti besedila so morda napačne. Če plasti z besedilom ne želite urejati, je skrb odveč." +"Nekatere lastnosti besedila so morda napačne. Če plasti z besedilom ne " +"želite urejati, je skrb odveč." + +#: ../app/text/gimptextlayout.c:577 +msgid "" +"The new text layout cannot be generated. Most likely the font size is too " +"big." +msgstr "" +"Nove postavitve besedila ni mogoče izdelati. Najverjetneje je pisava " +"prevelika." #: ../app/text/text-enums.c:23 msgctxt "text-box-mode" @@ -11439,8 +11717,7 @@ msgstr "_Zračno pršilo" msgid "Motion only" msgstr "Samo gibanje" -#: ../app/tools/gimpairbrushtool.c:91 -#: ../app/tools/gimpconvolvetool.c:228 +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:228 #: ../app/tools/gimpsmudgetool.c:91 msgid "Rate" msgstr "Mera" @@ -11461,8 +11738,7 @@ msgstr "Vodoravni odmik za razporeditev" msgid "Vertical offset for distribution" msgstr "Navpični odmik za razporeditev" -#: ../app/tools/gimpalignoptions.c:272 -#: ../app/tools/gimpaligntool.c:124 +#: ../app/tools/gimpalignoptions.c:272 ../app/tools/gimpaligntool.c:124 msgid "Align" msgstr "Poravnaj" @@ -11536,7 +11812,9 @@ msgstr "Pora_vnaj" #: ../app/tools/gimpaligntool.c:549 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "Kliknite na plast, pot ali vodilo ali pa kliknite-povlecite za izbor več plasti" +msgstr "" +"Kliknite na plast, pot ali vodilo ali pa kliknite-povlecite za izbor več " +"plasti" #: ../app/tools/gimpaligntool.c:557 msgid "Click to pick this layer as first item" @@ -11562,18 +11840,15 @@ msgstr "Kliknite za izbor te poti kot prve" msgid "Click to add this path to the list" msgstr "Kliknite za dodajanje te poti na seznam" -#: ../app/tools/gimpblendoptions.c:211 -#: ../app/tools/gimppaintoptions-gui.c:346 +#: ../app/tools/gimpblendoptions.c:211 ../app/tools/gimppaintoptions-gui.c:346 msgid "Gradient" msgstr "Preliv" -#: ../app/tools/gimpblendoptions.c:231 -#: ../app/widgets/gimpbrusheditor.c:139 +#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:139 msgid "Shape:" msgstr "Oblika:" -#: ../app/tools/gimpblendoptions.c:238 -#: ../app/tools/gimppaintoptions-gui.c:325 +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:325 msgid "Repeat:" msgstr "Ponovitve:" @@ -11605,8 +11880,7 @@ msgstr "Zlivanje ne deluje na indeksiranih plasteh." msgid "No gradient available for use with this tool." msgstr "Za to orodje prelivi niso na voljo." -#: ../app/tools/gimpblendtool.c:452 -#: ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimpblendtool.c:452 ../app/tools/gimppainttool.c:624 #, c-format msgid "%s for constrained angles" msgstr "%s za nespremenljive kote" @@ -11709,10 +11983,8 @@ msgstr "Iskanje podobnih barv" msgid "Fill transparent areas" msgstr "Zapolni prosojna območja" -#: ../app/tools/gimpbucketfilloptions.c:279 -#: ../app/tools/gimpclonetool.c:114 -#: ../app/tools/gimpcolorpickeroptions.c:158 -#: ../app/tools/gimphealtool.c:100 +#: ../app/tools/gimpbucketfilloptions.c:279 ../app/tools/gimpclonetool.c:114 +#: ../app/tools/gimpcolorpickeroptions.c:158 ../app/tools/gimphealtool.c:100 #: ../app/tools/gimpperspectiveclonetool.c:904 #: ../app/tools/gimpregionselectoptions.c:210 msgid "Sample merged" @@ -11728,7 +12000,8 @@ msgstr "Zapolni s kanglico" #: ../app/tools/gimpbucketfilltool.c:87 msgid "Bucket Fill Tool: Fill selected area with a color or pattern" -msgstr "Orodje Zapolni s kanglico: Zapolni izbrano področje z barvo ali vzorcem" +msgstr "" +"Orodje Zapolni s kanglico: Zapolni izbrano področje z barvo ali vzorcem" #: ../app/tools/gimpbucketfilltool.c:88 msgid "_Bucket Fill" @@ -11751,46 +12024,44 @@ msgctxt "command" msgid "Select by Color" msgstr "Izbor po barvi" -#: ../app/tools/gimpcagetool.c:152 -#: ../app/tools/gimpcagetool.c:1155 +#: ../app/tools/gimpcagetool.c:158 ../app/tools/gimpcagetool.c:1123 msgid "Cage Transform" msgstr "Preoblikovanje kletke" -#: ../app/tools/gimpcagetool.c:153 +#: ../app/tools/gimpcagetool.c:159 msgid "Cage Transform: Deform a selection with a cage" msgstr "Preoblikovanje kletke: deformirajte izbor s kletko" -#: ../app/tools/gimpcagetool.c:154 +#: ../app/tools/gimpcagetool.c:160 msgid "_Cage Transform" msgstr "Preo_blikovanje kletke" -#: ../app/tools/gimpcagetool.c:352 +#: ../app/tools/gimpcagetool.c:356 msgid "Press ENTER to commit the transform" msgstr "Pritisnite Enter za potrditev preoblikovanja" -#: ../app/tools/gimpcagetool.c:1096 +#: ../app/tools/gimpcagetool.c:1064 msgid "Computing Cage Coefficients" msgstr "Računanje koeficientov kletke" -#: ../app/tools/gimpcagetool.c:1273 +#: ../app/tools/gimpcagetool.c:1241 msgid "Cage transform" msgstr "Preoblikovanje kletke" #: ../app/tools/gimpclonetool.c:61 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush" -msgstr "Orodje Kloniraj: selektivno kopirajte s slike ali vzorca, z uporabo čopiča" +msgstr "" +"Orodje Kloniraj: selektivno kopirajte s slike ali vzorca, z uporabo čopiča" #: ../app/tools/gimpclonetool.c:62 msgid "_Clone" msgstr "_Kloniraj" -#: ../app/tools/gimpclonetool.c:85 -#: ../app/tools/gimpclonetool.c:88 +#: ../app/tools/gimpclonetool.c:85 ../app/tools/gimpclonetool.c:88 msgid "Click to clone" msgstr "Kliknite za kloniranje" -#: ../app/tools/gimpclonetool.c:86 -#: ../app/tools/gimpclonetool.c:91 +#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:91 #, c-format msgid "%s to set a new clone source" msgstr "%s za določitev novega vira kloniranja" @@ -11805,8 +12076,7 @@ msgstr "Kliknite za določitev novega vira kloniranja" msgid "Source" msgstr "Vir" -#: ../app/tools/gimpclonetool.c:128 -#: ../app/tools/gimphealtool.c:109 +#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:109 #: ../app/tools/gimpperspectiveclonetool.c:918 msgid "Alignment:" msgstr "Poravnava:" @@ -11843,8 +12113,7 @@ msgstr "Uravnovešanje barv deluje le na barvnih plasteh RGB." msgid "Select Range to Adjust" msgstr "Določite obseg za prilagajanje" -#: ../app/tools/gimpcolorbalancetool.c:275 -#: ../app/tools/gimplevelstool.c:172 +#: ../app/tools/gimpcolorbalancetool.c:275 ../app/tools/gimplevelstool.c:172 msgid "Adjust Color Levels" msgstr "Prilagodi ravni barv" @@ -11957,8 +12226,11 @@ msgid "Choose what color picker will do" msgstr "Izberite, kaj bo počela kapalka" #: ../app/tools/gimpcolorpickeroptions.c:80 -msgid "Open a floating dialog to view picked color values in various color models" -msgstr "Odpri plavajoče pogovorno okno za ogled vrednosti izbranih barv v različnih barvnih modelih" +msgid "" +"Open a floating dialog to view picked color values in various color models" +msgstr "" +"Odpri plavajoče pogovorno okno za ogled vrednosti izbranih barv v različnih " +"barvnih modelih" #. the pick FG/BG frame #: ../app/tools/gimpcolorpickeroptions.c:163 @@ -11988,13 +12260,11 @@ msgstr "_Kapalka" msgid "Click in any image to view its color" msgstr "Za ogled barve kliknite v sliko" -#: ../app/tools/gimpcolorpickertool.c:238 -#: ../app/tools/gimppainttool.c:477 +#: ../app/tools/gimpcolorpickertool.c:238 ../app/tools/gimppainttool.c:478 msgid "Click in any image to pick the foreground color" msgstr "Kliknite v katero koli sliko, da izberete barvo ospredja" -#: ../app/tools/gimpcolorpickertool.c:246 -#: ../app/tools/gimppainttool.c:483 +#: ../app/tools/gimpcolorpickertool.c:246 ../app/tools/gimppainttool.c:484 msgid "Click in any image to pick the background color" msgstr "Kliknite v katero koli sliko, da izberete barvo ozadja" @@ -12006,8 +12276,7 @@ msgstr "Za dodajanje barve na paleto kliknite v sliko" msgid "Color Picker Information" msgstr "Podatki kapalke" -#: ../app/tools/gimpcolortool.c:230 -#: ../app/tools/gimpcolortool.c:403 +#: ../app/tools/gimpcolortool.c:230 ../app/tools/gimpcolortool.c:403 msgid "Move Sample Point: " msgstr "Premakni vzorčno točko: " @@ -12029,7 +12298,9 @@ msgstr "Zabriši / izostri" #: ../app/tools/gimpconvolvetool.c:74 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "Orodje Zabriši / Izostri: selektivno zabrisovanje in izostrovanje z uporabo čopiča" +msgstr "" +"Orodje Zabriši / Izostri: selektivno zabrisovanje in izostrovanje z uporabo " +"čopiča" #: ../app/tools/gimpconvolvetool.c:75 msgid "Bl_ur / Sharpen" @@ -12078,7 +12349,8 @@ msgstr "Obreži le trenutno izbrano plast" #: ../app/tools/gimpcropoptions.c:88 msgid "Allow resizing canvas by dragging cropping frame beyond image boundary" -msgstr "Dovoli spremembo merila platna z vlečenjem okvira obrezave prek meja slike" +msgstr "" +"Dovoli spremembo merila platna z vlečenjem okvira obrezave prek meja slike" #: ../app/tools/gimpcropoptions.c:164 msgid "Current layer only" @@ -12148,23 +12420,19 @@ msgstr "Kliknite za dodajanje nadzornih točk vsem kanalom" msgid "Click to locate on curve (try Shift, Ctrl)" msgstr "Kliknite za mesto na krivulji (poskusite Shift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:463 -#: ../app/tools/gimplevelstool.c:384 +#: ../app/tools/gimpcurvestool.c:463 ../app/tools/gimplevelstool.c:384 msgid "Cha_nnel:" msgstr "Ka_nal:" -#: ../app/tools/gimpcurvestool.c:489 -#: ../app/tools/gimplevelstool.c:408 +#: ../app/tools/gimpcurvestool.c:489 ../app/tools/gimplevelstool.c:408 msgid "R_eset Channel" msgstr "Po_nastavi kanal" -#: ../app/tools/gimpcurvestool.c:583 -#: ../app/widgets/gimpdeviceinfoeditor.c:461 +#: ../app/tools/gimpcurvestool.c:583 ../app/widgets/gimpdeviceinfoeditor.c:461 msgid "Curve _type:" msgstr "Vrsta _krivulje:" -#: ../app/tools/gimpcurvestool.c:658 -#: ../app/tools/gimplevelstool.c:756 +#: ../app/tools/gimpcurvestool.c:658 ../app/tools/gimplevelstool.c:756 #, c-format msgid "Could not read header from '%s': %s" msgstr "Ni mogoče brati glave iz '%s': %s" @@ -12199,7 +12467,8 @@ msgstr "Posvetli / potemni" #: ../app/tools/gimpdodgeburntool.c:74 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush" -msgstr "Orodje Posvetli / potemni: Selektivno posvetlite ali potemnite s čopičem" +msgstr "" +"Orodje Posvetli / potemni: Selektivno posvetlite ali potemnite s čopičem" #: ../app/tools/gimpdodgeburntool.c:75 msgid "Dod_ge / Burn" @@ -12318,8 +12587,10 @@ msgid "Flip" msgstr "Prezrcali" #: ../app/tools/gimpfliptool.c:85 -msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically" -msgstr "Orodje Prezrcali: Vodoravno ali navpično prezrcalite plast, izbor ali pot" +msgid "" +"Flip Tool: Reverse the layer, selection or path horizontally or vertically" +msgstr "" +"Orodje Prezrcali: Vodoravno ali navpično prezrcalite plast, izbor ali pot" #: ../app/tools/gimpfliptool.c:87 msgid "_Flip" @@ -12348,16 +12619,24 @@ msgid "Select a single contiguous area" msgstr "Izberite posamezno neprekinjeno področje" #: ../app/tools/gimpforegroundselectoptions.c:91 -msgid "Paint over areas to mark color values for inclusion or exclusion from selection" -msgstr "Riši po površinah z namenom označevanja barvnih vrednosti za vključitev ali izključitev iz izbora" +msgid "" +"Paint over areas to mark color values for inclusion or exclusion from " +"selection" +msgstr "" +"Riši po površinah z namenom označevanja barvnih vrednosti za vključitev ali " +"izključitev iz izbora" #: ../app/tools/gimpforegroundselectoptions.c:98 msgid "Size of the brush used for refinements" msgstr "Velikost čopiča za popravke" #: ../app/tools/gimpforegroundselectoptions.c:104 -msgid "Smaller values give a more accurate selection border but may introduce holes in the selection" -msgstr "Manjše vrednosti podajo bolj natančen rob izbora, vendar lahko tudi povzročijo luknje v izboru" +msgid "" +"Smaller values give a more accurate selection border but may introduce holes " +"in the selection" +msgstr "" +"Manjše vrednosti podajo bolj natančen rob izbora, vendar lahko tudi " +"povzročijo luknje v izboru" #: ../app/tools/gimpforegroundselectoptions.c:112 msgid "Color of selection preview mask" @@ -12421,7 +12700,8 @@ msgstr "Izbor ospredja" #: ../app/tools/gimpforegroundselecttool.c:145 msgid "Foreground Select Tool: Select a region containing foreground objects" -msgstr "Orodje Izbor ospredja: Izberite območje, ki vsebuje predmete iz ospredja" +msgstr "" +"Orodje Izbor ospredja: Izberite območje, ki vsebuje predmete iz ospredja" #: ../app/tools/gimpforegroundselecttool.c:146 msgid "F_oreground Select" @@ -12445,8 +12725,11 @@ msgid "Foreground Select" msgstr "Izbor ospredja" #: ../app/tools/gimpfreeselecttool.c:197 -msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "Orodje Prosto izbiranje: Izberite z roko narisano območje s prostimi in večkotnimi odseki" +msgid "" +"Free Select Tool: Select a hand-drawn region with free and polygonal segments" +msgstr "" +"Orodje Prosto izbiranje: Izberite z roko narisano območje s prostimi in " +"večkotnimi odseki" #: ../app/tools/gimpfreeselecttool.c:198 msgid "_Free Select" @@ -12466,7 +12749,8 @@ msgstr "Enter uveljavi, Esc prekliče, vračalka odstrani zadnji odsek" #: ../app/tools/gimpfreeselecttool.c:1043 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "S klikom in vleko dodate prosti odsek, s klikom dodate mnogokotni odsek" +msgstr "" +"S klikom in vleko dodate prosti odsek, s klikom dodate mnogokotni odsek" #: ../app/tools/gimpfreeselecttool.c:1562 msgctxt "command" @@ -12490,8 +12774,7 @@ msgctxt "command" msgid "Fuzzy Select" msgstr "Mehki izbor" -#: ../app/tools/gimpgegltool.c:93 -#: ../app/tools/gimpgegltool.c:112 +#: ../app/tools/gimpgegltool.c:93 ../app/tools/gimpgegltool.c:112 msgid "GEGL Operation" msgstr "Operacija GEGL" @@ -12528,13 +12811,11 @@ msgstr "Orodje celjenja: Zaceli nepravilnosti slike" msgid "_Heal" msgstr "Za_celi" -#: ../app/tools/gimphealtool.c:76 -#: ../app/tools/gimphealtool.c:79 +#: ../app/tools/gimphealtool.c:76 ../app/tools/gimphealtool.c:79 msgid "Click to heal" msgstr "Kliknite za celjenje" -#: ../app/tools/gimphealtool.c:77 -#: ../app/tools/gimphealtool.c:82 +#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:82 #, c-format msgid "%s to set a new heal source" msgstr "%s za nastavitev novega vira celjenja" @@ -12550,7 +12831,8 @@ msgstr "Merilo histograma" #: ../app/tools/gimphuesaturationtool.c:103 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness" -msgstr "Orodje Obarvanost-nasičenost: Prilagodite obarvanost, nasičenost in svetlost" +msgstr "" +"Orodje Obarvanost-nasičenost: Prilagodite obarvanost, nasičenost in svetlost" #: ../app/tools/gimphuesaturationtool.c:104 msgid "Hue-_Saturation..." @@ -12638,8 +12920,7 @@ msgstr "_Predogled" msgid "Adjustment" msgstr "Prilagoditev" -#: ../app/tools/gimpinkoptions-gui.c:64 -#: ../app/tools/gimpinkoptions-gui.c:87 +#: ../app/tools/gimpinkoptions-gui.c:64 ../app/tools/gimpinkoptions-gui.c:87 #: ../app/tools/gimppaintoptions-gui.c:134 msgid "Size" msgstr "Velikost" @@ -12698,13 +12979,11 @@ msgstr "Orodje Izbor s škarjami: Izberite oblike s pametnim pomerjanjem robov" msgid "Intelligent _Scissors" msgstr "Pametne _škarje" -#: ../app/tools/gimpiscissorstool.c:902 -#: ../app/tools/gimpmeasuretool.c:605 +#: ../app/tools/gimpiscissorstool.c:902 ../app/tools/gimpmeasuretool.c:605 msgid "Click-Drag to move this point" msgstr "Kliknite in povlecite, da premaknete točko." -#: ../app/tools/gimpiscissorstool.c:904 -#: ../app/tools/gimpiscissorstool.c:969 +#: ../app/tools/gimpiscissorstool.c:904 ../app/tools/gimpiscissorstool.c:969 #, c-format msgid "%s: disable auto-snap" msgstr "%s: onemogoči samodejno pripenjanje" @@ -12780,8 +13059,7 @@ msgstr "Izhodne ravni" msgid "All Channels" msgstr "Vsi kanali" -#: ../app/tools/gimplevelstool.c:657 -#: ../app/tools/gimpthresholdtool.c:268 +#: ../app/tools/gimplevelstool.c:657 ../app/tools/gimpthresholdtool.c:268 msgid "_Auto" msgstr "_Samodejno" @@ -12875,11 +13153,9 @@ msgstr "Kliknite in povlecite za dodajanje nove točke" msgid "Click-Drag to move all points" msgstr "Kliknite in povlecite za premik vseh točk" -#: ../app/tools/gimpmeasuretool.c:939 -#: ../app/tools/gimpmeasuretool.c:1084 -#: ../app/tools/gimpmeasuretool.c:1140 -#: ../app/tools/gimpmeasuretool.c:1168 -#: ../app/tools/gimppainttool.c:632 +#: ../app/tools/gimpmeasuretool.c:939 ../app/tools/gimpmeasuretool.c:1084 +#: ../app/tools/gimpmeasuretool.c:1140 ../app/tools/gimpmeasuretool.c:1168 +#: ../app/tools/gimppainttool.c:633 msgid "pixels" msgstr "slikovnih točk" @@ -12938,8 +13214,7 @@ msgstr "Orodje Premakni: Premakne plasti, izbor in druge predmete" msgid "_Move" msgstr "_Premakni" -#: ../app/tools/gimpmovetool.c:249 -#: ../app/tools/gimpmovetool.c:554 +#: ../app/tools/gimpmovetool.c:249 ../app/tools/gimpmovetool.c:554 msgid "Move Guide: " msgstr "Premakni vodilo: " @@ -12965,8 +13240,7 @@ msgstr "Slikarski _čopič" #: ../app/tools/gimppaintoptions-gui.c:92 #: ../app/tools/gimpselectionoptions.c:217 -#: ../app/widgets/gimpbrushselect.c:190 -#: ../app/widgets/gimplayertreeview.c:268 +#: ../app/widgets/gimpbrushselect.c:190 ../app/widgets/gimplayertreeview.c:268 msgid "Mode:" msgstr "Način:" @@ -13052,7 +13326,7 @@ msgstr "%s za izbor barve" msgid "Cannot paint on layer groups." msgstr "Na skupine plasti ni mogoče slikati." -#: ../app/tools/gimppainttool.c:678 +#: ../app/tools/gimppainttool.c:679 #, c-format msgid "%s for a straight line" msgstr "%s za ravno črto" @@ -13066,8 +13340,12 @@ msgid "Pe_ncil" msgstr "Svi_nčnik" #: ../app/tools/gimpperspectiveclonetool.c:134 -msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation" -msgstr "Orodje Kloniranje v perspektivi: Klonirajte iz slikovnega vira ob upoštevanju transformacije perspektive" +msgid "" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" +msgstr "" +"Orodje Kloniranje v perspektivi: Klonirajte iz slikovnega vira ob " +"upoštevanju transformacije perspektive" #: ../app/tools/gimpperspectiveclonetool.c:136 msgid "_Perspective Clone" @@ -13196,8 +13474,7 @@ msgstr "Nespremenljivo:" msgid "Position:" msgstr "Položaj:" -#: ../app/tools/gimprectangleoptions.c:1020 -#: ../app/tools/gimptextoptions.c:525 +#: ../app/tools/gimprectangleoptions.c:1020 ../app/tools/gimptextoptions.c:525 msgid "Size:" msgstr "Velikost:" @@ -13238,8 +13515,7 @@ msgstr "Orodje Pravokotni izbor: Izberite pravokotno območje" msgid "_Rectangle Select" msgstr "_Pravokotni izbor" -#: ../app/tools/gimprectangletool.c:1146 -#: ../app/tools/gimprectangletool.c:2016 +#: ../app/tools/gimprectangletool.c:1146 ../app/tools/gimprectangletool.c:2016 msgid "Rectangle: " msgstr "Pravokotnik: " @@ -13323,8 +13599,7 @@ msgstr "Omogoči operjanje robov izbora" msgid "Radius of feathering" msgstr "Polmer operjanja" -#: ../app/tools/gimpselectionoptions.c:264 -#: ../app/tools/gimptextoptions.c:538 +#: ../app/tools/gimpselectionoptions.c:264 ../app/tools/gimptextoptions.c:538 msgid "Antialiasing" msgstr "Glajenje robov" @@ -13432,8 +13707,11 @@ msgid "Font size" msgstr "Velikost pisave" #: ../app/tools/gimptextoptions.c:145 -msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes" -msgstr "Namigovanje popravi obris pisave tako, da ta ostane ostra pri majhnih velikostih." +msgid "" +"Hinting alters the font outline to produce a crisp bitmap at small sizes" +msgstr "" +"Namigovanje popravi obris pisave tako, da ta ostane ostra pri majhnih " +"velikostih." #: ../app/tools/gimptextoptions.c:153 msgid "The text language may have an effect on the way the text is rendered." @@ -13456,8 +13734,12 @@ msgid "Adjust letter spacing" msgstr "Prilagodi razmik črk" #: ../app/tools/gimptextoptions.c:188 -msgid "Whether text flows into rectangular shape or moves into a new line when you press Enter" -msgstr "Ali besedilo poteka po pravokotnem liku ali pa se premakne v novo vrstico, ko pritisnete tipko Enter" +msgid "" +"Whether text flows into rectangular shape or moves into a new line when you " +"press Enter" +msgstr "" +"Ali besedilo poteka po pravokotnem liku ali pa se premakne v novo vrstico, " +"ko pritisnete tipko Enter" #: ../app/tools/gimptextoptions.c:196 msgid "Use an external editor window for text entry" @@ -13511,8 +13793,7 @@ msgstr "_Besedilo" msgid "Reshape Text Layer" msgstr "Preoblikuj plast besedila" -#: ../app/tools/gimptexttool.c:1513 -#: ../app/tools/gimptexttool.c:1516 +#: ../app/tools/gimptexttool.c:1513 ../app/tools/gimptexttool.c:1516 msgid "Confirm Text Editing" msgstr "Potrdi urejevanje besedila" @@ -13522,11 +13803,14 @@ msgstr "Ustvari _novo plast" #: ../app/tools/gimptexttool.c:1544 msgid "" -"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n" +"The layer you selected is a text layer but it has been modified using other " +"tools. Editing the layer with the text tool will discard these " +"modifications.\n" "\n" "You can edit the layer or create a new text layer from its text attributes." msgstr "" -"Izbrali ste plast besedila, ki je bila spremenjena z drugimi orodji. Urejanje plasti z orodjem besedila bo razveljavilo opravljene spremembe.\n" +"Izbrali ste plast besedila, ki je bila spremenjena z drugimi orodji. " +"Urejanje plasti z orodjem besedila bo razveljavilo opravljene spremembe.\n" "\n" "Lahko urejate plast ali pa iz lastnosti besedila ustvarite novo plast." @@ -13645,15 +13929,15 @@ msgstr "Ohrani izvorno razmerje stranic" msgid "Transforming" msgstr "Preoblikovanje" -#: ../app/tools/gimptransformtool.c:1066 +#: ../app/tools/gimptransformtool.c:1069 msgid "There is no layer to transform." msgstr "Ni plasti za preoblikovanje." -#: ../app/tools/gimptransformtool.c:1079 +#: ../app/tools/gimptransformtool.c:1082 msgid "There is no path to transform." msgstr "Ni poti za preoblikovanje." -#: ../app/tools/gimptransformtool.c:1080 +#: ../app/tools/gimptransformtool.c:1083 msgid "The active path's strokes are locked." msgstr "Poteze aktivne poti so zaklenjene." @@ -13767,13 +14051,11 @@ msgstr "Kliknite za ustvarjanje nove komponente poti" msgid "Click or Click-Drag to create a new anchor" msgstr "Kliknite ali kliknite in povlecite, da ustvarite novo sidro." -#: ../app/tools/gimpvectortool.c:1229 -#: ../app/tools/gimpvectortool.c:1236 +#: ../app/tools/gimpvectortool.c:1229 ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the anchor around" msgstr "Kliknite in povlecite, da premaknete sidro." -#: ../app/tools/gimpvectortool.c:1240 -#: ../app/tools/gimpvectortool.c:1263 +#: ../app/tools/gimpvectortool.c:1240 ../app/tools/gimpvectortool.c:1263 msgid "Click-Drag to move the anchors around" msgstr "Kliknite in povlecite, da premaknete sidra." @@ -14038,8 +14320,7 @@ msgstr "Bližnjica" msgid "Name" msgstr "Ime" -#: ../app/widgets/gimpactionview.c:633 -#: ../app/widgets/gimpactionview.c:843 +#: ../app/widgets/gimpactionview.c:633 ../app/widgets/gimpactionview.c:843 msgid "Changing shortcut failed." msgstr "Sprememba bližnjice ni uspela." @@ -14092,8 +14373,7 @@ msgstr "Razmik" msgid "Percentage of width of brush" msgstr "Odstotek širine čopiča" -#: ../app/widgets/gimpbufferview.c:179 -#: ../app/widgets/gimpbufferview.c:264 +#: ../app/widgets/gimpbufferview.c:179 ../app/widgets/gimpbufferview.c:264 #: ../app/widgets/gimpeditor.c:747 msgid "(None)" msgstr "(brez)" @@ -14137,30 +14417,30 @@ msgid "No filter selected" msgstr "Noben filter ni izbran" #: ../app/widgets/gimpcoloreditor.c:260 -msgid "Hexadecimal color notation as used in HTML and CSS. This entry also accepts CSS color names." -msgstr "Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme tudi imena barv CSS." +msgid "" +"Hexadecimal color notation as used in HTML and CSS. This entry also accepts " +"CSS color names." +msgstr "" +"Šestnajstiški zapis barv, kot je v uporabi v HTML in CSS. To polje sprejme " +"tudi imena barv CSS." #: ../app/widgets/gimpcolorframe.c:511 msgid "Index:" msgstr "Indeks:" -#: ../app/widgets/gimpcolorframe.c:524 -#: ../app/widgets/gimpcolorframe.c:550 +#: ../app/widgets/gimpcolorframe.c:524 ../app/widgets/gimpcolorframe.c:550 msgid "Red:" msgstr "Rdeča:" -#: ../app/widgets/gimpcolorframe.c:525 -#: ../app/widgets/gimpcolorframe.c:551 +#: ../app/widgets/gimpcolorframe.c:525 ../app/widgets/gimpcolorframe.c:551 msgid "Green:" msgstr "Zelena:" -#: ../app/widgets/gimpcolorframe.c:526 -#: ../app/widgets/gimpcolorframe.c:552 +#: ../app/widgets/gimpcolorframe.c:526 ../app/widgets/gimpcolorframe.c:552 msgid "Blue:" msgstr "Modra:" -#: ../app/widgets/gimpcolorframe.c:539 -#: ../app/widgets/gimpcolorframe.c:572 +#: ../app/widgets/gimpcolorframe.c:539 ../app/widgets/gimpcolorframe.c:572 msgid "Value:" msgstr "Vrednost:" @@ -14404,13 +14684,17 @@ msgstr "Želite odstraniti kontrolnik '%s'?" #: ../app/widgets/gimpcontrollerlist.c:583 msgid "" -"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n" +"Removing this controller from the list of active controllers will " +"permanently delete all event mappings you have configured.\n" "\n" -"Selecting \"Disable Controller\" will disable the controller without removing it." +"Selecting \"Disable Controller\" will disable the controller without " +"removing it." msgstr "" -"Z izbrisom tega kontrolnika s seznama aktivnih kontrolnikov boste nepovratno izbrisali vse preslikave dogodkov, ki ste jih nastavili.\n" +"Z izbrisom tega kontrolnika s seznama aktivnih kontrolnikov boste nepovratno " +"izbrisali vse preslikave dogodkov, ki ste jih nastavili.\n" "\n" -"Z izbiro \"Onemogoči kontrolnik\" lahko onemogočite kontrolnik, ne da bi ga tudi odstranili." +"Z izbiro \"Onemogoči kontrolnik\" lahko onemogočite kontrolnik, ne da bi ga " +"tudi odstranili." #: ../app/widgets/gimpcontrollerlist.c:635 msgid "Configure Input Controller" @@ -14563,7 +14847,8 @@ msgid "" "The next time this device is plugged, default settings will be used." msgstr "" "Izbrisali boste shranjene nastavitve te naprave.\n" -"Ko jo boste naslednjič priključili napravo, bodo uporabljene privzete nastavitve." +"Ko jo boste naslednjič priključili napravo, bodo uporabljene privzete " +"nastavitve." #: ../app/widgets/gimpdeviceinfoeditor.c:140 #: ../app/widgets/gimpdynamicseditor.c:141 @@ -14681,13 +14966,15 @@ msgid "Configure this tab" msgstr "Prilagodi ta zavihek" #. Auto button -#: ../app/widgets/gimpdockwindow.c:382 +#: ../app/widgets/gimpdockwindow.c:386 msgid "Auto" msgstr "Samodejno" -#: ../app/widgets/gimpdockwindow.c:393 -msgid "When enabled the dialog automatically follows the image you are working on." -msgstr "Če je vključeno, bodo pogovorna okna samodejno sledila aktivnim slikam." +#: ../app/widgets/gimpdockwindow.c:397 +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Če je vključeno, bodo pogovorna okna samodejno sledila aktivnim slikam." #: ../app/widgets/gimpdrawabletreeview.c:122 msgid "Lock pixels" @@ -14876,13 +15163,11 @@ msgstr "Spremeni barvo ozadja mreže" msgid "_Background color:" msgstr "Barva _ozadja:" -#: ../app/widgets/gimpgrideditor.c:195 -#: ../app/widgets/gimpgrideditor.c:227 +#: ../app/widgets/gimpgrideditor.c:195 ../app/widgets/gimpgrideditor.c:227 msgid "Width" msgstr "Širina" -#: ../app/widgets/gimpgrideditor.c:197 -#: ../app/widgets/gimpgrideditor.c:229 +#: ../app/widgets/gimpgrideditor.c:197 ../app/widgets/gimpgrideditor.c:229 msgid "Height" msgstr "Višina" @@ -14895,8 +15180,12 @@ msgid "The GIMP help browser is not available." msgstr "Brskalnik pomoči GIMP ni na voljo." #: ../app/widgets/gimphelp.c:295 -msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages." -msgstr "Očitno v vaši namestivi manjka vtičnik brskalnika pomoči GIMP. Namesto tega lahko strani pomoči prebirate s pomočjo svojega spletnega brskalnika." +msgid "" +"The GIMP help browser plug-in appears to be missing from your installation. " +"You may instead use the web browser for reading the help pages." +msgstr "" +"Očitno v vaši namestivi manjka vtičnik brskalnika pomoči GIMP. Namesto tega " +"lahko strani pomoči prebirate s pomočjo svojega spletnega brskalnika." #: ../app/widgets/gimphelp.c:336 msgid "Help browser doesn't start" @@ -14923,8 +15212,12 @@ msgid "The GIMP user manual is not installed on your computer." msgstr "Uporabniški priročnik za GIMP na vašem računalniku ni nameščen." #: ../app/widgets/gimphelp.c:644 -msgid "You may either install the additional help package or change your preferences to use the online version." -msgstr "Namestite lahko dodaten paket pomoči ali pa spremenite nastavitve, da boste lahko uporabljali spletno različico." +msgid "" +"You may either install the additional help package or change your " +"preferences to use the online version." +msgstr "" +"Namestite lahko dodaten paket pomoči ali pa spremenite nastavitve, da boste " +"lahko uporabljali spletno različico." #: ../app/widgets/gimphistogrameditor.c:99 msgid "Mean:" @@ -14960,86 +15253,90 @@ msgid "Use default comment" msgstr "Uporabi privzeti komentar" #: ../app/widgets/gimpimagecommenteditor.c:109 -msgid "Replace the current image comment with the default comment set in Edit→Preferences→Default Image." -msgstr "Zamenjaj trenutni komentar k sliki s privzetim komentarjem, kot je nastavljen v Uredi→Nastavitve→Privzeta slika." +msgid "" +"Replace the current image comment with the default comment set in " +"Edit→Preferences→Default Image." +msgstr "" +"Zamenjaj trenutni komentar k sliki s privzetim komentarjem, kot je " +"nastavljen v Uredi→Nastavitve→Privzeta slika." #: ../app/widgets/gimpimageprofileview.c:200 msgid "Querying..." msgstr "Povpraševanje ..." -#: ../app/widgets/gimpimagepropview.c:120 +#: ../app/widgets/gimpimagepropview.c:113 msgid "Size in pixels:" msgstr "Velikost v slik. točkah:" -#: ../app/widgets/gimpimagepropview.c:123 +#: ../app/widgets/gimpimagepropview.c:116 msgid "Print size:" msgstr "Velikost za tiskanje:" -#: ../app/widgets/gimpimagepropview.c:126 +#: ../app/widgets/gimpimagepropview.c:119 msgid "Resolution:" msgstr "Ločljivost:" -#: ../app/widgets/gimpimagepropview.c:129 +#: ../app/widgets/gimpimagepropview.c:122 msgid "Color space:" msgstr "Barvni prostor:" -#: ../app/widgets/gimpimagepropview.c:134 +#: ../app/widgets/gimpimagepropview.c:127 msgid "File Name:" msgstr "Ime datoteke:" -#: ../app/widgets/gimpimagepropview.c:140 +#: ../app/widgets/gimpimagepropview.c:133 msgid "File Size:" msgstr "Velikost datoteke:" -#: ../app/widgets/gimpimagepropview.c:143 +#: ../app/widgets/gimpimagepropview.c:136 msgid "File Type:" msgstr "Vrsta datoteke:" -#: ../app/widgets/gimpimagepropview.c:148 +#: ../app/widgets/gimpimagepropview.c:141 msgid "Size in memory:" msgstr "Velikost v spominu:" -#: ../app/widgets/gimpimagepropview.c:151 +#: ../app/widgets/gimpimagepropview.c:144 msgid "Undo steps:" msgstr "Koraki razveljavitve:" -#: ../app/widgets/gimpimagepropview.c:154 +#: ../app/widgets/gimpimagepropview.c:147 msgid "Redo steps:" msgstr "Koraki ponovitve:" -#: ../app/widgets/gimpimagepropview.c:159 +#: ../app/widgets/gimpimagepropview.c:152 msgid "Number of pixels:" msgstr "Število slikovnih točk:" -#: ../app/widgets/gimpimagepropview.c:162 +#: ../app/widgets/gimpimagepropview.c:155 msgid "Number of layers:" msgstr "Število plasti:" -#: ../app/widgets/gimpimagepropview.c:165 +#: ../app/widgets/gimpimagepropview.c:158 msgid "Number of channels:" msgstr "Število kanalov:" -#: ../app/widgets/gimpimagepropview.c:168 +#: ../app/widgets/gimpimagepropview.c:161 msgid "Number of paths:" msgstr "Število poti:" #. no undo (or redo) steps available -#: ../app/widgets/gimpimagepropview.c:411 +#: ../app/widgets/gimpimagepropview.c:410 msgid "None" msgstr "brez" -#: ../app/widgets/gimpimagepropview.c:465 +#: ../app/widgets/gimpimagepropview.c:464 #: ../app/widgets/gimptemplateeditor.c:331 #, c-format msgid "pixels/%s" msgstr "slik. točk/%s" -#: ../app/widgets/gimpimagepropview.c:467 +#: ../app/widgets/gimpimagepropview.c:466 #, c-format msgid "%g × %g %s" msgstr "%g × %g %s" -#: ../app/widgets/gimpimagepropview.c:488 +#: ../app/widgets/gimpimagepropview.c:487 msgid "colors" msgstr "barve" @@ -15237,12 +15534,12 @@ msgstr "%d × %d ppi, %s" msgid "%d ppi, %s" msgstr "%d ppi, %s" -#: ../app/widgets/gimptextbuffer-serialize.c:340 +#: ../app/widgets/gimptextbuffer-serialize.c:344 #, c-format msgid "Attribute \"%s\" is invalid on <%s> element in this context" msgstr "Lastnost \"%s\" je neveljavna za element <%s> v tem kontekstu" -#: ../app/widgets/gimptextbuffer-serialize.c:412 +#: ../app/widgets/gimptextbuffer-serialize.c:416 #, c-format msgid "Outermost element in text must be not <%s>" msgstr "Najbolj zunanji element v besedilu mora biti in ne <%s>" @@ -15310,19 +15607,16 @@ msgstr "" msgid "Pr_eview" msgstr "Pr_edogled" -#: ../app/widgets/gimpthumbbox.c:404 -#: ../app/widgets/gimpthumbbox.c:468 +#: ../app/widgets/gimpthumbbox.c:404 ../app/widgets/gimpthumbbox.c:468 msgid "No selection" msgstr "Nič ni izbrano" -#: ../app/widgets/gimpthumbbox.c:596 -#: ../app/widgets/gimpthumbbox.c:617 +#: ../app/widgets/gimpthumbbox.c:596 ../app/widgets/gimpthumbbox.c:617 #, c-format msgid "Thumbnail %d of %d" msgstr "Sličica za predogled %d od %d" -#: ../app/widgets/gimpthumbbox.c:730 -#: ../app/widgets/gimpthumbbox.c:740 +#: ../app/widgets/gimpthumbbox.c:730 ../app/widgets/gimpthumbbox.c:740 msgid "Creating preview..." msgstr "Ustvarjanje predogleda ..." @@ -15631,12 +15925,20 @@ msgid "Undefined" msgstr "Nedoločeno" #: ../app/xcf/xcf-load.c:339 -msgid "This XCF file is corrupt! I have loaded as much of it as I can, but it is incomplete." -msgstr "Datoteka XCF je okvarjena! Naložen je njen začetni pravilno oblikovan del, vendar ne v celoti." +msgid "" +"This XCF file is corrupt! I have loaded as much of it as I can, but it is " +"incomplete." +msgstr "" +"Datoteka XCF je okvarjena! Naložen je njen začetni pravilno oblikovan del, " +"vendar ne v celoti." #: ../app/xcf/xcf-load.c:350 -msgid "This XCF file is corrupt! I could not even salvage any partial image data from it." -msgstr "Datoteka XCF je okvarjena! Iz nje ni bilo mogoče rešiti niti najmanjšega dela podatkov." +msgid "" +"This XCF file is corrupt! I could not even salvage any partial image data " +"from it." +msgstr "" +"Datoteka XCF je okvarjena! Iz nje ni bilo mogoče rešiti niti najmanjšega " +"dela podatkov." #: ../app/xcf/xcf-load.c:423 msgid "" @@ -15657,15 +15959,12 @@ msgstr "Neveljavni niz UTF-8 v datoteki XCF." msgid "Error writing XCF: %s" msgstr "Napaka pri pisanju XCF: %s" -#: ../app/xcf/xcf-seek.c:43 -#: ../app/xcf/xcf-seek.c:60 -#: ../app/xcf/xcf-seek.c:71 +#: ../app/xcf/xcf-seek.c:43 ../app/xcf/xcf-seek.c:60 ../app/xcf/xcf-seek.c:71 #, c-format msgid "Could not seek in XCF file: %s" msgstr "V datoteki XCF ni možno iskanje: %s" -#: ../app/xcf/xcf.c:99 -#: ../app/xcf/xcf.c:167 +#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167 msgid "GIMP XCF image" msgstr "slika GIMP XCF" @@ -15705,4 +16004,3 @@ msgstr "Urejevalnik slik" #: ../desktop/gimp.desktop.in.in.h:3 msgid "Create images and edit photographs" msgstr "Ustvari slike in uredi fotografije" - diff --git a/themes/Default/Makefile.in b/themes/Default/Makefile.in index 330efa8a48..57c5cc424c 100644 --- a/themes/Default/Makefile.in +++ b/themes/Default/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -336,6 +336,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -362,6 +364,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/themes/Default/images/Makefile.in b/themes/Default/images/Makefile.in index 69549dffa5..5fd00c1e28 100644 --- a/themes/Default/images/Makefile.in +++ b/themes/Default/images/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -336,6 +336,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -362,6 +364,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/themes/Default/images/preferences/Makefile.in b/themes/Default/images/preferences/Makefile.in index c52088a39d..29c643a9a4 100644 --- a/themes/Default/images/preferences/Makefile.in +++ b/themes/Default/images/preferences/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/themes/Default/images/tools/stock-tool-align-16.png b/themes/Default/images/tools/stock-tool-align-16.png index b3e55d19886b0f219b5ead6aca6a6de973e849e2..7d055a5180e7bbac879e5243e0b2e6db2e8d1771 100644 GIT binary patch delta 277 zcmV+w0qXvP1F!;+B!BlwL_t(I%bk<4O2kkQMNeMR_z9L`HHCsd;3o)vhHUSjQn?B$8Hp*-0r!1Lu1A4@ zFYo=$r~(mp&beh@LblQM7T5zGH}dvld@-}5ZDs+`G)*@INq<+rxrLdXuEym!&+`;> z3rS^N*SltRNOXGcyG7opZ}9%aZmh>7uHtYhe20fuu5o&r}6S znyo#UtSfh2l7I&QGdtL}#&h7LhdeX0v(!0D;A7|)hAwd@gi!qZi(=R3xT?2N9~nuD bA@Vo!W8*FQ#SWIl00000NkvXXu0mjftqg=x delta 360 zcmV-u0hj);0)qpPB!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^RR1rZet4tW;ohyVZpHFQN-bVF}#ZDnqB04QTAATls8G$2Z0Yjt8EQ*>o% zZe?-`3PW;bVRU6=Aa`kWXdqN*WgtgMO;C{8i*En`0MAK8L4Q;@%cYVb4#F@Pg}<&# zfD>?lsaXE;tM|cCWiEifT!UUxN00006}f{;E)dQ@irj&{0Ces{ zlXSUPC_LUoK^rVWC>UwA@~r**$Nu(;jwq$P0!v`XIY0M|aW6FI46uy$^-)SW0OJ$w z>lFh-DWy#UFz{Q^RQIa=3A{Tr0eJz|os6fP^ZR-7Zld#gc7H$PKouz&3$U?-BoGL( z-|ydmui#0KiVDHV0)#CjBT?ZO{O&W4j_a6`u@g$hHYusTZJZKz{eHFwBTM1W(+&X4 zALgMH9Ev4}YQ++X-EId!0FORC^=K)DoU;I&j9k@PiDcI*BHt6=|by%+st`~O_@y4BD06Ewb!zub931^@s607*qoM6N<$f=D2y AQ2+n{ delta 410 zcmV;L0cHOD0bY*F7WpWA%Lvm$dbY)~9cWHEJ zAXI2&AV*0}P>|V+ZvX%R5lKWrR5;7kl`(RIKnz9S|KdvVDSx1(%u(XPSBX1HT)O05 zq*!4y4m(2;j~zAI(P;l@pCo`6TMNwT|6Fu_hBzs@+suD6Z3Ty6_ySHlH9q^kKR*VW zO7iLOabQlYlCc0AOGpBN5Yse$1Lqp!cIz#+2nP{H4#LI`Y!m4#Q$&-8@exaeOGwHp zm&y%RCU24)fq$;a!+M+qU@~07*qoM6N<$ Ef<_moZ~y=R diff --git a/themes/Makefile.in b/themes/Makefile.in index db05d59cab..d641eee914 100644 --- a/themes/Makefile.in +++ b/themes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -306,6 +306,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -332,6 +334,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/themes/Small/Makefile.in b/themes/Small/Makefile.in index 54181c9acf..e20e169054 100644 --- a/themes/Small/Makefile.in +++ b/themes/Small/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -276,6 +276,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -302,6 +304,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 7451f4e993..f6c5cb83b2 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -351,6 +351,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -377,6 +379,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ @@ -717,14 +723,14 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/tools/gimptool.c b/tools/gimptool.c index 4a7bac4ed6..b8ba02d186 100644 --- a/tools/gimptool.c +++ b/tools/gimptool.c @@ -263,7 +263,8 @@ find_out_env_flags (void) else env_cc = CC; - if (g_ascii_strncasecmp (env_cc, "cl", 2) == 0) + if (g_ascii_strncasecmp (env_cc, "cl", 2) == 0 && + g_ascii_strncasecmp (env_cc, "clang", 5) != 0) msvc_syntax = TRUE; if ((p = getenv ("CFLAGS")) != NULL) @@ -554,6 +555,7 @@ do_install_nogimpui (const gchar *what) static gchar * get_sys_plugin_dir (gboolean forward_slashes) { +#ifdef G_OS_WIN32 const gchar *rprefix; rprefix = get_runtime_prefix (forward_slashes ? '/' : G_DIR_SEPARATOR); @@ -564,6 +566,14 @@ get_sys_plugin_dir (gboolean forward_slashes) GIMP_PLUGIN_VERSION, "plug-ins", NULL); +#else + return g_build_path (forward_slashes ? "/" : G_DIR_SEPARATOR_S, + LIBDIR, + "gimp", + GIMP_PLUGIN_VERSION, + "plug-ins", + NULL); +#endif } static void diff --git a/tools/pdbgen/Makefile.in b/tools/pdbgen/Makefile.in index 5cfa338b4b..9acc29d466 100644 --- a/tools/pdbgen/Makefile.in +++ b/tools/pdbgen/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -246,6 +246,8 @@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ +GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@ +GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@ GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ GUDEV_LIBS = @GUDEV_LIBS@ @@ -272,6 +274,10 @@ ISO_CODES_LOCATION = @ISO_CODES_LOCATION@ JP2_LIBS = @JP2_LIBS@ JPEG_LIBS = @JPEG_LIBS@ LCMS = @LCMS@ +LCMS1_CFLAGS = @LCMS1_CFLAGS@ +LCMS1_LIBS = @LCMS1_LIBS@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb index a84aea3f77..aca9e675b3 100644 --- a/tools/pdbgen/pdb/image.pdb +++ b/tools/pdbgen/pdb/image.pdb @@ -1028,7 +1028,7 @@ HELP headers => [ qw("core/gimpimage-merge.h") ], code => <<'CODE' { - layer = gimp_image_flatten (image, context); + layer = gimp_image_flatten (image, context, error); if (! layer) success = FALSE; diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb index a46301761c..66cf609486 100644 --- a/tools/pdbgen/pdb/layer.pdb +++ b/tools/pdbgen/pdb/layer.pdb @@ -145,10 +145,7 @@ HELP else new_type = GIMP_TYPE_LAYER; - if (dest_image == gimp_item_get_image (GIMP_ITEM (drawable))) - new_item = gimp_item_duplicate (GIMP_ITEM (drawable), new_type); - else - new_item = gimp_item_convert (GIMP_ITEM (drawable), dest_image, new_type); + new_item = gimp_item_convert (GIMP_ITEM (drawable), dest_image, new_type); if (new_item) layer_copy = GIMP_LAYER (new_item);