From 7a4b05d93dfa83f2254d30c3a6b4e97999869701 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 6 Jul 2009 22:08:45 +0200 Subject: [PATCH 01/70] =?UTF-8?q?Bug=20587710=20=E2=80=93=20PAT=20file=20s?= =?UTF-8?q?pecification=20seems=20to=20have=20a=20wrong=20magic=20number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix magic number of the GIMP pattern file format in the documentation. --- devel-docs/pat.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel-docs/pat.txt b/devel-docs/pat.txt index b050286e4b..36a869f8bf 100644 --- a/devel-docs/pat.txt +++ b/devel-docs/pat.txt @@ -29,7 +29,7 @@ Bytes 16 - 19: bytes Bytes 20 - 23: magic_number Type: 32 bit unsigned int Value: GIMP pattern magic number. - ('G' << 24) + ('I' << 16) + ('M' << 8) + 'P' + ('G' << 24) + ('P' << 16) + ('A' << 8) + 'T' Bytes 24 - (header_size - 1): Type: char * From 75484699da6698db862df2df5814541ec55ae2a3 Mon Sep 17 00:00:00 2001 From: Roman Joost Date: Mon, 6 Jul 2009 10:20:39 +1000 Subject: [PATCH 02/70] Disabled the build of the metadata plugin if libexif is disabled. Relates to Bug 587172 - Merge Exif data with XMP model. --- configure.ac | 2 ++ plug-ins/Makefile.am | 6 +++++- plug-ins/metadata/exif-decode.c | 4 ---- plug-ins/metadata/metadata.c | 7 +------ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index f987d8a2cb..bbb81b1063 100644 --- a/configure.ac +++ b/configure.ac @@ -1188,6 +1188,8 @@ fi AC_SUBST(EXIF_CFLAGS) AC_SUBST(EXIF_LIBS) +AM_CONDITIONAL(BUILD_METADATA, test "x$have_libexif" = xyes) + ################# # Check for libaa diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am index 25eab535f3..fd6282388c 100644 --- a/plug-ins/Makefile.am +++ b/plug-ins/Makefile.am @@ -47,6 +47,10 @@ if BUILD_XJT file_xjt = file-xjt endif +if BUILD_METADATA +metadata = metadata +endif + SUBDIRS = \ $(script_fu) \ @@ -74,7 +78,7 @@ SUBDIRS = \ lighting \ map-object \ maze \ - metadata \ + $(metadata) \ pagecurl \ $(print) \ selection-to-path \ diff --git a/plug-ins/metadata/exif-decode.c b/plug-ins/metadata/exif-decode.c index de1e6ad9fd..8123ad024c 100644 --- a/plug-ins/metadata/exif-decode.c +++ b/plug-ins/metadata/exif-decode.c @@ -30,15 +30,11 @@ #include "xmp-model.h" #include "xmp-schemas.h" - #include "exif-decode.h" /* local function prototypes */ -gboolean xmp_merge_from_exifbuffer (XMPModel *xmp_model, - gint32 image_ID, - GError **error); static void exif_foreach_content_cb (ExifContent *content, XMPModel *xmp_model); static void exif_foreach_entry_cb (ExifEntry *entry, diff --git a/plug-ins/metadata/metadata.c b/plug-ins/metadata/metadata.c index 6010b3eb85..8e59a2f4c3 100644 --- a/plug-ins/metadata/metadata.c +++ b/plug-ins/metadata/metadata.c @@ -29,7 +29,6 @@ #include "metadata.h" #include "xmp-encode.h" - #include "interface.h" #include "exif-decode.h" /* FIXME: uncomment when these are working @@ -438,17 +437,13 @@ run (const gchar *name, } else if (! strcmp (name, DECODE_EXIF_PROC)) { -#ifdef HAVE_EXIF GError *error = NULL; - if (! xmp_merge_from_exifbuffer (xmp_model, - image_ID, - &error)) + if (! xmp_merge_from_exifbuffer (xmp_model, image_ID, &error)) { status = GIMP_PDB_EXECUTION_ERROR; g_printerr ("\nExif to XMP merge failed.\n"); } -#endif } else if (! strcmp (name, GET_PROC)) { From 669011b07d0c36791bace582863b336e40c1fdb1 Mon Sep 17 00:00:00 2001 From: Daniel Nylander Date: Tue, 7 Jul 2009 16:55:32 +0200 Subject: [PATCH 03/70] Updated Swedish translation --- po/sv.po | 1217 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 666 insertions(+), 551 deletions(-) diff --git a/po/sv.po b/po/sv.po index 881722d4de..89cdfa65e4 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-24 10:45+0100\n" -"PO-Revision-Date: 2009-03-24 13:33+0100\n" +"POT-Creation-Date: 2009-07-07 12:22+0200\n" +"PO-Revision-Date: 2009-07-07 16:53+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -193,7 +193,7 @@ msgstr "(Tryck på en tangent för att stänga fönstret)\n" msgid "GIMP output. You can minimize this window, but don't close it." msgstr "GIMP-utdata. Du kan minimera det här fönstret men stäng det inte." -#: ../app/sanity.c:340 +#: ../app/sanity.c:363 #, c-format msgid "" "The configured filename encoding cannot be converted to UTF-8: %s\n" @@ -204,7 +204,7 @@ msgstr "" "\n" "Kontrollera värdet på miljövariabeln G_FILENAME_ENCODING." -#: ../app/sanity.c:359 +#: ../app/sanity.c:382 #, c-format msgid "" "The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n" @@ -227,219 +227,219 @@ msgstr "använder %s version %s (kompilerad mot version %s)" msgid "%s version %s" msgstr "%s version %s" -#: ../app/actions/actions.c:111 -#: ../app/dialogs/dialogs.c:223 +#: ../app/actions/actions.c:105 +#: ../app/dialogs/dialogs.c:225 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "Penselredigerare" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:114 +#: ../app/actions/actions.c:108 #: ../app/core/gimp.c:855 -#: ../app/dialogs/dialogs.c:156 +#: ../app/dialogs/dialogs.c:158 #: ../app/dialogs/preferences-dialog.c:2743 msgid "Brushes" msgstr "Penslar" -#: ../app/actions/actions.c:117 -#: ../app/dialogs/dialogs.c:168 +#: ../app/actions/actions.c:111 +#: ../app/dialogs/dialogs.c:170 msgid "Buffers" msgstr "Buffertar" -#: ../app/actions/actions.c:120 -#: ../app/dialogs/dialogs.c:181 +#: ../app/actions/actions.c:114 +#: ../app/dialogs/dialogs.c:183 msgid "Channels" msgstr "Kanaler" -#: ../app/actions/actions.c:123 +#: ../app/actions/actions.c:117 #: ../app/dialogs/convert-dialog.c:174 -#: ../app/dialogs/dialogs.c:189 +#: ../app/dialogs/dialogs.c:191 msgid "Colormap" msgstr "Färgkarta" -#: ../app/actions/actions.c:126 +#: ../app/actions/actions.c:120 msgid "Configuration" msgstr "Konfiguration" -#: ../app/actions/actions.c:129 +#: ../app/actions/actions.c:123 msgid "Context" msgstr "Sammanhang" -#: ../app/actions/actions.c:132 -#: ../app/dialogs/dialogs.c:149 +#: ../app/actions/actions.c:126 +#: ../app/dialogs/dialogs.c:151 msgid "Pointer Information" msgstr "Pekarinformation" -#: ../app/actions/actions.c:135 +#: ../app/actions/actions.c:129 msgid "Debug" msgstr "Felsök" -#: ../app/actions/actions.c:138 +#: ../app/actions/actions.c:132 msgid "Dialogs" msgstr "Dialoger" -#: ../app/actions/actions.c:141 +#: ../app/actions/actions.c:135 msgid "Dock" msgstr "Docka" -#: ../app/actions/actions.c:144 +#: ../app/actions/actions.c:138 msgid "Dockable" msgstr "Dockningsbar" #. Document History -#: ../app/actions/actions.c:147 -#: ../app/dialogs/dialogs.c:170 +#: ../app/actions/actions.c:141 +#: ../app/dialogs/dialogs.c:172 #: ../app/dialogs/preferences-dialog.c:1594 msgid "Document History" msgstr "Dokumenthistorik" -#: ../app/actions/actions.c:150 +#: ../app/actions/actions.c:144 msgid "Drawable" msgstr "Rityta" -#: ../app/actions/actions.c:153 +#: ../app/actions/actions.c:147 msgid "Edit" msgstr "Redigera" -#: ../app/actions/actions.c:156 -#: ../app/dialogs/dialogs.c:145 +#: ../app/actions/actions.c:150 +#: ../app/dialogs/dialogs.c:147 msgid "Error Console" msgstr "Felkonsoll" -#: ../app/actions/actions.c:159 +#: ../app/actions/actions.c:153 msgid "File" msgstr "Fil" -#: ../app/actions/actions.c:162 -#: ../app/dialogs/dialogs.c:164 +#: ../app/actions/actions.c:156 +#: ../app/dialogs/dialogs.c:166 #: ../app/dialogs/preferences-dialog.c:2759 msgid "Fonts" msgstr "Typsnitt" -#: ../app/actions/actions.c:165 -#: ../app/dialogs/dialogs.c:227 +#: ../app/actions/actions.c:159 +#: ../app/dialogs/dialogs.c:229 #: ../app/widgets/gimpgradienteditor.c:275 msgid "Gradient Editor" msgstr "Gradientredigerare" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:168 +#: ../app/actions/actions.c:162 #: ../app/core/gimp.c:867 -#: ../app/dialogs/dialogs.c:160 +#: ../app/dialogs/dialogs.c:162 #: ../app/dialogs/preferences-dialog.c:2755 msgid "Gradients" msgstr "Gradienter" -#: ../app/actions/actions.c:171 +#: ../app/actions/actions.c:165 msgid "Help" msgstr "Hjälp" -#: ../app/actions/actions.c:174 +#: ../app/actions/actions.c:168 msgid "Image" msgstr "Bild" #. list & grid views -#: ../app/actions/actions.c:177 -#: ../app/dialogs/dialogs.c:154 +#: ../app/actions/actions.c:171 +#: ../app/dialogs/dialogs.c:156 msgid "Images" msgstr "Bilder" -#: ../app/actions/actions.c:180 -#: ../app/dialogs/dialogs.c:177 +#: ../app/actions/actions.c:174 +#: ../app/dialogs/dialogs.c:179 #: ../app/dialogs/resize-dialog.c:286 msgid "Layers" msgstr "Lager" -#: ../app/actions/actions.c:183 -#: ../app/dialogs/dialogs.c:231 +#: ../app/actions/actions.c:177 +#: ../app/dialogs/dialogs.c:233 #: ../app/widgets/gimppaletteeditor.c:154 msgid "Palette Editor" msgstr "Palettredigerare" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:186 +#: ../app/actions/actions.c:180 #: ../app/core/gimp.c:863 -#: ../app/dialogs/dialogs.c:162 +#: ../app/dialogs/dialogs.c:164 #: ../app/dialogs/preferences-dialog.c:2751 msgid "Palettes" msgstr "Paletter" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:189 +#: ../app/actions/actions.c:183 #: ../app/core/gimp.c:859 -#: ../app/dialogs/dialogs.c:158 +#: ../app/dialogs/dialogs.c:160 #: ../app/dialogs/preferences-dialog.c:2747 msgid "Patterns" msgstr "Mönster" -#: ../app/actions/actions.c:192 +#: ../app/actions/actions.c:186 #: ../app/dialogs/preferences-dialog.c:2763 msgid "Plug-Ins" msgstr "Insticksmoduler" -#: ../app/actions/actions.c:195 +#: ../app/actions/actions.c:189 #: ../app/core/gimpchannel.c:368 msgid "Quick Mask" msgstr "Snabbmask" -#: ../app/actions/actions.c:198 -#: ../app/dialogs/dialogs.c:205 +#: ../app/actions/actions.c:192 +#: ../app/dialogs/dialogs.c:207 msgid "Sample Points" msgstr "Sampelspunkter" -#: ../app/actions/actions.c:201 +#: ../app/actions/actions.c:195 msgid "Select" msgstr "Välj" #. initialize the template list -#: ../app/actions/actions.c:204 +#: ../app/actions/actions.c:198 #: ../app/core/gimp.c:876 -#: ../app/dialogs/dialogs.c:172 +#: ../app/dialogs/dialogs.c:174 msgid "Templates" msgstr "Mallar" -#: ../app/actions/actions.c:207 +#: ../app/actions/actions.c:201 msgid "Text Tool" msgstr "Textverktyg" -#: ../app/actions/actions.c:210 +#: ../app/actions/actions.c:204 msgid "Text Editor" msgstr "Textredigerare" -#: ../app/actions/actions.c:213 -#: ../app/dialogs/dialogs.c:137 +#: ../app/actions/actions.c:207 +#: ../app/dialogs/dialogs.c:139 #: ../app/dialogs/preferences-dialog.c:1879 #: ../app/gui/gui.c:428 msgid "Tool Options" msgstr "Verktygsalternativ" -#: ../app/actions/actions.c:216 -#: ../app/dialogs/dialogs.c:166 +#: ../app/actions/actions.c:210 +#: ../app/dialogs/dialogs.c:168 msgid "Tools" msgstr "Verktyg" -#: ../app/actions/actions.c:219 -#: ../app/dialogs/dialogs.c:185 -#: ../app/tools/gimpvectortool.c:160 +#: ../app/actions/actions.c:213 +#: ../app/dialogs/dialogs.c:187 +#: ../app/tools/gimpvectortool.c:161 msgid "Paths" msgstr "Slingor" -#: ../app/actions/actions.c:222 +#: ../app/actions/actions.c:216 msgid "View" msgstr "Visa" -#: ../app/actions/actions.c:225 +#: ../app/actions/actions.c:219 msgid "Windows" msgstr "Fönster" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:516 +#: ../app/actions/actions.c:510 #, c-format msgid "%s: %.2f" msgstr "%s: %.2f" #. value description and new value shown in the status bar -#: ../app/actions/actions.c:542 +#: ../app/actions/actions.c:536 #, c-format msgid "%s: %d" msgstr "%s: %d" @@ -913,6 +913,26 @@ msgctxt "context-action" msgid "Exchange foreground and background colors" msgstr "Byt för- och bakgrundsfärger" +#: ../app/actions/context-commands.c:426 +#, fuzzy, c-format +msgid "Paint Mode: %s" +msgstr "Målningsläge" + +#: ../app/actions/context-commands.c:551 +#, fuzzy, c-format +msgid "Brush Shape: %s" +msgstr "Penselform" + +#: ../app/actions/context-commands.c:610 +#, fuzzy, c-format +msgid "Brush Radius: %2.2f" +msgstr "Penselradie" + +#: ../app/actions/context-commands.c:714 +#, fuzzy, c-format +msgid "Brush Angle: %2.2f" +msgstr "Penselvinkel" + #: ../app/actions/cursor-info-actions.c:40 msgctxt "cursor-info-action" msgid "Pointer Information Menu" @@ -930,15 +950,15 @@ msgstr "Använd kompositfärgen för alla synliga lager" #: ../app/actions/data-commands.c:106 #: ../app/actions/documents-commands.c:342 -#: ../app/actions/file-commands.c:184 -#: ../app/dialogs/file-open-dialog.c:220 -#: ../app/dialogs/file-open-dialog.c:264 +#: ../app/actions/file-commands.c:193 +#: ../app/dialogs/file-open-dialog.c:221 +#: ../app/dialogs/file-open-dialog.c:265 #: ../app/dialogs/file-open-location-dialog.c:212 #: ../app/dialogs/file-open-location-dialog.c:224 #: ../app/display/gimpdisplayshell-dnd.c:537 #: ../app/widgets/gimplayertreeview.c:757 #: ../app/widgets/gimptoolbox-dnd.c:158 -#: ../app/widgets/gimptoolbox.c:977 +#: ../app/widgets/gimptoolbox.c:979 #, c-format msgid "" "Opening '%s' failed:\n" @@ -951,7 +971,7 @@ msgstr "" #: ../app/actions/data-commands.c:132 #: ../app/core/gimpbrushgenerated-load.c:124 -#: ../app/core/gimpimage.c:1411 +#: ../app/core/gimpimage.c:1425 #: ../app/core/gimppalette-import.c:210 #: ../app/core/gimppalette-load.c:222 #: ../app/core/gimppalette.c:378 @@ -1684,8 +1704,9 @@ msgid "_Edit" msgstr "R_edigera" #: ../app/actions/edit-actions.c:64 +#, fuzzy msgctxt "edit-action" -msgid "_Paste as" +msgid "Paste _as" msgstr "Klis_tra in som" #: ../app/actions/edit-actions.c:65 @@ -1861,85 +1882,86 @@ msgctxt "edit-action" msgid "Copy _Visible Named..." msgstr "Kopiera _synlig namngiven..." -#: ../app/actions/edit-actions.c:172 +#: ../app/actions/edit-actions.c:173 +#, fuzzy msgctxt "edit-action" -msgid "Copy the selected region to a named buffer" -msgstr "Kopiera den markerade regionen till en namngiven buffert" +msgid "Copy what is visible in the selected region to a named buffer" +msgstr "Kopiera vad som är synligt i den markerade regionen" -#: ../app/actions/edit-actions.c:177 +#: ../app/actions/edit-actions.c:178 msgctxt "edit-action" msgid "_Paste Named..." msgstr "Klistra in namngi_ven..." -#: ../app/actions/edit-actions.c:178 +#: ../app/actions/edit-actions.c:179 msgctxt "edit-action" msgid "Paste the content of a named buffer" msgstr "Klistra in innehållet för en namngiven buffert" -#: ../app/actions/edit-actions.c:183 +#: ../app/actions/edit-actions.c:184 msgctxt "edit-action" msgid "Cl_ear" msgstr "T_öm" -#: ../app/actions/edit-actions.c:184 +#: ../app/actions/edit-actions.c:185 msgctxt "edit-action" msgid "Clear the selected pixels" msgstr "Töm de markerade bildpunkterna" -#: ../app/actions/edit-actions.c:192 +#: ../app/actions/edit-actions.c:193 msgctxt "edit-action" msgid "Fill with _FG Color" msgstr "Fyll med _förgrundsfärg" -#: ../app/actions/edit-actions.c:193 +#: ../app/actions/edit-actions.c:194 msgctxt "edit-action" msgid "Fill the selection using the foreground color" msgstr "Fyll markeringen med förgrundsfärgen" -#: ../app/actions/edit-actions.c:198 +#: ../app/actions/edit-actions.c:199 msgctxt "edit-action" msgid "Fill with B_G Color" msgstr "Fyll med _bakgrundsfärg" -#: ../app/actions/edit-actions.c:199 +#: ../app/actions/edit-actions.c:200 msgctxt "edit-action" msgid "Fill the selection using the background color" msgstr "Fyll markeringen med bakgrundsfärgen" -#: ../app/actions/edit-actions.c:204 -msgctxt "edit-action" -msgid "Fill with P_attern" -msgstr "Fyll med möns_ter" - #: ../app/actions/edit-actions.c:205 msgctxt "edit-action" +msgid "Fill _with Pattern" +msgstr "Fyll m_ed mönster" + +#: ../app/actions/edit-actions.c:206 +msgctxt "edit-action" msgid "Fill the selection using the active pattern" msgstr "Fyll markeringen med aktivt mönster" -#: ../app/actions/edit-actions.c:282 +#: ../app/actions/edit-actions.c:283 #, c-format msgid "_Undo %s" msgstr "_Ångra %s" -#: ../app/actions/edit-actions.c:289 +#: ../app/actions/edit-actions.c:290 #, c-format msgid "_Redo %s" msgstr "_Gör om %s" -#: ../app/actions/edit-actions.c:304 +#: ../app/actions/edit-actions.c:305 #, c-format msgid "_Fade %s..." msgstr "_Tona %s..." -#: ../app/actions/edit-actions.c:316 +#: ../app/actions/edit-actions.c:317 msgid "_Undo" msgstr "_Ångra" -#: ../app/actions/edit-actions.c:317 +#: ../app/actions/edit-actions.c:318 msgid "_Redo" msgstr "_Gör om" -#: ../app/actions/edit-actions.c:318 +#: ../app/actions/edit-actions.c:319 msgid "_Fade..." msgstr "_Tona..." @@ -2072,167 +2094,185 @@ msgstr "" "Fel vid skrivning av filen \"%s\":\n" "%s" -#: ../app/actions/file-actions.c:66 +#: ../app/actions/file-actions.c:67 msgctxt "file-action" msgid "_File" msgstr "_Arkiv" -#: ../app/actions/file-actions.c:67 +#: ../app/actions/file-actions.c:68 msgctxt "file-action" msgid "Create" msgstr "Skapa" -#: ../app/actions/file-actions.c:68 +#: ../app/actions/file-actions.c:69 msgctxt "file-action" msgid "Open _Recent" msgstr "Öppna _tidigare" -#: ../app/actions/file-actions.c:71 +#: ../app/actions/file-actions.c:72 msgctxt "file-action" msgid "_Open..." msgstr "_Öppna..." -#: ../app/actions/file-actions.c:72 +#: ../app/actions/file-actions.c:73 msgctxt "file-action" msgid "Open an image file" msgstr "Öppna en bildfil" -#: ../app/actions/file-actions.c:77 +#: ../app/actions/file-actions.c:78 msgctxt "file-action" msgid "Op_en as Layers..." msgstr "Öppna som _lager..." -#: ../app/actions/file-actions.c:78 +#: ../app/actions/file-actions.c:79 msgctxt "file-action" msgid "Open an image file as layers" msgstr "Öppna en bildfil som lager" -#: ../app/actions/file-actions.c:83 +#: ../app/actions/file-actions.c:84 msgctxt "file-action" msgid "Open _Location..." msgstr "Öppna pla_ts..." -#: ../app/actions/file-actions.c:84 +#: ../app/actions/file-actions.c:85 msgctxt "file-action" msgid "Open an image file from a specified location" msgstr "Öppna en bildfil från en angiven plats" -#: ../app/actions/file-actions.c:89 -msgctxt "file-action" -msgid "Save as _Template..." -msgstr "Spara som _mall..." - #: ../app/actions/file-actions.c:90 msgctxt "file-action" +msgid "Create _Template..." +msgstr "Skapa _mall..." + +#: ../app/actions/file-actions.c:91 +msgctxt "file-action" msgid "Create a new template from this image" msgstr "Skapa en ny mall från denna bild" -#: ../app/actions/file-actions.c:95 +#: ../app/actions/file-actions.c:96 msgctxt "file-action" msgid "Re_vert" msgstr "Åter_gå" -#: ../app/actions/file-actions.c:96 +#: ../app/actions/file-actions.c:97 msgctxt "file-action" msgid "Reload the image file from disk" msgstr "Läs om bildfilen från disk" -#: ../app/actions/file-actions.c:101 +#: ../app/actions/file-actions.c:102 msgctxt "file-action" msgid "Close all" msgstr "Stäng alla" -#: ../app/actions/file-actions.c:102 +#: ../app/actions/file-actions.c:103 msgctxt "file-action" msgid "Close all opened images" msgstr "Stäng alla öppna bilder" -#: ../app/actions/file-actions.c:107 +#: ../app/actions/file-actions.c:108 msgctxt "file-action" msgid "_Quit" msgstr "_Avsluta" -#: ../app/actions/file-actions.c:108 +#: ../app/actions/file-actions.c:109 msgctxt "file-action" msgid "Quit the GNU Image Manipulation Program" msgstr "Avsluta GNU:s bildmanipuleringsprogram" -#: ../app/actions/file-actions.c:116 +#: ../app/actions/file-actions.c:117 msgctxt "file-action" msgid "_Save" msgstr "_Spara" -#: ../app/actions/file-actions.c:117 +#: ../app/actions/file-actions.c:118 msgctxt "file-action" msgid "Save this image" msgstr "Spara denna bild" -#: ../app/actions/file-actions.c:122 +#: ../app/actions/file-actions.c:123 msgctxt "file-action" msgid "Save _As..." msgstr "Spara s_om..." -#: ../app/actions/file-actions.c:123 +#: ../app/actions/file-actions.c:124 msgctxt "file-action" msgid "Save this image with a different name" msgstr "Spara denna bild med ett annat namn" -#: ../app/actions/file-actions.c:128 +#: ../app/actions/file-actions.c:129 msgctxt "file-action" msgid "Save a Cop_y..." msgstr "Spara en _kopia..." -#: ../app/actions/file-actions.c:130 +#: ../app/actions/file-actions.c:131 msgctxt "file-action" msgid "Save this image with a different name, but keep its current name" msgstr "Spara den här bilden med ett annat namn, men behåll dess aktuella namn" -#: ../app/actions/file-actions.c:135 +#: ../app/actions/file-actions.c:136 msgctxt "file-action" msgid "Save and Close..." msgstr "Spara och stäng..." -#: ../app/actions/file-actions.c:136 +#: ../app/actions/file-actions.c:137 msgctxt "file-action" msgid "Save this image and close its window" msgstr "Spara denna bild och stäng dess fönster" -#: ../app/actions/file-commands.c:104 -#: ../app/actions/file-commands.c:458 -#: ../app/dialogs/file-open-dialog.c:76 +#: ../app/actions/file-actions.c:142 +msgctxt "file-action" +msgid "Export to" +msgstr "Exportera till" + +#: ../app/actions/file-actions.c:143 +msgctxt "file-action" +msgid "Export the image back to the import source in the import format" +msgstr "" + +#: ../app/actions/file-actions.c:148 +msgctxt "file-action" +msgid "Export..." +msgstr "Exportera..." + +#: ../app/actions/file-actions.c:149 +msgctxt "file-action" +msgid "Export the image to various file formats such as PNG or JPEG" +msgstr "" + +#: ../app/actions/file-actions.c:273 +#, c-format +msgid "Overwrite %s" +msgstr "Skriv över %s" + +#: ../app/actions/file-actions.c:276 +#, c-format +msgid "Export to %s" +msgstr "Exportera till %s" + +#: ../app/actions/file-actions.c:285 +msgid "Export to" +msgstr "Exportera till" + +#: ../app/actions/file-commands.c:113 +#: ../app/actions/file-commands.c:470 +#: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Öppna bild" -#: ../app/actions/file-commands.c:125 +#: ../app/actions/file-commands.c:134 msgid "Open Image as Layers" msgstr "Öppna bild som lager" -#: ../app/actions/file-commands.c:266 -msgid "Saving canceled" -msgstr "Sparning avbröts" - -#: ../app/actions/file-commands.c:275 -#: ../app/dialogs/file-save-dialog.c:513 -#: ../app/widgets/gimpdnd-xds.c:175 -#, c-format -msgid "" -"Saving '%s' failed:\n" -"\n" -"%s" -msgstr "" -"Sparande av filen \"%s\" misslyckades:\n" -"%s" - -#: ../app/actions/file-commands.c:301 +#: ../app/actions/file-commands.c:264 msgid "No changes need to be saved" msgstr "Inga ändringar behöver sparas" -#: ../app/actions/file-commands.c:308 -#: ../app/dialogs/file-save-dialog.c:88 +#: ../app/actions/file-commands.c:271 +#: ../app/dialogs/file-save-dialog.c:95 msgid "Save Image" msgstr "Spara bild" -#: ../app/actions/file-commands.c:314 +#: ../app/actions/file-commands.c:277 msgid "Save a Copy of the Image" msgstr "Spara en kopia av bilden" @@ -2244,28 +2284,28 @@ msgstr "Skapa en ny mall" msgid "Enter a name for this template" msgstr "Ange namn för denna mall" -#: ../app/actions/file-commands.c:365 +#: ../app/actions/file-commands.c:373 msgid "Revert failed. No file name associated with this image." msgstr "Återgång misslyckades. Inget filnamn är associerat med den här bilden." -#: ../app/actions/file-commands.c:378 +#: ../app/actions/file-commands.c:386 msgid "Revert Image" msgstr "Återgå till gammal bild" -#: ../app/actions/file-commands.c:404 +#: ../app/actions/file-commands.c:416 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Återgå från \"%s\" till \"%s\"?" -#: ../app/actions/file-commands.c:410 +#: ../app/actions/file-commands.c:422 msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information." msgstr "Genom att återgå till den sparade versionen kommer du att förlora alla dina ändringar, inklusive all ångringsinformation" -#: ../app/actions/file-commands.c:565 +#: ../app/actions/file-commands.c:630 msgid "(Unnamed Template)" msgstr "(Namnlös mall)" -#: ../app/actions/file-commands.c:613 +#: ../app/actions/file-commands.c:682 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -4406,12 +4446,12 @@ msgid "From right to left" msgstr "Från höger till vänster" #: ../app/actions/text-editor-commands.c:62 -#: ../app/actions/text-tool-commands.c:111 +#: ../app/actions/text-tool-commands.c:110 msgid "Open Text File (UTF-8)" msgstr "Öppna textfil (UTF-8)" #: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:219 +#: ../app/actions/text-tool-commands.c:218 #: ../app/config/gimpconfig-file.c:58 #: ../app/core/gimpbrush-load.c:139 #: ../app/core/gimpbrush-load.c:419 @@ -4426,7 +4466,7 @@ msgstr "Öppna textfil (UTF-8)" #: ../app/core/gimppalette-load.c:461 #: ../app/core/gimppalette-load.c:627 #: ../app/core/gimppattern-load.c:75 -#: ../app/tools/gimpcurvestool.c:626 +#: ../app/tools/gimpcurvestool.c:631 #: ../app/tools/gimplevelstool.c:743 #: ../app/xcf/xcf.c:328 #, c-format @@ -4950,7 +4990,7 @@ msgstr "Slinga till markering" #: ../app/actions/vectors-commands.c:389 #: ../app/tools/gimpvectoroptions.c:198 -#: ../app/tools/gimpvectortool.c:1945 +#: ../app/tools/gimpvectortool.c:1947 #: ../app/vectors/gimpvectors.c:200 msgid "Stroke Path" msgstr "Stryk längs slinga" @@ -5630,11 +5670,11 @@ msgctxt "layer-mode-effects" msgid "Anti erase" msgstr "Antisudda" -#: ../app/base/tile-swap.c:552 +#: ../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 "Kunde inte öppna växlingfilen. GIMP har slut på minne och kan inte använda växlingsfilen. Delar av dina bilder kan vara skadade. Prova att spara ditt arbete under andra filnamn, starta om GIMP och kontrollera platsen för växlingskatalogen i dina inställningar." -#: ../app/base/tile-swap.c:567 +#: ../app/base/tile-swap.c:725 #, c-format msgid "Failed to resize swap file: %s" msgstr "Misslyckades med att ändra storlek på växlingsfil: %s" @@ -5646,7 +5686,7 @@ msgstr "Misslyckades med att ändra storlek på växlingsfil: %s" #: ../app/core/gimpgradient-save.c:144 #: ../app/core/gimppalette-save.c:55 #: ../app/gui/themes.c:238 -#: ../app/tools/gimpcurvestool.c:679 +#: ../app/tools/gimpcurvestool.c:684 #: ../app/tools/gimplevelstool.c:796 #: ../app/vectors/gimpvectors-export.c:82 #: ../app/xcf/xcf.c:421 @@ -6918,7 +6958,7 @@ msgstr "Ogiltig UTF-8-sträng i penselfilen \"%s\"." #: ../app/core/gimpitem.c:619 #: ../app/core/gimppattern-load.c:145 #: ../app/dialogs/template-options-dialog.c:82 -#: ../app/tools/gimpvectortool.c:299 +#: ../app/tools/gimpvectortool.c:301 msgid "Unnamed" msgstr "Namnlös" @@ -6941,6 +6981,11 @@ msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": kunde inte avkoda abr-for msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." msgstr "Ödesdigert tolkningsfel i penselfilen \"%s\": Breda penslar stöds inte." +#: ../app/core/gimpbrush.c:136 +#, fuzzy +msgid "Brush Spacing" +msgstr "Penslar" + #: ../app/core/gimpbrushgenerated-load.c:86 #, c-format msgid "Fatal parse error in brush file '%s': Not a GIMP brush file." @@ -6989,11 +7034,12 @@ msgid "Brush Hardness" msgstr "Penselhårdhet" #: ../app/core/gimpbrushgenerated.c:158 +#: ../app/paint/gimppaintoptions.c:250 msgid "Brush Aspect Ratio" msgstr "Penselns aspektförhållande" #: ../app/core/gimpbrushgenerated.c:165 -#: ../app/paint/gimppaintoptions.c:237 +#: ../app/paint/gimppaintoptions.c:254 msgid "Brush Angle" msgstr "Penselvinkel" @@ -7069,7 +7115,7 @@ msgid "Rotate Channel" msgstr "Rotera kanal" #: ../app/core/gimpchannel.c:269 -#: ../app/core/gimpdrawable-transform.c:842 +#: ../app/core/gimpdrawable-transform.c:885 msgid "Transform Channel" msgstr "Transformera kanal" @@ -7127,7 +7173,7 @@ msgid "Selection Mask" msgstr "Markeringsmask" #: ../app/core/gimpcontext.c:593 -#: ../app/tools/gimppaintoptions-gui.c:165 +#: ../app/tools/gimppaintoptions-gui.c:175 msgid "Opacity" msgstr "Opacitet" @@ -7183,7 +7229,7 @@ msgstr "" "%s" #: ../app/core/gimpdrawable-blend.c:244 -#: ../app/tools/gimpblendtool.c:108 +#: ../app/tools/gimpblendtool.c:109 msgid "Blend" msgstr "Toning" @@ -7192,7 +7238,7 @@ msgid "Brightness_Contrast" msgstr "Ljusstyrka_Kontrast" #: ../app/core/gimpdrawable-brightness-contrast.c:81 -#: ../app/tools/gimpbrightnesscontrasttool.c:110 +#: ../app/tools/gimpbrightnesscontrasttool.c:111 msgid "Brightness-Contrast" msgstr "Ljusstyrka-Kontrast" @@ -7281,24 +7327,24 @@ msgstr "Tröskelvärde" msgid "Transform" msgstr "Transformera" -#: ../app/core/gimpdrawable-transform.c:628 +#: ../app/core/gimpdrawable-transform.c:644 #: ../app/tools/gimpfliptool.c:116 msgctxt "command" msgid "Flip" msgstr "Vänd" -#: ../app/core/gimpdrawable-transform.c:715 +#: ../app/core/gimpdrawable-transform.c:744 #: ../app/tools/gimprotatetool.c:121 msgctxt "command" msgid "Rotate" msgstr "Rotera" -#: ../app/core/gimpdrawable-transform.c:840 +#: ../app/core/gimpdrawable-transform.c:883 #: ../app/core/gimplayer.c:256 msgid "Transform Layer" msgstr "Transformera lager" -#: ../app/core/gimpdrawable-transform.c:855 +#: ../app/core/gimpdrawable-transform.c:898 msgid "Transformation" msgstr "Transformation" @@ -7439,7 +7485,7 @@ msgid "Add Vertical Guide" msgstr "Lägg till vertikal hjälplinje" #: ../app/core/gimpimage-guides.c:114 -#: ../app/tools/gimpmovetool.c:566 +#: ../app/tools/gimpmovetool.c:568 msgid "Remove Guide" msgstr "Ta bort hjälplinje" @@ -7497,7 +7543,7 @@ msgid "Add Sample Point" msgstr "Lägg till sampelpunkt" #: ../app/core/gimpimage-sample-points.c:97 -#: ../app/tools/gimpcolortool.c:429 +#: ../app/tools/gimpcolortool.c:431 msgid "Remove Sample Point" msgstr "Ta bort sampelpunkt" @@ -7510,121 +7556,121 @@ msgstr "Flytta sampelpunkt" msgid "Can't undo %s" msgstr "Kan inte ångra %s" -#: ../app/core/gimpimage.c:1513 +#: ../app/core/gimpimage.c:1527 msgid "Change Image Resolution" msgstr "Ändra bildupplösning" -#: ../app/core/gimpimage.c:1557 +#: ../app/core/gimpimage.c:1571 msgid "Change Image Unit" msgstr "Ändra bildenhet" -#: ../app/core/gimpimage.c:2399 +#: ../app/core/gimpimage.c:2467 msgid "Attach Parasite to Image" msgstr "Koppla parasit till bild" -#: ../app/core/gimpimage.c:2437 +#: ../app/core/gimpimage.c:2505 msgid "Remove Parasite from Image" msgstr "Ta bort parasit från bild" -#: ../app/core/gimpimage.c:2943 +#: ../app/core/gimpimage.c:3011 msgid "Add Layer" msgstr "Lägg till lager" -#: ../app/core/gimpimage.c:3009 -#: ../app/core/gimpimage.c:3032 +#: ../app/core/gimpimage.c:3077 +#: ../app/core/gimpimage.c:3100 msgid "Remove Layer" msgstr "Ta bort lager" -#: ../app/core/gimpimage.c:3025 +#: ../app/core/gimpimage.c:3093 msgid "Remove Floating Selection" msgstr "Ta bort lytande markering" -#: ../app/core/gimpimage.c:3179 +#: ../app/core/gimpimage.c:3247 msgid "Layer cannot be raised higher." msgstr "Lagret kan inte höjas mer." -#: ../app/core/gimpimage.c:3184 +#: ../app/core/gimpimage.c:3252 msgid "Raise Layer" msgstr "Höj lager" -#: ../app/core/gimpimage.c:3204 +#: ../app/core/gimpimage.c:3272 msgid "Layer cannot be lowered more." msgstr "Lagret kan inte sänkas mer." -#: ../app/core/gimpimage.c:3209 +#: ../app/core/gimpimage.c:3277 msgid "Lower Layer" msgstr "Sänk lager" -#: ../app/core/gimpimage.c:3220 +#: ../app/core/gimpimage.c:3288 msgid "Raise Layer to Top" msgstr "Höj lager till överst" -#: ../app/core/gimpimage.c:3235 +#: ../app/core/gimpimage.c:3303 msgid "Lower Layer to Bottom" msgstr "Sänk lager till nederst" -#: ../app/core/gimpimage.c:3288 +#: ../app/core/gimpimage.c:3356 msgid "Add Channel" msgstr "Lägg till kanal" -#: ../app/core/gimpimage.c:3338 -#: ../app/core/gimpimage.c:3351 +#: ../app/core/gimpimage.c:3406 +#: ../app/core/gimpimage.c:3419 msgid "Remove Channel" msgstr "Ta bort kanal" -#: ../app/core/gimpimage.c:3410 +#: ../app/core/gimpimage.c:3478 msgid "Channel cannot be raised higher." msgstr "Kanalen kan inte höjas mer." -#: ../app/core/gimpimage.c:3415 +#: ../app/core/gimpimage.c:3483 msgid "Raise Channel" msgstr "Höj kanal" -#: ../app/core/gimpimage.c:3426 +#: ../app/core/gimpimage.c:3494 msgid "Raise Channel to Top" msgstr "Höj kanal till toppen" -#: ../app/core/gimpimage.c:3447 +#: ../app/core/gimpimage.c:3515 msgid "Channel cannot be lowered more." msgstr "Kanalen kan inte sänkas mer." -#: ../app/core/gimpimage.c:3452 +#: ../app/core/gimpimage.c:3520 msgid "Lower Channel" msgstr "Sänk kanal" -#: ../app/core/gimpimage.c:3467 +#: ../app/core/gimpimage.c:3535 msgid "Lower Channel to Bottom" msgstr "Sänk kanal till nederst" -#: ../app/core/gimpimage.c:3521 +#: ../app/core/gimpimage.c:3589 msgid "Add Path" msgstr "Lägg till slinga" -#: ../app/core/gimpimage.c:3565 +#: ../app/core/gimpimage.c:3633 msgid "Remove Path" msgstr "Ta bort slinga" -#: ../app/core/gimpimage.c:3618 +#: ../app/core/gimpimage.c:3686 msgid "Path cannot be raised higher." msgstr "Slingan kan inte höjas mer." -#: ../app/core/gimpimage.c:3623 +#: ../app/core/gimpimage.c:3691 msgid "Raise Path" msgstr "Höj slinga" -#: ../app/core/gimpimage.c:3634 +#: ../app/core/gimpimage.c:3702 msgid "Raise Path to Top" msgstr "Höj slingan till överst" -#: ../app/core/gimpimage.c:3654 +#: ../app/core/gimpimage.c:3722 msgid "Path cannot be lowered more." msgstr "Slingan kan inte sänkas mer." -#: ../app/core/gimpimage.c:3659 +#: ../app/core/gimpimage.c:3727 msgid "Lower Path" msgstr "Sänk slinga" -#: ../app/core/gimpimage.c:3674 +#: ../app/core/gimpimage.c:3742 msgid "Lower Path to Bottom" msgstr "Sänk slingan till underst" @@ -7673,7 +7719,7 @@ msgstr[0] "%d × %d bildpunkt" msgstr[1] "%d × %d bildpunkter" #: ../app/core/gimpimagefile.c:634 -#: ../app/display/gimpdisplayshell-title.c:310 +#: ../app/display/gimpdisplayshell-title.c:316 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -7930,15 +7976,15 @@ msgstr "Det finns ingen markering att stryka." msgid "Unable to cut or copy because the selected region is empty." msgstr "Kunde inte kopiera eller klippa ut eftersom den markerade regionen är tom." -#: ../app/core/gimpselection.c:832 +#: ../app/core/gimpselection.c:834 msgid "Cannot float selection because the selected region is empty." msgstr "Kan inte göra markeringen flytande eftersom den markerade regionen är tom." -#: ../app/core/gimpselection.c:839 +#: ../app/core/gimpselection.c:841 msgid "Float Selection" msgstr "Flytande markering" -#: ../app/core/gimpselection.c:855 +#: ../app/core/gimpselection.c:857 msgid "Floated Layer" msgstr "Flytande lager" @@ -8103,69 +8149,69 @@ msgstr "Konverterar till indexerade färger" msgid "Cannot convert to a palette with more than 256 colors." msgstr "Kan inte konvertera till palett med mer än 256 färger." -#: ../app/dialogs/dialogs-constructors.c:184 +#: ../app/dialogs/dialogs-constructors.c:192 #: ../app/gui/gui.c:160 #: ../app/gui/gui-message.c:147 msgid "GIMP Message" msgstr "GIMP-meddelande" -#: ../app/dialogs/dialogs.c:141 +#: ../app/dialogs/dialogs.c:143 msgid "Devices" msgstr "Enheter" -#: ../app/dialogs/dialogs.c:141 +#: ../app/dialogs/dialogs.c:143 msgid "Device Status" msgstr "Enhetsstatus" -#: ../app/dialogs/dialogs.c:145 +#: ../app/dialogs/dialogs.c:147 msgid "Errors" msgstr "Fel" -#: ../app/dialogs/dialogs.c:149 +#: ../app/dialogs/dialogs.c:151 msgid "Pointer" msgstr "Pekare" -#: ../app/dialogs/dialogs.c:170 +#: ../app/dialogs/dialogs.c:172 msgid "History" msgstr "Historik" -#: ../app/dialogs/dialogs.c:172 +#: ../app/dialogs/dialogs.c:174 msgid "Image Templates" msgstr "Bildmallar" -#: ../app/dialogs/dialogs.c:193 +#: ../app/dialogs/dialogs.c:195 msgid "Histogram" msgstr "Histogram" -#: ../app/dialogs/dialogs.c:197 +#: ../app/dialogs/dialogs.c:199 msgid "Selection" msgstr "Markering" -#: ../app/dialogs/dialogs.c:197 +#: ../app/dialogs/dialogs.c:199 msgid "Selection Editor" msgstr "Markeringsredigerare" -#: ../app/dialogs/dialogs.c:201 +#: ../app/dialogs/dialogs.c:203 msgid "Undo" msgstr "Ångra" -#: ../app/dialogs/dialogs.c:201 +#: ../app/dialogs/dialogs.c:203 msgid "Undo History" msgstr "Ångringshistorik" -#: ../app/dialogs/dialogs.c:211 +#: ../app/dialogs/dialogs.c:213 msgid "Navigation" msgstr "Navigering" -#: ../app/dialogs/dialogs.c:211 +#: ../app/dialogs/dialogs.c:213 msgid "Display Navigation" msgstr "Visningsnavigering" -#: ../app/dialogs/dialogs.c:217 +#: ../app/dialogs/dialogs.c:219 msgid "FG/BG" msgstr "FG/BG" -#: ../app/dialogs/dialogs.c:217 +#: ../app/dialogs/dialogs.c:219 msgid "FG/BG Color" msgstr "FG/BG-färg" @@ -8186,7 +8232,7 @@ msgstr "_Läge:" msgid "_Opacity:" msgstr "_Opacitet:" -#: ../app/dialogs/file-open-dialog.c:253 +#: ../app/dialogs/file-open-dialog.c:254 msgid "Open layers" msgstr "Öppna lager" @@ -8198,27 +8244,53 @@ msgstr "Öppna plats" msgid "Enter location (URI):" msgstr "Ange plats (URI):" -#: ../app/dialogs/file-save-dialog.c:302 -#: ../app/dialogs/file-save-dialog.c:338 -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 "Angivet filnamn har inte en känd filändelse. Ange en känd filändelse eller välj ett filformat från filformatlistan." +#: ../app/dialogs/file-save-dialog.c:105 +msgid "Export Image" +msgstr "Exportera bild" -#: ../app/dialogs/file-save-dialog.c:371 +#: ../app/dialogs/file-save-dialog.c:468 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 "Sparning av fjärrfiler behöver fastställa filformatet från filändelsen. Ange en filändelse som matchar det valda filformatet eller ange ingen filändelse alls." -#: ../app/dialogs/file-save-dialog.c:428 +#: ../app/dialogs/file-save-dialog.c:595 +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 "" + +#: ../app/dialogs/file-save-dialog.c:602 +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:608 +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 "Angivet filnamn har inte en känd filändelse. Ange en känd filändelse eller välj ett filformat från filformatlistan." + +#: ../app/dialogs/file-save-dialog.c:622 msgid "Extension Mismatch" msgstr "Filändelsen stämmer inte" -#: ../app/dialogs/file-save-dialog.c:444 +#: ../app/dialogs/file-save-dialog.c:638 msgid "The given file extension does not match the chosen file type." msgstr "Angiven filändelse matchar inte den valda filtypen." -#: ../app/dialogs/file-save-dialog.c:448 +#: ../app/dialogs/file-save-dialog.c:642 msgid "Do you want to save the image using this name anyway?" msgstr "Vill du spara bilden med det här namnet ändå?" +#: ../app/dialogs/file-save-dialog.c:697 +msgid "Saving canceled" +msgstr "Sparning avbröts" + +#: ../app/dialogs/file-save-dialog.c:705 +#: ../app/widgets/gimpdnd-xds.c:183 +#, c-format +msgid "" +"Saving '%s' failed:\n" +"\n" +"%s" +msgstr "" +"Sparande av filen \"%s\" misslyckades:\n" +"%s" + #: ../app/dialogs/grid-dialog.c:85 msgid "Configure Grid" msgstr "Ställ in rutnät" @@ -8352,12 +8424,12 @@ msgstr "Lager_namn:" #. The size labels #: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1067 +#: ../app/tools/gimpmeasuretool.c:1069 msgid "Width:" msgstr "Bredd:" #: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1095 +#: ../app/tools/gimpmeasuretool.c:1097 msgid "Height:" msgstr "Höjd:" @@ -8856,7 +8928,7 @@ msgid "Set layer or path as active" msgstr "Ställ in lager eller slinga som aktiv" #: ../app/dialogs/preferences-dialog.c:1965 -#: ../app/widgets/gimptoolbox.c:629 +#: ../app/widgets/gimptoolbox.c:631 msgid "Toolbox" msgstr "Verktygslåda" @@ -9659,63 +9731,68 @@ msgstr "N" msgid "_Sample Merged" msgstr "Sa_mpla sammanfogade" -#: ../app/display/gimpdisplay-handlers.c:160 +#: ../app/display/gimpdisplay-handlers.c:169 #, c-format msgid "Image saved to '%s'" msgstr "Bilden sparades till \"%s\"" -#: ../app/display/gimpdisplayshell.c:1075 +#: ../app/display/gimpdisplay-handlers.c:183 +#, fuzzy, c-format +msgid "Image exported to '%s'" +msgstr "Bilden sparades till \"%s\"" + +#: ../app/display/gimpdisplayshell.c:1104 msgid "Access the image menu" msgstr "Kom åt bildmenyn" -#: ../app/display/gimpdisplayshell.c:1180 +#: ../app/display/gimpdisplayshell.c:1209 msgid "Zoom image when window size changes" msgstr "Zooma bild när fönsterstorlek ändras" -#: ../app/display/gimpdisplayshell.c:1209 +#: ../app/display/gimpdisplayshell.c:1238 msgid "Toggle Quick Mask" msgstr "Visa snabbmask" -#: ../app/display/gimpdisplayshell.c:1230 +#: ../app/display/gimpdisplayshell.c:1259 msgid "Navigate the image display" msgstr "Navigera i bildvisningen" -#: ../app/display/gimpdisplayshell.c:1325 -#: ../app/display/gimpdisplayshell.c:1415 +#: ../app/display/gimpdisplayshell.c:1354 +#: ../app/display/gimpdisplayshell.c:1444 #: ../app/widgets/gimptoolbox.c:220 msgid "Drop image files here to open them" msgstr "Släpp bildfiler här för att öppna dem" -#: ../app/display/gimpdisplayshell-close.c:147 -#: ../app/display/gimpdisplayshell-close.c:217 +#: ../app/display/gimpdisplayshell-close.c:146 +#: ../app/display/gimpdisplayshell-close.c:216 #, c-format msgid "Close %s" msgstr "Stäng %s" -#: ../app/display/gimpdisplayshell-close.c:158 +#: ../app/display/gimpdisplayshell-close.c:157 msgid "Close _without Saving" msgstr "Avsluta _utan att spara" -#: ../app/display/gimpdisplayshell-close.c:225 +#: ../app/display/gimpdisplayshell-close.c:224 #, c-format msgid "Save the changes to image '%s' before closing?" msgstr "Spara ändringar till bilden \"%s\" innan du avslutar?" -#: ../app/display/gimpdisplayshell-close.c:247 +#: ../app/display/gimpdisplayshell-close.c:246 #, 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] "Om du inte sparar bilden kommer du att förlora ändringar gjorda den senaste timmen." msgstr[1] "Om du inte sparar bilden kommer du att förlora ändringar gjorda de senaste %d timmarna." -#: ../app/display/gimpdisplayshell-close.c:257 +#: ../app/display/gimpdisplayshell-close.c:256 #, 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] "Om du inte sparar bilden kommer du att förlora ändringar gjorda den senaste timmen och %d minut." msgstr[1] "\"Om du inte sparar bilden kommer du att förlora ändringar gjorda den senaste timmen och %d minuterna." -#: ../app/display/gimpdisplayshell-close.c:268 +#: ../app/display/gimpdisplayshell-close.c:267 #, 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." @@ -9771,50 +9848,62 @@ msgstr "Zoomfaktor:" msgid "Zoom:" msgstr "Zooma:" -#: ../app/display/gimpdisplayshell-title.c:278 +#: ../app/display/gimpdisplayshell-title.c:284 msgid "(modified)" msgstr "(ändrad)" -#: ../app/display/gimpdisplayshell-title.c:283 +#: ../app/display/gimpdisplayshell-title.c:289 msgid "(clean)" msgstr "(ren)" -#: ../app/display/gimpdisplayshell-title.c:331 -#: ../app/display/gimpdisplayshell-title.c:344 +#: ../app/display/gimpdisplayshell-title.c:337 +#: ../app/display/gimpdisplayshell-title.c:350 #: ../app/widgets/gimpactiongroup.c:888 msgid "(none)" msgstr "(ingen)" +#: ../app/display/gimpdisplayshell-title.c:478 +msgid " (exported)" +msgstr "" + +#: ../app/display/gimpdisplayshell-title.c:480 +msgid " (overwritten)" +msgstr "" + +#: ../app/display/gimpdisplayshell-title.c:486 +msgid " (imported)" +msgstr " (importerad)" + #: ../app/display/gimpstatusbar.c:346 #, c-format msgid "Cancel %s" msgstr "Avbryt %s" -#: ../app/file/file-open.c:131 -#: ../app/file/file-save.c:110 +#: ../app/file/file-open.c:133 +#: ../app/file/file-save.c:112 msgid "Not a regular file" msgstr "Inte en vanlig fil" -#: ../app/file/file-open.c:183 +#: ../app/file/file-open.c:185 #, c-format msgid "%s plug-in returned SUCCESS but did not return an image" msgstr "Insticksmodulen %s returnerade LYCKADES men returnerade ingen bild" -#: ../app/file/file-open.c:194 +#: ../app/file/file-open.c:196 #, c-format msgid "%s plug-In could not open image" msgstr "Insticksmodulen %s kunde inte öppna bild" -#: ../app/file/file-open.c:501 +#: ../app/file/file-open.c:513 msgid "Image doesn't contain any layers" msgstr "Bilden innehåller inga lager" -#: ../app/file/file-open.c:554 +#: ../app/file/file-open.c:566 #, c-format msgid "Opening '%s' failed: %s" msgstr "Öppnande av \"%s\" misslyckades: %s" -#: ../app/file/file-open.c:660 +#: ../app/file/file-open.c:675 msgid "Color management has been disabled. It can be enabled again in the Preferences dialog." msgstr "Färghantering har inaktiverats. Den kan aktiveras igen i inställningsdialogen." @@ -9822,18 +9911,18 @@ msgstr "Färghantering har inaktiverats. Den kan aktiveras igen i inställningsd msgid "Unknown file type" msgstr "Okänd filtyp" -#: ../app/file/file-save.c:191 +#: ../app/file/file-save.c:189 #, c-format msgid "%s plug-in could not save image" msgstr "Insticksmodulen %s kunde inte spara bild" -#: ../app/file/file-utils.c:72 +#: ../app/file/file-utils.c:74 #, c-format msgid "'%s:' is not a valid URI scheme" msgstr "\"%s\" är inte ett giltigt URI-schema" -#: ../app/file/file-utils.c:88 -#: ../app/file/file-utils.c:124 +#: ../app/file/file-utils.c:90 +#: ../app/file/file-utils.c:126 msgid "Invalid character sequence in URI" msgstr "Ogiltig teckensekvens i URI" @@ -9859,47 +9948,47 @@ msgstr "Dokument" msgid "GIMP Startup" msgstr "Uppstart av GIMP" -#: ../app/paint/gimpairbrush.c:68 +#: ../app/paint/gimpairbrush.c:70 #: ../app/tools/gimpairbrushtool.c:53 msgid "Airbrush" msgstr "Färgspruta" -#: ../app/paint/gimpbrushcore.c:363 +#: ../app/paint/gimpbrushcore.c:370 msgid "No brushes available for use with this tool." msgstr "Det finns inga penslar tillgängliga för detta verktyg." -#: ../app/paint/gimpclone.c:99 +#: ../app/paint/gimpclone.c:100 #: ../app/tools/gimpclonetool.c:60 msgid "Clone" msgstr "Klona" -#: ../app/paint/gimpclone.c:140 +#: ../app/paint/gimpclone.c:141 msgid "No patterns available for use with this tool." msgstr "Inga mönster finns tillgängliga för detta verktyg." -#: ../app/paint/gimpconvolve.c:76 +#: ../app/paint/gimpconvolve.c:78 msgid "Convolve" msgstr "Konvolvera" -#: ../app/paint/gimpdodgeburn.c:86 +#: ../app/paint/gimpdodgeburn.c:89 msgid "Dodge/Burn" msgstr "Blek/Bränna" -#: ../app/paint/gimperaser.c:61 +#: ../app/paint/gimperaser.c:63 #: ../app/tools/gimperasertool.c:65 msgid "Eraser" msgstr "Suddare" -#: ../app/paint/gimpheal.c:115 +#: ../app/paint/gimpheal.c:116 #: ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Läk" -#: ../app/paint/gimpheal.c:154 +#: ../app/paint/gimpheal.c:155 msgid "Healing does not operate on indexed layers." msgstr "Läkning fungerar inte på indexerade lager." -#: ../app/paint/gimpink.c:94 +#: ../app/paint/gimpink.c:97 #: ../app/tools/gimpinktool.c:54 msgid "Ink" msgstr "Bläck" @@ -9917,20 +10006,20 @@ msgstr "Aspektförhållande:" msgid "Ink Blob Angle" msgstr "" -#: ../app/paint/gimppaintbrush.c:62 +#: ../app/paint/gimppaintbrush.c:63 #: ../app/tools/gimppaintbrushtool.c:50 msgid "Paintbrush" msgstr "Pensel" -#: ../app/paint/gimppaintcore-stroke.c:337 +#: ../app/paint/gimppaintcore-stroke.c:335 msgid "Not enough points to stroke" msgstr "Inte tillräckligt många punkter att stryka" -#: ../app/paint/gimppaintcore.c:136 +#: ../app/paint/gimppaintcore.c:140 msgid "Paint" msgstr "Måla" -#: ../app/paint/gimppaintoptions.c:233 +#: ../app/paint/gimppaintoptions.c:245 msgid "Brush Scale" msgstr "Penselskala" @@ -9939,21 +10028,21 @@ msgstr "Penselskala" msgid "Pencil" msgstr "Penna" -#: ../app/paint/gimpperspectiveclone.c:97 -#: ../app/tools/gimpperspectiveclonetool.c:126 +#: ../app/paint/gimpperspectiveclone.c:98 +#: ../app/tools/gimpperspectiveclonetool.c:127 msgid "Perspective Clone" msgstr "Perspektivkloning" -#: ../app/paint/gimpperspectiveclone.c:162 +#: ../app/paint/gimpperspectiveclone.c:163 msgid "Perspective Clone does not operate on indexed layers." msgstr "Perspektivkloning fungerar inte på indexerade lager." -#: ../app/paint/gimpsmudge.c:77 +#: ../app/paint/gimpsmudge.c:81 #: ../app/tools/gimpsmudgetool.c:52 msgid "Smudge" msgstr "Smeta" -#: ../app/paint/gimpsourcecore.c:228 +#: ../app/paint/gimpsourcecore.c:230 msgid "Set a source image first." msgstr "Ställ in en källbild först." @@ -10031,7 +10120,7 @@ msgid "2D Transforming" msgstr "2d-transformerar" #: ../app/pdb/edit-cmds.c:714 -#: ../app/tools/gimpblendtool.c:226 +#: ../app/tools/gimpblendtool.c:228 msgid "Blending" msgstr "Tonar" @@ -10228,7 +10317,7 @@ msgid "Image resolution is out of bounds, using the default resolution instead." msgstr "Bildupplösningen är utanför intervallet, använder standardupplösningen istället." #: ../app/pdb/selection-tools-cmds.c:217 -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/tools/gimpfreeselecttool.c:198 msgid "Free Select" msgstr "Fri markering" @@ -10250,7 +10339,8 @@ msgstr "Misslyckades med att skapa textlager" #: ../app/pdb/text-layer-cmds.c:888 #: ../app/pdb/text-layer-cmds.c:960 #: ../app/pdb/text-layer-cmds.c:1032 -#: ../app/pdb/text-layer-cmds.c:1110 +#: ../app/pdb/text-layer-cmds.c:1068 +#: ../app/pdb/text-layer-cmds.c:1147 msgid "Set text layer attribute" msgstr "Ange textlagerattribut" @@ -10316,31 +10406,31 @@ msgstr "" msgid "Failed to run plug-in \"%s\"" msgstr "Misslyckades med att köra insticksmodulen \"%s\"" -#: ../app/plug-in/gimppluginmanager-restore.c:222 +#: ../app/plug-in/gimppluginmanager-restore.c:225 msgid "Searching Plug-Ins" msgstr "Söker efter insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:271 +#: ../app/plug-in/gimppluginmanager-restore.c:274 msgid "Resource configuration" msgstr "Resurskonfiguration" -#: ../app/plug-in/gimppluginmanager-restore.c:307 +#: ../app/plug-in/gimppluginmanager-restore.c:310 msgid "Querying new Plug-ins" msgstr "Undersöker nya insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:357 +#: ../app/plug-in/gimppluginmanager-restore.c:360 msgid "Initializing Plug-ins" msgstr "Initierar insticksmoduler" -#: ../app/plug-in/gimppluginmanager-restore.c:429 +#: ../app/plug-in/gimppluginmanager-restore.c:432 msgid "Starting Extensions" msgstr "Startar tillägg" -#: ../app/plug-in/gimppluginmanager.c:295 +#: ../app/plug-in/gimppluginmanager.c:303 msgid "Plug-In Interpreters" msgstr "Insticksmodultolkar" -#: ../app/plug-in/gimppluginmanager.c:302 +#: ../app/plug-in/gimppluginmanager.c:310 msgid "Plug-In Environment" msgstr "Insticksmodulmiljö" @@ -10402,7 +10492,7 @@ msgstr "" "strax hwila på mjuka tuvor." #: ../app/text/gimptext-compat.c:107 -#: ../app/tools/gimptexttool.c:1748 +#: ../app/tools/gimptexttool.c:2152 msgid "Add Text Layer" msgstr "Lägg till textlager" @@ -10486,114 +10576,114 @@ msgid "Rate:" msgstr "Flöde:" #: ../app/tools/gimpairbrushtool.c:97 -#: ../app/tools/gimppaintoptions-gui.c:224 +#: ../app/tools/gimppaintoptions-gui.c:241 msgid "Pressure:" msgstr "Tryck:" -#: ../app/tools/gimpaligntool.c:133 -#: ../app/tools/gimpaligntool.c:765 +#: ../app/tools/gimpaligntool.c:134 +#: ../app/tools/gimpaligntool.c:767 msgid "Align" msgstr "Arrangera" -#: ../app/tools/gimpaligntool.c:134 +#: ../app/tools/gimpaligntool.c:135 msgid "Alignment Tool: Align or arrange layers and other objects" msgstr "Arrangeringsverktyg: Arrangera lager och andra objekt" -#: ../app/tools/gimpaligntool.c:135 +#: ../app/tools/gimpaligntool.c:136 msgid "_Align" msgstr "_Arrangera" -#: ../app/tools/gimpaligntool.c:598 +#: ../app/tools/gimpaligntool.c:600 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" msgstr "Klicka på ett lager, slinga eller hjälplinje, eller klicka och dra för att välja flera lager" -#: ../app/tools/gimpaligntool.c:607 +#: ../app/tools/gimpaligntool.c:609 msgid "Click to pick this layer as first item" msgstr "Klicka för att välja detta lager som första objekt" -#: ../app/tools/gimpaligntool.c:615 +#: ../app/tools/gimpaligntool.c:617 msgid "Click to add this layer to the list" msgstr "Klicka för att lägga till detta lager till listan" -#: ../app/tools/gimpaligntool.c:619 +#: ../app/tools/gimpaligntool.c:621 msgid "Click to pick this guide as first item" msgstr "Klicka för att välja denna hjälplinje som första objekt" -#: ../app/tools/gimpaligntool.c:627 +#: ../app/tools/gimpaligntool.c:629 msgid "Click to add this guide to the list" msgstr "Klicka för att lägga till denna hjälplinje till listan" -#: ../app/tools/gimpaligntool.c:631 +#: ../app/tools/gimpaligntool.c:633 msgid "Click to pick this path as first item" msgstr "Klicka för att välja denna slinga som första objekt" -#: ../app/tools/gimpaligntool.c:639 +#: ../app/tools/gimpaligntool.c:641 msgid "Click to add this path to the list" msgstr "Klicka för att lägga till denna slinga till listan" -#: ../app/tools/gimpaligntool.c:777 +#: ../app/tools/gimpaligntool.c:779 msgid "Relative to:" msgstr "Relativ till:" -#: ../app/tools/gimpaligntool.c:795 +#: ../app/tools/gimpaligntool.c:797 msgid "Align left edge of target" msgstr "Arrangera mot vänsterkant av målet" -#: ../app/tools/gimpaligntool.c:801 +#: ../app/tools/gimpaligntool.c:803 msgid "Align center of target" msgstr "Arrangera mot centrum av målet" -#: ../app/tools/gimpaligntool.c:807 +#: ../app/tools/gimpaligntool.c:809 msgid "Align right edge of target" msgstr "Arrangera mot högerkant av målet" -#: ../app/tools/gimpaligntool.c:817 +#: ../app/tools/gimpaligntool.c:819 msgid "Align top edge of target" msgstr "Arrangera mot överkant av målet" -#: ../app/tools/gimpaligntool.c:823 +#: ../app/tools/gimpaligntool.c:825 msgid "Align middle of target" msgstr "Arrangera mot mitten av målet" -#: ../app/tools/gimpaligntool.c:829 +#: ../app/tools/gimpaligntool.c:831 msgid "Align bottom of target" msgstr "Arrangera mot nederkant av målet" -#: ../app/tools/gimpaligntool.c:833 +#: ../app/tools/gimpaligntool.c:835 msgid "Distribute" msgstr "Distribuera" -#: ../app/tools/gimpaligntool.c:847 +#: ../app/tools/gimpaligntool.c:849 msgid "Distribute left edges of targets" msgstr "Distribuera vänsterkanter för målen" -#: ../app/tools/gimpaligntool.c:854 +#: ../app/tools/gimpaligntool.c:856 msgid "Distribute horizontal centers of targets" msgstr "Distribuera horisontella centrum för målen" -#: ../app/tools/gimpaligntool.c:861 +#: ../app/tools/gimpaligntool.c:863 msgid "Distribute right edges of targets" msgstr "Distribuera högerkanter för målen" -#: ../app/tools/gimpaligntool.c:871 +#: ../app/tools/gimpaligntool.c:873 msgid "Distribute top edges of targets" msgstr "Distribuera överkanter för målen" -#: ../app/tools/gimpaligntool.c:878 +#: ../app/tools/gimpaligntool.c:880 msgid "Distribute vertical centers of targets" msgstr "Distribuera vertikala centrum för målen" -#: ../app/tools/gimpaligntool.c:884 +#: ../app/tools/gimpaligntool.c:886 msgid "Distribute bottoms of targets" msgstr "Distribuera nederkanter för målen" -#: ../app/tools/gimpaligntool.c:892 +#: ../app/tools/gimpaligntool.c:894 #: ../app/tools/gimpblendoptions.c:221 msgid "Offset:" msgstr "Position:" #: ../app/tools/gimpblendoptions.c:215 -#: ../app/tools/gimppaintoptions-gui.c:825 +#: ../app/tools/gimppaintoptions-gui.c:890 msgid "Gradient:" msgstr "Gradient:" @@ -10603,7 +10693,7 @@ msgid "Shape:" msgstr "Form:" #: ../app/tools/gimpblendoptions.c:238 -#: ../app/tools/gimppaintoptions-gui.c:849 +#: ../app/tools/gimppaintoptions-gui.c:914 msgid "Repeat:" msgstr "Upprepa:" @@ -10621,66 +10711,66 @@ msgstr "Max djup:" msgid "Threshold:" msgstr "Tröskelvärde:" -#: ../app/tools/gimpblendtool.c:109 +#: ../app/tools/gimpblendtool.c:110 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "Toningsverktyg: Fyll markerat område med en färggradient" -#: ../app/tools/gimpblendtool.c:110 +#: ../app/tools/gimpblendtool.c:111 msgid "Blen_d" msgstr "Färgto_ning" -#: ../app/tools/gimpblendtool.c:165 +#: ../app/tools/gimpblendtool.c:166 msgid "Blend does not operate on indexed layers." msgstr "Toning fungerar inte på indexerade lager." -#: ../app/tools/gimpblendtool.c:403 -#: ../app/tools/gimppainttool.c:606 +#: ../app/tools/gimpblendtool.c:405 +#: ../app/tools/gimppainttool.c:571 #, c-format msgid "%s for constrained angles" msgstr "%s för begränsade vinklar" -#: ../app/tools/gimpblendtool.c:404 +#: ../app/tools/gimpblendtool.c:406 #, c-format msgid "%s to move the whole line" msgstr "%s för att flytta hela linjen" -#: ../app/tools/gimpblendtool.c:408 +#: ../app/tools/gimpblendtool.c:410 msgid "Blend: " msgstr "Toning: " -#: ../app/tools/gimpbrightnesscontrasttool.c:111 +#: ../app/tools/gimpbrightnesscontrasttool.c:112 msgid "Brightness/Contrast Tool: Adjust brightness and contrast" msgstr "Ljusstyrka/Kontrast-verktyg: Justera ljusstyrka och kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:112 +#: ../app/tools/gimpbrightnesscontrasttool.c:113 msgid "B_rightness-Contrast..." msgstr "L_jusstyrka-Kontrast..." -#: ../app/tools/gimpbrightnesscontrasttool.c:132 +#: ../app/tools/gimpbrightnesscontrasttool.c:133 msgid "Adjust Brightness and Contrast" msgstr "Justera ljusstyrka och kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:134 +#: ../app/tools/gimpbrightnesscontrasttool.c:135 msgid "Import Brightness-Contrast settings" msgstr "Importera inställningar för ljusstyrka-kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:135 +#: ../app/tools/gimpbrightnesscontrasttool.c:136 msgid "Export Brightness-Contrast settings" msgstr "Exportera inställningar för ljusstyrka-kontrast" -#: ../app/tools/gimpbrightnesscontrasttool.c:183 +#: ../app/tools/gimpbrightnesscontrasttool.c:184 msgid "Brightness-Contrast does not operate on indexed layers." msgstr "Ljusstyrka-Kontrast går inte att använda på indexerade lager." -#: ../app/tools/gimpbrightnesscontrasttool.c:321 +#: ../app/tools/gimpbrightnesscontrasttool.c:323 msgid "_Brightness:" msgstr "_Ljusstyrka:" -#: ../app/tools/gimpbrightnesscontrasttool.c:336 +#: ../app/tools/gimpbrightnesscontrasttool.c:338 msgid "Con_trast:" msgstr "Kon_trast:" -#: ../app/tools/gimpbrightnesscontrasttool.c:350 +#: ../app/tools/gimpbrightnesscontrasttool.c:352 msgid "Edit these Settings as Levels" msgstr "Redigera dessa inställningar som nivåer" @@ -10729,7 +10819,7 @@ msgstr "Fyll transparenta områden" #: ../app/tools/gimpclonetool.c:113 #: ../app/tools/gimpcolorpickeroptions.c:150 #: ../app/tools/gimphealtool.c:98 -#: ../app/tools/gimpperspectiveclonetool.c:941 +#: ../app/tools/gimpperspectiveclonetool.c:938 #: ../app/tools/gimpregionselectoptions.c:207 msgid "Sample merged" msgstr "Sampla sammanfogade" @@ -10786,13 +10876,13 @@ msgid "Click to set a new clone source" msgstr "Klicka för att ställa in en ny kloningskälla" #: ../app/tools/gimpclonetool.c:108 -#: ../app/tools/gimpperspectiveclonetool.c:936 +#: ../app/tools/gimpperspectiveclonetool.c:933 msgid "Source" msgstr "Källa" #: ../app/tools/gimpclonetool.c:129 #: ../app/tools/gimphealtool.c:110 -#: ../app/tools/gimpperspectiveclonetool.c:957 +#: ../app/tools/gimpperspectiveclonetool.c:954 msgid "Alignment:" msgstr "Arrangemang:" @@ -10910,11 +11000,16 @@ msgstr "_Mättnad:" msgid "_Lightness:" msgstr "_Ljusstyrka:" -#: ../app/tools/gimpcoloroptions.c:160 +#: ../app/tools/gimpcoloroptions.c:75 +#, fuzzy +msgid "Color Picker Average Radius" +msgstr "Information om färghämtare" + +#: ../app/tools/gimpcoloroptions.c:161 msgid "Sample average" msgstr "Sampelmedel" -#: ../app/tools/gimpcoloroptions.c:170 +#: ../app/tools/gimpcoloroptions.c:171 #: ../app/tools/gimprectangleselectoptions.c:175 #: ../app/tools/gimpselectionoptions.c:280 #: ../app/widgets/gimpbrusheditor.c:153 @@ -10950,12 +11045,12 @@ msgid "Click in any image to view its color" msgstr "Klicka i en bild för att visa dess färg" #: ../app/tools/gimpcolorpickertool.c:249 -#: ../app/tools/gimppainttool.c:509 +#: ../app/tools/gimppainttool.c:476 msgid "Click in any image to pick the foreground color" msgstr "Klicka i en bild för att välja förgrundsfärgen" #: ../app/tools/gimpcolorpickertool.c:257 -#: ../app/tools/gimppainttool.c:515 +#: ../app/tools/gimppainttool.c:482 msgid "Click in any image to pick the background color" msgstr "Klicka i en bild för att välja bakgrundsfärgen" @@ -10968,16 +11063,16 @@ msgstr "Klicka i en bild för att lägga till färgen till paletten" msgid "Color Picker Information" msgstr "Information om färghämtare" -#: ../app/tools/gimpcolortool.c:258 -#: ../app/tools/gimpcolortool.c:437 +#: ../app/tools/gimpcolortool.c:260 +#: ../app/tools/gimpcolortool.c:439 msgid "Move Sample Point: " msgstr "Flytta sampelpunkt: " -#: ../app/tools/gimpcolortool.c:430 +#: ../app/tools/gimpcolortool.c:432 msgid "Cancel Sample Point" msgstr "Ta bort sampelpunkt" -#: ../app/tools/gimpcolortool.c:438 +#: ../app/tools/gimpcolortool.c:440 msgid "Add Sample Point: " msgstr "Lägg till sampelpunkt: " @@ -11033,19 +11128,19 @@ msgstr "Endast aktuellt lager" msgid "Allow growing" msgstr "Tillåt förstoring" -#: ../app/tools/gimpcroptool.c:126 +#: ../app/tools/gimpcroptool.c:127 msgid "Crop" msgstr "Beskär" -#: ../app/tools/gimpcroptool.c:127 +#: ../app/tools/gimpcroptool.c:128 msgid "Crop Tool: Remove edge areas from image or layer" msgstr "Beskäringsverktyg: Ta bort kantområden från bild eller lager" -#: ../app/tools/gimpcroptool.c:128 +#: ../app/tools/gimpcroptool.c:129 msgid "_Crop" msgstr "_Beskär" -#: ../app/tools/gimpcroptool.c:269 +#: ../app/tools/gimpcroptool.c:271 msgid "Click or press Enter to crop" msgstr "Klicka eller tryck på Enter för att beskära" @@ -11081,27 +11176,32 @@ msgstr "Klicka för att lägga till en kontrollpunkt" msgid "Click to add control points to all channels" msgstr "Klicka för att lägga till kontrollpunkter till alla kanaler" -#: ../app/tools/gimpcurvestool.c:444 +#: ../app/tools/gimpcurvestool.c:336 +#, fuzzy +msgid "Click to locate on curve (try Shift, Ctrl)" +msgstr "Klicka för att skapa ett nytt ankare. (prova SHIFT)" + +#: ../app/tools/gimpcurvestool.c:449 #: ../app/tools/gimplevelstool.c:380 msgid "Cha_nnel:" msgstr "Ka_nal:" -#: ../app/tools/gimpcurvestool.c:470 +#: ../app/tools/gimpcurvestool.c:475 #: ../app/tools/gimplevelstool.c:404 msgid "R_eset Channel" msgstr "Återstäl_l kanal" -#: ../app/tools/gimpcurvestool.c:560 +#: ../app/tools/gimpcurvestool.c:565 msgid "Curve _type:" msgstr "Kurv_typ:" -#: ../app/tools/gimpcurvestool.c:635 +#: ../app/tools/gimpcurvestool.c:640 #: ../app/tools/gimplevelstool.c:752 #, c-format msgid "Could not read header from '%s': %s" msgstr "Kunde inte läsa rubrik från \"%s\": %s" -#: ../app/tools/gimpcurvestool.c:708 +#: ../app/tools/gimpcurvestool.c:713 msgid "Use _old curves file format" msgstr "Använd filformat för _gamla kurvor" @@ -11318,60 +11418,60 @@ msgstr "Förhandsgranska färg:" msgid "Color Sensitivity" msgstr "Färgkänslighet" -#: ../app/tools/gimpforegroundselecttool.c:145 +#: ../app/tools/gimpforegroundselecttool.c:146 msgid "Foreground Select" msgstr "Förgrundsmarkering" -#: ../app/tools/gimpforegroundselecttool.c:146 +#: ../app/tools/gimpforegroundselecttool.c:147 msgid "Foreground Select Tool: Select a region containing foreground objects" msgstr "Förgrundsmarkeringsverktyg: Markera en region som innehåller förgrundsobjekt" -#: ../app/tools/gimpforegroundselecttool.c:147 +#: ../app/tools/gimpforegroundselecttool.c:148 msgid "F_oreground Select" msgstr "F_örgrundsmarkering" -#: ../app/tools/gimpforegroundselecttool.c:314 +#: ../app/tools/gimpforegroundselecttool.c:315 msgid "Add more strokes or press Enter to accept the selection" msgstr "Lägg till fler strykningar eller tryck på Enter för att godta markeringen" -#: ../app/tools/gimpforegroundselecttool.c:316 +#: ../app/tools/gimpforegroundselecttool.c:317 msgid "Mark foreground by painting on the object to extract" msgstr "Markera förgrunden genom att måla på objektet att extrahera" -#: ../app/tools/gimpforegroundselecttool.c:327 +#: ../app/tools/gimpforegroundselecttool.c:328 msgid "Roughly outline the object to extract" msgstr "Rita en grov kontur runt objektet att extrahera" -#: ../app/tools/gimpforegroundselecttool.c:766 +#: ../app/tools/gimpforegroundselecttool.c:768 msgctxt "command" msgid "Foreground Select" msgstr "Förgrundsmarkering" -#: ../app/tools/gimpfreeselecttool.c:198 +#: ../app/tools/gimpfreeselecttool.c:199 msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments" msgstr "Fri markering: Markera en handritad region med fria och polygona segment" -#: ../app/tools/gimpfreeselecttool.c:199 +#: ../app/tools/gimpfreeselecttool.c:200 msgid "_Free Select" msgstr "_Fri markering" -#: ../app/tools/gimpfreeselecttool.c:1116 +#: ../app/tools/gimpfreeselecttool.c:1117 msgid "Click to complete selection" msgstr "Klicka för att färdigställa markeringen" -#: ../app/tools/gimpfreeselecttool.c:1120 +#: ../app/tools/gimpfreeselecttool.c:1121 msgid "Click-Drag to move segment vertex" msgstr "Klicka och dra för att flytta segmenthörnet" -#: ../app/tools/gimpfreeselecttool.c:1125 +#: ../app/tools/gimpfreeselecttool.c:1126 msgid "Return commits, Escape cancels, Backspace removes last segment" msgstr "Return verkställer, Escape avbryter, Backsteg tar bort sista segmentet" -#: ../app/tools/gimpfreeselecttool.c:1129 +#: ../app/tools/gimpfreeselecttool.c:1130 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" msgstr "Klicka och dra lägger till ett ledigt segment, Klick lägger till ett polygont segment" -#: ../app/tools/gimpfreeselecttool.c:1581 +#: ../app/tools/gimpfreeselecttool.c:1583 msgctxt "command" msgid "Free Select" msgstr "Fri markering" @@ -11539,8 +11639,8 @@ msgid "Size:" msgstr "Storlek:" #: ../app/tools/gimpinkoptions-gui.c:75 -#: ../app/tools/gimpmeasuretool.c:1039 -#: ../app/tools/gimppaintoptions-gui.c:158 +#: ../app/tools/gimpmeasuretool.c:1041 +#: ../app/tools/gimppaintoptions-gui.c:168 #: ../app/widgets/gimpbrusheditor.c:207 msgid "Angle:" msgstr "Vinkel:" @@ -11551,7 +11651,7 @@ msgid "Sensitivity" msgstr "Känslighet" #: ../app/tools/gimpinkoptions-gui.c:99 -#: ../app/tools/gimppaintoptions-gui.c:242 +#: ../app/tools/gimppaintoptions-gui.c:259 msgid "Tilt:" msgstr "Lutning:" @@ -11580,46 +11680,46 @@ msgstr "Bl_äck" msgid "Interactive boundary" msgstr "Interaktiv gräns" -#: ../app/tools/gimpiscissorstool.c:278 +#: ../app/tools/gimpiscissorstool.c:279 msgid "Scissors" msgstr "Saxar" -#: ../app/tools/gimpiscissorstool.c:279 +#: ../app/tools/gimpiscissorstool.c:280 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" msgstr "Saxmarkeringsverktyg: Markerar figurer med intelligent kantpassning" -#: ../app/tools/gimpiscissorstool.c:280 +#: ../app/tools/gimpiscissorstool.c:281 msgid "Intelligent _Scissors" msgstr "_Intelligent sax" -#: ../app/tools/gimpiscissorstool.c:940 -#: ../app/tools/gimpmeasuretool.c:610 +#: ../app/tools/gimpiscissorstool.c:942 +#: ../app/tools/gimpmeasuretool.c:612 msgid "Click-Drag to move this point" msgstr "Klicka och dra för att flytta den här punkten" -#: ../app/tools/gimpiscissorstool.c:942 -#: ../app/tools/gimpiscissorstool.c:1007 +#: ../app/tools/gimpiscissorstool.c:944 +#: ../app/tools/gimpiscissorstool.c:1009 #, c-format msgid "%s: disable auto-snap" msgstr "%s: inaktivera automatisk fästning" -#: ../app/tools/gimpiscissorstool.c:959 +#: ../app/tools/gimpiscissorstool.c:961 msgid "Click to close the curve" msgstr "Klicka för att sluta kurvan" -#: ../app/tools/gimpiscissorstool.c:965 +#: ../app/tools/gimpiscissorstool.c:967 msgid "Click to add a point on this segment" msgstr "Klicka för att lägga till en punkt på det här segmentet" -#: ../app/tools/gimpiscissorstool.c:979 +#: ../app/tools/gimpiscissorstool.c:981 msgid "Click or press Enter to convert to a selection" msgstr "Klicka eller tryck på Enter för att konvertera till en markering" -#: ../app/tools/gimpiscissorstool.c:989 +#: ../app/tools/gimpiscissorstool.c:991 msgid "Press Enter to convert to a selection" msgstr "Tryck på Enter för att konvertera till en markering" -#: ../app/tools/gimpiscissorstool.c:1004 +#: ../app/tools/gimpiscissorstool.c:1006 msgid "Click or Click-Drag to add a point" msgstr "Klicka eller klicka och dra för att lägga till en punkt" @@ -11702,15 +11802,15 @@ msgstr "Ändra automatiskt fönsterstorlek" msgid "Tool Toggle (%s)" msgstr "Verktygsväxel (%s)" -#: ../app/tools/gimpmagnifytool.c:86 +#: ../app/tools/gimpmagnifytool.c:87 msgid "Zoom" msgstr "Zooma" -#: ../app/tools/gimpmagnifytool.c:87 +#: ../app/tools/gimpmagnifytool.c:88 msgid "Zoom Tool: Adjust the zoom level" msgstr "Zoomverktyg: Justera zoomnivån" -#: ../app/tools/gimpmagnifytool.c:88 +#: ../app/tools/gimpmagnifytool.c:89 msgid "tool|_Zoom" msgstr "_Zooma" @@ -11718,56 +11818,56 @@ msgstr "_Zooma" msgid "Use info window" msgstr "Använd informationsfönster" -#: ../app/tools/gimpmeasuretool.c:121 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure" msgstr "Mät" -#: ../app/tools/gimpmeasuretool.c:122 +#: ../app/tools/gimpmeasuretool.c:123 msgid "Measure Tool: Measure distances and angles" msgstr "Mätningsverktyg: Mät avstånd och vinklar" -#: ../app/tools/gimpmeasuretool.c:123 +#: ../app/tools/gimpmeasuretool.c:124 msgid "_Measure" msgstr "Mät_ning" -#: ../app/tools/gimpmeasuretool.c:241 +#: ../app/tools/gimpmeasuretool.c:243 msgid "Add Guides" msgstr "Lägg till hjälplinjer" -#: ../app/tools/gimpmeasuretool.c:561 +#: ../app/tools/gimpmeasuretool.c:563 msgid "Click to place vertical and horizontal guides" msgstr "Klicka för att placera vertikala och horisontella hjälplinjer" -#: ../app/tools/gimpmeasuretool.c:570 +#: ../app/tools/gimpmeasuretool.c:572 msgid "Click to place a horizontal guide" msgstr "Klicka för att placera ut en horisontell hjälplinje" -#: ../app/tools/gimpmeasuretool.c:585 +#: ../app/tools/gimpmeasuretool.c:587 msgid "Click to place a vertical guide" msgstr "Klicka för att placera ut en vertikal hjälplinje" -#: ../app/tools/gimpmeasuretool.c:599 +#: ../app/tools/gimpmeasuretool.c:601 msgid "Click-Drag to add a new point" msgstr "Klicka och dra för att lägga till en ny punkt" -#: ../app/tools/gimpmeasuretool.c:630 +#: ../app/tools/gimpmeasuretool.c:632 msgid "Click-Drag to move all points" msgstr "Klicka och dra för att flytta alla punkter" -#: ../app/tools/gimpmeasuretool.c:879 -#: ../app/tools/gimpmeasuretool.c:1022 -#: ../app/tools/gimpmeasuretool.c:1078 -#: ../app/tools/gimpmeasuretool.c:1106 -#: ../app/tools/gimppainttool.c:615 +#: ../app/tools/gimpmeasuretool.c:881 +#: ../app/tools/gimpmeasuretool.c:1024 +#: ../app/tools/gimpmeasuretool.c:1080 +#: ../app/tools/gimpmeasuretool.c:1108 +#: ../app/tools/gimppainttool.c:580 msgid "pixels" msgstr "bildpunkter" #. tool->display->shell -#: ../app/tools/gimpmeasuretool.c:991 +#: ../app/tools/gimpmeasuretool.c:993 msgid "Measure Distances and Angles" msgstr "Mät avstånd och vinklar" -#: ../app/tools/gimpmeasuretool.c:1011 +#: ../app/tools/gimpmeasuretool.c:1013 msgid "Distance:" msgstr "Avstånd:" @@ -11795,29 +11895,29 @@ msgstr "Flytta den aktiva slingan" msgid "Move:" msgstr "Flytta:" -#: ../app/tools/gimpmovetool.c:127 +#: ../app/tools/gimpmovetool.c:128 msgctxt "tool" msgid "Move" msgstr "Flytta" -#: ../app/tools/gimpmovetool.c:128 +#: ../app/tools/gimpmovetool.c:129 msgid "Move Tool: Move layers, selections, and other objects" msgstr "Flyttningsverktyg: Flytta lager, markeringar och andra objekt" -#: ../app/tools/gimpmovetool.c:129 +#: ../app/tools/gimpmovetool.c:130 msgid "_Move" msgstr "_Flytta" -#: ../app/tools/gimpmovetool.c:276 -#: ../app/tools/gimpmovetool.c:572 +#: ../app/tools/gimpmovetool.c:278 +#: ../app/tools/gimpmovetool.c:574 msgid "Move Guide: " msgstr "Flytta hjälplinje: " -#: ../app/tools/gimpmovetool.c:566 +#: ../app/tools/gimpmovetool.c:568 msgid "Cancel Guide" msgstr "Avbryt hjälplinje" -#: ../app/tools/gimpmovetool.c:572 +#: ../app/tools/gimpmovetool.c:574 msgid "Add Guide: " msgstr "Lägg till hjälplinje: " @@ -11829,108 +11929,116 @@ msgstr "Målarpenselverktyg: Måla mjuka penseldrag med en pensel" msgid "_Paintbrush" msgstr "_Pensel" -#: ../app/tools/gimppaintoptions-gui.c:120 +#: ../app/tools/gimppaintoptions-gui.c:121 #: ../app/tools/gimpselectionoptions.c:210 #: ../app/widgets/gimpbrushselect.c:193 #: ../app/widgets/gimplayertreeview.c:296 msgid "Mode:" msgstr "Läge:" -#: ../app/tools/gimppaintoptions-gui.c:135 +#: ../app/tools/gimppaintoptions-gui.c:136 #: ../app/tools/gimptransformoptions.c:347 #: ../app/widgets/gimpbrushselect.c:180 #: ../app/widgets/gimplayertreeview.c:311 msgid "Opacity:" msgstr "Opacitet:" -#: ../app/tools/gimppaintoptions-gui.c:146 +#: ../app/tools/gimppaintoptions-gui.c:149 msgid "Brush:" msgstr "Pensel:" -#: ../app/tools/gimppaintoptions-gui.c:151 +#: ../app/tools/gimppaintoptions-gui.c:154 msgid "Scale:" msgstr "Skala:" -#: ../app/tools/gimppaintoptions-gui.c:171 +#: ../app/tools/gimppaintoptions-gui.c:161 +msgid "Aspect Ratio:" +msgstr "Aspektförhållande:" + +#: ../app/tools/gimppaintoptions-gui.c:181 msgid "Hardness" msgstr "Hårdhet" -#: ../app/tools/gimppaintoptions-gui.c:177 +#: ../app/tools/gimppaintoptions-gui.c:187 msgid "Rate" msgstr "Flöde" -#: ../app/tools/gimppaintoptions-gui.c:183 +#: ../app/tools/gimppaintoptions-gui.c:193 msgid "Size" msgstr "Storlek" -#: ../app/tools/gimppaintoptions-gui.c:189 +#: ../app/tools/gimppaintoptions-gui.c:199 +msgid "Aspect ratio" +msgstr "Aspektförhållande" + +#: ../app/tools/gimppaintoptions-gui.c:206 msgid "Angle" msgstr "Vinkel" -#: ../app/tools/gimppaintoptions-gui.c:195 +#: ../app/tools/gimppaintoptions-gui.c:212 msgid "Color" msgstr "Färg" -#: ../app/tools/gimppaintoptions-gui.c:212 +#: ../app/tools/gimppaintoptions-gui.c:229 msgid "Brush Dynamics" msgstr "Penseldynamik" -#: ../app/tools/gimppaintoptions-gui.c:230 +#: ../app/tools/gimppaintoptions-gui.c:247 msgid "Velocity:" msgstr "Hastighet:" -#: ../app/tools/gimppaintoptions-gui.c:236 +#: ../app/tools/gimppaintoptions-gui.c:253 msgid "Direction:" msgstr "Riktning:" -#: ../app/tools/gimppaintoptions-gui.c:248 +#: ../app/tools/gimppaintoptions-gui.c:265 msgid "Random:" msgstr "Slumpmässig:" -#: ../app/tools/gimppaintoptions-gui.c:308 +#: ../app/tools/gimppaintoptions-gui.c:325 msgid "Incremental" msgstr "Inkrementell" -#: ../app/tools/gimppaintoptions-gui.c:324 +#: ../app/tools/gimppaintoptions-gui.c:341 msgid "Hard edge" msgstr "Hård kant" -#: ../app/tools/gimppaintoptions-gui.c:742 +#: ../app/tools/gimppaintoptions-gui.c:807 msgid "Fade out" msgstr "Tona ut" -#: ../app/tools/gimppaintoptions-gui.c:751 -#: ../app/tools/gimppaintoptions-gui.c:834 +#: ../app/tools/gimppaintoptions-gui.c:816 +#: ../app/tools/gimppaintoptions-gui.c:899 msgid "Length:" msgstr "Längd:" # FIXME: Hitta bättre ord -#: ../app/tools/gimppaintoptions-gui.c:778 +#: ../app/tools/gimppaintoptions-gui.c:843 msgid "Apply Jitter" msgstr "Tillämpa jitter" -#: ../app/tools/gimppaintoptions-gui.c:783 +#: ../app/tools/gimppaintoptions-gui.c:848 msgid "Amount:" msgstr "Mängd:" -#: ../app/tools/gimppaintoptions-gui.c:808 +#: ../app/tools/gimppaintoptions-gui.c:873 msgid "Use color from gradient" msgstr "Använd färg från gradient" -#: ../app/tools/gimppainttool.c:136 +#: ../app/tools/gimppainttool.c:137 msgid "Click to paint" msgstr "Klicka för att måla" -#: ../app/tools/gimppainttool.c:137 +#: ../app/tools/gimppainttool.c:138 msgid "Click to draw the line" msgstr "Klicka för att rita linjen" -#: ../app/tools/gimppainttool.c:138 +#: ../app/tools/gimppainttool.c:139 #, c-format msgid "%s to pick a color" msgstr "%s för att välja en färg" -#: ../app/tools/gimppainttool.c:662 +#: ../app/tools/gimppainttool.c:627 #, c-format msgid "%s for a straight line" msgstr "%s för en rak linje" @@ -11943,15 +12051,15 @@ msgstr "Pennverktyg: Målning med hårda kanter med en pensel" msgid "Pe_ncil" msgstr "Pe_nna" -#: ../app/tools/gimpperspectiveclonetool.c:127 +#: ../app/tools/gimpperspectiveclonetool.c:128 msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation" msgstr "Verktyg för perspektivkloning: Klona från en bildkälla efter en perspektivtransformering tillämpats" -#: ../app/tools/gimpperspectiveclonetool.c:129 +#: ../app/tools/gimpperspectiveclonetool.c:130 msgid "_Perspective Clone" msgstr "_Perspektivkloning" -#: ../app/tools/gimpperspectiveclonetool.c:692 +#: ../app/tools/gimpperspectiveclonetool.c:694 msgid "Ctrl-Click to set a clone source" msgstr "Ctrl-klicka för att ställa in en kloningskälla" @@ -12034,15 +12142,15 @@ msgstr "Krymp sammanfogade" msgid "Rounded corners" msgstr "Rundade hörn" -#: ../app/tools/gimprectangleselecttool.c:167 +#: ../app/tools/gimprectangleselecttool.c:168 msgid "Rectangle Select" msgstr "Rekt. markering" -#: ../app/tools/gimprectangleselecttool.c:168 +#: ../app/tools/gimprectangleselecttool.c:169 msgid "Rectangle Select Tool: Select a rectangular region" msgstr "Rektangelmarkeringsverktyg: Markera en rektangulär region" -#: ../app/tools/gimprectangleselecttool.c:169 +#: ../app/tools/gimprectangleselecttool.c:170 msgid "_Rectangle Select" msgstr "_Rekt. markering" @@ -12067,7 +12175,7 @@ msgstr "Markera transparenta områden" msgid "Select by:" msgstr "Markera med:" -#: ../app/tools/gimpregionselecttool.c:162 +#: ../app/tools/gimpregionselecttool.c:164 msgid "Move the mouse to change threshold" msgstr "Flytta musen för att ändra tröskelvärde" @@ -12242,36 +12350,36 @@ msgstr "Färg:" msgid "Justify:" msgstr "Justera:" -#: ../app/tools/gimptexttool.c:208 +#: ../app/tools/gimptexttool.c:225 msgid "Text" msgstr "Text" -#: ../app/tools/gimptexttool.c:209 +#: ../app/tools/gimptexttool.c:226 msgid "Text Tool: Create or edit text layers" msgstr "Textverktyg: Skapa eller redigera textlager" -#: ../app/tools/gimptexttool.c:210 +#: ../app/tools/gimptexttool.c:227 msgid "Te_xt" msgstr "Te_xt" -#: ../app/tools/gimptexttool.c:1361 +#: ../app/tools/gimptexttool.c:1337 msgid "Reshape Text Layer" msgstr "Omforma textlager" -#: ../app/tools/gimptexttool.c:1826 +#: ../app/tools/gimptexttool.c:2230 msgid "GIMP Text Editor" msgstr "GIMP-textredigerare" -#: ../app/tools/gimptexttool.c:1955 -#: ../app/tools/gimptexttool.c:1958 +#: ../app/tools/gimptexttool.c:2352 +#: ../app/tools/gimptexttool.c:2355 msgid "Confirm Text Editing" msgstr "Bekräfta textredigering" -#: ../app/tools/gimptexttool.c:1962 +#: ../app/tools/gimptexttool.c:2359 msgid "Create _New Layer" msgstr "Skapa _nytt lager" -#: ../app/tools/gimptexttool.c:1986 +#: ../app/tools/gimptexttool.c:2383 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" "\n" @@ -12309,7 +12417,7 @@ msgstr "Kan inte använda tröskelvärde på indexerade lager." msgid "Automatically adjust to optimal binarization threshold" msgstr "Justera automatiskt till optimalt binäriserat tröskelvärde" -#: ../app/tools/gimptool.c:850 +#: ../app/tools/gimptool.c:857 msgid "Can't work on an empty image, add a layer first" msgstr "Kan inte arbeta på en tom bild, lägg till ett lager först" @@ -12344,15 +12452,15 @@ msgstr "15° (%s)" msgid "Keep aspect (%s)" msgstr "Behåll aspekt (%s)" -#: ../app/tools/gimptransformtool.c:236 +#: ../app/tools/gimptransformtool.c:237 msgid "Transforming" msgstr "Transformerar" -#: ../app/tools/gimptransformtool.c:1163 +#: ../app/tools/gimptransformtool.c:1165 msgid "There is no layer to transform." msgstr "Det finns inget lager att transformera." -#: ../app/tools/gimptransformtool.c:1174 +#: ../app/tools/gimptransformtool.c:1176 msgid "There is no path to transform." msgstr "Det finns ingen slinga att transformera." @@ -12386,261 +12494,261 @@ msgstr "" msgid "Selection from Path" msgstr "Markering från slinga" -#: ../app/tools/gimpvectortool.c:161 +#: ../app/tools/gimpvectortool.c:162 msgid "Paths Tool: Create and edit paths" msgstr "Slingverktyg: Skapa och redigera slingor" -#: ../app/tools/gimpvectortool.c:162 +#: ../app/tools/gimpvectortool.c:163 msgid "Pat_hs" msgstr "Slin_gor" -#: ../app/tools/gimpvectortool.c:322 +#: ../app/tools/gimpvectortool.c:324 msgid "Add Stroke" msgstr "Lägg till penseldrag" -#: ../app/tools/gimpvectortool.c:345 +#: ../app/tools/gimpvectortool.c:347 msgid "Add Anchor" msgstr "Lägg till ankare" -#: ../app/tools/gimpvectortool.c:370 +#: ../app/tools/gimpvectortool.c:372 msgid "Insert Anchor" msgstr "Lägg in ankare" -#: ../app/tools/gimpvectortool.c:400 +#: ../app/tools/gimpvectortool.c:402 msgid "Drag Handle" msgstr "Handtag" -#: ../app/tools/gimpvectortool.c:429 +#: ../app/tools/gimpvectortool.c:431 msgid "Drag Anchor" msgstr "Dra ankare" -#: ../app/tools/gimpvectortool.c:446 +#: ../app/tools/gimpvectortool.c:448 msgid "Drag Anchors" msgstr "Dra ankare" -#: ../app/tools/gimpvectortool.c:468 +#: ../app/tools/gimpvectortool.c:470 msgid "Drag Curve" msgstr "Dra kurva" -#: ../app/tools/gimpvectortool.c:496 +#: ../app/tools/gimpvectortool.c:498 msgid "Connect Strokes" msgstr "Koppla ihop penseldrag" -#: ../app/tools/gimpvectortool.c:527 +#: ../app/tools/gimpvectortool.c:529 msgid "Drag Path" msgstr "Dra slinga" -#: ../app/tools/gimpvectortool.c:537 +#: ../app/tools/gimpvectortool.c:539 msgid "Convert Edge" msgstr "Konvertera kant" -#: ../app/tools/gimpvectortool.c:567 +#: ../app/tools/gimpvectortool.c:569 msgid "Delete Anchor" msgstr "Ta bort ankare" -#: ../app/tools/gimpvectortool.c:589 +#: ../app/tools/gimpvectortool.c:591 msgid "Delete Segment" msgstr "Ta bort segment" -#: ../app/tools/gimpvectortool.c:807 +#: ../app/tools/gimpvectortool.c:809 msgid "Move Anchors" msgstr "Flytta ankare" -#: ../app/tools/gimpvectortool.c:1167 +#: ../app/tools/gimpvectortool.c:1169 msgid "Click to pick path to edit" msgstr "Klicka för att välja slinga att redigera" -#: ../app/tools/gimpvectortool.c:1171 +#: ../app/tools/gimpvectortool.c:1173 msgid "Click to create a new path" msgstr "Klicka för att skapa en ny slinga" -#: ../app/tools/gimpvectortool.c:1175 +#: ../app/tools/gimpvectortool.c:1177 msgid "Click to create a new component of the path" msgstr "Klicka för att skapa ny komponent till slingan" -#: ../app/tools/gimpvectortool.c:1179 +#: ../app/tools/gimpvectortool.c:1181 msgid "Click or Click-Drag to create a new anchor" msgstr "Klicka eller klicka och dra för att skapa ett nytt ankare" -#: ../app/tools/gimpvectortool.c:1189 -#: ../app/tools/gimpvectortool.c:1196 +#: ../app/tools/gimpvectortool.c:1191 +#: ../app/tools/gimpvectortool.c:1198 msgid "Click-Drag to move the anchor around" msgstr "Klicka och dra för att flytta runt ankaret" -#: ../app/tools/gimpvectortool.c:1200 -#: ../app/tools/gimpvectortool.c:1213 +#: ../app/tools/gimpvectortool.c:1202 +#: ../app/tools/gimpvectortool.c:1215 msgid "Click-Drag to move the anchors around" msgstr "Klicka och dra för att flytta runt ankarna" -#: ../app/tools/gimpvectortool.c:1204 +#: ../app/tools/gimpvectortool.c:1206 msgid "Click-Drag to move the handle around" msgstr "Klicka och dra för att flytta runt handtaget" -#: ../app/tools/gimpvectortool.c:1218 +#: ../app/tools/gimpvectortool.c:1220 msgid "Click-Drag to change the shape of the curve" msgstr "Klicka och dra för att ändra kurvans form" -#: ../app/tools/gimpvectortool.c:1221 +#: ../app/tools/gimpvectortool.c:1223 #, c-format msgid "%s: symmetrical" msgstr "%s: symmetrisk" -#: ../app/tools/gimpvectortool.c:1226 +#: ../app/tools/gimpvectortool.c:1228 msgid "Click-Drag to move the component around" msgstr "Klicka och dra för att flytta runt komponenten" -#: ../app/tools/gimpvectortool.c:1234 +#: ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the path around" msgstr "Klicka och dra för att flytta runt slingan" -#: ../app/tools/gimpvectortool.c:1238 +#: ../app/tools/gimpvectortool.c:1240 msgid "Click-Drag to insert an anchor on the path" msgstr "Klicka och dra för att infoga ett ankare i slingan" -#: ../app/tools/gimpvectortool.c:1246 +#: ../app/tools/gimpvectortool.c:1248 msgid "Click to delete this anchor" msgstr "Klicka för att ta bort det här ankaret" -#: ../app/tools/gimpvectortool.c:1250 +#: ../app/tools/gimpvectortool.c:1252 msgid "Click to connect this anchor with the selected endpoint" msgstr "Klicka för att koppla ihop ankaret med den valda ändpunkten" -#: ../app/tools/gimpvectortool.c:1255 +#: ../app/tools/gimpvectortool.c:1257 msgid "Click to open up the path" msgstr "Klicka för att öppna upp slingan" -#: ../app/tools/gimpvectortool.c:1259 +#: ../app/tools/gimpvectortool.c:1261 msgid "Click to make this node angular" msgstr "Klicka för att göra noden vinkelformad" -#: ../app/tools/gimpvectortool.c:1766 +#: ../app/tools/gimpvectortool.c:1768 msgid "Delete Anchors" msgstr "Ta bort ankare" -#: ../app/tools/gimpvectortool.c:1912 +#: ../app/tools/gimpvectortool.c:1914 msgid "Path to selection" msgstr "Slinga till markering" -#: ../app/tools/gimpvectortool.c:1939 +#: ../app/tools/gimpvectortool.c:1941 msgid "There is no active layer or channel to stroke to" msgstr "Det finns inget aktivt lager eller kanal att stryka till" -#: ../app/tools/tools-enums.c:60 +#: ../app/tools/tools-enums.c:91 msgctxt "rectangle-guide" msgid "No guides" msgstr "Inga hjälplinjer" -#: ../app/tools/tools-enums.c:61 +#: ../app/tools/tools-enums.c:92 msgctxt "rectangle-guide" msgid "Center lines" msgstr "Centrumlinjer" -#: ../app/tools/tools-enums.c:62 +#: ../app/tools/tools-enums.c:93 msgctxt "rectangle-guide" msgid "Rule of thirds" msgstr "Tredjedelsregeln" -#: ../app/tools/tools-enums.c:63 +#: ../app/tools/tools-enums.c:94 msgctxt "rectangle-guide" msgid "Golden sections" msgstr "Gyllene snitt" -#: ../app/tools/tools-enums.c:64 +#: ../app/tools/tools-enums.c:95 msgctxt "rectangle-guide" msgid "Diagonal lines" msgstr "Diagonala linjer" -#: ../app/tools/tools-enums.c:154 +#: ../app/tools/tools-enums.c:185 msgctxt "rectangle-tool-fixed-rule" msgid "Aspect ratio" msgstr "Aspektförhållande" -#: ../app/tools/tools-enums.c:155 +#: ../app/tools/tools-enums.c:186 msgctxt "rectangle-tool-fixed-rule" msgid "Width" msgstr "Bredd" -#: ../app/tools/tools-enums.c:156 +#: ../app/tools/tools-enums.c:187 msgctxt "rectangle-tool-fixed-rule" msgid "Height" msgstr "Höjd" -#: ../app/tools/tools-enums.c:157 +#: ../app/tools/tools-enums.c:188 msgctxt "rectangle-tool-fixed-rule" msgid "Size" msgstr "Storlek" -#: ../app/tools/tools-enums.c:186 +#: ../app/tools/tools-enums.c:217 msgctxt "rect-select-mode" msgid "Free select" msgstr "Fri markering" -#: ../app/tools/tools-enums.c:187 +#: ../app/tools/tools-enums.c:218 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "Fast storlek" -#: ../app/tools/tools-enums.c:188 +#: ../app/tools/tools-enums.c:219 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" msgstr "Fast aspektförhållande" -#: ../app/tools/tools-enums.c:217 +#: ../app/tools/tools-enums.c:248 msgctxt "transform-type" msgid "Layer" msgstr "Lager" -#: ../app/tools/tools-enums.c:218 +#: ../app/tools/tools-enums.c:249 msgctxt "transform-type" msgid "Selection" msgstr "Markering" -#: ../app/tools/tools-enums.c:219 +#: ../app/tools/tools-enums.c:250 msgctxt "transform-type" msgid "Path" msgstr "Slinga" -#: ../app/tools/tools-enums.c:249 +#: ../app/tools/tools-enums.c:280 msgctxt "transform-preview-type" msgid "Outline" msgstr "Kontur" -#: ../app/tools/tools-enums.c:250 +#: ../app/tools/tools-enums.c:281 msgctxt "transform-preview-type" msgid "Grid" msgstr "Rutnät" -#: ../app/tools/tools-enums.c:251 +#: ../app/tools/tools-enums.c:282 msgctxt "transform-preview-type" msgid "Image" msgstr "Bild" -#: ../app/tools/tools-enums.c:252 +#: ../app/tools/tools-enums.c:283 msgctxt "transform-preview-type" msgid "Image + Grid" msgstr "Bild + rutnät" -#: ../app/tools/tools-enums.c:280 +#: ../app/tools/tools-enums.c:311 msgctxt "transform-grid-type" msgid "Number of grid lines" msgstr "Antal rutnätslinjer" -#: ../app/tools/tools-enums.c:281 +#: ../app/tools/tools-enums.c:312 msgctxt "transform-grid-type" msgid "Grid line spacing" msgstr "Mellanrum mellan rutnätslinjer" -#: ../app/tools/tools-enums.c:310 +#: ../app/tools/tools-enums.c:341 msgctxt "vector-mode" msgid "Design" msgstr "Design" -#: ../app/tools/tools-enums.c:311 +#: ../app/tools/tools-enums.c:342 msgctxt "vector-mode" msgid "Edit" msgstr "Redigera" -#: ../app/tools/tools-enums.c:312 +#: ../app/tools/tools-enums.c:343 msgctxt "vector-mode" msgid "Move" msgstr "Flytta" @@ -12717,47 +12825,47 @@ msgstr "_Sök:" msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)" -#: ../app/widgets/gimpactionview.c:345 -#: ../app/widgets/gimpcontrollereditor.c:347 +#: ../app/widgets/gimpactionview.c:337 +#: ../app/widgets/gimpcontrollereditor.c:344 msgid "Action" msgstr "Åtgärd" -#: ../app/widgets/gimpactionview.c:374 +#: ../app/widgets/gimpactionview.c:366 msgid "Shortcut" msgstr "Genväg" -#: ../app/widgets/gimpactionview.c:400 +#: ../app/widgets/gimpactionview.c:392 msgid "Name" msgstr "Namn" -#: ../app/widgets/gimpactionview.c:640 -#: ../app/widgets/gimpactionview.c:845 +#: ../app/widgets/gimpactionview.c:632 +#: ../app/widgets/gimpactionview.c:832 msgid "Changing shortcut failed." msgstr "Ändring av genväg misslyckades." -#: ../app/widgets/gimpactionview.c:682 +#: ../app/widgets/gimpactionview.c:669 msgid "Conflicting Shortcuts" msgstr "Krockande genvägar" -#: ../app/widgets/gimpactionview.c:688 +#: ../app/widgets/gimpactionview.c:675 msgid "_Reassign shortcut" msgstr "_Ändra genväg" -#: ../app/widgets/gimpactionview.c:703 +#: ../app/widgets/gimpactionview.c:690 #, c-format msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group." msgstr "Genvägen \"%s\" är redan tagen av \"%s\" från gruppen \"%s\"." -#: ../app/widgets/gimpactionview.c:707 +#: ../app/widgets/gimpactionview.c:694 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." msgstr "Ändring av genvägen kommer ta bort den från \"%s\"." -#: ../app/widgets/gimpactionview.c:780 +#: ../app/widgets/gimpactionview.c:767 msgid "Invalid shortcut." msgstr "Ogiltig genväg." -#: ../app/widgets/gimpactionview.c:869 +#: ../app/widgets/gimpactionview.c:856 msgid "Removing shortcut failed." msgstr "Borttagning av genväg misslyckades." @@ -12785,7 +12893,7 @@ msgstr "Procent av penselns bredd" #: ../app/widgets/gimpbufferview.c:173 #: ../app/widgets/gimpbufferview.c:257 -#: ../app/widgets/gimpeditor.c:753 +#: ../app/widgets/gimpeditor.c:745 msgid "(None)" msgstr "(Ingen)" @@ -12935,34 +13043,34 @@ msgstr "Namn:" msgid "State:" msgstr "Tillstånd:" -#: ../app/widgets/gimpcontrollereditor.c:341 +#: ../app/widgets/gimpcontrollereditor.c:338 msgid "Event" msgstr "Händelse" -#: ../app/widgets/gimpcontrollereditor.c:366 +#: ../app/widgets/gimpcontrollereditor.c:363 msgid "_Grab event" msgstr "_Fånga händelse" -#: ../app/widgets/gimpcontrollereditor.c:376 +#: ../app/widgets/gimpcontrollereditor.c:373 msgid "Select the next event arriving from the controller" msgstr "Välj nästa händelse som kommer från enheten" -#: ../app/widgets/gimpcontrollereditor.c:534 +#: ../app/widgets/gimpcontrollereditor.c:531 #, c-format msgid "Remove the action assigned to '%s'" msgstr "Ta bort åtgärden tilldelad \"%s\"" -#: ../app/widgets/gimpcontrollereditor.c:539 +#: ../app/widgets/gimpcontrollereditor.c:536 #, c-format msgid "Assign an action to '%s'" msgstr "Ställ in en åtgärd för \"%s\"" -#: ../app/widgets/gimpcontrollereditor.c:660 +#: ../app/widgets/gimpcontrollereditor.c:657 #, c-format msgid "Select Action for Event '%s'" msgstr "Välj åtgärd för händelsen \"%s\"" -#: ../app/widgets/gimpcontrollereditor.c:665 +#: ../app/widgets/gimpcontrollereditor.c:662 msgid "Select Controller Event Action" msgstr "Välj händelseåtgärd" @@ -13184,24 +13292,24 @@ msgstr "Förgrund: %d, %d, %d" msgid "Background: %d, %d, %d" msgstr "Bakgrund: %d, %d, %d" -#: ../app/widgets/gimpdnd-xds.c:193 +#: ../app/widgets/gimpdnd-xds.c:201 msgid "The given filename does not have any known file extension." msgstr "Det angivna filnamnet har inte en känd filändelse." -#: ../app/widgets/gimpdnd-xds.c:211 +#: ../app/widgets/gimpdnd-xds.c:219 msgid "File Exists" msgstr "Filen finns redan" -#: ../app/widgets/gimpdnd-xds.c:216 +#: ../app/widgets/gimpdnd-xds.c:224 msgid "_Replace" msgstr "_Ersätt" -#: ../app/widgets/gimpdnd-xds.c:227 +#: ../app/widgets/gimpdnd-xds.c:235 #, c-format msgid "A file named '%s' already exists." msgstr "En fil med namnet \"%s\" finns redan." -#: ../app/widgets/gimpdnd-xds.c:232 +#: ../app/widgets/gimpdnd-xds.c:240 msgid "Do you want to replace it with the image you are saving?" msgstr "Vill du ersätta den med bilden du sparar?" @@ -13226,23 +13334,23 @@ msgstr "Meddelanden omdirigeras till stderr." msgid "%s Message" msgstr "%s-meddelande" -#: ../app/widgets/gimpfiledialog.c:310 +#: ../app/widgets/gimpfiledialog.c:315 msgid "Automatically Detected" msgstr "Identifiera automatiskt" -#: ../app/widgets/gimpfiledialog.c:320 +#: ../app/widgets/gimpfiledialog.c:329 msgid "By Extension" msgstr "Via ändelse" -#: ../app/widgets/gimpfiledialog.c:654 +#: ../app/widgets/gimpfiledialog.c:775 msgid "All files" msgstr "Alla filer" -#: ../app/widgets/gimpfiledialog.c:659 +#: ../app/widgets/gimpfiledialog.c:780 msgid "All images" msgstr "Alla bilder" -#: ../app/widgets/gimpfiledialog.c:788 +#: ../app/widgets/gimpfiledialog.c:909 #, c-format msgid "Select File _Type (%s)" msgstr "Välj fil_typ (%s)" @@ -14162,6 +14270,15 @@ msgstr "Försäkra dig om att verktygslådan är synlig!" msgid "Couldn't start '%s': %s" msgstr "Kunde inte starta \"%s\": %s" +#~ msgctxt "edit-action" +#~ msgid "Copy the selected region to a named buffer" +#~ msgstr "Kopiera den markerade regionen till en namngiven buffert" +#~ msgctxt "edit-action" +#~ msgid "Fill with P_attern" +#~ msgstr "Fyll med möns_ter" +#~ msgctxt "file-action" +#~ msgid "Save as _Template..." +#~ msgstr "Spara som _mall..." #~ msgctxt "context-action" #~ msgid "_Aspect" #~ msgstr "_Aspekt" @@ -14657,8 +14774,6 @@ msgstr "Kunde inte starta \"%s\": %s" #~ msgstr "Transformeringsriktning" #~ msgid "Clip result" #~ msgstr "Klipp resultat" -#~ msgid "Click to create a new anchor. (try SHIFT)" -#~ msgstr "Klicka för att skapa ett nytt ankare. (prova SHIFT)" #~ msgid "Click-Drag to move the handle around. (try SHIFT)" #~ msgstr "Håll och dra för att flytta runt handtaget. (prova SHIFT)" #~ msgid "Click-Drag to move the component around. (try SHIFT)" From c837f25b40b97bba09845336ea0a997149aa3c5e Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Tue, 7 Jul 2009 17:02:32 +0200 Subject: [PATCH 04/70] =?UTF-8?q?Bug=20167604=20=E2=80=93=20gimp=5Fgradien?= =?UTF-8?q?t=5Fget=5Fcolor=5Fat()=20may=20return=20out-of-bounds=20values?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is not a problem of gimp_gradient_get_color_at(), but a typo in gradient_editor_right_color_update(). --- app/actions/gradient-editor-commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 918cf8421a..5895e279cf 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -772,7 +772,7 @@ gradient_editor_right_color_update (GimpColorDialog *dialog, gimp_gradient_segment_range_blend (gradient, editor->control_sel_l, editor->control_sel_r, - &editor->control_sel_r->left_color, + &editor->control_sel_l->left_color, color, TRUE, TRUE); break; @@ -781,7 +781,7 @@ gradient_editor_right_color_update (GimpColorDialog *dialog, gimp_gradient_segment_range_blend (gradient, editor->control_sel_l, editor->control_sel_r, - &editor->control_sel_r->left_color, + &editor->control_sel_l->left_color, color, TRUE, TRUE); gimp_gradient_segments_free (editor->right_saved_segments); From 5be4f235a392be003c47ac652ce874528875170d Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Tue, 7 Jul 2009 17:05:42 +0200 Subject: [PATCH 05/70] =?UTF-8?q?Bug=20554658=20=E2=80=93=20Path=20Dialog:?= =?UTF-8?q?=20Path=20preview=20pics=20not=20to=20see=20constantly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Always initialize the 'status' member of a newly allocated cairo_path_t to the value CAIRO_STATUS_SUCCESS as required to successively call cairo_append_path(). --- app/vectors/gimpvectors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c index 70fde88fe0..342f3814bb 100644 --- a/app/vectors/gimpvectors.c +++ b/app/vectors/gimpvectors.c @@ -1054,6 +1054,7 @@ gimp_vectors_real_make_bezier (const GimpVectors *vectors) if (cmd_array->len > 0) { ret_bezdesc = g_new (GimpBezierDesc, 1); + ret_bezdesc->status = CAIRO_STATUS_SUCCESS; ret_bezdesc->num_data = cmd_array->len; ret_bezdesc->data = (cairo_path_data_t *) cmd_array->data; g_array_free (cmd_array, FALSE); From 34ccca92a5cdb273ec93dd94c3a91d7920384646 Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Tue, 7 Jul 2009 17:07:12 +0200 Subject: [PATCH 06/70] =?UTF-8?q?Bug=20567262=20=E2=80=93=20Black=20pixels?= =?UTF-8?q?=20appear=20in=20"Spread"=20filter=20preview?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The plug-in makes use of a GimpPixelFetcher to access the source image. And a GimpPixelFetcher in its default state only returns pixels inside the bounding box of the selection. Setting its edge-mode to whatever but GIMP_PIXEL_FETCHER_EDGE_NONE allows to read pixels outside of the selection. --- plug-ins/common/noise-spread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plug-ins/common/noise-spread.c b/plug-ins/common/noise-spread.c index 54f73f56c7..74e70b7479 100644 --- a/plug-ins/common/noise-spread.c +++ b/plug-ins/common/noise-spread.c @@ -272,6 +272,7 @@ spread (GimpDrawable *drawable) param.width = drawable->width; param.height = drawable->height; + gimp_pixel_fetcher_set_edge_mode(param.pft, GIMP_PIXEL_FETCHER_EDGE_BLACK); iter = gimp_rgn_iterator_new (drawable, 0); gimp_rgn_iterator_dest (iter, spread_func, ¶m); gimp_rgn_iterator_free (iter); @@ -301,6 +302,7 @@ spread_preview_update (GimpPreview *preview, 1) + 1) / 2; param.width = drawable->width; param.height = drawable->height; + gimp_pixel_fetcher_set_edge_mode(param.pft, GIMP_PIXEL_FETCHER_EDGE_BLACK); gimp_preview_get_size (preview, &width, &height); From a7bca9407d7dec994cbb116e32e84589d34840a5 Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Tue, 7 Jul 2009 17:09:21 +0200 Subject: [PATCH 07/70] =?UTF-8?q?Bug=20569661=20=E2=80=93=20Import=20from?= =?UTF-8?q?=20PDF=20throws=20errors=20when=20entering=20resolution=20in=20?= =?UTF-8?q?pixels=20per=20millimetre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix calculation of dpi value. --- plug-ins/common/file-pdf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c index 36d13e8c0f..36fa328c1b 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf.c @@ -1288,7 +1288,8 @@ gimp_resolution_entry_get_x_in_dpi (GimpResolutionEntry *gre) { g_return_val_if_fail (GIMP_IS_RESOLUTION_ENTRY (gre), 0); - return gre->x.value / gimp_unit_get_factor (gre->unit); + /* dots_in_one_unit * units_in_one_inch -> dpi */ + return gre->x.value * gimp_unit_get_factor (gre->unit); } /** @@ -1302,7 +1303,7 @@ gimp_resolution_entry_get_y_in_dpi (GimpResolutionEntry *gre) { g_return_val_if_fail (GIMP_IS_RESOLUTION_ENTRY (gre), 0); - return gre->y.value / gimp_unit_get_factor (gre->unit); + return gre->y.value * gimp_unit_get_factor (gre->unit); } From 8e7c19b76c2d693a00c26f168a92edb31c4eb7ef Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Fri, 10 Jul 2009 19:27:23 +0200 Subject: [PATCH 08/70] app: Clarify gimp_display_shell_format_filename() Clarify gimp_display_shell_format_filename() by using booleans with nice names in the if conditions. --- app/display/gimpdisplayshell-title.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c index bda0785d89..ec6d3533bd 100644 --- a/app/display/gimpdisplayshell-title.c +++ b/app/display/gimpdisplayshell-title.c @@ -446,17 +446,21 @@ gimp_display_shell_format_filename (gchar *buf, const gchar *export_status = NULL; gchar *format_string = NULL; gchar *name = NULL; + gboolean is_imported = FALSE; gint incr = 0; source = g_object_get_data (G_OBJECT (image), GIMP_FILE_IMPORT_SOURCE_URI_KEY); + /* Note that as soon as the image is saved, it is not considered + * imported any longer (GIMP_FILE_IMPORT_SOURCE_URI_KEY is set to + * NULL) + */ + is_imported = (source != NULL); + /* Calculate filename and format */ - if (! source) + if (! is_imported) { - /* As soon as the image is saved the source is forgotten, so the - * above condition is enough to figure out name and name format - */ name = g_strdup (filename); name_format = "%s"; } @@ -472,16 +476,17 @@ gimp_display_shell_format_filename (gchar *buf, /* Calculate filename suffix */ if (! gimp_image_is_export_dirty (image)) { - const gchar *export_to = g_object_get_data (G_OBJECT (image), - GIMP_FILE_EXPORT_TO_URI_KEY); - if (export_to) + gboolean is_exported; + is_exported = (g_object_get_data (G_OBJECT (image), + GIMP_FILE_EXPORT_TO_URI_KEY) != NULL); + if (is_exported) export_status = _(" (exported)"); - else if (source) + else if (is_imported) export_status = _(" (overwritten)"); else g_warning ("Unexpected code path, Save+export implementation is buggy!"); } - else if (source) + else if (is_imported) { export_status = _(" (imported)"); } From f350e5ac51e4573dce356e2448f46a6b1110f788 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 00:47:34 +0200 Subject: [PATCH 09/70] Whitespace and minor code cleanup --- app/widgets/gimptagpopup.c | 365 +++++++++++++++++++------------------ 1 file changed, 191 insertions(+), 174 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index a2d47b5e56..a9e8855374 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -40,19 +40,14 @@ #include "gimp-intl.h" -enum -{ - PROP_0, - PROP_OWNER, -}; -#define MENU_SCROLL_STEP1 8 -#define MENU_SCROLL_STEP2 15 -#define MENU_SCROLL_FAST_ZONE 8 -#define MENU_SCROLL_TIMEOUT1 50 -#define MENU_SCROLL_TIMEOUT2 20 +#define MENU_SCROLL_STEP1 8 +#define MENU_SCROLL_STEP2 15 +#define MENU_SCROLL_FAST_ZONE 8 +#define MENU_SCROLL_TIMEOUT1 50 +#define MENU_SCROLL_TIMEOUT2 20 -#define GIMP_TAG_POPUP_MARGIN 5 +#define GIMP_TAG_POPUP_MARGIN 5 struct _PopupTagData @@ -63,6 +58,13 @@ struct _PopupTagData }; +enum +{ + PROP_0, + PROP_OWNER +}; + + static GObject* gimp_tag_popup_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params); @@ -184,11 +186,11 @@ gimp_tag_popup_constructor (GType type, popup = GIMP_TAG_POPUP (object); gtk_widget_add_events (GTK_WIDGET (popup), - GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_MASK - | GDK_KEY_RELEASE_MASK - | GDK_SCROLL_MASK); + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_KEY_RELEASE_MASK | + GDK_SCROLL_MASK); gtk_window_set_screen (GTK_WINDOW (popup), gtk_widget_get_screen (GTK_WIDGET (popup->combo_entry))); @@ -200,18 +202,18 @@ gimp_tag_popup_constructor (GType type, drawing_area = gtk_drawing_area_new (); gtk_widget_add_events (GTK_WIDGET (drawing_area), - GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_MASK); + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK); gtk_container_add (GTK_CONTAINER (alignment), drawing_area); - popup->alignment = alignment; - popup->drawing_area = drawing_area; - popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup)); - popup->layout = pango_layout_new (popup->context); - popup->prelight = NULL; - popup->upper_arrow_state = GTK_STATE_NORMAL; - popup->lower_arrow_state = GTK_STATE_NORMAL; + popup->alignment = alignment; + popup->drawing_area = drawing_area; + popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup)); + popup->layout = pango_layout_new (popup->context); + popup->prelight = NULL; + popup->upper_arrow_state = GTK_STATE_NORMAL; + popup->lower_arrow_state = GTK_STATE_NORMAL; gtk_widget_style_get (GTK_WIDGET (popup), "scroll-arrow-vlength", &popup->scroll_arrow_height, NULL); @@ -228,7 +230,7 @@ gimp_tag_popup_constructor (GType type, tag_list = g_hash_table_get_keys (tag_hash); tag_list = g_list_sort (tag_list, gimp_tag_compare_func); popup->tag_count = g_list_length (tag_list); - popup->tag_data = g_malloc (sizeof (PopupTagData) * popup->tag_count); + popup->tag_data = g_malloc (sizeof (PopupTagData) * popup->tag_count); tag_iterator = tag_list; for (i = 0; i < popup->tag_count; i++) { @@ -305,7 +307,7 @@ gimp_tag_popup_constructor (GType type, gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), popup->scroll_arrow_height + 2, popup->scroll_arrow_height + 2, 0, 0); - popup_height = popup_rect.height - popup->scroll_arrow_height * 2 + 4; + popup_height = popup_rect.height - popup->scroll_arrow_height * 2 + 4; popup->scroll_height = height - popup_rect.height; popup->scroll_y = 0; popup->scroll_step = 0; @@ -367,8 +369,11 @@ gimp_tag_popup_dispose (GObject *object) popup->close_rectangles = NULL; } - g_free (popup->tag_data); - popup->tag_data = NULL; + if (popup->tag_data) + { + g_free (popup->tag_data); + popup->tag_data = NULL; + } G_OBJECT_CLASS (parent_class)->dispose (object); } @@ -383,36 +388,34 @@ gimp_tag_popup_set_property (GObject *object, switch (property_id) { - case PROP_OWNER: - { - tag_popup->combo_entry = g_value_get_object (value); - g_object_ref (tag_popup->combo_entry); - } - break; + case PROP_OWNER: + tag_popup->combo_entry = g_value_get_object (value); + g_object_ref (tag_popup->combo_entry); + break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; } } static void -gimp_tag_popup_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) +gimp_tag_popup_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) { GimpTagPopup *tag_popup = GIMP_TAG_POPUP (object); switch (property_id) { - case PROP_OWNER: - g_value_set_object (value, tag_popup->combo_entry); - break; + case PROP_OWNER: + g_value_set_object (value, tag_popup->combo_entry); + break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; } } @@ -446,7 +449,6 @@ gimp_tag_popup_new (GimpComboTagEntry *combo_entry) void gimp_tag_popup_show (GimpTagPopup *popup) { - GdkGrabStatus grab_status; g_return_if_fail (popup); @@ -456,9 +458,10 @@ gimp_tag_popup_show (GimpTagPopup *popup) gtk_grab_add (GTK_WIDGET (popup)); gtk_widget_grab_focus (GTK_WIDGET (popup)); grab_status = gdk_pointer_grab (GTK_WIDGET (popup)->window, TRUE, - GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_MASK, NULL, NULL, + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK, + NULL, NULL, GDK_CURRENT_TIME); if (grab_status != GDK_GRAB_SUCCESS) { @@ -545,7 +548,8 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, tag_data->bounds.x = width - tag_data->bounds.x - tag_data->bounds.width; } - for (iterator = popup->close_rectangles; iterator; + for (iterator = popup->close_rectangles; + iterator; iterator = g_list_next (iterator)) { GdkRectangle *rect = (GdkRectangle *) iterator->data; @@ -654,22 +658,23 @@ gimp_tag_popup_border_event (GtkWidget *widget, button_event = (GdkEventButton *) event; - if (button_event->window == widget->window - && gimp_tag_popup_button_scroll (popup, button_event)) + if (button_event->window == widget->window && + gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; } gdk_window_get_pointer (widget->window, &x, &y, NULL); - if (button_event->window != popup->drawing_area->window - && (x < widget->allocation.y - || y < widget->allocation.x - || x > widget->allocation.x + widget->allocation.width - || y > widget->allocation.y + widget->allocation.height)) + if (button_event->window != popup->drawing_area->window && + (x < widget->allocation.y || + y < widget->allocation.x || + x > widget->allocation.x + widget->allocation.width || + y > widget->allocation.y + widget->allocation.height)) { /* user has clicked outside the popup area, - * which means it should be hidden. */ + * which means it should be hidden. + */ gtk_grab_remove (widget); gdk_display_pointer_ungrab (gtk_widget_get_display (widget), GDK_CURRENT_TIME); @@ -678,8 +683,8 @@ gimp_tag_popup_border_event (GtkWidget *widget, } else if (event->type == GDK_MOTION_NOTIFY) { - gint x; - gint y; + gint x; + gint y; gdk_window_get_pointer (widget->window, &x, &y, NULL); x += widget->allocation.x; @@ -692,9 +697,9 @@ gimp_tag_popup_border_event (GtkWidget *widget, { popup->single_select_disabled = TRUE; - if (((GdkEventButton *)event)->window == widget->window - && ! popup->ignore_button_release - && gimp_tag_popup_button_scroll (popup, (GdkEventButton *) event)) + if (((GdkEventButton *) event)->window == widget->window && + ! popup->ignore_button_release && + gimp_tag_popup_button_scroll (popup, (GdkEventButton *) event)) { return TRUE; } @@ -712,19 +717,19 @@ gimp_tag_popup_border_event (GtkWidget *widget, } else if (event->type == GDK_SCROLL) { - GdkEventScroll *scroll_event = (GdkEventScroll *) event; + GdkEventScroll *scroll_event = (GdkEventScroll *) event; switch (scroll_event->direction) { - case GDK_SCROLL_RIGHT: - case GDK_SCROLL_DOWN: - gimp_tag_popup_scroll_by (popup, MENU_SCROLL_STEP2); - return TRUE; + case GDK_SCROLL_RIGHT: + case GDK_SCROLL_DOWN: + gimp_tag_popup_scroll_by (popup, MENU_SCROLL_STEP2); + return TRUE; - case GDK_SCROLL_LEFT: - case GDK_SCROLL_UP: - gimp_tag_popup_scroll_by (popup, - MENU_SCROLL_STEP2); - return TRUE; + case GDK_SCROLL_LEFT: + case GDK_SCROLL_UP: + gimp_tag_popup_scroll_by (popup, - MENU_SCROLL_STEP2); + return TRUE; } } @@ -743,7 +748,8 @@ gimp_tag_popup_list_expose (GtkWidget *widget, PangoAttrList *attributes; renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget)); - gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), widget->style->black_gc); + gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), + widget->style->black_gc); gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), widget->window); @@ -769,8 +775,8 @@ gimp_tag_popup_list_expose (GtkWidget *widget, attributes = pango_attr_list_copy (popup->combo_entry->normal_item_attr); } - if (&popup->tag_data[i] == popup->prelight - && popup->tag_data[i].state != GTK_STATE_INSENSITIVE) + if (&popup->tag_data[i] == popup->prelight && + popup->tag_data[i].state != GTK_STATE_INSENSITIVE) { attribute = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE); pango_attr_list_insert (attributes, attribute); @@ -787,13 +793,14 @@ gimp_tag_popup_list_expose (GtkWidget *widget, popup->tag_data[i].bounds.width + 2, popup->tag_data[i].bounds.height - 2); } + pango_renderer_draw_layout (renderer, popup->layout, (popup->tag_data[i].bounds.x) * PANGO_SCALE, (popup->tag_data[i].bounds.y - popup->scroll_y) * PANGO_SCALE); - if (&popup->tag_data[i] == popup->prelight - && popup->tag_data[i].state != GTK_STATE_INSENSITIVE - && ! popup->single_select_disabled) + if (&popup->tag_data[i] == popup->prelight && + popup->tag_data[i].state != GTK_STATE_INSENSITIVE && + ! popup->single_select_disabled) { gtk_paint_focus (widget->style, widget->window, popup->tag_data[i].state, @@ -820,7 +827,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, { if (event->type == GDK_BUTTON_PRESS) { - GdkEventButton *button_event; + GdkEventButton *button_event = (GdkEventButton *) event; gint x; gint y; gint i; @@ -829,7 +836,6 @@ gimp_tag_popup_list_event (GtkWidget *widget, popup->single_select_disabled = TRUE; - button_event = (GdkEventButton *) event; x = button_event->x; y = button_event->y; @@ -838,14 +844,13 @@ gimp_tag_popup_list_event (GtkWidget *widget, for (i = 0; i < popup->tag_count; i++) { bounds = &popup->tag_data[i].bounds; - if (x >= bounds->x - && y >= bounds->y - && x < bounds->x + bounds->width - && y < bounds->y + bounds->height) + if (x >= bounds->x && + y >= bounds->y && + x < bounds->x + bounds->width && + y < bounds->y + bounds->height) { tag = popup->tag_data[i].tag; - gimp_tag_popup_toggle_tag (popup, - &popup->tag_data[i]); + gimp_tag_popup_toggle_tag (popup, &popup->tag_data[i]); gtk_widget_queue_draw (widget); break; } @@ -855,14 +860,16 @@ gimp_tag_popup_list_event (GtkWidget *widget, { GList *iterator; - for (iterator = popup->close_rectangles; iterator; + for (iterator = popup->close_rectangles; + iterator; iterator = g_list_next (iterator)) { bounds = (GdkRectangle *) iterator->data; - if (x >= bounds->x - && y >= bounds->y - && x < bounds->x + bounds->width - && y < bounds->y + bounds->height) + + if (x >= bounds->x && + y >= bounds->y && + x < bounds->x + bounds->width && + y < bounds->y + bounds->height) { gtk_widget_destroy (GTK_WIDGET (popup)); break; @@ -872,26 +879,27 @@ gimp_tag_popup_list_event (GtkWidget *widget, } else if (event->type == GDK_MOTION_NOTIFY) { - GdkEventMotion *motion_event; + GdkEventMotion *motion_event = (GdkEventMotion *) event; gint x; gint y; gint i; GdkRectangle *bounds; PopupTagData *previous_prelight = popup->prelight; - motion_event = (GdkEventMotion*) event; x = motion_event->x; y = motion_event->y; + y += popup->scroll_y; popup->prelight = NULL; for (i = 0; i < popup->tag_count; i++) { bounds = &popup->tag_data[i].bounds; - if (x >= bounds->x - && y >= bounds->y - && x < bounds->x + bounds->width - && y < bounds->y + bounds->height) + + if (x >= bounds->x && + y >= bounds->y && + x < bounds->x + bounds->width && + y < bounds->y + bounds->height) { popup->prelight = &popup->tag_data[i]; break; @@ -903,19 +911,18 @@ gimp_tag_popup_list_event (GtkWidget *widget, gtk_widget_queue_draw (widget); } } - else if (event->type == GDK_BUTTON_RELEASE - && !popup->single_select_disabled) + else if (event->type == GDK_BUTTON_RELEASE && + ! popup->single_select_disabled) { - GdkEventButton *button_event; - gint x; - gint y; - gint i; - GdkRectangle *bounds; - GimpTag *tag; + GdkEventButton *button_event = (GdkEventButton *) event; + gint x; + gint y; + gint i; + GdkRectangle *bounds; + GimpTag *tag; popup->single_select_disabled = TRUE; - button_event = (GdkEventButton *) event; x = button_event->x; y = button_event->y; @@ -924,10 +931,11 @@ gimp_tag_popup_list_event (GtkWidget *widget, for (i = 0; i < popup->tag_count; i++) { bounds = &popup->tag_data[i].bounds; - if (x >= bounds->x - && y >= bounds->y - && x < bounds->x + bounds->width - && y < bounds->y + bounds->height) + + if (x >= bounds->x && + y >= bounds->y && + x < bounds->x + bounds->width && + y < bounds->y + bounds->height) { tag = popup->tag_data[i].tag; gimp_tag_popup_toggle_tag (popup, &popup->tag_data[i]); @@ -981,19 +989,21 @@ gimp_tag_popup_toggle_tag (GimpTagPopup *popup, g_string_append (tag_str, gimp_tag_entry_get_separator ()); g_string_append_c (tag_str, ' '); } + g_string_append (tag_str, current_tags[i]); } } if (! tag_toggled_off) { - /* this tag was not selected yet, - * so it needs to be toggled on. */ + /* this tag was not selected yet, so it needs to be toggled on */ + if (tag_str->len) { g_string_append (tag_str, gimp_tag_entry_get_separator ()); g_string_append_c (tag_str, ' '); } + g_string_append (tag_str, tag); } @@ -1016,6 +1026,7 @@ gimp_tag_popup_toggle_tag (GimpTagPopup *popup, popup->tag_data[i].state = GTK_STATE_INSENSITIVE; } } + gimp_container_foreach (GIMP_CONTAINER (container), (GFunc) gimp_tag_popup_check_can_toggle, popup); @@ -1026,25 +1037,29 @@ static int gimp_tag_popup_data_compare (const void *a, const void *b) { - return gimp_tag_compare_func (GIMP_TAG (((PopupTagData *) a)->tag), - GIMP_TAG (((PopupTagData *) b)->tag)); + return gimp_tag_compare_func (((PopupTagData *) a)->tag, + ((PopupTagData *) b)->tag); } static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged, GimpTagPopup *popup) { - GList *tag_iterator; + GList *iterator; PopupTagData search_key; PopupTagData *search_result; - for (tag_iterator = gimp_tagged_get_tags (tagged); tag_iterator; - tag_iterator = g_list_next (tag_iterator)) + for (iterator = gimp_tagged_get_tags (tagged); + iterator; + iterator = g_list_next (iterator)) { - search_key.tag = GIMP_TAG (tag_iterator->data); - search_result = - (PopupTagData *) bsearch (&search_key, popup->tag_data, popup->tag_count, - sizeof (PopupTagData), gimp_tag_popup_data_compare); + search_key.tag = iterator->data; + search_result = (PopupTagData *) + bsearch (&search_key, + popup->tag_data, popup->tag_count, + sizeof (PopupTagData), + gimp_tag_popup_data_compare); + if (search_result) { if (search_result->state == GTK_STATE_INSENSITIVE) @@ -1058,7 +1073,7 @@ gimp_tag_popup_check_can_toggle (GimpTagged *tagged, static gboolean gimp_tag_popup_scroll_timeout (gpointer data) { - GimpTagPopup *popup = (GimpTagPopup *) data; + GimpTagPopup *popup = data; gboolean touchscreen_mode; g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)), @@ -1083,11 +1098,9 @@ gimp_tag_popup_remove_scroll_timeout (GimpTagPopup *popup) static gboolean gimp_tag_popup_scroll_timeout_initial (gpointer data) { - GimpTagPopup *popup; - guint timeout; - gboolean touchscreen_mode; - - popup = (GimpTagPopup*) (data); + GimpTagPopup *popup = data; + guint timeout; + gboolean touchscreen_mode; g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)), "gtk-timeout-repeat", &timeout, @@ -1112,7 +1125,7 @@ gimp_tag_popup_start_scrolling (GimpTagPopup *popup) gboolean touchscreen_mode; g_object_get (gtk_widget_get_settings (GTK_WIDGET (popup)), - "gtk-timeout-repeat", &timeout, + "gtk-timeout-repeat", &timeout, "gtk-touchscreen-mode", &touchscreen_mode, NULL); @@ -1134,7 +1147,7 @@ gimp_tag_popup_stop_scrolling (GimpTagPopup *popup) "gtk-touchscreen-mode", &touchscreen_mode, NULL); - if (!touchscreen_mode) + if (! touchscreen_mode) { popup->upper_arrow_prelight = FALSE; popup->lower_arrow_prelight = FALSE; @@ -1150,38 +1163,43 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, if (new_scroll_y < 0) { new_scroll_y = 0; + if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE) { gimp_tag_popup_stop_scrolling (popup); gtk_widget_queue_draw (GTK_WIDGET (popup)); } + popup->upper_arrow_state = GTK_STATE_INSENSITIVE; } else { - popup->upper_arrow_state = popup->upper_arrow_prelight ? - GTK_STATE_PRELIGHT : GTK_STATE_NORMAL; + popup->upper_arrow_state = (popup->upper_arrow_prelight ? + GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); } if (new_scroll_y >= popup->scroll_height) { new_scroll_y = popup->scroll_height - 1; - if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE) + + if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE) { gimp_tag_popup_stop_scrolling (popup); gtk_widget_queue_draw (GTK_WIDGET (popup)); } + popup->lower_arrow_state = GTK_STATE_INSENSITIVE; } else { - popup->lower_arrow_state = popup->lower_arrow_prelight ? - GTK_STATE_PRELIGHT : GTK_STATE_NORMAL; + popup->lower_arrow_state = (popup->lower_arrow_prelight ? + GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); } if (new_scroll_y != popup->scroll_y) { popup->scroll_y = new_scroll_y; + gdk_window_scroll (popup->drawing_area->window, 0, -step); } } @@ -1194,11 +1212,11 @@ gimp_tag_popup_do_timeout_scroll (GimpTagPopup *popup, } static void -gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, - gint x, - gint y, - gboolean enter, - gboolean motion) +gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, + gint x, + gint y, + gboolean enter, + gboolean motion) { GdkRectangle rect; gboolean in_arrow; @@ -1214,9 +1232,11 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, get_arrows_sensitive_area (popup, &rect, NULL); in_arrow = FALSE; - if (popup->arrows_visible && - (x >= rect.x) && (x < rect.x + rect.width) && - (y >= rect.y) && (y < rect.y + rect.height)) + if (popup->arrows_visible && + x >= rect.x && + x < rect.x + rect.width && + y >= rect.y && + y < rect.y + rect.height) { in_arrow = TRUE; } @@ -1312,9 +1332,11 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, get_arrows_sensitive_area (popup, NULL, &rect); in_arrow = FALSE; - if (popup->arrows_visible && - (x >= rect.x) && (x < rect.x + rect.width) && - (y >= rect.y) && (y < rect.y + rect.height)) + if (popup->arrows_visible && + x >= rect.x && + x < rect.x + rect.width && + y >= rect.y && + y < rect.y + rect.height) { in_arrow = TRUE; } @@ -1410,8 +1432,7 @@ static gboolean gimp_tag_popup_button_scroll (GimpTagPopup *popup, GdkEventButton *event) { - if (popup->upper_arrow_prelight - || popup->lower_arrow_prelight) + if (popup->upper_arrow_prelight || popup->lower_arrow_prelight) { gboolean touchscreen_mode; @@ -1421,9 +1442,10 @@ gimp_tag_popup_button_scroll (GimpTagPopup *popup, if (touchscreen_mode) gimp_tag_popup_handle_scrolling (popup, - event->x_root, event->y_root, - event->type == GDK_BUTTON_PRESS, - FALSE); + event->x_root, + event->y_root, + event->type == GDK_BUTTON_PRESS, + FALSE); return TRUE; } @@ -1439,7 +1461,6 @@ get_arrows_visible_area (GimpTagPopup *popup, gint *arrow_space) { GtkWidget *widget = GTK_WIDGET (popup->alignment); - gint scroll_arrow_height = popup->scroll_arrow_height; guint padding_top; guint padding_bottom; guint padding_left; @@ -1451,17 +1472,17 @@ get_arrows_visible_area (GimpTagPopup *popup, *border = widget->allocation; - upper->x = border->x + padding_left; - upper->y = border->y; - upper->width = border->width - padding_left - padding_right; + upper->x = border->x + padding_left; + upper->y = border->y; + upper->width = border->width - padding_left - padding_right; upper->height = padding_top; - lower->x = border->x + padding_left; - lower->y = border->y + border->height - padding_bottom; - lower->width = border->width - padding_left - padding_right; + lower->x = border->x + padding_left; + lower->y = border->y + border->height - padding_bottom; + lower->width = border->width - padding_left - padding_right; lower->height = padding_bottom; - *arrow_space = scroll_arrow_height; + *arrow_space = popup->scroll_arrow_height; } static void @@ -1469,21 +1490,17 @@ get_arrows_sensitive_area (GimpTagPopup *popup, GdkRectangle *upper, GdkRectangle *lower) { - GdkRectangle tmp_border; - GdkRectangle tmp_upper; - GdkRectangle tmp_lower; - gint tmp_arrow_space; + GdkRectangle tmp_border; + GdkRectangle tmp_upper; + GdkRectangle tmp_lower; + gint tmp_arrow_space; get_arrows_visible_area (popup, &tmp_border, &tmp_upper, &tmp_lower, &tmp_arrow_space); + if (upper) - { - *upper = tmp_upper; - } + *upper = tmp_upper; + if (lower) - { - *lower = tmp_lower; - } + *lower = tmp_lower; } - - From 4d860185c15b1e54d7e8d1c6e0788895649ac744 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 00:51:45 +0200 Subject: [PATCH 10/70] Rename member "drawing_area" to "tag_area" --- app/widgets/gimptagpopup.c | 22 +++++++++++----------- app/widgets/gimptagpopup.h | 4 +++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index a9e8855374..543886e34a 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -159,7 +159,7 @@ gimp_tag_popup_constructor (GType type, GimpTagPopup *popup; GimpFilteredContainer *container; GtkWidget *alignment; - GtkWidget *drawing_area; + GtkWidget *tag_area; GtkWidget *frame; gint x; gint y; @@ -200,15 +200,15 @@ gimp_tag_popup_constructor (GType type, alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); gtk_container_add (GTK_CONTAINER (frame), alignment); - drawing_area = gtk_drawing_area_new (); - gtk_widget_add_events (GTK_WIDGET (drawing_area), + tag_area = gtk_drawing_area_new (); + gtk_widget_add_events (tag_area, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK); - gtk_container_add (GTK_CONTAINER (alignment), drawing_area); + gtk_container_add (GTK_CONTAINER (alignment), tag_area); popup->alignment = alignment; - popup->drawing_area = drawing_area; + popup->tag_area = tag_area; popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup)); popup->layout = pango_layout_new (popup->context); popup->prelight = NULL; @@ -313,8 +313,8 @@ gimp_tag_popup_constructor (GType type, popup->scroll_step = 0; } - drawing_area->requisition.width = width; - drawing_area->requisition.height = popup_height; + tag_area->requisition.width = width; + tag_area->requisition.height = popup_height; gtk_window_move (GTK_WINDOW (popup), popup_rect.x, popup_rect.y); gtk_window_resize (GTK_WINDOW (popup), popup_rect.width, popup_rect.height); @@ -327,10 +327,10 @@ gimp_tag_popup_constructor (GType type, g_signal_connect (popup, "event", G_CALLBACK (gimp_tag_popup_border_event), NULL); - g_signal_connect (drawing_area, "expose-event", + g_signal_connect (tag_area, "expose-event", G_CALLBACK (gimp_tag_popup_list_expose), popup); - g_signal_connect (drawing_area, "event", + g_signal_connect (tag_area, "event", G_CALLBACK (gimp_tag_popup_list_event), popup); @@ -666,7 +666,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, gdk_window_get_pointer (widget->window, &x, &y, NULL); - if (button_event->window != popup->drawing_area->window && + if (button_event->window != popup->tag_area->window && (x < widget->allocation.y || y < widget->allocation.x || x > widget->allocation.x + widget->allocation.width || @@ -1200,7 +1200,7 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, { popup->scroll_y = new_scroll_y; - gdk_window_scroll (popup->drawing_area->window, 0, -step); + gdk_window_scroll (popup->tag_area->window, 0, -step); } } diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index 7523ec8a35..a2faf2b13c 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -36,9 +36,11 @@ typedef struct _PopupTagData PopupTagData; struct _GimpTagPopup { GtkWindow parent_instance; + GimpComboTagEntry *combo_entry; GtkWidget *alignment; - GtkWidget *drawing_area; + GtkWidget *tag_area; + PangoContext *context; PangoLayout *layout; PopupTagData *tag_data; From 1ecf4bed6754b3114800beb11b148fdc23a00f68 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 01:03:55 +0200 Subject: [PATCH 11/70] Widget construction / showing cleanup - create the widgets in init() instead of constructor() - don't show the popup in constructor() - don't use gtk_widget_show_all() --- app/widgets/gimptagpopup.c | 84 +++++++++++++++++++------------------- app/widgets/gimptagpopup.h | 1 + 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 543886e34a..4d1f246a96 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -148,9 +148,36 @@ gimp_tag_popup_class_init (GimpTagPopupClass *klass) static void gimp_tag_popup_init (GimpTagPopup *popup) { + GtkWidget *widget = GTK_WIDGET (popup); + + popup->upper_arrow_state = GTK_STATE_NORMAL; + popup->lower_arrow_state = GTK_STATE_NORMAL; + + gtk_widget_add_events (widget, + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK | + GDK_KEY_RELEASE_MASK | + GDK_SCROLL_MASK); + + popup->frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER (popup), popup->frame); + gtk_widget_show (popup->frame); + + popup->alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + gtk_container_add (GTK_CONTAINER (popup->frame), popup->alignment); + gtk_widget_show (popup->alignment); + + popup->tag_area = gtk_drawing_area_new (); + gtk_widget_add_events (popup->tag_area, + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK); + gtk_container_add (GTK_CONTAINER (popup->alignment), popup->tag_area); + gtk_widget_show (popup->tag_area); } -static GObject* +static GObject * gimp_tag_popup_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params) @@ -158,9 +185,6 @@ gimp_tag_popup_constructor (GType type, GObject *object; GimpTagPopup *popup; GimpFilteredContainer *container; - GtkWidget *alignment; - GtkWidget *tag_area; - GtkWidget *frame; gint x; gint y; gint width; @@ -179,41 +203,17 @@ gimp_tag_popup_constructor (GType type, GdkRectangle popup_rects[2]; /* variants of popup placement */ GdkRectangle popup_rect; /* best popup rect in screen coordinates */ - object = G_OBJECT_CLASS (parent_class)->constructor (type, n_construct_params, construct_params); popup = GIMP_TAG_POPUP (object); - gtk_widget_add_events (GTK_WIDGET (popup), - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK | - GDK_KEY_RELEASE_MASK | - GDK_SCROLL_MASK); gtk_window_set_screen (GTK_WINDOW (popup), gtk_widget_get_screen (GTK_WIDGET (popup->combo_entry))); - frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER (popup), frame); + popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup)); + popup->layout = pango_layout_new (popup->context); - alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); - gtk_container_add (GTK_CONTAINER (frame), alignment); - - tag_area = gtk_drawing_area_new (); - gtk_widget_add_events (tag_area, - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK); - gtk_container_add (GTK_CONTAINER (alignment), tag_area); - - popup->alignment = alignment; - popup->tag_area = tag_area; - popup->context = gtk_widget_create_pango_context (GTK_WIDGET (popup)); - popup->layout = pango_layout_new (popup->context); - popup->prelight = NULL; - popup->upper_arrow_state = GTK_STATE_NORMAL; - popup->lower_arrow_state = GTK_STATE_NORMAL; gtk_widget_style_get (GTK_WIDGET (popup), "scroll-arrow-vlength", &popup->scroll_arrow_height, NULL); @@ -263,12 +263,12 @@ gimp_tag_popup_constructor (GType type, (GFunc) gimp_tag_popup_check_can_toggle, popup); } - width = GTK_WIDGET (popup->combo_entry)->allocation.width - frame->style->xthickness * 2; + width = GTK_WIDGET (popup->combo_entry)->allocation.width - popup->frame->style->xthickness * 2; height = gimp_tag_popup_layout_tags (popup, width); gdk_window_get_origin (GTK_WIDGET (popup->combo_entry)->window, &x, &y); max_height = GTK_WIDGET (popup->combo_entry)->allocation.height * 7; screen_height = gdk_screen_get_height (gtk_widget_get_screen (GTK_WIDGET (popup->combo_entry))); - height += frame->style->ythickness * 2; + height += popup->frame->style->ythickness * 2; popup_height = height; popup_rects[0].x = x; popup_rects[0].y = 0; @@ -294,17 +294,17 @@ gimp_tag_popup_constructor (GType type, if (popup_rects[0].height >= popup_rects[1].height) { popup_rect = popup_rects[0]; - popup_rect.y += popup->scroll_arrow_height + frame->style->ythickness; + popup_rect.y += popup->scroll_arrow_height + popup->frame->style->ythickness; } else { popup_rect = popup_rects[1]; - popup_rect.y -= popup->scroll_arrow_height + frame->style->ythickness; + popup_rect.y -= popup->scroll_arrow_height + popup->frame->style->ythickness; } popup->arrows_visible = TRUE; popup->upper_arrow_state = GTK_STATE_INSENSITIVE; - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), + gtk_alignment_set_padding (GTK_ALIGNMENT (popup->alignment), popup->scroll_arrow_height + 2, popup->scroll_arrow_height + 2, 0, 0); popup_height = popup_rect.height - popup->scroll_arrow_height * 2 + 4; @@ -313,24 +313,22 @@ gimp_tag_popup_constructor (GType type, popup->scroll_step = 0; } - tag_area->requisition.width = width; - tag_area->requisition.height = popup_height; + popup->tag_area->requisition.width = width; + popup->tag_area->requisition.height = popup_height; gtk_window_move (GTK_WINDOW (popup), popup_rect.x, popup_rect.y); gtk_window_resize (GTK_WINDOW (popup), popup_rect.width, popup_rect.height); - gtk_widget_show_all (GTK_WIDGET (popup)); - - g_signal_connect (alignment, "expose-event", + g_signal_connect (popup->alignment, "expose-event", G_CALLBACK (gimp_tag_popup_border_expose), popup); g_signal_connect (popup, "event", G_CALLBACK (gimp_tag_popup_border_event), NULL); - g_signal_connect (tag_area, "expose-event", + g_signal_connect (popup->tag_area, "expose-event", G_CALLBACK (gimp_tag_popup_list_expose), popup); - g_signal_connect (tag_area, "event", + g_signal_connect (popup->tag_area, "event", G_CALLBACK (gimp_tag_popup_list_event), popup); @@ -453,7 +451,7 @@ gimp_tag_popup_show (GimpTagPopup *popup) g_return_if_fail (popup); - gtk_widget_show_all (GTK_WIDGET (popup)); + gtk_widget_show (GTK_WIDGET (popup)); gtk_grab_add (GTK_WIDGET (popup)); gtk_widget_grab_focus (GTK_WIDGET (popup)); diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index a2faf2b13c..f2324f862f 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -38,6 +38,7 @@ struct _GimpTagPopup GtkWindow parent_instance; GimpComboTagEntry *combo_entry; + GtkWidget *frame; GtkWidget *alignment; GtkWidget *tag_area; From 3d85ee285a823ba5684d16261098b18a38273bf9 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 01:57:29 +0200 Subject: [PATCH 12/70] Various code cleanups --- app/widgets/gimptagpopup.c | 443 +++++++++++++++++++------------------ 1 file changed, 232 insertions(+), 211 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 4d1f246a96..b6abf7a688 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -131,12 +131,12 @@ G_DEFINE_TYPE (GimpTagPopup, gimp_tag_popup, GTK_TYPE_WINDOW); static void gimp_tag_popup_class_init (GimpTagPopupClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->constructor = gimp_tag_popup_constructor; - object_class->dispose = gimp_tag_popup_dispose; - object_class->set_property = gimp_tag_popup_set_property; - object_class->get_property = gimp_tag_popup_get_property; + object_class->constructor = gimp_tag_popup_constructor; + object_class->dispose = gimp_tag_popup_dispose; + object_class->set_property = gimp_tag_popup_set_property; + object_class->get_property = gimp_tag_popup_get_property; g_object_class_install_property (object_class, PROP_OWNER, g_param_spec_object ("owner", NULL, NULL, @@ -259,8 +259,10 @@ gimp_tag_popup_constructor (GType type, popup->tag_data[i].state = GTK_STATE_INSENSITIVE; } } + gimp_container_foreach (GIMP_CONTAINER (container), - (GFunc) gimp_tag_popup_check_can_toggle, popup); + (GFunc) gimp_tag_popup_check_can_toggle, + popup); } width = GTK_WIDGET (popup->combo_entry)->allocation.width - popup->frame->style->xthickness * 2; @@ -382,13 +384,13 @@ gimp_tag_popup_set_property (GObject *object, const GValue *value, GParamSpec *pspec) { - GimpTagPopup *tag_popup = GIMP_TAG_POPUP (object); + GimpTagPopup *popup = GIMP_TAG_POPUP (object); switch (property_id) { case PROP_OWNER: - tag_popup->combo_entry = g_value_get_object (value); - g_object_ref (tag_popup->combo_entry); + popup->combo_entry = g_value_get_object (value); + g_object_ref (popup->combo_entry); break; default: @@ -403,12 +405,12 @@ gimp_tag_popup_get_property (GObject *object, GValue *value, GParamSpec *pspec) { - GimpTagPopup *tag_popup = GIMP_TAG_POPUP (object); + GimpTagPopup *popup = GIMP_TAG_POPUP (object); switch (property_id) { case PROP_OWNER: - g_value_set_object (value, tag_popup->combo_entry); + g_value_set_object (value, popup->combo_entry); break; default: @@ -447,26 +449,29 @@ gimp_tag_popup_new (GimpComboTagEntry *combo_entry) void gimp_tag_popup_show (GimpTagPopup *popup) { - GdkGrabStatus grab_status; + GtkWidget *widget; - g_return_if_fail (popup); + g_return_if_fail (GIMP_IS_TAG_POPUP (popup)); - gtk_widget_show (GTK_WIDGET (popup)); + widget = GTK_WIDGET (popup); - gtk_grab_add (GTK_WIDGET (popup)); - gtk_widget_grab_focus (GTK_WIDGET (popup)); - grab_status = gdk_pointer_grab (GTK_WIDGET (popup)->window, TRUE, - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_POINTER_MOTION_MASK, - NULL, NULL, - GDK_CURRENT_TIME); - if (grab_status != GDK_GRAB_SUCCESS) + gtk_widget_show (widget); + + gtk_grab_add (widget); + gtk_widget_grab_focus (widget); + + if (gdk_pointer_grab (gtk_widget_get_window (widget), TRUE, + GDK_BUTTON_PRESS_MASK | + GDK_BUTTON_RELEASE_MASK | + GDK_POINTER_MOTION_MASK, + NULL, NULL, + GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) { /* pointer grab must be attained otherwise user would have - * problems closing the popup window. */ - gtk_grab_remove (GTK_WIDGET (popup)); - gtk_widget_destroy (GTK_WIDGET (popup)); + * problems closing the popup window. + */ + gtk_grab_remove (widget); + gtk_widget_destroy (widget); } } @@ -474,86 +479,101 @@ static gint gimp_tag_popup_layout_tags (GimpTagPopup *popup, gint width) { + PangoFontMetrics *font_metrics; gint x; gint y; gint height = 0; gint i; gint line_height; gint space_width; - PangoFontMetrics *font_metrics; x = GIMP_TAG_POPUP_MARGIN; y = GIMP_TAG_POPUP_MARGIN; + font_metrics = pango_context_get_metrics (popup->context, pango_context_get_font_description (popup->context), NULL); - line_height = pango_font_metrics_get_ascent (font_metrics) + - pango_font_metrics_get_descent (font_metrics); - space_width = pango_font_metrics_get_approximate_char_width (font_metrics); - line_height /= PANGO_SCALE; - space_width /= PANGO_SCALE; + + line_height = PANGO_PIXELS ((pango_font_metrics_get_ascent (font_metrics) + + pango_font_metrics_get_descent (font_metrics))); + space_width = PANGO_PIXELS (pango_font_metrics_get_approximate_char_width (font_metrics)); + pango_font_metrics_unref (font_metrics); + for (i = 0; i < popup->tag_count; i++) { + PopupTagData *tag_data = &popup->tag_data[i]; + gint w, h; + pango_layout_set_text (popup->layout, - gimp_tag_get_name (popup->tag_data[i].tag), -1); - pango_layout_get_size (popup->layout, - &popup->tag_data[i].bounds.width, - &popup->tag_data[i].bounds.height); - popup->tag_data[i].bounds.width /= PANGO_SCALE; - popup->tag_data[i].bounds.height /= PANGO_SCALE; - if (popup->tag_data[i].bounds.width + x + 3 +GIMP_TAG_POPUP_MARGIN > width) + gimp_tag_get_name (tag_data->tag), -1); + pango_layout_get_size (popup->layout, &w, &h); + + tag_data->bounds.width = PANGO_PIXELS (w); + tag_data->bounds.height = PANGO_PIXELS (h); + + if (tag_data->bounds.width + x + 3 + GIMP_TAG_POPUP_MARGIN > width) { - if (popup->tag_data[i].bounds.width + line_height + GIMP_TAG_POPUP_MARGIN < width) + if (tag_data->bounds.width + line_height + GIMP_TAG_POPUP_MARGIN < width) { - GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); - close_rect->x = x - space_width - 5; - close_rect->y = y; - close_rect->width = width - close_rect->x; + GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); + + close_rect->x = x - space_width - 5; + close_rect->y = y; + close_rect->width = width - close_rect->x; close_rect->height = line_height + 2; + popup->close_rectangles = g_list_append (popup->close_rectangles, - close_rect); + close_rect); } + x = GIMP_TAG_POPUP_MARGIN; y += line_height + 2; } - popup->tag_data[i].bounds.x = x; - popup->tag_data[i].bounds.y = y; + tag_data->bounds.x = x; + tag_data->bounds.y = y; - x += popup->tag_data[i].bounds.width + space_width + 5; + x += tag_data->bounds.width + space_width + 5; } - if (popup->tag_count > 0 - && (width - x) > line_height + GIMP_TAG_POPUP_MARGIN) + if (popup->tag_count > 0 && + (width - x) > line_height + GIMP_TAG_POPUP_MARGIN) { - GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); - close_rect->x = x - space_width - 5; - close_rect->y = y; - close_rect->width = width - close_rect->x; + GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); + + close_rect->x = x - space_width - 5; + close_rect->y = y; + close_rect->width = width - close_rect->x; close_rect->height = line_height + 2; + popup->close_rectangles = g_list_append (popup->close_rectangles, - close_rect); + close_rect); } if (gtk_widget_get_direction (GTK_WIDGET (popup)) == GTK_TEXT_DIR_RTL) { - GList *iterator; + GList *iterator; for (i = 0; i < popup->tag_count; i++) { PopupTagData *tag_data = &popup->tag_data[i]; - tag_data->bounds.x = width - tag_data->bounds.x - tag_data->bounds.width; + + tag_data->bounds.x = (width - + tag_data->bounds.x - + tag_data->bounds.width); } for (iterator = popup->close_rectangles; iterator; iterator = g_list_next (iterator)) { - GdkRectangle *rect = (GdkRectangle *) iterator->data; + GdkRectangle *rect = iterator->data; + rect->x = width - rect->x - rect->width; } } + height = y + line_height + GIMP_TAG_POPUP_MARGIN; return height; @@ -570,75 +590,75 @@ gimp_tag_popup_border_expose (GtkWidget *widget, GdkRectangle lower; gint arrow_space; + if (event->window != widget->window) + return FALSE; + + gc = gdk_gc_new (GDK_DRAWABLE (widget->window)); + + get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space); + if (event->window == widget->window) { - gc = gdk_gc_new (GDK_DRAWABLE (widget->window)); + gint arrow_size = 0.7 * arrow_space; - get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space); + gtk_paint_box (widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + &event->area, widget, "menu", + 0, 0, -1, -1); - if (event->window == widget->window) + if (popup->arrows_visible) { - gint arrow_size = 0.7 * arrow_space; - gtk_paint_box (widget->style, widget->window, - GTK_STATE_NORMAL, + popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", - 0, 0, -1, -1); + upper.x, + upper.y, + upper.width, + upper.height); - if (popup->arrows_visible) - { - gtk_paint_box (widget->style, - widget->window, - popup->upper_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu", - upper.x, - upper.y, - upper.width, - upper.height); - - gtk_paint_arrow (widget->style, - widget->window, - popup->upper_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu_scroll_arrow_up", - GTK_ARROW_UP, - TRUE, - upper.x + (upper.width - arrow_size) / 2, - upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, - arrow_size, arrow_size); - } - - if (popup->arrows_visible) - { - gtk_paint_box (widget->style, - widget->window, - popup->lower_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu", - lower.x, - lower.y, - lower.width, - lower.height); - - gtk_paint_arrow (widget->style, - widget->window, - popup->lower_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu_scroll_arrow_down", - GTK_ARROW_DOWN, - TRUE, - lower.x + (lower.width - arrow_size) / 2, - lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, - arrow_size, arrow_size); - } + gtk_paint_arrow (widget->style, + widget->window, + popup->upper_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu_scroll_arrow_up", + GTK_ARROW_UP, + TRUE, + upper.x + (upper.width - arrow_size) / 2, + upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + arrow_size, arrow_size); } - g_object_unref (gc); + if (popup->arrows_visible) + { + gtk_paint_box (widget->style, + widget->window, + popup->lower_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu", + lower.x, + lower.y, + lower.width, + lower.height); + + gtk_paint_arrow (widget->style, + widget->window, + popup->lower_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu_scroll_arrow_down", + GTK_ARROW_DOWN, + TRUE, + lower.x + (lower.width - arrow_size) / 2, + lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + arrow_size, arrow_size); + } } + g_object_unref (gc); + return FALSE; } @@ -650,12 +670,10 @@ gimp_tag_popup_border_event (GtkWidget *widget, if (event->type == GDK_BUTTON_PRESS) { - GdkEventButton *button_event; + GdkEventButton *button_event = (GdkEventButton *) event; gint x; gint y; - button_event = (GdkEventButton *) event; - if (button_event->window == widget->window && gimp_tag_popup_button_scroll (popup, button_event)) { @@ -681,23 +699,26 @@ gimp_tag_popup_border_event (GtkWidget *widget, } else if (event->type == GDK_MOTION_NOTIFY) { - gint x; - gint y; + GdkEventMotion *motion_event = (GdkEventMotion *) event; + gint x, y; + + x = motion_event->x + widget->allocation.x; + y = motion_event->y + widget->allocation.y; - gdk_window_get_pointer (widget->window, &x, &y, NULL); - x += widget->allocation.x; - y += widget->allocation.y; popup->ignore_button_release = FALSE; + gimp_tag_popup_handle_scrolling (popup, x, y, popup->timeout_id == 0, TRUE); } else if (event->type == GDK_BUTTON_RELEASE) { + GdkEventButton *button_event = (GdkEventButton *) event; + popup->single_select_disabled = TRUE; - if (((GdkEventButton *) event)->window == widget->window && - ! popup->ignore_button_release && - gimp_tag_popup_button_scroll (popup, (GdkEventButton *) event)) + if (button_event->window == widget->window && + ! popup->ignore_button_release && + gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; } @@ -739,6 +760,8 @@ gimp_tag_popup_list_expose (GtkWidget *widget, GdkEventExpose *event, GimpTagPopup *popup) { + GdkWindow *window = gtk_widget_get_window (widget); + GtkStyle *style = gtk_widget_get_style (widget); GdkGC *gc; PangoRenderer *renderer; gint i; @@ -747,19 +770,21 @@ gimp_tag_popup_list_expose (GtkWidget *widget, renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget)); gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), - widget->style->black_gc); - gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), - widget->window); + style->black_gc); + gdk_pango_renderer_set_drawable (GDK_PANGO_RENDERER (renderer), window); - gc = gdk_gc_new (GDK_DRAWABLE (widget->window)); + gc = gdk_gc_new (GDK_DRAWABLE (window)); gdk_gc_set_rgb_fg_color (gc, &popup->combo_entry->selected_item_color); gdk_gc_set_line_attributes (gc, 5, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND); for (i = 0; i < popup->tag_count; i++) { + PopupTagData *tag_data = &popup->tag_data[i]; + pango_layout_set_text (popup->layout, - gimp_tag_get_name (popup->tag_data[i].tag), -1); + gimp_tag_get_name (tag_data->tag), -1); + if (popup->tag_data[i].state == GTK_STATE_SELECTED) { attributes = pango_attr_list_copy (popup->combo_entry->selected_item_attr); @@ -773,8 +798,8 @@ gimp_tag_popup_list_expose (GtkWidget *widget, attributes = pango_attr_list_copy (popup->combo_entry->normal_item_attr); } - if (&popup->tag_data[i] == popup->prelight && - popup->tag_data[i].state != GTK_STATE_INSENSITIVE) + if (tag_data == popup->prelight && + tag_data->state != GTK_STATE_INSENSITIVE) { attribute = pango_attr_underline_new (PANGO_UNDERLINE_SINGLE); pango_attr_list_insert (attributes, attribute); @@ -785,28 +810,29 @@ gimp_tag_popup_list_expose (GtkWidget *widget, if (popup->tag_data[i].state == GTK_STATE_SELECTED) { - gdk_draw_rectangle (widget->window, gc, FALSE, - popup->tag_data[i].bounds.x - 1, - popup->tag_data[i].bounds.y - popup->scroll_y + 1, - popup->tag_data[i].bounds.width + 2, - popup->tag_data[i].bounds.height - 2); + gdk_draw_rectangle (window, gc, FALSE, + tag_data->bounds.x - 1, + tag_data->bounds.y - popup->scroll_y + 1, + tag_data->bounds.width + 2, + tag_data->bounds.height - 2); } pango_renderer_draw_layout (renderer, popup->layout, - (popup->tag_data[i].bounds.x) * PANGO_SCALE, - (popup->tag_data[i].bounds.y - popup->scroll_y) * PANGO_SCALE); + tag_data->bounds.x * PANGO_SCALE, + (tag_data->bounds.y - + popup->scroll_y) * PANGO_SCALE); - if (&popup->tag_data[i] == popup->prelight && - popup->tag_data[i].state != GTK_STATE_INSENSITIVE && + if (tag_data == popup->prelight && + tag_data->state != GTK_STATE_INSENSITIVE && ! popup->single_select_disabled) { - gtk_paint_focus (widget->style, widget->window, - popup->tag_data[i].state, + gtk_paint_focus (style, window, + tag_data->state, &event->area, widget, NULL, - popup->tag_data[i].bounds.x, - popup->tag_data[i].bounds.y - popup->scroll_y, - popup->tag_data[i].bounds.width, - popup->tag_data[i].bounds.height); + tag_data->bounds.x, + tag_data->bounds.y - popup->scroll_y, + tag_data->bounds.width, + tag_data->bounds.height); } } @@ -829,8 +855,6 @@ gimp_tag_popup_list_event (GtkWidget *widget, gint x; gint y; gint i; - GdkRectangle *bounds; - GimpTag *tag; popup->single_select_disabled = TRUE; @@ -841,14 +865,14 @@ gimp_tag_popup_list_event (GtkWidget *widget, for (i = 0; i < popup->tag_count; i++) { - bounds = &popup->tag_data[i].bounds; - if (x >= bounds->x && - y >= bounds->y && - x < bounds->x + bounds->width && - y < bounds->y + bounds->height) + PopupTagData *tag_data = &popup->tag_data[i]; + + if (x >= tag_data->bounds.x && + y >= tag_data->bounds.y && + x < tag_data->bounds.x + tag_data->bounds.width && + y < tag_data->bounds.y + tag_data->bounds.height) { - tag = popup->tag_data[i].tag; - gimp_tag_popup_toggle_tag (popup, &popup->tag_data[i]); + gimp_tag_popup_toggle_tag (popup, tag_data); gtk_widget_queue_draw (widget); break; } @@ -862,12 +886,12 @@ gimp_tag_popup_list_event (GtkWidget *widget, iterator; iterator = g_list_next (iterator)) { - bounds = (GdkRectangle *) iterator->data; + GdkRectangle *bounds = iterator->data; if (x >= bounds->x && y >= bounds->y && - x < bounds->x + bounds->width && - y < bounds->y + bounds->height) + x < bounds->x + bounds->width && + y < bounds->y + bounds->height) { gtk_widget_destroy (GTK_WIDGET (popup)); break; @@ -881,33 +905,29 @@ gimp_tag_popup_list_event (GtkWidget *widget, gint x; gint y; gint i; - GdkRectangle *bounds; - PopupTagData *previous_prelight = popup->prelight; x = motion_event->x; y = motion_event->y; y += popup->scroll_y; - popup->prelight = NULL; for (i = 0; i < popup->tag_count; i++) { - bounds = &popup->tag_data[i].bounds; + PopupTagData *tag_data = &popup->tag_data[i]; - if (x >= bounds->x && - y >= bounds->y && - x < bounds->x + bounds->width && - y < bounds->y + bounds->height) + if (x >= tag_data->bounds.x && + y >= tag_data->bounds.y && + x < tag_data->bounds.x + tag_data->bounds.width && + y < tag_data->bounds.y + tag_data->bounds.height) { - popup->prelight = &popup->tag_data[i]; - break; + if (popup->prelight != tag_data) + { + popup->prelight = tag_data; + gtk_widget_queue_draw (widget); + break; + } } } - - if (previous_prelight != popup->prelight) - { - gtk_widget_queue_draw (widget); - } } else if (event->type == GDK_BUTTON_RELEASE && ! popup->single_select_disabled) @@ -916,8 +936,6 @@ gimp_tag_popup_list_event (GtkWidget *widget, gint x; gint y; gint i; - GdkRectangle *bounds; - GimpTag *tag; popup->single_select_disabled = TRUE; @@ -928,15 +946,14 @@ gimp_tag_popup_list_event (GtkWidget *widget, for (i = 0; i < popup->tag_count; i++) { - bounds = &popup->tag_data[i].bounds; + PopupTagData *tag_data = &popup->tag_data[i]; - if (x >= bounds->x && - y >= bounds->y && - x < bounds->x + bounds->width && - y < bounds->y + bounds->height) + if (x >= tag_data->bounds.x && + y >= tag_data->bounds.y && + x < tag_data->bounds.x + tag_data->bounds.width && + y < tag_data->bounds.y + tag_data->bounds.height) { - tag = popup->tag_data[i].tag; - gimp_tag_popup_toggle_tag (popup, &popup->tag_data[i]); + gimp_tag_popup_toggle_tag (popup, tag_data); gtk_widget_destroy (GTK_WIDGET (popup)); break; } @@ -1043,20 +1060,22 @@ static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged, GimpTagPopup *popup) { - GList *iterator; - PopupTagData search_key; - PopupTagData *search_result; + GList *iterator; for (iterator = gimp_tagged_get_tags (tagged); iterator; iterator = g_list_next (iterator)) { + PopupTagData search_key; + PopupTagData *search_result; + search_key.tag = iterator->data; - search_result = (PopupTagData *) - bsearch (&search_key, - popup->tag_data, popup->tag_count, - sizeof (PopupTagData), - gimp_tag_popup_data_compare); + + search_result = + (PopupTagData *) bsearch (&search_key, + popup->tag_data, popup->tag_count, + sizeof (PopupTagData), + gimp_tag_popup_data_compare); if (search_result) { @@ -1257,7 +1276,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, gimp_tag_popup_remove_scroll_timeout (popup); popup->scroll_step = -MENU_SCROLL_STEP2; /* always fast */ - if (!motion) + if (! motion) { /* Only do stuff on click. */ gimp_tag_popup_start_scrolling (popup); @@ -1269,7 +1288,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, arrow_pressed = TRUE; } } - else if (!enter) + else if (! enter) { gimp_tag_popup_stop_scrolling (popup); } @@ -1279,23 +1298,24 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, scroll_fast = (y < rect.y + MENU_SCROLL_FAST_ZONE); if (enter && in_arrow && - (!popup->upper_arrow_prelight || + (! popup->upper_arrow_prelight || popup->scroll_fast != scroll_fast)) { popup->upper_arrow_prelight = TRUE; - popup->scroll_fast = scroll_fast; + popup->scroll_fast = scroll_fast; gimp_tag_popup_remove_scroll_timeout (popup); - popup->scroll_step = scroll_fast ? - -MENU_SCROLL_STEP2 : -MENU_SCROLL_STEP1; + popup->scroll_step = (scroll_fast ? + -MENU_SCROLL_STEP2 : -MENU_SCROLL_STEP1); popup->timeout_id = gdk_threads_add_timeout (scroll_fast ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1, - gimp_tag_popup_scroll_timeout, popup); + gimp_tag_popup_scroll_timeout, + popup); } - else if (!enter && !in_arrow && popup->upper_arrow_prelight) + else if (! enter && ! in_arrow && popup->upper_arrow_prelight) { gimp_tag_popup_stop_scrolling (popup); } @@ -1357,7 +1377,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, gimp_tag_popup_remove_scroll_timeout (popup); popup->scroll_step = MENU_SCROLL_STEP2; /* always fast */ - if (!motion) + if (! motion) { /* Only do stuff on click. */ gimp_tag_popup_start_scrolling (popup); @@ -1369,7 +1389,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, arrow_pressed = TRUE; } } - else if (!enter) + else if (! enter) { gimp_tag_popup_stop_scrolling (popup); } @@ -1379,23 +1399,24 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, scroll_fast = (y > rect.y + rect.height - MENU_SCROLL_FAST_ZONE); if (enter && in_arrow && - (!popup->lower_arrow_prelight || + (! popup->lower_arrow_prelight || popup->scroll_fast != scroll_fast)) { popup->lower_arrow_prelight = TRUE; - popup->scroll_fast = scroll_fast; + popup->scroll_fast = scroll_fast; gimp_tag_popup_remove_scroll_timeout (popup); - popup->scroll_step = scroll_fast ? - MENU_SCROLL_STEP2 : MENU_SCROLL_STEP1; + popup->scroll_step = (scroll_fast ? + MENU_SCROLL_STEP2 : MENU_SCROLL_STEP1); popup->timeout_id = gdk_threads_add_timeout (scroll_fast ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1, - gimp_tag_popup_scroll_timeout, popup); + gimp_tag_popup_scroll_timeout, + popup); } - else if (!enter && !in_arrow && popup->lower_arrow_prelight) + else if (! enter && ! in_arrow && popup->lower_arrow_prelight) { gimp_tag_popup_stop_scrolling (popup); } @@ -1452,11 +1473,11 @@ gimp_tag_popup_button_scroll (GimpTagPopup *popup, } static void -get_arrows_visible_area (GimpTagPopup *popup, - GdkRectangle *border, - GdkRectangle *upper, - GdkRectangle *lower, - gint *arrow_space) +get_arrows_visible_area (GimpTagPopup *popup, + GdkRectangle *border, + GdkRectangle *upper, + GdkRectangle *lower, + gint *arrow_space) { GtkWidget *widget = GTK_WIDGET (popup->alignment); guint padding_top; From 75ee288278021aed5272f1c3aaf1eeedbd43976f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 02:17:00 +0200 Subject: [PATCH 13/70] Remove "close_rectangles" member and the feature it implemented Closing whatever popup by click on dead space within it is a no no, otherwise one-pixel mis-clicks inside the widget make it go away, which is totally unexpected. --- app/widgets/gimptagpopup.c | 64 -------------------------------------- app/widgets/gimptagpopup.h | 1 - 2 files changed, 65 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index b6abf7a688..39571a0eb4 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -362,13 +362,6 @@ gimp_tag_popup_dispose (GObject *object) popup->context = NULL; } - if (popup->close_rectangles) - { - g_list_foreach (popup->close_rectangles, (GFunc) g_free, NULL); - g_list_free (popup->close_rectangles); - popup->close_rectangles = NULL; - } - if (popup->tag_data) { g_free (popup->tag_data); @@ -514,19 +507,6 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, if (tag_data->bounds.width + x + 3 + GIMP_TAG_POPUP_MARGIN > width) { - if (tag_data->bounds.width + line_height + GIMP_TAG_POPUP_MARGIN < width) - { - GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); - - close_rect->x = x - space_width - 5; - close_rect->y = y; - close_rect->width = width - close_rect->x; - close_rect->height = line_height + 2; - - popup->close_rectangles = g_list_append (popup->close_rectangles, - close_rect); - } - x = GIMP_TAG_POPUP_MARGIN; y += line_height + 2; } @@ -537,20 +517,6 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, x += tag_data->bounds.width + space_width + 5; } - if (popup->tag_count > 0 && - (width - x) > line_height + GIMP_TAG_POPUP_MARGIN) - { - GdkRectangle *close_rect = g_malloc (sizeof (GdkRectangle)); - - close_rect->x = x - space_width - 5; - close_rect->y = y; - close_rect->width = width - close_rect->x; - close_rect->height = line_height + 2; - - popup->close_rectangles = g_list_append (popup->close_rectangles, - close_rect); - } - if (gtk_widget_get_direction (GTK_WIDGET (popup)) == GTK_TEXT_DIR_RTL) { GList *iterator; @@ -563,15 +529,6 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, tag_data->bounds.x - tag_data->bounds.width); } - - for (iterator = popup->close_rectangles; - iterator; - iterator = g_list_next (iterator)) - { - GdkRectangle *rect = iterator->data; - - rect->x = width - rect->x - rect->width; - } } height = y + line_height + GIMP_TAG_POPUP_MARGIN; @@ -877,27 +834,6 @@ gimp_tag_popup_list_event (GtkWidget *widget, break; } } - - if (i == popup->tag_count) - { - GList *iterator; - - for (iterator = popup->close_rectangles; - iterator; - iterator = g_list_next (iterator)) - { - GdkRectangle *bounds = iterator->data; - - if (x >= bounds->x && - y >= bounds->y && - x < bounds->x + bounds->width && - y < bounds->y + bounds->height) - { - gtk_widget_destroy (GTK_WIDGET (popup)); - break; - } - } - } } else if (event->type == GDK_MOTION_NOTIFY) { diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index f2324f862f..1ed01a0b22 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -47,7 +47,6 @@ struct _GimpTagPopup PopupTagData *tag_data; PopupTagData *prelight; gint tag_count; - GList *close_rectangles; guint timeout_id; gint scroll_height; gint scroll_y; From 8995cdf9d7bdee6fe884205400975a47d13196e3 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 02:25:25 +0200 Subject: [PATCH 14/70] Use #defines instead of magic values for the tag spacing constants --- app/widgets/gimptagpopup.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 39571a0eb4..dbe42b83aa 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -41,13 +41,15 @@ #include "gimp-intl.h" -#define MENU_SCROLL_STEP1 8 -#define MENU_SCROLL_STEP2 15 -#define MENU_SCROLL_FAST_ZONE 8 -#define MENU_SCROLL_TIMEOUT1 50 -#define MENU_SCROLL_TIMEOUT2 20 +#define MENU_SCROLL_STEP1 8 +#define MENU_SCROLL_STEP2 15 +#define MENU_SCROLL_FAST_ZONE 8 +#define MENU_SCROLL_TIMEOUT1 50 +#define MENU_SCROLL_TIMEOUT2 20 -#define GIMP_TAG_POPUP_MARGIN 5 +#define GIMP_TAG_POPUP_MARGIN 5 +#define GIMP_TAG_POPUP_SPACING_X 3 +#define GIMP_TAG_POPUP_SPACING_Y 2 struct _PopupTagData @@ -505,10 +507,11 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, tag_data->bounds.width = PANGO_PIXELS (w); tag_data->bounds.height = PANGO_PIXELS (h); - if (tag_data->bounds.width + x + 3 + GIMP_TAG_POPUP_MARGIN > width) + if (x + GIMP_TAG_POPUP_SPACING_X + tag_data->bounds.width + + GIMP_TAG_POPUP_MARGIN > width) { x = GIMP_TAG_POPUP_MARGIN; - y += line_height + 2; + y += line_height + GIMP_TAG_POPUP_SPACING_Y; } tag_data->bounds.x = x; @@ -519,8 +522,6 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, if (gtk_widget_get_direction (GTK_WIDGET (popup)) == GTK_TEXT_DIR_RTL) { - GList *iterator; - for (i = 0; i < popup->tag_count; i++) { PopupTagData *tag_data = &popup->tag_data[i]; From 1f199ba0606485d4c7219e80796bc10907272f29 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 02:46:13 +0200 Subject: [PATCH 15/70] Use GTK_SHADOW_OUT for the tag popup's frame --- app/widgets/gimptagpopup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index dbe42b83aa..55a4ec94b6 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -163,6 +163,7 @@ gimp_tag_popup_init (GimpTagPopup *popup) GDK_SCROLL_MASK); popup->frame = gtk_frame_new (NULL); + gtk_frame_set_shadow_type (GTK_FRAME (popup->frame), GTK_SHADOW_OUT); gtk_container_add (GTK_CONTAINER (popup), popup->frame); gtk_widget_show (popup->frame); From dd6b65179e40acce56aab9fa0fd06811e2f68a26 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 03:36:40 +0200 Subject: [PATCH 16/70] Clean up spacings, tag size calculation and tag rendering The area sensitive to clicks now corresponds to the area that is drawn selected, minus a border of one pixel. --- app/widgets/gimptagpopup.c | 77 +++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 55a4ec94b6..85e8d88e13 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -41,15 +41,15 @@ #include "gimp-intl.h" -#define MENU_SCROLL_STEP1 8 -#define MENU_SCROLL_STEP2 15 -#define MENU_SCROLL_FAST_ZONE 8 -#define MENU_SCROLL_TIMEOUT1 50 -#define MENU_SCROLL_TIMEOUT2 20 +#define MENU_SCROLL_STEP1 8 +#define MENU_SCROLL_STEP2 15 +#define MENU_SCROLL_FAST_ZONE 8 +#define MENU_SCROLL_TIMEOUT1 50 +#define MENU_SCROLL_TIMEOUT2 20 -#define GIMP_TAG_POPUP_MARGIN 5 -#define GIMP_TAG_POPUP_SPACING_X 3 -#define GIMP_TAG_POPUP_SPACING_Y 2 +#define GIMP_TAG_POPUP_MARGIN 5 +#define GIMP_TAG_POPUP_PADDING 2 +#define GIMP_TAG_POPUP_LINE_SPACING 2 struct _PopupTagData @@ -503,22 +503,22 @@ gimp_tag_popup_layout_tags (GimpTagPopup *popup, pango_layout_set_text (popup->layout, gimp_tag_get_name (tag_data->tag), -1); - pango_layout_get_size (popup->layout, &w, &h); + pango_layout_get_pixel_size (popup->layout, &w, &h); - tag_data->bounds.width = PANGO_PIXELS (w); - tag_data->bounds.height = PANGO_PIXELS (h); + tag_data->bounds.width = w + 2 * GIMP_TAG_POPUP_PADDING; + tag_data->bounds.height = h + 2 * GIMP_TAG_POPUP_PADDING; - if (x + GIMP_TAG_POPUP_SPACING_X + tag_data->bounds.width + - GIMP_TAG_POPUP_MARGIN > width) + if (x + space_width + tag_data->bounds.width + + GIMP_TAG_POPUP_MARGIN - 1 > width) { x = GIMP_TAG_POPUP_MARGIN; - y += line_height + GIMP_TAG_POPUP_SPACING_Y; + y += line_height + 2 * GIMP_TAG_POPUP_PADDING + GIMP_TAG_POPUP_LINE_SPACING; } tag_data->bounds.x = x; tag_data->bounds.y = y; - x += tag_data->bounds.width + space_width + 5; + x += tag_data->bounds.width + space_width; } if (gtk_widget_get_direction (GTK_WIDGET (popup)) == GTK_TEXT_DIR_RTL) @@ -734,8 +734,6 @@ gimp_tag_popup_list_expose (GtkWidget *widget, gc = gdk_gc_new (GDK_DRAWABLE (window)); gdk_gc_set_rgb_fg_color (gc, &popup->combo_entry->selected_item_color); - gdk_gc_set_line_attributes (gc, 5, GDK_LINE_SOLID, GDK_CAP_ROUND, - GDK_JOIN_ROUND); for (i = 0; i < popup->tag_count; i++) { @@ -744,17 +742,19 @@ gimp_tag_popup_list_expose (GtkWidget *widget, pango_layout_set_text (popup->layout, gimp_tag_get_name (tag_data->tag), -1); - if (popup->tag_data[i].state == GTK_STATE_SELECTED) + switch (tag_data->state) { + case GTK_STATE_SELECTED: attributes = pango_attr_list_copy (popup->combo_entry->selected_item_attr); - } - else if (popup->tag_data[i].state == GTK_STATE_INSENSITIVE) - { + break; + + case GTK_STATE_INSENSITIVE: attributes = pango_attr_list_copy (popup->combo_entry->insensitive_item_attr); - } - else - { + break; + + default: attributes = pango_attr_list_copy (popup->combo_entry->normal_item_attr); + break; } if (tag_data == popup->prelight && @@ -767,19 +767,34 @@ gimp_tag_popup_list_expose (GtkWidget *widget, pango_layout_set_attributes (popup->layout, attributes); pango_attr_list_unref (attributes); - if (popup->tag_data[i].state == GTK_STATE_SELECTED) + if (tag_data->state == GTK_STATE_SELECTED) { - gdk_draw_rectangle (window, gc, FALSE, + gdk_draw_line (window, gc, + tag_data->bounds.x, + tag_data->bounds.y - popup->scroll_y - 1, + tag_data->bounds.x + tag_data->bounds.width - 1, + tag_data->bounds.y - popup->scroll_y - 1); + + gdk_draw_rectangle (window, gc, TRUE, tag_data->bounds.x - 1, - tag_data->bounds.y - popup->scroll_y + 1, - tag_data->bounds.width + 2, - tag_data->bounds.height - 2); + tag_data->bounds.y - popup->scroll_y, + tag_data->bounds.width + 2, + tag_data->bounds.height); + + gdk_draw_line (window, gc, + tag_data->bounds.x, + tag_data->bounds.y - popup->scroll_y + tag_data->bounds.height, + tag_data->bounds.x + tag_data->bounds.width - 1, + tag_data->bounds.y - popup->scroll_y + tag_data->bounds.height); } pango_renderer_draw_layout (renderer, popup->layout, - tag_data->bounds.x * PANGO_SCALE, + (tag_data->bounds.x + + GIMP_TAG_POPUP_PADDING) * PANGO_SCALE + + GIMP_TAG_POPUP_PADDING, (tag_data->bounds.y - - popup->scroll_y) * PANGO_SCALE); + popup->scroll_y + + GIMP_TAG_POPUP_PADDING) * PANGO_SCALE); if (tag_data == popup->prelight && tag_data->state != GTK_STATE_INSENSITIVE && From 4699152a4f77c7de89e472b113f91c701db47afa Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 03:40:44 +0200 Subject: [PATCH 17/70] Remove useless member "ignore_button_release" --- app/widgets/gimptagpopup.c | 3 --- app/widgets/gimptagpopup.h | 1 - 2 files changed, 4 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 85e8d88e13..f4eb976b17 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -664,8 +664,6 @@ gimp_tag_popup_border_event (GtkWidget *widget, x = motion_event->x + widget->allocation.x; y = motion_event->y + widget->allocation.y; - popup->ignore_button_release = FALSE; - gimp_tag_popup_handle_scrolling (popup, x, y, popup->timeout_id == 0, TRUE); } @@ -676,7 +674,6 @@ gimp_tag_popup_border_event (GtkWidget *widget, popup->single_select_disabled = TRUE; if (button_event->window == widget->window && - ! popup->ignore_button_release && gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index 1ed01a0b22..b6adb54c21 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -54,7 +54,6 @@ struct _GimpTagPopup gint scroll_arrow_height; gboolean scroll_fast; gboolean arrows_visible; - gboolean ignore_button_release; gboolean upper_arrow_prelight; gboolean lower_arrow_prelight; gboolean single_select_disabled; From e15e9c222d7074a1e7e0deff2989987d8dc35bb7 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 03:46:42 +0200 Subject: [PATCH 18/70] Some more cleanup and a fix of a tiny earlier cleanup glitch --- app/widgets/gimptagpopup.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index f4eb976b17..b0672c9e4b 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -830,9 +830,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, popup->single_select_disabled = TRUE; x = button_event->x; - y = button_event->y; - - y += popup->scroll_y; + y = button_event->y + popup->scroll_y; for (i = 0; i < popup->tag_count; i++) { @@ -857,9 +855,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, gint i; x = motion_event->x; - y = motion_event->y; - - y += popup->scroll_y; + y = motion_event->y + popup->scroll_y; for (i = 0; i < popup->tag_count; i++) { @@ -874,8 +870,9 @@ gimp_tag_popup_list_event (GtkWidget *widget, { popup->prelight = tag_data; gtk_widget_queue_draw (widget); - break; } + + break; } } } @@ -890,9 +887,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, popup->single_select_disabled = TRUE; x = button_event->x; - y = button_event->y; - - y += popup->scroll_y; + y = button_event->y + popup->scroll_y; for (i = 0; i < popup->tag_count; i++) { From bd00ac3891b0fb49c76fe868c6716a29912da975 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 04:10:57 +0200 Subject: [PATCH 19/70] More tag popup cleanup - reorder instance struct and add some spacing - rename member "timeout_id" to "scroll_timeout_id" - clean up constructor() even more (still the wrong place to do all these things) --- app/widgets/gimptagpopup.c | 112 ++++++++++++++++++++++--------------- app/widgets/gimptagpopup.h | 11 +++- 2 files changed, 74 insertions(+), 49 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index b0672c9e4b..d07224e10e 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -28,15 +28,15 @@ #include "widgets-types.h" #include "core/gimpcontainer.h" -#include "core/gimpfilteredcontainer.h" #include "core/gimpcontext.h" -#include "core/gimpviewable.h" +#include "core/gimpfilteredcontainer.h" #include "core/gimptag.h" #include "core/gimptagged.h" +#include "core/gimpviewable.h" +#include "gimpcombotagentry.h" #include "gimptagentry.h" #include "gimptagpopup.h" -#include "gimpcombotagentry.h" #include "gimp-intl.h" @@ -51,6 +51,11 @@ #define GIMP_TAG_POPUP_PADDING 2 #define GIMP_TAG_POPUP_LINE_SPACING 2 +enum +{ + PROP_0, + PROP_OWNER +}; struct _PopupTagData { @@ -60,13 +65,6 @@ struct _PopupTagData }; -enum -{ - PROP_0, - PROP_OWNER -}; - - static GObject* gimp_tag_popup_constructor (GType type, guint n_construct_params, GObjectConstructParam *construct_params); @@ -224,7 +222,7 @@ gimp_tag_popup_constructor (GType type, pango_layout_set_attributes (popup->layout, popup->combo_entry->normal_item_attr); - current_tags = gimp_tag_entry_parse_tags (GIMP_TAG_ENTRY (popup->combo_entry)); + current_tags = gimp_tag_entry_parse_tags (GIMP_TAG_ENTRY (popup->combo_entry)); current_count = g_strv_length (current_tags); container = GIMP_TAG_ENTRY (popup->combo_entry)->container; @@ -232,24 +230,31 @@ gimp_tag_popup_constructor (GType type, tag_hash = container->tag_ref_counts; tag_list = g_hash_table_get_keys (tag_hash); tag_list = g_list_sort (tag_list, gimp_tag_compare_func); + popup->tag_count = g_list_length (tag_list); - popup->tag_data = g_malloc (sizeof (PopupTagData) * popup->tag_count); - tag_iterator = tag_list; - for (i = 0; i < popup->tag_count; i++) + popup->tag_data = g_new0 (PopupTagData, popup->tag_count); + + for (i = 0, tag_iterator = tag_list; + i < popup->tag_count; + i++, tag_iterator = g_list_next (tag_iterator)) { - popup->tag_data[i].tag = GIMP_TAG (tag_iterator->data); - popup->tag_data[i].state = GTK_STATE_NORMAL; - list_tag = gimp_tag_get_name (popup->tag_data[i].tag); + PopupTagData *tag_data = &popup->tag_data[i]; + + tag_data->tag = tag_iterator->data; + tag_data->state = GTK_STATE_NORMAL; + + list_tag = gimp_tag_get_name (tag_data->tag); + for (j = 0; j < current_count; j++) { if (! strcmp (current_tags[j], list_tag)) { - popup->tag_data[i].state = GTK_STATE_SELECTED; + tag_data->state = GTK_STATE_SELECTED; break; } } - tag_iterator = g_list_next (tag_iterator); } + g_list_free (tag_list); g_strfreev (current_tags); @@ -268,21 +273,29 @@ gimp_tag_popup_constructor (GType type, popup); } - width = GTK_WIDGET (popup->combo_entry)->allocation.width - popup->frame->style->xthickness * 2; - height = gimp_tag_popup_layout_tags (popup, width); + width = (GTK_WIDGET (popup->combo_entry)->allocation.width - + 2 * popup->frame->style->xthickness); + height = (gimp_tag_popup_layout_tags (popup, width) + + 2 * popup->frame->style->ythickness); + gdk_window_get_origin (GTK_WIDGET (popup->combo_entry)->window, &x, &y); + max_height = GTK_WIDGET (popup->combo_entry)->allocation.height * 7; + screen_height = gdk_screen_get_height (gtk_widget_get_screen (GTK_WIDGET (popup->combo_entry))); - height += popup->frame->style->ythickness * 2; + popup_height = height; - popup_rects[0].x = x; - popup_rects[0].y = 0; - popup_rects[0].width = GTK_WIDGET (popup->combo_entry)->allocation.width; + + popup_rects[0].x = x; + popup_rects[0].y = 0; + popup_rects[0].width = GTK_WIDGET (popup->combo_entry)->allocation.width; popup_rects[0].height = y + GTK_WIDGET (popup->combo_entry)->allocation.height; - popup_rects[1].x = popup_rects[0].x; - popup_rects[1].y = y; - popup_rects[1].width = popup_rects[0].width; + + popup_rects[1].x = popup_rects[0].x; + popup_rects[1].y = y; + popup_rects[1].width = popup_rects[0].width; popup_rects[1].height = screen_height - popup_rects[0].height; + if (popup_rects[0].height >= popup_height) { popup_rect = popup_rects[0]; @@ -299,20 +312,25 @@ gimp_tag_popup_constructor (GType type, if (popup_rects[0].height >= popup_rects[1].height) { popup_rect = popup_rects[0]; - popup_rect.y += popup->scroll_arrow_height + popup->frame->style->ythickness; + popup_rect.y += (popup->scroll_arrow_height + + popup->frame->style->ythickness); } else { popup_rect = popup_rects[1]; - popup_rect.y -= popup->scroll_arrow_height + popup->frame->style->ythickness; + popup_rect.y -= (popup->scroll_arrow_height + + popup->frame->style->ythickness); } - popup->arrows_visible = TRUE; + popup->arrows_visible = TRUE; popup->upper_arrow_state = GTK_STATE_INSENSITIVE; + gtk_alignment_set_padding (GTK_ALIGNMENT (popup->alignment), popup->scroll_arrow_height + 2, popup->scroll_arrow_height + 2, 0, 0); - popup_height = popup_rect.height - popup->scroll_arrow_height * 2 + 4; + + popup_height = popup_rect.height - 2 * popup->scroll_arrow_height + 4; + popup->scroll_height = height - popup_rect.height; popup->scroll_y = 0; popup->scroll_step = 0; @@ -665,7 +683,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, y = motion_event->y + widget->allocation.y; gimp_tag_popup_handle_scrolling (popup, x, y, - popup->timeout_id == 0, TRUE); + popup->scroll_timeout_id == 0, TRUE); } else if (event->type == GDK_BUTTON_RELEASE) { @@ -1050,10 +1068,10 @@ gimp_tag_popup_scroll_timeout (gpointer data) static void gimp_tag_popup_remove_scroll_timeout (GimpTagPopup *popup) { - if (popup->timeout_id) + if (popup->scroll_timeout_id) { - g_source_remove (popup->timeout_id); - popup->timeout_id = 0; + g_source_remove (popup->scroll_timeout_id); + popup->scroll_timeout_id = 0; } } @@ -1073,9 +1091,10 @@ gimp_tag_popup_scroll_timeout_initial (gpointer data) gimp_tag_popup_remove_scroll_timeout (popup); - popup->timeout_id = gdk_threads_add_timeout (timeout, - gimp_tag_popup_scroll_timeout, - popup); + popup->scroll_timeout_id = + gdk_threads_add_timeout (timeout, + gimp_tag_popup_scroll_timeout, + popup); return FALSE; } @@ -1093,9 +1112,10 @@ gimp_tag_popup_start_scrolling (GimpTagPopup *popup) gimp_tag_popup_do_timeout_scroll (popup, touchscreen_mode); - popup->timeout_id = gdk_threads_add_timeout (timeout, - gimp_tag_popup_scroll_timeout_initial, - popup); + popup->scroll_timeout_id = + gdk_threads_add_timeout (timeout, + gimp_tag_popup_scroll_timeout_initial, + popup); } static void @@ -1216,7 +1236,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { if (enter && popup->upper_arrow_prelight) { - if (popup->timeout_id == 0) + if (popup->scroll_timeout_id == 0) { gimp_tag_popup_remove_scroll_timeout (popup); popup->scroll_step = -MENU_SCROLL_STEP2; /* always fast */ @@ -1253,7 +1273,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, popup->scroll_step = (scroll_fast ? -MENU_SCROLL_STEP2 : -MENU_SCROLL_STEP1); - popup->timeout_id = + popup->scroll_timeout_id = gdk_threads_add_timeout (scroll_fast ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1, @@ -1317,7 +1337,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { if (enter && popup->lower_arrow_prelight) { - if (popup->timeout_id == 0) + if (popup->scroll_timeout_id == 0) { gimp_tag_popup_remove_scroll_timeout (popup); popup->scroll_step = MENU_SCROLL_STEP2; /* always fast */ @@ -1354,7 +1374,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, popup->scroll_step = (scroll_fast ? MENU_SCROLL_STEP2 : MENU_SCROLL_STEP1); - popup->timeout_id = + popup->scroll_timeout_id = gdk_threads_add_timeout (scroll_fast ? MENU_SCROLL_TIMEOUT2 : MENU_SCROLL_TIMEOUT1, diff --git a/app/widgets/gimptagpopup.h b/app/widgets/gimptagpopup.h index b6adb54c21..84ee54731d 100644 --- a/app/widgets/gimptagpopup.h +++ b/app/widgets/gimptagpopup.h @@ -38,16 +38,22 @@ struct _GimpTagPopup GtkWindow parent_instance; GimpComboTagEntry *combo_entry; + GtkWidget *frame; GtkWidget *alignment; GtkWidget *tag_area; PangoContext *context; PangoLayout *layout; + PopupTagData *tag_data; - PopupTagData *prelight; gint tag_count; - guint timeout_id; + + PopupTagData *prelight; + + gboolean single_select_disabled; + + guint scroll_timeout_id; gint scroll_height; gint scroll_y; gint scroll_step; @@ -56,7 +62,6 @@ struct _GimpTagPopup gboolean arrows_visible; gboolean upper_arrow_prelight; gboolean lower_arrow_prelight; - gboolean single_select_disabled; GtkStateType upper_arrow_state; GtkStateType lower_arrow_state; }; From 5a26780ed9c06f91eaf33903c34710a48d55d8ca Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 04:20:54 +0200 Subject: [PATCH 20/70] Fix tiny miscalculation of the tag name rendering position --- app/widgets/gimptagpopup.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index d07224e10e..086133dfee 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -805,12 +805,22 @@ gimp_tag_popup_list_expose (GtkWidget *widget, pango_renderer_draw_layout (renderer, popup->layout, (tag_data->bounds.x + - GIMP_TAG_POPUP_PADDING) * PANGO_SCALE + - GIMP_TAG_POPUP_PADDING, + GIMP_TAG_POPUP_PADDING) * PANGO_SCALE, (tag_data->bounds.y - popup->scroll_y + GIMP_TAG_POPUP_PADDING) * PANGO_SCALE); +#if 0 + gtk_paint_layout (style, window, + tag_data->state, + TRUE, + &event->area, widget, NULL, + tag_data->bounds.x + GIMP_TAG_POPUP_PADDING, + tag_data->bounds.y - popup->scroll_y + + GIMP_TAG_POPUP_PADDING, + popup->layout); +#endif + if (tag_data == popup->prelight && tag_data->state != GTK_STATE_INSENSITIVE && ! popup->single_select_disabled) From 25a8a9ea9f967f063e4028e66e66b09e42de3703 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 04:31:53 +0200 Subject: [PATCH 21/70] Factor out tag hit detection into a utility function --- app/widgets/gimptagpopup.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 086133dfee..4c13b659f2 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -89,6 +89,9 @@ static gboolean gimp_tag_popup_border_event (GtkWidget *widg static gboolean gimp_tag_popup_list_event (GtkWidget *widget, GdkEvent *event, GimpTagPopup *popup); +static gboolean gimp_tag_popup_is_in_tag (PopupTagData *tag_data, + gint x, + gint y); static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data); static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged, @@ -864,10 +867,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, { PopupTagData *tag_data = &popup->tag_data[i]; - if (x >= tag_data->bounds.x && - y >= tag_data->bounds.y && - x < tag_data->bounds.x + tag_data->bounds.width && - y < tag_data->bounds.y + tag_data->bounds.height) + if (gimp_tag_popup_is_in_tag (tag_data, x, y)) { gimp_tag_popup_toggle_tag (popup, tag_data); gtk_widget_queue_draw (widget); @@ -889,10 +889,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, { PopupTagData *tag_data = &popup->tag_data[i]; - if (x >= tag_data->bounds.x && - y >= tag_data->bounds.y && - x < tag_data->bounds.x + tag_data->bounds.width && - y < tag_data->bounds.y + tag_data->bounds.height) + if (gimp_tag_popup_is_in_tag (tag_data, x, y)) { if (popup->prelight != tag_data) { @@ -921,10 +918,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, { PopupTagData *tag_data = &popup->tag_data[i]; - if (x >= tag_data->bounds.x && - y >= tag_data->bounds.y && - x < tag_data->bounds.x + tag_data->bounds.width && - y < tag_data->bounds.y + tag_data->bounds.height) + if (gimp_tag_popup_is_in_tag (tag_data, x, y)) { gimp_tag_popup_toggle_tag (popup, tag_data); gtk_widget_destroy (GTK_WIDGET (popup)); @@ -936,6 +930,22 @@ gimp_tag_popup_list_event (GtkWidget *widget, return FALSE; } +static gboolean +gimp_tag_popup_is_in_tag (PopupTagData *tag_data, + gint x, + gint y) +{ + if (x >= tag_data->bounds.x && + y >= tag_data->bounds.y && + x < tag_data->bounds.x + tag_data->bounds.width && + y < tag_data->bounds.y + tag_data->bounds.height) + { + return TRUE; + } + + return FALSE; +} + static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data) From 48bc1d1ced9b0fd886a5d7d22e652c5812217ba7 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 12:39:13 +0200 Subject: [PATCH 22/70] Remove more obsolete variables and indentation levels --- app/widgets/gimptagpopup.c | 113 ++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 58 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 4c13b659f2..a1a48f7eee 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -564,81 +564,75 @@ gimp_tag_popup_border_expose (GtkWidget *widget, GdkEventExpose *event, GimpTagPopup *popup) { - GdkGC *gc; - GdkRectangle border; - GdkRectangle upper; - GdkRectangle lower; - gint arrow_space; + GdkRectangle border; + GdkRectangle upper; + GdkRectangle lower; + gint arrow_space; + gint arrow_size; if (event->window != widget->window) return FALSE; - gc = gdk_gc_new (GDK_DRAWABLE (widget->window)); - get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space); - if (event->window == widget->window) + arrow_size = 0.7 * arrow_space; + + gtk_paint_box (widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + &event->area, widget, "menu", + 0, 0, -1, -1); + + if (popup->arrows_visible) { - gint arrow_size = 0.7 * arrow_space; + /* upper arrow */ gtk_paint_box (widget->style, widget->window, - GTK_STATE_NORMAL, + popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", - 0, 0, -1, -1); + upper.x, + upper.y, + upper.width, + upper.height); - if (popup->arrows_visible) - { - gtk_paint_box (widget->style, - widget->window, - popup->upper_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu", - upper.x, - upper.y, - upper.width, - upper.height); + gtk_paint_arrow (widget->style, + widget->window, + popup->upper_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu_scroll_arrow_up", + GTK_ARROW_UP, + TRUE, + upper.x + (upper.width - arrow_size) / 2, + upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + arrow_size, arrow_size); - gtk_paint_arrow (widget->style, - widget->window, - popup->upper_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu_scroll_arrow_up", - GTK_ARROW_UP, - TRUE, - upper.x + (upper.width - arrow_size) / 2, - upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, - arrow_size, arrow_size); - } + /* lower arrow */ - if (popup->arrows_visible) - { - gtk_paint_box (widget->style, - widget->window, - popup->lower_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu", - lower.x, - lower.y, - lower.width, - lower.height); + gtk_paint_box (widget->style, + widget->window, + popup->lower_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu", + lower.x, + lower.y, + lower.width, + lower.height); - gtk_paint_arrow (widget->style, - widget->window, - popup->lower_arrow_state, - GTK_SHADOW_OUT, - &event->area, widget, "menu_scroll_arrow_down", - GTK_ARROW_DOWN, - TRUE, - lower.x + (lower.width - arrow_size) / 2, - lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, - arrow_size, arrow_size); - } + gtk_paint_arrow (widget->style, + widget->window, + popup->lower_arrow_state, + GTK_SHADOW_OUT, + &event->area, widget, "menu_scroll_arrow_down", + GTK_ARROW_DOWN, + TRUE, + lower.x + (lower.width - arrow_size) / 2, + lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + arrow_size, arrow_size); } - g_object_unref (gc); - return FALSE; } @@ -709,6 +703,9 @@ gimp_tag_popup_border_event (GtkWidget *widget, } else if (event->type == GDK_KEY_PRESS) { + gtk_grab_remove (widget); + gdk_display_pointer_ungrab (gtk_widget_get_display (widget), + GDK_CURRENT_TIME); gtk_widget_destroy (GTK_WIDGET (popup)); } else if (event->type == GDK_SCROLL) @@ -741,9 +738,9 @@ gimp_tag_popup_list_expose (GtkWidget *widget, GtkStyle *style = gtk_widget_get_style (widget); GdkGC *gc; PangoRenderer *renderer; - gint i; PangoAttribute *attribute; PangoAttrList *attributes; + gint i; renderer = gdk_pango_renderer_get_default (gtk_widget_get_screen (widget)); gdk_pango_renderer_set_gc (GDK_PANGO_RENDERER (renderer), From 7171dad36401fb866fa62488127d2beddf545292 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 10 Jul 2009 13:41:51 +0200 Subject: [PATCH 23/70] Tag popup scrolling cleanup - artificially limit the popup's height again so scrolling gets some testing. - make sure the scroll buttons' sensitivity is always correct. - remove obsolete utility function and other cleanups. --- app/widgets/gimptagpopup.c | 87 +++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index a1a48f7eee..f26032df74 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -98,8 +98,6 @@ static void gimp_tag_popup_check_can_toggle (GimpTagged *tagg GimpTagPopup *popup); static gint gimp_tag_popup_layout_tags (GimpTagPopup *popup, gint width); -static void gimp_tag_popup_do_timeout_scroll (GimpTagPopup *popup, - gboolean touchscreen_mode); static gboolean gimp_tag_popup_scroll_timeout (gpointer data); static void gimp_tag_popup_remove_scroll_timeout (GimpTagPopup *popup); static gboolean gimp_tag_popup_scroll_timeout_initial (gpointer data); @@ -283,18 +281,18 @@ gimp_tag_popup_constructor (GType type, gdk_window_get_origin (GTK_WIDGET (popup->combo_entry)->window, &x, &y); - max_height = GTK_WIDGET (popup->combo_entry)->allocation.height * 7; + max_height = GTK_WIDGET (popup->combo_entry)->allocation.height * 10; screen_height = gdk_screen_get_height (gtk_widget_get_screen (GTK_WIDGET (popup->combo_entry))); - popup_height = height; + popup_height = MIN (height, max_height); popup_rects[0].x = x; popup_rects[0].y = 0; popup_rects[0].width = GTK_WIDGET (popup->combo_entry)->allocation.width; popup_rects[0].height = y + GTK_WIDGET (popup->combo_entry)->allocation.height; - popup_rects[1].x = popup_rects[0].x; + popup_rects[1].x = x; popup_rects[1].y = y; popup_rects[1].width = popup_rects[0].width; popup_rects[1].height = screen_height - popup_rects[0].height; @@ -325,6 +323,11 @@ gimp_tag_popup_constructor (GType type, popup->frame->style->ythickness); } + popup_height = popup_rect.height; + } + + if (popup_height < height) + { popup->arrows_visible = TRUE; popup->upper_arrow_state = GTK_STATE_INSENSITIVE; @@ -332,7 +335,7 @@ gimp_tag_popup_constructor (GType type, popup->scroll_arrow_height + 2, popup->scroll_arrow_height + 2, 0, 0); - popup_height = popup_rect.height - 2 * popup->scroll_arrow_height + 4; + popup_height -= 2 * popup->scroll_arrow_height + 4; popup->scroll_height = height - popup_rect.height; popup->scroll_y = 0; @@ -674,13 +677,15 @@ gimp_tag_popup_border_event (GtkWidget *widget, else if (event->type == GDK_MOTION_NOTIFY) { GdkEventMotion *motion_event = (GdkEventMotion *) event; - gint x, y; - x = motion_event->x + widget->allocation.x; - y = motion_event->y + widget->allocation.y; + if (motion_event->window == widget->window) + { + gint x = motion_event->x + widget->allocation.x; + gint y = motion_event->y + widget->allocation.y; - gimp_tag_popup_handle_scrolling (popup, x, y, - popup->scroll_timeout_id == 0, TRUE); + gimp_tag_popup_handle_scrolling (popup, x, y, + popup->scroll_timeout_id == 0, TRUE); + } } else if (event->type == GDK_BUTTON_RELEASE) { @@ -706,7 +711,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, gtk_grab_remove (widget); gdk_display_pointer_ungrab (gtk_widget_get_display (widget), GDK_CURRENT_TIME); - gtk_widget_destroy (GTK_WIDGET (popup)); + gtk_widget_destroy (widget); } else if (event->type == GDK_SCROLL) { @@ -1077,7 +1082,7 @@ gimp_tag_popup_scroll_timeout (gpointer data) "gtk-touchscreen-mode", &touchscreen_mode, NULL); - gimp_tag_popup_do_timeout_scroll (popup, touchscreen_mode); + gimp_tag_popup_scroll_by (popup, popup->scroll_step); return TRUE; } @@ -1104,7 +1109,7 @@ gimp_tag_popup_scroll_timeout_initial (gpointer data) "gtk-touchscreen-mode", &touchscreen_mode, NULL); - gimp_tag_popup_do_timeout_scroll (popup, touchscreen_mode); + gimp_tag_popup_scroll_by (popup, popup->scroll_step); gimp_tag_popup_remove_scroll_timeout (popup); @@ -1127,7 +1132,7 @@ gimp_tag_popup_start_scrolling (GimpTagPopup *popup) "gtk-touchscreen-mode", &touchscreen_mode, NULL); - gimp_tag_popup_do_timeout_scroll (popup, touchscreen_mode); + gimp_tag_popup_scroll_by (popup, popup->scroll_step); popup->scroll_timeout_id = gdk_threads_add_timeout (timeout, @@ -1157,42 +1162,53 @@ static void gimp_tag_popup_scroll_by (GimpTagPopup *popup, gint step) { - gint new_scroll_y = popup->scroll_y + step; + GtkStateType arrow_state; + gint new_scroll_y = popup->scroll_y + step; + + arrow_state = popup->upper_arrow_state; if (new_scroll_y < 0) { new_scroll_y = 0; - if (popup->upper_arrow_state != GTK_STATE_INSENSITIVE) - { - gimp_tag_popup_stop_scrolling (popup); - gtk_widget_queue_draw (GTK_WIDGET (popup)); - } + if (arrow_state != GTK_STATE_INSENSITIVE) + gimp_tag_popup_stop_scrolling (popup); - popup->upper_arrow_state = GTK_STATE_INSENSITIVE; + arrow_state = GTK_STATE_INSENSITIVE; } else { - popup->upper_arrow_state = (popup->upper_arrow_prelight ? - GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); + arrow_state = (popup->upper_arrow_prelight ? + GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); } + if (arrow_state != popup->upper_arrow_state) + { + popup->upper_arrow_state = arrow_state; + gtk_widget_queue_draw (GTK_WIDGET (popup)); + } + + arrow_state = popup->lower_arrow_state; + if (new_scroll_y >= popup->scroll_height) { new_scroll_y = popup->scroll_height - 1; - if (popup->lower_arrow_state != GTK_STATE_INSENSITIVE) - { - gimp_tag_popup_stop_scrolling (popup); - gtk_widget_queue_draw (GTK_WIDGET (popup)); - } + if (arrow_state != GTK_STATE_INSENSITIVE) + gimp_tag_popup_stop_scrolling (popup); - popup->lower_arrow_state = GTK_STATE_INSENSITIVE; + arrow_state = GTK_STATE_INSENSITIVE; } else { - popup->lower_arrow_state = (popup->lower_arrow_prelight ? - GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); + arrow_state = (popup->lower_arrow_prelight ? + GTK_STATE_PRELIGHT : GTK_STATE_NORMAL); + } + + if (arrow_state != popup->lower_arrow_state) + { + popup->lower_arrow_state = arrow_state; + gtk_widget_queue_draw (GTK_WIDGET (popup)); } if (new_scroll_y != popup->scroll_y) @@ -1203,13 +1219,6 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, } } -static void -gimp_tag_popup_do_timeout_scroll (GimpTagPopup *popup, - gboolean touchscreen_mode) -{ - gimp_tag_popup_scroll_by (popup, popup->scroll_step); -} - static void gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, gint x, From 8402ed35408fe2bdc854c6f8fd4cc5e7f41b5e49 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Fri, 10 Jul 2009 22:37:44 +0200 Subject: [PATCH 24/70] Start updating NEWS for 2.7.0 Update NEWS with changes up to and including 2009-02-28. --- NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/NEWS b/NEWS index 35830d2dd5..ccfc8f756f 100644 --- a/NEWS +++ b/NEWS @@ -2,3 +2,51 @@ GNU Image Manipulation Program Development Branch ------------------------------ + +This is the unstable development branch of GIMP. Here we are working +towards the next stable release, which will be GIMP 2.8. + + +Changes in GIMP 2.7.0 +===================== + +Core: + - Ported the projection code to GEGL, i.e. the code that composes a + single image from a stack of layers + - Arrange layer modes into more logical and useful groups + - Port layer modes to GEGL + - Rearrange leagcy layer mode code to increase maintainability + - New docks are created at the pointer position + - Allow to benchmark projectino performance with + File->Debug->Benchmark Projection + - Clean up and merge infrastructure code from the GSoC 2006 Vector + Layer branch + - Clean up and merge on-canvas text editing code from the GSoC 2008 + On-Canvas Text Editing branch + - Move 'Text along path' from tool options to text context menu + - Refactor the layer stack code to more easily allow nesting of + layers aka layer groups later + - Show selection position and size in the Pointer dockable + - Merge support for tagging and tag-based selection of resources such + as brushes from the GSoC 2008 Tagging of Resources branch + - Add support for printing crop marks for images + - Smooth painting strokes with Catmull-Rom Spline based event + interpolation + - Port the floating selection code to GEGL + - Prepare better and more intuitive handling of the floating + selection + - Support rotation of brushes + - Add more capabilities to brush dynamics such as based on tilt + - Add File->Debug->Show Image Graph that show the GEGL graph of an + image + +Plug-ins: + - Map the 'Linear Dodge' layer mode in PSD files to the 'Addition' + layer mode in GIMP + +General: + - Changed licence to GPLv3+ and LGPLv3+ + - Lots of bugfixes and cleanups... + + +** These are changes up to and including 2009-02-28 ** From 065bb5dfbb85e59fd5c5136541ea8cdbdeacecda Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 09:42:53 +0200 Subject: [PATCH 25/70] Update NEWS for 2.7.0 Update NEWS will all changes up until now. --- NEWS | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index ccfc8f756f..ea9277fd1f 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ Changes in GIMP 2.7.0 ===================== Core: + - Ported the projection code to GEGL, i.e. the code that composes a single image from a stack of layers - Arrange layer modes into more logical and useful groups @@ -36,17 +37,30 @@ Core: - Prepare better and more intuitive handling of the floating selection - Support rotation of brushes - - Add more capabilities to brush dynamics such as based on tilt + - Allow brush dynamics to depend on tilt - Add File->Debug->Show Image Graph that show the GEGL graph of an image + - Add diagonal guides to the Crop Tool + - Drop support for the GnomeVFS file-uri backend + - Add aspect ratio to brush dynamics + - Allow to dump keyboard shortucts ith File->Debug->Dump Keyboard + Shortcuts + - Separate the activites of saving and exporting images + - Add status bar feedback for keyboard changes to brush paramaters + - Add a simple parser to size entry widgets + - Change default shortcuts for "Shrink Wrap" and "Fit in Window" to + Ctrl+R and Ctrl+Shift+R respectively since the previous shortcuts + are now used for the save+export Plug-ins: + - Map the 'Linear Dodge' layer mode in PSD files to the 'Addition' layer mode in GIMP + - Add JPEG2000 load plug-in + - Add X11 mouse cursor plug-in + - Add support for loading 16bit (RGB565) raw data General: + - Changed licence to GPLv3+ and LGPLv3+ - Lots of bugfixes and cleanups... - - -** These are changes up to and including 2009-02-28 ** From 8d041426342fe488f9da16043dd0b08ead8e69ae Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 09:45:57 +0200 Subject: [PATCH 26/70] Update README Update README with more generic version references. --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 3fa76d17b9..d8d8fe95a4 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ GIMP 2.7 replaces earlier GIMP 2.x versions. It is advised that you uninstall them before installing GIMP 2.7. If you want to keep your older GIMP 2.x installation in parallel to GIMP 2.7, you have to choose a separate prefix which is not in your default library search -path. Otherwise your GIMP 2.4 or GIMP 2.2 installation will start to -use the new libraries. You have been warned. +path. Otherwise your prevoius GIMP installation will start to use the +new libraries. You have been warned. If you think you found a bug in this version, please make sure that it hasn't been reported earlier and that it is not just new stuff that is From d9b783764112b9cfe9a506ac4eff5115761157f1 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 12:06:18 +0200 Subject: [PATCH 27/70] Update authors.xml for 2.7.0 Update authors.xml for 2.7.0 and autogenerate AUTHORS. --- AUTHORS | 16 +++++++++++++ authors.xml | 69 ++++++++++++++++++++++++++++++++--------------------- 2 files changed, 58 insertions(+), 27 deletions(-) diff --git a/AUTHORS b/AUTHORS index d09c4cde11..b89ea15d74 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,10 +9,12 @@ GIMP was originally written by: The following people have contributed code to GIMP: Lauri Alanko + Fredrik Alströmer Shawn Amundson Sven Anders Henrik Brix Andersen Karl-Johan Andersson + Rob Antonishen Nicola Archibald Luis Barrancos John Beale @@ -21,6 +23,7 @@ The following people have contributed code to GIMP: Marc Bless Edward Blevins Reagan Blundell + Hendrik Boom Xavier Bouchoux Roberto Boyd Stanislav Brabec @@ -32,6 +35,7 @@ The following people have contributed code to GIMP: Francisco Bustamante Albert Cahalan George J. Carrette + Marco Ciampa Sean Cier Winston Chang Stephane Chauveau @@ -49,6 +53,7 @@ The following people have contributed code to GIMP: Brian Degenhardt Karine Delvare Andreas Dilger + Nicholas Doyle Austin Donnelly Scott Draves Daniel Dunbar @@ -79,6 +84,7 @@ The following people have contributed code to GIMP: Saul Goode David Gowers Cameron Gregory + Stephen Griffiths Pavel Grinfeld Dov Grobgeld Michael Hammel @@ -86,6 +92,7 @@ The following people have contributed code to GIMP: Robert Helgesson James Henstridge Eric Hernes + Lukasz Hladowski David Hodson Christoph Hoegl Wolfgang Hofer @@ -96,6 +103,7 @@ The following people have contributed code to GIMP: Ben Jackson Tim Janik Kristian Jantz + Tim Jedlicka Róman Joost Geert Jordaens Aurimas Juška @@ -135,6 +143,7 @@ The following people have contributed code to GIMP: John Marshall Kelly Martin Torsten Martinsen + Takeshi Matsuyama Gordon Matzigkeit Gregory McLean Federico Mena Quintero @@ -145,6 +154,7 @@ The following people have contributed code to GIMP: Chris Mohler Chris Moller David Monniaux + Christopher Montgomery Tim Mooney Adam D Moss Balazs Nagy @@ -155,6 +165,7 @@ The following people have contributed code to GIMP: David Neary David Necas Sven Neumann + Andreas Neustifter Stephen Robert Norris Tim Newsome Martin Nordholts @@ -182,6 +193,7 @@ The following people have contributed code to GIMP: James Robinson Stefan Röllin Guillermo S. Romero + Marco Rossini Tim Rowley Mike Schaeffer John Schlag @@ -205,6 +217,7 @@ The following people have contributed code to GIMP: Nathan Summers Mike Sweet Eiichi Takamori + Tal Tristan Tarrant Michael Taylor Owen Taylor @@ -212,6 +225,8 @@ The following people have contributed code to GIMP: Andy Thomas Patrice Tremblay Kevin Turner + Andreas Turtschan + Massimo Valentini Brion Vibber Helvetix Victorinox Rebecca Walter @@ -224,6 +239,7 @@ The following people have contributed code to GIMP: Karl Günter Wünsch Yoshinori Yamakawa Shirasaki Yasuhiro + Simon Zilliken The following people have contributed art to GIMP: diff --git a/authors.xml b/authors.xml index 865cd85518..91a5e14f0b 100644 --- a/authors.xml +++ b/authors.xml @@ -12,11 +12,13 @@ Peter Mattis Lauri Alanko + Fredrik Alströmer Shawn Amundson Sven Anders Henrik Brix Andersen Karl-Johan Andersson Ignacio AntI + Rob Antonishen Nicola Archibald Luis Barrancos John Beale @@ -26,12 +28,13 @@ Marc Bless Edward Blevins Reagan Blundell + Hendrik Boom Xavier Bouchoux Roberto Boyd Stanislav Brabec Hans Breuer Simon Budig - João S. O. Bueno + João S. O. Bueno Carey Bunks Seth Burgess Brent Burton @@ -39,32 +42,33 @@ Albert Cahalan Lapo Calamandrei George J. Carrette - Marco Ciampa + Marco Ciampa Sean Cier - Winston Chang + Winston Chang Stephane Chauveau Zbigniew Chyla - Lars-Peter Clausen + Lars-Peter Clausen Branko Collin Ed Connel Piers Cornwell David Costanzo Daniel Cotting Jay Cox - Kevin Cozens + Kevin Cozens Paul Davey Michael Deal - Alexia Death + Alexia Death Brian Degenhardt Karine Delvare Aurore Derriennic Andreas Dilger + Nicholas Doyle Austin Donnelly Scott Draves Daniel Dunbar Dust Misha Dynin - Daniel Eddeland + Daniel Eddeland Daniel Egger Ulf-D. Ehlert Morton Eriksen @@ -92,6 +96,7 @@ Saul Goode David Gowers Cameron Gregory + Stephen Griffiths Pavel Grinfeld Dov Grobgeld Michael Hammel @@ -100,27 +105,29 @@ Robert Helgesson James Henstridge Eric Hernes + Lukasz Hladowski David Hodson Christoph Hoegl Wolfgang Hofer Alan Horkan - Daniel Hornung + Daniel Hornung Jan Hubička - Barak Itkin + Barak Itkin Ben Jackson Simon Janes Tim Janik Kristian Jantz - Róman Joost + Tim Jedlicka + Róman Joost Hans de Jonge Geert Jordaens - Aurimas Juška + Aurimas Juška Andrew Kieschnick Peter Kirchgessner Philipp Klaus David Koblas Daniel Kobras - Øyvind Kolås + Øyvind Kolås Robert L Krawitz Semka Kuloviæ-Debals Tuomas Kuosmanen @@ -129,7 +136,7 @@ Karl La Rocca Philip Lafleur Chris Lahey - Eric Lamarque + Eric Lamarque Nick Lamb Marco Lamberto Jens Lautenbacher @@ -143,19 +150,20 @@ Raph Levien Wing Tung Leung Adrian Likins - Tor Lillqvist + Tor Lillqvist Jean-Pierre Litzler Vitaly Lomov Ingo Lütkebohle Josh MacDonald Ed Mackey Vidar Madsen - Luidnel Maignan + Luidnel Maignan Ian Main Kjartan Maraas John Marshall Kelly Martin Torsten Martinsen + Takeshi Matsuyama Gordon Matzigkeit Gregory McLean Federico Mena Quintero @@ -166,39 +174,41 @@ Chris Mohler Chris Moller David Monniaux + Christopher Montgomery Tim Mooney Adam D Moss Balazs Nagy Yukihiro Nakai Shuji Narazaki Felix Natter - Michael Natterer + Michael Natterer David Neary David Necas - Sven Neumann + Sven Neumann + Andreas Neustifter Andreas Nilsson Stephen Robert Norris Tim Newsome - Martin Nordholts + Martin Nordholts Erik Nygren Miles O'Neal - David Odin + David Odin Robert Ögren Thom van Os Garry R. Osgood Alan Paeth Jay Painter Ville Pätsi - Akkana Peck + Akkana Peck Pierre Perrier Asbjorn Pettersen Mike Phillips - Nils Philippsen + Nils Philippsen Ari Pollak Alexandre Prokoudine Raphaël Quinet Manuel Quiñones - Dennis Ranke + Dennis Ranke Tom Rathborne Jens Restemeier Maurits Rijk @@ -207,21 +217,22 @@ James Robinson Stefan Röllin Guillermo S. Romero + Marco Rossini Tim Rowley Mike Schaeffer John Schlag Norbert Schmitz Thorsten Schnier Alexander Schulz - Michael Schumacher + Michael Schumacher Tracy Scott Craig Setera - Peter Sikking + Peter Sikking Ted Shaneyfelt Aaron Sherman Nickolay V. Shmyrev Jernej Simončič - Manish Singh + Manish Singh Mukund Sivaraman William Skaggs Daniel Skarda @@ -229,12 +240,13 @@ Carol Spears Adam Spiers Patrycja Stawiarska - Jakub Steiner + Jakub Steiner Kolbjørn Stuestøl Nathan Summers Mike Sweet William Szilveszter Eiichi Takamori + Tal Tristan Tarrant Michael Taylor Owen Taylor @@ -242,6 +254,8 @@ Andy Thomas Patrice Tremblay Kevin Turner + Andreas Turtschan + Massimo Valentini Brion Vibber Helvetix Victorinox Rebecca Walter @@ -253,6 +267,7 @@ Calvin Williamson Matthew Wilson Karl Günter Wünsch - Yoshinori Yamakawa + Yoshinori Yamakawa Shirasaki Yasuhiro + Simon Zilliken From 670a04668881fd65501a88389d901d6b72197a98 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 09:57:04 +0200 Subject: [PATCH 28/70] devel-docs: Add authors.xml to release-howto.txt --- devel-docs/release-howto.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devel-docs/release-howto.txt b/devel-docs/release-howto.txt index af0cedf3bc..9a84f6c62c 100644 --- a/devel-docs/release-howto.txt +++ b/devel-docs/release-howto.txt @@ -24,7 +24,7 @@ ( ) Do a complete build of the source tree. - ( ) Check if NEWS, README or INSTALL need to be updated. + ( ) Check if NEWS, authors.xml, README or INSTALL need to be updated. ( ) Does the splash screen need to be changed? From 1e7fd6cd27460a68550a323c31a8250a2ec7c734 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 12:07:21 +0200 Subject: [PATCH 29/70] app: Only show contributors for 2.8 in the about dialog --- app/dialogs/authors.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dialogs/authors.xsl b/app/dialogs/authors.xsl index b7a96375ea..4c6bf414d8 100644 --- a/app/dialogs/authors.xsl +++ b/app/dialogs/authors.xsl @@ -10,7 +10,7 @@ - + From 04349c8878ac2f9cc915b691b2b791c1b1518e9a Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 11:19:08 +0200 Subject: [PATCH 30/70] app: Put gimp-file.h in file/Makefile.am --- app/file/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/file/Makefile.am b/app/file/Makefile.am index 74edfb6358..34f05f045e 100644 --- a/app/file/Makefile.am +++ b/app/file/Makefile.am @@ -23,6 +23,6 @@ libappfile_a_SOURCES = \ file-save.h \ file-utils.c \ file-utils.h \ - gimpfile.h + gimp-file.h EXTRA_DIST = makefile.msc From ab48d9fe65d09ed030ee6a3d96d83ff42963cf8e Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 12:46:21 +0200 Subject: [PATCH 31/70] Regenerate gimprc --- docs/gimprc.5.in | 40 ++++++++++++++++++++++++++++++++++------ etc/gimprc | 33 +++++++++++++++++++++++++++++---- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 5df8588dc6..d54cabf72c 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -208,8 +208,8 @@ are yes and no. .TP (default-image - (width 640) - (height 400) + (width 610) + (height 377) (unit pixels) (xresolution 72.000000) (yresolution 72.000000) @@ -601,6 +601,30 @@ Sets the default settings for the image view. This is a parameter list. Sets the default settings used when an image is viewed in fullscreen mode. This is a parameter list. +.TP +(default-snap-to-guides yes) + +Snap to guides by default in new image windows. Possible values are yes and +no. + +.TP +(default-snap-to-grid no) + +Snap to the grid by default in new image windows. Possible values are yes and +no. + +.TP +(default-snap-to-canvas yes) + +Snap to the canvas edge by default in new image windows. Possible values are +yes and no. + +.TP +(default-snap-to-path no) + +Snap to the active path by default in new image windows. Possible values are +yes and no. + .TP (activate-on-focus yes) @@ -645,6 +669,12 @@ If enabled, the move tool sets the edited layer or path as active. This used to be the default behaviour in older versions. Possible values are yes and no. +.TP +(image-map-tool-max-recent 10) + +How many recent settings to keep around in color correction tools This is an +integer value. + .TP (trust-dirty-flag yes) @@ -788,7 +818,7 @@ Sets the browser used by the help system. Possible values are gimp and web-browser. .TP -(web-browser "firefox %s") +(web-browser "xdg-open %s") Sets the external web browser to be used. This can be an absolute path or the name of an executable to search for in the user's PATH. If the command @@ -802,7 +832,7 @@ When enabled, the online user manual will be used by the help system. Otherwise the locally installed copy is used. Possible values are yes and no. .TP -(user-manual-online-uri "http://docs.gimp.org/2.6") +(user-manual-online-uri "http://docs.gimp.org/2.7") The location of the online user manual. This is used if 'user-manual-online' is enabled. This is a string value. @@ -905,5 +935,3 @@ Per-user configuration file .SH "SEE ALSO" .BR gimp (1), -.BR gimptool (1), -.BR gimp\-remote (1) diff --git a/etc/gimprc b/etc/gimprc index 38519c3326..79f8cdb604 100644 --- a/etc/gimprc +++ b/etc/gimprc @@ -159,8 +159,8 @@ # Sets the default image in the "File/New" dialog. This is a parameter list. # # (default-image -# (width 640) -# (height 400) +# (width 610) +# (height 377) # (unit pixels) # (xresolution 72.000000) # (yresolution 72.000000) @@ -462,6 +462,26 @@ # (padding-mode default) # (padding-color (color-rgb 1.000000 1.000000 1.000000))) +# Snap to guides by default in new image windows. Possible values are yes +# and no. +# +# (default-snap-to-guides yes) + +# Snap to the grid by default in new image windows. Possible values are yes +# and no. +# +# (default-snap-to-grid no) + +# Snap to the canvas edge by default in new image windows. Possible values +# are yes and no. +# +# (default-snap-to-canvas yes) + +# Snap to the active path by default in new image windows. Possible values +# are yes and no. +# +# (default-snap-to-path no) + # 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". Possible values are yes and no. @@ -500,6 +520,11 @@ # # (move-tool-changes-active no) +# How many recent settings to keep around in color correction tools This is +# an integer value. +# +# (image-map-tool-max-recent 10) + # When enabled, GIMP will not save an image if it has not been changed since # it was opened. Possible values are yes and no. # @@ -625,7 +650,7 @@ # appended to the command with a space separating the two. This is a single # filename. # -# (web-browser "firefox %s") +# (web-browser "xdg-open %s") # When enabled, the online user manual will be used by the help system. # Otherwise the locally installed copy is used. Possible values are yes and @@ -636,7 +661,7 @@ # The location of the online user manual. This is used if # 'user-manual-online' is enabled. This is a string value. # -# (user-manual-online-uri "http://docs.gimp.org/2.6") +# (user-manual-online-uri "http://docs.gimp.org/2.7") # The window type hint that is set on the toolbox. This may affect how your # window manager decorates and handles the toolbox window. Possible values From f1b14dd6b72276ed8b222c43d10b9dc6703d6f4e Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sun, 12 Jul 2009 12:46:37 +0200 Subject: [PATCH 32/70] Update library .def files --- libgimp/gimp.def | 1 + libgimpwidgets/gimpwidgets.def | 1 + 2 files changed, 2 insertions(+) diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 09cee5cf67..d76f51a881 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -635,6 +635,7 @@ EXPORTS gimp_text_layer_get_line_spacing gimp_text_layer_get_text gimp_text_layer_new + gimp_text_layer_resize gimp_text_layer_set_antialias gimp_text_layer_set_base_direction gimp_text_layer_set_color diff --git a/libgimpwidgets/gimpwidgets.def b/libgimpwidgets/gimpwidgets.def index 4bd0770d49..e176eb66a8 100644 --- a/libgimpwidgets/gimpwidgets.def +++ b/libgimpwidgets/gimpwidgets.def @@ -122,6 +122,7 @@ EXPORTS gimp_dialog_run gimp_dialogs_show_help_button gimp_double_adjustment_update + gimp_eevl_evaluate gimp_enum_combo_box_get_type gimp_enum_combo_box_new gimp_enum_combo_box_new_with_model From 669d26ee39fbf5cf74e5efe0b16ed9b36b693605 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 12 Jul 2009 16:45:18 +0200 Subject: [PATCH 33/70] Move dialog destruction to a utility function --- app/tools/gimpimagemaptool.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c index 1cfbfbf05f..a681fc2e28 100644 --- a/app/tools/gimpimagemaptool.c +++ b/app/tools/gimpimagemaptool.c @@ -99,6 +99,8 @@ static void gimp_image_map_tool_response (GtkWidget *widget, gint response_id, GimpImageMapTool *im_tool); +static void gimp_image_map_tool_dialog_destroy (GimpImageMapTool *im_tool); + static void gimp_image_map_tool_notify_preview (GObject *config, GParamSpec *pspec, GimpImageMapTool *im_tool); @@ -248,13 +250,7 @@ gimp_image_map_tool_finalize (GObject *object) } if (image_map_tool->shell) - { - gtk_widget_destroy (image_map_tool->shell); - image_map_tool->shell = NULL; - image_map_tool->main_vbox = NULL; - image_map_tool->settings_box = NULL; - image_map_tool->label_group = NULL; - } + gimp_image_map_tool_dialog_destroy (image_map_tool); G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -595,6 +591,16 @@ gimp_image_map_tool_response (GtkWidget *widget, } } +static void +gimp_image_map_tool_dialog_destroy (GimpImageMapTool *image_map_tool) +{ + gtk_widget_destroy (image_map_tool->shell); + image_map_tool->shell = NULL; + image_map_tool->main_vbox = NULL; + image_map_tool->settings_box = NULL; + image_map_tool->label_group = NULL; +} + static void gimp_image_map_tool_notify_preview (GObject *config, GParamSpec *pspec, From c9171a3fbf186ce92b02f0262a44a08e21dad21f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 12 Jul 2009 17:14:08 +0200 Subject: [PATCH 34/70] Clean up various calls to the response() callback (gimp_image_map_tool_control): call gimp_image_map_tool_response() directly instead of gtk_dialog_response(). (gimp_image_map_tool_key_press): must not call response() if there is no dialog (if the tool wasn't used yet). --- app/tools/gimpimagemaptool.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c index a681fc2e28..9ac0f7dd5f 100644 --- a/app/tools/gimpimagemaptool.c +++ b/app/tools/gimpimagemaptool.c @@ -363,8 +363,9 @@ gimp_image_map_tool_control (GimpTool *tool, case GIMP_TOOL_ACTION_HALT: if (image_map_tool->shell) - gtk_dialog_response (GTK_DIALOG (image_map_tool->shell), - GTK_RESPONSE_CANCEL); + gimp_image_map_tool_response (image_map_tool->shell, + GTK_RESPONSE_CANCEL, + image_map_tool); break; } @@ -378,22 +379,28 @@ gimp_image_map_tool_key_press (GimpTool *tool, { GimpImageMapTool *image_map_tool = GIMP_IMAGE_MAP_TOOL (tool); - if (display == tool->display) + if (image_map_tool->shell && display == tool->display) { switch (kevent->keyval) { case GDK_Return: case GDK_KP_Enter: case GDK_ISO_Enter: - gimp_image_map_tool_response (NULL, GTK_RESPONSE_OK, image_map_tool); + gimp_image_map_tool_response (image_map_tool->shell, + GTK_RESPONSE_OK, + image_map_tool); return TRUE; case GDK_BackSpace: - gimp_image_map_tool_response (NULL, RESPONSE_RESET, image_map_tool); + gimp_image_map_tool_response (image_map_tool->shell, + RESPONSE_RESET, + image_map_tool); return TRUE; case GDK_Escape: - gimp_image_map_tool_response (NULL, GTK_RESPONSE_CANCEL, image_map_tool); + gimp_image_map_tool_response (image_map_tool->shell, + GTK_RESPONSE_CANCEL, + image_map_tool); return TRUE; } } From a46fbe82dd802ca0503787eebc6b8ec077577050 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Mon, 13 Jul 2009 08:20:42 +0200 Subject: [PATCH 35/70] Cleanup NEWS Sort items into groups and roughly order of importance. --- NEWS | 89 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 40 deletions(-) diff --git a/NEWS b/NEWS index ea9277fd1f..432e2c8397 100644 --- a/NEWS +++ b/NEWS @@ -10,47 +10,28 @@ towards the next stable release, which will be GIMP 2.8. Changes in GIMP 2.7.0 ===================== -Core: +UI: - - Ported the projection code to GEGL, i.e. the code that composes a - single image from a stack of layers + - Change the Text Tool to perform text editing on-canvas (GSoC 2008) + - Add support for tagging GIMP resources such as brushes and allow + filtering based on these tags (GSoC 2008) + - Separate the activies of saving an image and exporting it, there is + now an 'File->Export...' for example + - Add a simple parser to size entry widgets, images can be scaled + to e.g. "50%" or "2 * 37px + 10in" - Arrange layer modes into more logical and useful groups - - Port layer modes to GEGL - - Rearrange leagcy layer mode code to increase maintainability - - New docks are created at the pointer position - - Allow to benchmark projectino performance with - File->Debug->Benchmark Projection - - Clean up and merge infrastructure code from the GSoC 2006 Vector - Layer branch - - Clean up and merge on-canvas text editing code from the GSoC 2008 - On-Canvas Text Editing branch - - Move 'Text along path' from tool options to text context menu - - Refactor the layer stack code to more easily allow nesting of - layers aka layer groups later - - Show selection position and size in the Pointer dockable - - Merge support for tagging and tag-based selection of resources such - as brushes from the GSoC 2008 Tagging of Resources branch - - Add support for printing crop marks for images - - Smooth painting strokes with Catmull-Rom Spline based event - interpolation - - Port the floating selection code to GEGL - - Prepare better and more intuitive handling of the floating - selection - - Support rotation of brushes - - Allow brush dynamics to depend on tilt - - Add File->Debug->Show Image Graph that show the GEGL graph of an - image - - Add diagonal guides to the Crop Tool - - Drop support for the GnomeVFS file-uri backend - - Add aspect ratio to brush dynamics - - Allow to dump keyboard shortucts ith File->Debug->Dump Keyboard - Shortcuts - - Separate the activites of saving and exporting images + - Added support for rotation of brushes + - Make the Pointer dockable show information about selection position + and size - Add status bar feedback for keyboard changes to brush paramaters - - Add a simple parser to size entry widgets + - Add diagonal guides to the Crop Tool + - New docks are created at the pointer position + - Add support for printing crop marks for images + - Move 'Text along path' from tool options to text context menu - Change default shortcuts for "Shrink Wrap" and "Fit in Window" to Ctrl+R and Ctrl+Shift+R respectively since the previous shortcuts - are now used for the save+export + are now used for the save+export feature + Plug-ins: @@ -58,9 +39,37 @@ Plug-ins: layer mode in GIMP - Add JPEG2000 load plug-in - Add X11 mouse cursor plug-in - - Add support for loading 16bit (RGB565) raw data + - Addd support for loading 16bit (RGB565) raw data -General: - - Changed licence to GPLv3+ and LGPLv3+ - - Lots of bugfixes and cleanups... +GEGL: + + - Port the projection code, the code that composes a single image + from a stack of layers, to GEGL + - Port layer modes to GEGL + - Port the floating selection code to GEGL + - Refactor the layer stack code to prepare for layer groups later + - Prepare better and more intuitive handling of the floating + selection + - Add File->Debug->Show Image Graph that show the GEGL graph of an + image + - Allow to benchmark projection performance with + File->Debug->Benchmark Projection + + +Core: + + - Make painting strokes Catmull-Rom Spline interpolated + - Add support for arbitrary affine transforms of brushes + - Add support for brush dynamics to depend on tilt + - Add aspect ratio to brush dynamics + - Add infrastructure to soon support vector layers (GSoC 2006) + - Rearrange legacy layer mode code to increase maintainability + - Drop support for the obsolete GnomeVFS file-uri backend + - Allow to dump keyboard shortucts ith File->Debug->Dump Keyboard + Shortcuts + + +PDB: + + - Add procedures to manipulate size of text box From e2c18a4d0291f119930333c6a265c3c18e2ebe40 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Mon, 13 Jul 2009 10:09:13 +0200 Subject: [PATCH 36/70] po-python: Add text-brush.py to POTFILES.in --- po-python/POTFILES.in | 1 + 1 file changed, 1 insertion(+) diff --git a/po-python/POTFILES.in b/po-python/POTFILES.in index 6e8e8d002c..348811c438 100644 --- a/po-python/POTFILES.in +++ b/po-python/POTFILES.in @@ -14,3 +14,4 @@ plug-ins/pygimp/plug-ins/palette-to-gradient.py plug-ins/pygimp/plug-ins/py-slice.py plug-ins/pygimp/plug-ins/python-console.py plug-ins/pygimp/plug-ins/shadow_bevel.py +plug-ins/pygimp/plug-ins/text-brush.py From e1fd003d9502eaa7c38adaa420495ab7326ed242 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Mon, 13 Jul 2009 13:37:17 +0400 Subject: [PATCH 37/70] Updated Russian translation --- po-python/ru.po | 44 +- po/ru.po | 2519 ++++++++++++++++++++++++++--------------------- 2 files changed, 1441 insertions(+), 1122 deletions(-) diff --git a/po-python/ru.po b/po-python/ru.po index 062215e8ed..79666fc9e2 100644 --- a/po-python/ru.po +++ b/po-python/ru.po @@ -5,13 +5,13 @@ # Anatoly A. Yakushin , 2003, 2004. # AnatolyA. Yakushin , 2004. # Roxana Kolosova , 2003-2006. -# Alexandre Prokoudine , 2005, 2006. +# Alexandre Prokoudine , 2005, 2006, 2009. msgid "" msgstr "" "Project-Id-Version: gimp python trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-12 23:22+0300\n" -"PO-Revision-Date: 2009-01-10 01:25+0300\n" +"POT-Creation-Date: 2009-07-13 13:34+0400\n" +"PO-Revision-Date: 2009-07-13 13:36+0400\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -20,37 +20,37 @@ msgstr "" "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" -#: ../plug-ins/pygimp/gimpfu.py:385 +#: ../plug-ins/pygimp/gimpfu.py:391 msgid "Missing exception information" msgstr "Отсутствует информация о прерывании" -#: ../plug-ins/pygimp/gimpfu.py:394 +#: ../plug-ins/pygimp/gimpfu.py:400 #, python-format msgid "An error occured running %s" msgstr "При запуске %s произошла ошибка" -#: ../plug-ins/pygimp/gimpfu.py:405 +#: ../plug-ins/pygimp/gimpfu.py:411 msgid "_More Information" msgstr "_Подробнее" -#: ../plug-ins/pygimp/gimpfu.py:517 ../plug-ins/pygimp/gimpfu.py:529 -#: ../plug-ins/pygimp/gimpfu.py:535 +#: ../plug-ins/pygimp/gimpfu.py:523 ../plug-ins/pygimp/gimpfu.py:535 +#: ../plug-ins/pygimp/gimpfu.py:541 msgid "No" msgstr "Нет" -#: ../plug-ins/pygimp/gimpfu.py:527 ../plug-ins/pygimp/gimpfu.py:535 +#: ../plug-ins/pygimp/gimpfu.py:533 ../plug-ins/pygimp/gimpfu.py:541 msgid "Yes" msgstr "Да" -#: ../plug-ins/pygimp/gimpfu.py:586 ../plug-ins/pygimp/gimpui.py:223 +#: ../plug-ins/pygimp/gimpfu.py:592 ../plug-ins/pygimp/gimpui.py:223 msgid "Python-Fu File Selection" msgstr "Выбор файла в Python-Fu" -#: ../plug-ins/pygimp/gimpfu.py:597 +#: ../plug-ins/pygimp/gimpfu.py:603 msgid "Python-Fu Folder Selection" msgstr "Выбор каталога в Python-Fu" -#: ../plug-ins/pygimp/gimpfu.py:688 +#: ../plug-ins/pygimp/gimpfu.py:694 #, python-format msgid "Invalid input for '%s'" msgstr "Некорректный ввод для '%s'" @@ -313,3 +313,23 @@ msgstr "Смещение тени по _X" #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:74 msgid "Drop shadow _Y displacement" msgstr "Смещение тени по _Y" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:75 +msgid "Create a new brush with characters from a text sequence" +msgstr "Создать новую кисть, содержащую последовательность букв" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:81 +msgid "New Brush from _Text..." +msgstr "_Кисть из текста..." + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:84 +msgid "Font" +msgstr "Шрифт:" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:85 +msgid "Pixel Size" +msgstr "Кегль (px):" + +#: ../plug-ins/pygimp/plug-ins/text-brush.py:86 +msgid "Text" +msgstr "Текст:" diff --git a/po/ru.po b/po/ru.po index ada27cb10b..dd3ce17a5a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,26 +4,26 @@ # Valek Filippov , 1999-2002. # Anatoly A. Yakushin , 2003, 2004. # Roxana Kolosova , 2003-2006. -# Alexandre Prokoudine , 2005, 2006, 2007. +# Alexandre Prokoudine , 2005, 2006, 2007, 2009. msgid "" msgstr "" "Project-Id-Version: gimp trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 18:26+0400\n" -"PO-Revision-Date: 2009-05-25 20:27+0300\n" +"POT-Creation-Date: 2009-07-13 12:43+0400\n" +"PO-Revision-Date: 2009-07-13 13:33+0400\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: Russian \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);\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" #: ../app/about.h:23 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:2 msgid "GNU Image Manipulation Program" msgstr "GNU Image Manipulation Program" @@ -37,42 +37,62 @@ msgstr "" #: ../app/about.h:33 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 ." +"You should have received a copy of the GNU General Public License along with " +"GIMP. If not, see ." 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:213 #, 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:135 -#: ../tools/gimp-remote.c:59 +#: ../app/main.c:135 ../tools/gimp-remote.c:59 msgid "Show version information and exit" msgstr "Показать номер версии и выйти" @@ -205,13 +225,19 @@ msgstr "" #: ../app/sanity.c:382 #, 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 @@ -219,38 +245,31 @@ msgstr "" msgid "using %s version %s (compiled against version %s)" msgstr "используя %s версии %s (собранной с версией %s)" -#: ../app/version.c:126 -#: ../tools/gimp-remote.c:94 +#: ../app/version.c:126 ../tools/gimp-remote.c:94 #, c-format msgid "%s version %s" msgstr "%s версии %s" -#: ../app/actions/actions.c:105 -#: ../app/dialogs/dialogs.c:225 +#: ../app/actions/actions.c:105 ../app/dialogs/dialogs.c:225 #: ../app/widgets/gimpbrusheditor.c:89 msgid "Brush Editor" msgstr "Редактор кистей" #. initialize the list of gimp brushes -#: ../app/actions/actions.c:108 -#: ../app/core/gimp.c:855 -#: ../app/dialogs/dialogs.c:158 -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/actions/actions.c:108 ../app/core/gimp.c:855 +#: ../app/dialogs/dialogs.c:158 ../app/dialogs/preferences-dialog.c:2743 msgid "Brushes" msgstr "Кисти" -#: ../app/actions/actions.c:111 -#: ../app/dialogs/dialogs.c:170 +#: ../app/actions/actions.c:111 ../app/dialogs/dialogs.c:170 msgid "Buffers" msgstr "Буферы" -#: ../app/actions/actions.c:114 -#: ../app/dialogs/dialogs.c:183 +#: ../app/actions/actions.c:114 ../app/dialogs/dialogs.c:183 msgid "Channels" msgstr "Каналы" -#: ../app/actions/actions.c:117 -#: ../app/dialogs/convert-dialog.c:174 +#: ../app/actions/actions.c:117 ../app/dialogs/convert-dialog.c:174 #: ../app/dialogs/dialogs.c:191 msgid "Colormap" msgstr "Цветовая карта" @@ -263,8 +282,7 @@ msgstr "Настройка" msgid "Context" msgstr "Контекст" -#: ../app/actions/actions.c:126 -#: ../app/dialogs/dialogs.c:151 +#: ../app/actions/actions.c:126 ../app/dialogs/dialogs.c:151 msgid "Pointer Information" msgstr "Информация о курсоре" @@ -285,8 +303,7 @@ msgid "Dockable" msgstr "Панель" #. Document History -#: ../app/actions/actions.c:141 -#: ../app/dialogs/dialogs.c:172 +#: ../app/actions/actions.c:141 ../app/dialogs/dialogs.c:172 #: ../app/dialogs/preferences-dialog.c:1594 msgid "Document History" msgstr "Недавние изображения" @@ -299,8 +316,7 @@ msgstr "Изображение" msgid "Edit" msgstr "Правка" -#: ../app/actions/actions.c:150 -#: ../app/dialogs/dialogs.c:147 +#: ../app/actions/actions.c:150 ../app/dialogs/dialogs.c:147 msgid "Error Console" msgstr "Консоль ошибок" @@ -308,23 +324,19 @@ msgstr "Консоль ошибок" msgid "File" msgstr "Файл" -#: ../app/actions/actions.c:156 -#: ../app/dialogs/dialogs.c:166 +#: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:166 #: ../app/dialogs/preferences-dialog.c:2759 msgid "Fonts" msgstr "Шрифты" -#: ../app/actions/actions.c:159 -#: ../app/dialogs/dialogs.c:229 +#: ../app/actions/actions.c:159 ../app/dialogs/dialogs.c:229 #: ../app/widgets/gimpgradienteditor.c:275 msgid "Gradient Editor" msgstr "Редактор градиентов" #. initialize the list of gimp gradients -#: ../app/actions/actions.c:162 -#: ../app/core/gimp.c:867 -#: ../app/dialogs/dialogs.c:162 -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/actions/actions.c:162 ../app/core/gimp.c:867 +#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:2755 msgid "Gradients" msgstr "Градиенты" @@ -337,51 +349,41 @@ msgid "Image" msgstr "Изображение" #. list & grid views -#: ../app/actions/actions.c:171 -#: ../app/dialogs/dialogs.c:156 +#: ../app/actions/actions.c:171 ../app/dialogs/dialogs.c:156 msgid "Images" msgstr "Изображения" -#: ../app/actions/actions.c:174 -#: ../app/dialogs/dialogs.c:179 +#: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:179 #: ../app/dialogs/resize-dialog.c:286 msgid "Layers" msgstr "Слои" -#: ../app/actions/actions.c:177 -#: ../app/dialogs/dialogs.c:233 +#: ../app/actions/actions.c:177 ../app/dialogs/dialogs.c:233 #: ../app/widgets/gimppaletteeditor.c:154 msgid "Palette Editor" msgstr "Редактор палитры образцов" #. initialize the list of gimp palettes -#: ../app/actions/actions.c:180 -#: ../app/core/gimp.c:863 -#: ../app/dialogs/dialogs.c:164 -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/actions/actions.c:180 ../app/core/gimp.c:863 +#: ../app/dialogs/dialogs.c:164 ../app/dialogs/preferences-dialog.c:2751 msgid "Palettes" msgstr "Палитры цветовых образцов" #. initialize the list of gimp patterns -#: ../app/actions/actions.c:183 -#: ../app/core/gimp.c:859 -#: ../app/dialogs/dialogs.c:160 -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/actions/actions.c:183 ../app/core/gimp.c:859 +#: ../app/dialogs/dialogs.c:160 ../app/dialogs/preferences-dialog.c:2747 msgid "Patterns" msgstr "Текстуры" -#: ../app/actions/actions.c:186 -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/actions/actions.c:186 ../app/dialogs/preferences-dialog.c:2763 msgid "Plug-Ins" msgstr "Расширения" -#: ../app/actions/actions.c:189 -#: ../app/core/gimpchannel.c:368 +#: ../app/actions/actions.c:189 ../app/core/gimpchannel.c:368 msgid "Quick Mask" msgstr "Быстрая маска" -#: ../app/actions/actions.c:192 -#: ../app/dialogs/dialogs.c:207 +#: ../app/actions/actions.c:192 ../app/dialogs/dialogs.c:207 msgid "Sample Points" msgstr "Образцовые точки" @@ -390,8 +392,7 @@ msgid "Select" msgstr "Выделение" #. initialize the template list -#: ../app/actions/actions.c:198 -#: ../app/core/gimp.c:876 +#: ../app/actions/actions.c:198 ../app/core/gimp.c:876 #: ../app/dialogs/dialogs.c:174 msgid "Templates" msgstr "Шаблоны" @@ -404,21 +405,17 @@ msgstr "Текст" msgid "Text Editor" msgstr "Редактор текста" -#: ../app/actions/actions.c:207 -#: ../app/dialogs/dialogs.c:139 -#: ../app/dialogs/preferences-dialog.c:1879 -#: ../app/gui/gui.c:428 +#: ../app/actions/actions.c:207 ../app/dialogs/dialogs.c:139 +#: ../app/dialogs/preferences-dialog.c:1879 ../app/gui/gui.c:428 msgid "Tool Options" msgstr "Параметры инструментов" -#: ../app/actions/actions.c:210 -#: ../app/dialogs/dialogs.c:168 +#: ../app/actions/actions.c:210 ../app/dialogs/dialogs.c:168 msgid "Tools" msgstr "Инструменты" -#: ../app/actions/actions.c:213 -#: ../app/dialogs/dialogs.c:187 -#: ../app/tools/gimpvectortool.c:160 +#: ../app/actions/actions.c:213 ../app/dialogs/dialogs.c:187 +#: ../app/tools/gimpvectortool.c:161 msgid "Paths" msgstr "Контуры" @@ -744,16 +741,13 @@ msgstr "Цвет нового канала" #: ../app/actions/channels-commands.c:243 #: ../app/display/gimpdisplayshell-dnd.c:584 #: ../app/widgets/gimpchanneltreeview.c:265 -#: ../app/widgets/gimplayertreeview.c:800 -#: ../app/widgets/gimptoolbox-dnd.c:313 +#: ../app/widgets/gimplayertreeview.c:800 ../app/widgets/gimptoolbox-dnd.c:313 #, c-format msgid "%s Channel Copy" msgstr "Копия '%s'" -#: ../app/actions/channels-commands.c:307 -#: ../app/core/gimpselection.c:574 -#: ../app/pdb/selection-cmds.c:453 -#: ../app/pdb/selection-cmds.c:520 +#: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:574 +#: ../app/pdb/selection-cmds.c:453 ../app/pdb/selection-cmds.c:520 msgid "Channel to Selection" msgstr "Канал → Выделение" @@ -946,16 +940,13 @@ msgctxt "cursor-info-action" msgid "Use the composite color of all visible layers" msgstr "Использовать все видимые слои при выделении области" -#: ../app/actions/data-commands.c:106 -#: ../app/actions/documents-commands.c:342 -#: ../app/actions/file-commands.c:193 -#: ../app/dialogs/file-open-dialog.c:221 +#: ../app/actions/data-commands.c:106 ../app/actions/documents-commands.c:342 +#: ../app/actions/file-commands.c:193 ../app/dialogs/file-open-dialog.c:221 #: ../app/dialogs/file-open-dialog.c:265 #: ../app/dialogs/file-open-location-dialog.c:212 #: ../app/dialogs/file-open-location-dialog.c:224 #: ../app/display/gimpdisplayshell-dnd.c:537 -#: ../app/widgets/gimplayertreeview.c:757 -#: ../app/widgets/gimptoolbox-dnd.c:158 +#: ../app/widgets/gimplayertreeview.c:757 ../app/widgets/gimptoolbox-dnd.c:158 #: ../app/widgets/gimptoolbox.c:979 #, c-format msgid "" @@ -968,12 +959,9 @@ msgstr "" "%s" #: ../app/actions/data-commands.c:132 -#: ../app/core/gimpbrushgenerated-load.c:124 -#: ../app/core/gimpimage.c:1423 -#: ../app/core/gimppalette-import.c:210 -#: ../app/core/gimppalette-load.c:222 -#: ../app/core/gimppalette.c:378 -#: ../app/dialogs/palette-import-dialog.c:771 +#: ../app/core/gimpbrushgenerated-load.c:124 ../app/core/gimpimage.c:1425 +#: ../app/core/gimppalette-import.c:210 ../app/core/gimppalette-load.c:222 +#: ../app/core/gimppalette.c:378 ../app/dialogs/palette-import-dialog.c:771 #: ../app/widgets/gimpdnd-xds.c:92 msgid "Untitled" msgstr "Без имени" @@ -989,7 +977,8 @@ msgstr "Удалить '%s'?" #: ../app/actions/data-commands.c:258 #, 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/actions/dialogs-actions.c:38 @@ -1571,8 +1560,12 @@ msgid "Clear the Recent Documents list?" msgstr "Очистить весь журнал открывавшихся документов?" #: ../app/actions/documents-commands.c:217 -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" @@ -1744,7 +1737,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" @@ -1754,7 +1748,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" @@ -1832,8 +1828,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 "Создать новое изображение из содержимого буфера обмена" @@ -1879,85 +1874,85 @@ msgctxt "edit-action" msgid "Copy _Visible Named..." msgstr "Скопировать _видимое с именем..." -#: ../app/actions/edit-actions.c:172 +#: ../app/actions/edit-actions.c:173 msgctxt "edit-action" -msgid "Copy the selected region to a named buffer" -msgstr "Скопировать выделенную область в именованный буфер обмена" +msgid "Copy what is visible in the selected region to a named buffer" +msgstr "Скопировать всё видимое в именованный буфер" -#: ../app/actions/edit-actions.c:177 +#: ../app/actions/edit-actions.c:178 msgctxt "edit-action" msgid "_Paste Named..." msgstr "_Вставить из буфера с именем..." -#: ../app/actions/edit-actions.c:178 +#: ../app/actions/edit-actions.c:179 msgctxt "edit-action" msgid "Paste the content of a named buffer" msgstr "Вставить содержимое именованного буфера обмена" -#: ../app/actions/edit-actions.c:183 +#: ../app/actions/edit-actions.c:184 msgctxt "edit-action" msgid "Cl_ear" msgstr "О_чистить" -#: ../app/actions/edit-actions.c:184 +#: ../app/actions/edit-actions.c:185 msgctxt "edit-action" msgid "Clear the selected pixels" msgstr "Удалить выделенные точки растра" -#: ../app/actions/edit-actions.c:192 +#: ../app/actions/edit-actions.c:193 msgctxt "edit-action" msgid "Fill with _FG Color" msgstr "Залить цветом _переднего плана" -#: ../app/actions/edit-actions.c:193 +#: ../app/actions/edit-actions.c:194 msgctxt "edit-action" msgid "Fill the selection using the foreground color" msgstr "Залить выделенную область цветом переднего плана" -#: ../app/actions/edit-actions.c:198 +#: ../app/actions/edit-actions.c:199 msgctxt "edit-action" msgid "Fill with B_G Color" msgstr "Залить цветом _фона" -#: ../app/actions/edit-actions.c:199 +#: ../app/actions/edit-actions.c:200 msgctxt "edit-action" msgid "Fill the selection using the background color" msgstr "Залить выделенную область цветом фона" -#: ../app/actions/edit-actions.c:204 +#: ../app/actions/edit-actions.c:205 msgctxt "edit-action" msgid "Fill _with Pattern" msgstr "_Залить текстурой" -#: ../app/actions/edit-actions.c:205 +#: ../app/actions/edit-actions.c:206 msgctxt "edit-action" msgid "Fill the selection using the active pattern" msgstr "Залить выделенную область активной текстурой" -#: ../app/actions/edit-actions.c:282 +#: ../app/actions/edit-actions.c:283 #, c-format msgid "_Undo %s" msgstr "О_тменить действие «%s»" -#: ../app/actions/edit-actions.c:289 +#: ../app/actions/edit-actions.c:290 #, c-format msgid "_Redo %s" msgstr "По_вторить действие «%s»" -#: ../app/actions/edit-actions.c:304 +#: ../app/actions/edit-actions.c:305 #, c-format msgid "_Fade %s..." msgstr "_Ослабить %s..." -#: ../app/actions/edit-actions.c:316 +#: ../app/actions/edit-actions.c:317 msgid "_Undo" msgstr "_Отменить" -#: ../app/actions/edit-actions.c:317 +#: ../app/actions/edit-actions.c:318 msgid "_Redo" msgstr "Ве_рнуть" -#: ../app/actions/edit-actions.c:318 +#: ../app/actions/edit-actions.c:319 msgid "_Fade..." msgstr "_Ослабить..." @@ -1978,21 +1973,17 @@ msgstr "Очистка истории действий с этим изобра msgid "Cut pixels to the clipboard" msgstr "Вырезать пикселы в буфер обмена" -#: ../app/actions/edit-commands.c:232 -#: ../app/actions/edit-commands.c:261 +#: ../app/actions/edit-commands.c:232 ../app/actions/edit-commands.c:261 msgid "Copied pixels to the clipboard" msgstr "Пикселы скопированы в буфер обмена" -#: ../app/actions/edit-commands.c:324 -#: ../app/actions/edit-commands.c:358 +#: ../app/actions/edit-commands.c:324 ../app/actions/edit-commands.c:358 #: ../app/actions/edit-commands.c:534 msgid "There is no image data in the clipboard to paste." msgstr "В буфере обмена ничего нет." -#: ../app/actions/edit-commands.c:347 -#: ../app/core/gimpbrushclipboard.c:180 -#: ../app/core/gimppatternclipboard.c:180 -#: ../app/widgets/gimpclipboard.c:295 +#: ../app/actions/edit-commands.c:347 ../app/core/gimpbrushclipboard.c:180 +#: ../app/core/gimppatternclipboard.c:180 ../app/widgets/gimpclipboard.c:295 msgid "Clipboard" msgstr "Буфер обмена" @@ -2000,8 +1991,7 @@ msgstr "Буфер обмена" msgid "Cut Named" msgstr "Вырезать в буфер с именем" -#: ../app/actions/edit-commands.c:375 -#: ../app/actions/edit-commands.c:416 +#: ../app/actions/edit-commands.c:375 ../app/actions/edit-commands.c:416 #: ../app/actions/edit-commands.c:436 msgid "Enter a name for this buffer" msgstr "Введите имя для этого буфера" @@ -2018,8 +2008,7 @@ msgstr "Скопировать видимое с именем" msgid "There is no active layer or channel to cut from." msgstr "Нет активного слоя или канала для вырезания." -#: ../app/actions/edit-commands.c:556 -#: ../app/actions/edit-commands.c:588 +#: ../app/actions/edit-commands.c:556 ../app/actions/edit-commands.c:588 #: ../app/actions/edit-commands.c:612 msgid "(Unnamed Buffer)" msgstr "(Безымянный буфер)" @@ -2203,7 +2192,9 @@ msgstr "Сохранить коп_ию..." #: ../app/actions/file-actions.c:131 msgctxt "file-action" msgid "Save this image with a different name, but keep its current name" -msgstr "Сохранить это изображение под другим именем, продолжив пользоваться оригиналом" +msgstr "" +"Сохранить это изображение под другим именем, продолжив пользоваться " +"оригиналом" #: ../app/actions/file-actions.c:136 msgctxt "file-action" @@ -2217,36 +2208,39 @@ msgstr "Сохранить это изображение и закрыть ег #: ../app/actions/file-actions.c:142 msgctxt "file-action" -msgid "Export..." -msgstr "Экспортировать..." - -#: ../app/actions/file-actions.c:143 -msgctxt "file-action" -msgid "Export the image to various file formats such as PNG or JPEG" -msgstr "Экспортировать изображение в такие форматы данных как PNG и JPEG" - -#: ../app/actions/file-actions.c:148 -msgctxt "file-action" msgid "Export to" msgstr "Экспортировать в" -#: ../app/actions/file-actions.c:149 +#: ../app/actions/file-actions.c:143 msgctxt "file-action" msgid "Export the image back to the import source in the import format" msgstr "Экспортировать изображение обратно в исходный импортированный файл" -#. Update file-export-to label -#: ../app/actions/file-actions.c:269 +#: ../app/actions/file-actions.c:148 +msgctxt "file-action" +msgid "Export..." +msgstr "Экспортировать..." + +#: ../app/actions/file-actions.c:149 +msgctxt "file-action" +msgid "Export the image to various file formats such as PNG or JPEG" +msgstr "Экспортировать изображение в такие форматы данных как PNG и JPEG" + +#: ../app/actions/file-actions.c:273 +#, c-format +msgid "Overwrite %s" +msgstr "Перезаписать %s" + +#: ../app/actions/file-actions.c:276 #, c-format msgid "Export to %s" msgstr "Экспортировать в %s" -#: ../app/actions/file-actions.c:277 +#: ../app/actions/file-actions.c:285 msgid "Export to" msgstr "Экспортировать в" -#: ../app/actions/file-commands.c:113 -#: ../app/actions/file-commands.c:462 +#: ../app/actions/file-commands.c:113 ../app/actions/file-commands.c:470 #: ../app/dialogs/file-open-dialog.c:77 msgid "Open Image" msgstr "Открыть изображение" @@ -2259,8 +2253,7 @@ msgstr "Открыть изображение как слои" msgid "No changes need to be saved" msgstr "Нет сохраняемых изменений" -#: ../app/actions/file-commands.c:271 -#: ../app/dialogs/file-save-dialog.c:95 +#: ../app/actions/file-commands.c:271 ../app/dialogs/file-save-dialog.c:95 msgid "Save Image" msgstr "Сохранить изображение" @@ -2268,38 +2261,42 @@ msgstr "Сохранить изображение" msgid "Save a Copy of the Image" msgstr "Сохранить копию изображения" -#: ../app/actions/file-commands.c:326 +#: ../app/actions/file-commands.c:334 msgid "Create New Template" msgstr "Создать новый шаблон" -#: ../app/actions/file-commands.c:330 +#: ../app/actions/file-commands.c:338 msgid "Enter a name for this template" msgstr "Введите имя для этого шаблона" -#: ../app/actions/file-commands.c:365 +#: ../app/actions/file-commands.c:373 msgid "Revert failed. No file name associated with this image." msgstr "" "Сбой восстановления.\n" "Нет имени файла, связанного с этим изображением." -#: ../app/actions/file-commands.c:378 +#: ../app/actions/file-commands.c:386 msgid "Revert Image" msgstr "Восстановить изображение" -#: ../app/actions/file-commands.c:408 +#: ../app/actions/file-commands.c:416 #, c-format msgid "Revert '%s' to '%s'?" msgstr "Восстановить '%s' до '%s'?" -#: ../app/actions/file-commands.c:414 -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:422 +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:622 +#: ../app/actions/file-commands.c:630 msgid "(Unnamed Template)" msgstr "(Безымянный шаблон)" -#: ../app/actions/file-commands.c:674 +#: ../app/actions/file-commands.c:682 #, c-format msgid "" "Reverting to '%s' failed:\n" @@ -2764,8 +2761,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 "_Справка" @@ -2785,8 +2781,7 @@ msgctxt "help-action" msgid "Show the help for a specific user interface item" msgstr "Показать справку по той или иной части интерфейса" -#: ../app/actions/image-actions.c:47 -#: ../app/actions/image-actions.c:51 +#: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51 msgctxt "image-action" msgid "Image Menu" msgstr "Меню изображения" @@ -3040,8 +3035,7 @@ msgstr "Повернуть изображение на 90 градусов вл msgid "Set Image Canvas Size" msgstr "Установка размера холста" -#: ../app/actions/image-commands.c:262 -#: ../app/actions/image-commands.c:283 +#: ../app/actions/image-commands.c:262 ../app/actions/image-commands.c:283 #: ../app/actions/image-commands.c:561 msgid "Resizing" msgstr "Изменяется размер..." @@ -3058,15 +3052,12 @@ msgstr "Производится отражение..." #: ../app/actions/image-commands.c:384 #: ../app/pdb/drawable-transform-cmds.c:524 -#: ../app/pdb/drawable-transform-cmds.c:603 -#: ../app/pdb/image-cmds.c:532 -#: ../app/pdb/transform-tools-cmds.c:214 -#: ../app/tools/gimprotatetool.c:122 +#: ../app/pdb/drawable-transform-cmds.c:603 ../app/pdb/image-cmds.c:532 +#: ../app/pdb/transform-tools-cmds.c:214 ../app/tools/gimprotatetool.c:122 msgid "Rotating" msgstr "Производится вращение..." -#: ../app/actions/image-commands.c:410 -#: ../app/actions/layers-commands.c:637 +#: ../app/actions/image-commands.c:410 ../app/actions/layers-commands.c:637 msgid "Cannot crop because the current selection is empty." msgstr "" "Не удалось вырезать из-за того,\n" @@ -3076,22 +3067,17 @@ msgstr "" msgid "Change Print Size" msgstr "Изменить размер при печати" -#: ../app/actions/image-commands.c:649 -#: ../app/core/gimpimage-scale.c:81 +#: ../app/actions/image-commands.c:649 ../app/core/gimpimage-scale.c:81 msgid "Scale Image" msgstr "Смена размера изображения" #. Scaling -#: ../app/actions/image-commands.c:660 -#: ../app/actions/layers-commands.c:1100 +#: ../app/actions/image-commands.c:660 ../app/actions/layers-commands.c:1100 #: ../app/dialogs/preferences-dialog.c:1924 #: ../app/pdb/drawable-transform-cmds.c:681 -#: ../app/pdb/drawable-transform-cmds.c:757 -#: ../app/pdb/image-cmds.c:404 -#: ../app/pdb/image-cmds.c:440 -#: ../app/pdb/layer-cmds.c:288 -#: ../app/pdb/layer-cmds.c:333 -#: ../app/pdb/transform-tools-cmds.c:290 +#: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:404 +#: ../app/pdb/image-cmds.c:440 ../app/pdb/layer-cmds.c:288 +#: ../app/pdb/layer-cmds.c:333 ../app/pdb/transform-tools-cmds.c:290 #: ../app/tools/gimpscaletool.c:107 msgid "Scaling" msgstr "Изменяется размер изображения" @@ -3409,7 +3395,9 @@ msgstr "Добавить _маску слоя..." #: ../app/actions/layers-actions.c:206 msgctxt "layers-action" msgid "Add a mask that allows non-destructive editing of transparency" -msgstr "Добавить маску, с помощью которой можно неразрушающе редактировать прозрачность" +msgstr "" +"Добавить маску, с помощью которой можно неразрушающе редактировать " +"прозрачность" #: ../app/actions/layers-actions.c:211 msgctxt "layers-action" @@ -3506,8 +3494,7 @@ msgctxt "layers-action" msgid "Add the layer mask to the current selection" msgstr "Добавить маску слоя к текущему выделению" -#: ../app/actions/layers-actions.c:284 -#: ../app/actions/layers-actions.c:313 +#: ../app/actions/layers-actions.c:284 ../app/actions/layers-actions.c:313 #: ../app/actions/layers-actions.c:343 msgctxt "layers-action" msgid "_Subtract from Selection" @@ -3518,8 +3505,7 @@ msgctxt "layers-action" msgid "Subtract the layer mask from the current selection" msgstr "Вычесть маску слоя из текущего выделения" -#: ../app/actions/layers-actions.c:290 -#: ../app/actions/layers-actions.c:320 +#: ../app/actions/layers-actions.c:290 ../app/actions/layers-actions.c:320 #: ../app/actions/layers-actions.c:350 msgctxt "layers-action" msgid "_Intersect with Selection" @@ -3540,8 +3526,7 @@ msgctxt "layers-action" msgid "Replace the selection with the layer's alpha channel" msgstr "Преобразовать альфа-канал в выделение" -#: ../app/actions/layers-actions.c:306 -#: ../app/actions/layers-actions.c:336 +#: ../app/actions/layers-actions.c:306 ../app/actions/layers-actions.c:336 msgctxt "layers-action" msgid "A_dd to Selection" msgstr "_Добавить к выделению" @@ -3634,10 +3619,8 @@ msgstr "Атрибуты слоя" msgid "Edit Layer Attributes" msgstr "Правка атрибутов слоя" -#: ../app/actions/layers-commands.c:250 -#: ../app/actions/layers-commands.c:252 -#: ../app/actions/layers-commands.c:320 -#: ../app/actions/layers-commands.c:324 +#: ../app/actions/layers-commands.c:250 ../app/actions/layers-commands.c:252 +#: ../app/actions/layers-commands.c:320 ../app/actions/layers-commands.c:324 #: ../app/widgets/gimpdrawabletreeview.c:327 #: ../app/widgets/gimplayertreeview.c:862 msgid "New Layer" @@ -3655,8 +3638,7 @@ msgstr "Видимое" msgid "Set Layer Boundary Size" msgstr "Установить размеры границ слоя" -#: ../app/actions/layers-commands.c:609 -#: ../app/core/gimplayer.c:252 +#: ../app/actions/layers-commands.c:609 ../app/core/gimplayer.c:252 msgid "Scale Layer" msgstr "Смена размера слоя" @@ -3672,8 +3654,7 @@ msgstr "Маска слоя → Выделение" msgid "Please select a channel first" msgstr "Сначала выберите канал" -#: ../app/actions/layers-commands.c:1043 -#: ../app/core/gimplayer.c:1310 +#: ../app/actions/layers-commands.c:1043 ../app/core/gimplayer.c:1310 #: ../app/dialogs/layer-add-mask-dialog.c:81 msgid "Add Layer Mask" msgstr "Добавить маску слоя" @@ -4029,7 +4010,8 @@ msgstr "_Повторить последний" #: ../app/actions/plug-in-actions.c:134 msgctxt "plug-in-action" msgid "Rerun the last used plug-in using the same settings" -msgstr "Применить последний использованный фильтр или сценарий с теми же параметрами" +msgstr "" +"Применить последний использованный фильтр или сценарий с теми же параметрами" #: ../app/actions/plug-in-actions.c:139 msgctxt "plug-in-action" @@ -4186,7 +4168,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" @@ -4258,8 +4242,7 @@ msgctxt "select-action" msgid "Stroke the selection with last used values" msgstr "Обвести выделенное с последними значениями" -#: ../app/actions/select-commands.c:154 -#: ../app/core/gimpselection.c:169 +#: ../app/actions/select-commands.c:154 ../app/core/gimpselection.c:169 msgid "Feather Selection" msgstr "Растушёвка выделения" @@ -4267,8 +4250,7 @@ msgstr "Растушёвка выделения" msgid "Feather selection by" msgstr "Растушевать выделение на" -#: ../app/actions/select-commands.c:192 -#: ../app/core/gimpselection.c:176 +#: ../app/actions/select-commands.c:192 ../app/core/gimpselection.c:176 msgid "Shrink Selection" msgstr "Сокращение выделения" @@ -4280,8 +4262,7 @@ msgstr "Сократить выделение на" msgid "_Shrink from image border" msgstr "Со_кратить по границе изображения" -#: ../app/actions/select-commands.c:229 -#: ../app/core/gimpselection.c:175 +#: ../app/actions/select-commands.c:229 ../app/core/gimpselection.c:175 msgid "Grow Selection" msgstr "Увеличение выделения" @@ -4289,8 +4270,7 @@ msgstr "Увеличение выделения" msgid "Grow selection by" msgstr "Увеличить выделение на" -#: ../app/actions/select-commands.c:256 -#: ../app/core/gimpselection.c:174 +#: ../app/actions/select-commands.c:256 ../app/core/gimpselection.c:174 msgid "Border Selection" msgstr "Граница из выделения" @@ -4308,16 +4288,13 @@ msgstr "_Растушевать края" msgid "_Lock selection to image edges" msgstr "_Прикреплять выделение к краям изображения" -#: ../app/actions/select-commands.c:332 -#: ../app/actions/select-commands.c:365 -#: ../app/actions/vectors-commands.c:383 -#: ../app/actions/vectors-commands.c:417 +#: ../app/actions/select-commands.c:332 ../app/actions/select-commands.c:365 +#: ../app/actions/vectors-commands.c:383 ../app/actions/vectors-commands.c:417 #: ../app/dialogs/stroke-dialog.c:288 msgid "There is no active layer or channel to stroke to." msgstr "Нет активного слоя или канала для обводки" -#: ../app/actions/select-commands.c:338 -#: ../app/core/gimpselection.c:153 +#: ../app/actions/select-commands.c:338 ../app/core/gimpselection.c:153 msgid "Stroke Selection" msgstr "Обвести выделенную область" @@ -4395,7 +4372,8 @@ msgstr "Удалить шаблон" #: ../app/actions/templates-commands.c:239 #, 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 @@ -4439,28 +4417,20 @@ msgid "From right to left" msgstr "Справа налево" #: ../app/actions/text-editor-commands.c:62 -#: ../app/actions/text-tool-commands.c:111 +#: ../app/actions/text-tool-commands.c:110 msgid "Open Text File (UTF-8)" msgstr "Открыть текствый файл (UTF-8)" #: ../app/actions/text-editor-commands.c:143 -#: ../app/actions/text-tool-commands.c:219 -#: ../app/config/gimpconfig-file.c:58 -#: ../app/core/gimpbrush-load.c:139 -#: ../app/core/gimpbrush-load.c:419 +#: ../app/actions/text-tool-commands.c:218 ../app/config/gimpconfig-file.c:58 +#: ../app/core/gimpbrush-load.c:139 ../app/core/gimpbrush-load.c:419 #: ../app/core/gimpbrushgenerated-load.c:72 -#: ../app/core/gimpbrushpipe-load.c:80 -#: ../app/core/gimpcurve-load.c:54 -#: ../app/core/gimpgradient-load.c:61 -#: ../app/core/gimppalette-load.c:75 -#: ../app/core/gimppalette-load.c:271 -#: ../app/core/gimppalette-load.c:316 -#: ../app/core/gimppalette-load.c:372 -#: ../app/core/gimppalette-load.c:461 -#: ../app/core/gimppalette-load.c:627 -#: ../app/core/gimppattern-load.c:75 -#: ../app/tools/gimpcurvestool.c:631 -#: ../app/tools/gimplevelstool.c:743 +#: ../app/core/gimpbrushpipe-load.c:80 ../app/core/gimpcurve-load.c:54 +#: ../app/core/gimpgradient-load.c:61 ../app/core/gimppalette-load.c:75 +#: ../app/core/gimppalette-load.c:271 ../app/core/gimppalette-load.c:316 +#: ../app/core/gimppalette-load.c:372 ../app/core/gimppalette-load.c:461 +#: ../app/core/gimppalette-load.c:627 ../app/core/gimppattern-load.c:75 +#: ../app/tools/gimpcurvestool.c:631 ../app/tools/gimplevelstool.c:743 #: ../app/xcf/xcf.c:328 #, c-format msgid "Could not open '%s' for reading: %s" @@ -4619,7 +4589,8 @@ msgstr "Сбросить параметры" #: ../app/actions/tool-options-commands.c:208 msgid "Do you really want to reset all tool options to default values?" -msgstr "Вы действительно хотите вернуться к исходным параметрам всех инструментов?" +msgstr "" +"Вы действительно хотите вернуться к исходным параметрам всех инструментов?" #: ../app/actions/tools-actions.c:46 msgctxt "tools-action" @@ -4936,8 +4907,7 @@ msgctxt "vectors-action" msgid "Selecti_on to Path" msgstr "Выделение → _Контур" -#: ../app/actions/vectors-actions.c:196 -#: ../app/actions/vectors-actions.c:202 +#: ../app/actions/vectors-actions.c:196 ../app/actions/vectors-actions.c:202 msgctxt "vectors-action" msgid "Selection to path" msgstr "Превратить выделение в контур" @@ -4965,8 +4935,7 @@ msgstr "Атрибуты контура" msgid "Edit Path Attributes" msgstr "Правка атрибутов контура" -#: ../app/actions/vectors-commands.c:165 -#: ../app/actions/vectors-commands.c:166 +#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166 #: ../app/actions/vectors-commands.c:188 msgid "New Path" msgstr "Новый контур" @@ -4975,16 +4944,13 @@ msgstr "Новый контур" msgid "New Path Options" msgstr "Параметры нового контура" -#: ../app/actions/vectors-commands.c:306 -#: ../app/pdb/paths-cmds.c:641 +#: ../app/actions/vectors-commands.c:306 ../app/pdb/paths-cmds.c:641 #: ../app/pdb/vectors-cmds.c:1252 msgid "Path to Selection" msgstr "Контур в выделенную область" -#: ../app/actions/vectors-commands.c:389 -#: ../app/tools/gimpvectoroptions.c:198 -#: ../app/tools/gimpvectortool.c:1945 -#: ../app/vectors/gimpvectors.c:200 +#: ../app/actions/vectors-commands.c:389 ../app/tools/gimpvectoroptions.c:198 +#: ../app/tools/gimpvectortool.c:1947 ../app/vectors/gimpvectors.c:200 msgid "Stroke Path" msgstr "Обводка по контуру" @@ -5046,7 +5012,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" @@ -5253,8 +5221,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-action" msgid "Zoom out" msgstr "Уменьшить масштаб просмотра" @@ -5264,8 +5231,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-action" msgid "Zoom in" msgstr "Увеличить масштаб просмотра" @@ -5662,32 +5628,35 @@ msgctxt "layer-mode-effects" msgid "Anti erase" msgstr "Антиластик" -#: ../app/base/tile-swap.c:552 -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: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 и проверьте путь к файлу подкачки в параметрах " +"программы." -#: ../app/base/tile-swap.c:567 +#: ../app/base/tile-swap.c:725 #, c-format msgid "Failed to resize swap file: %s" msgstr "Не удалось изменить размер файла подкачки: %s" -#: ../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:55 -#: ../app/gui/themes.c:238 -#: ../app/tools/gimpcurvestool.c:684 -#: ../app/tools/gimplevelstool.c:796 -#: ../app/vectors/gimpvectors-export.c:82 +#: ../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:55 +#: ../app/gui/themes.c:238 ../app/tools/gimpcurvestool.c:684 +#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:82 #: ../app/xcf/xcf.c:421 #, 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" @@ -5699,20 +5668,34 @@ 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 -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:27 msgid "Specifies how the area around the image should be drawn." @@ -5735,24 +5718,46 @@ msgid "Sets the type of mouse pointers to use." msgstr "Определяет тип курсора мыши" #: ../app/config/gimprc-blurbs.h:45 -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:53 -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:75 msgid "This is the distance in pixels where Guide and Grid snapping activates." -msgstr "Это расстояние в пикселах, на котором срабатывает функция прилипания к сетке и направляющим." +msgstr "" +"Это расстояние в пикселах, на котором срабатывает функция прилипания к сетке " +"и направляющим." #: ../app/config/gimprc-blurbs.h:91 -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:104 -msgid "The window type hint that is set on dock windows. This may affect the way your window manager decorates and handles dock windows." -msgstr "От этого параметра зависит то, какой вид придаст оконный менеджер панелям." +msgid "" +"The window type hint that is set on dock windows. This may affect the way " +"your window manager decorates and handles dock windows." +msgstr "" +"От этого параметра зависит то, какой вид придаст оконный менеджер панелям." #: ../app/config/gimprc-blurbs.h:135 msgid "When enabled, the selected brush will be used for all tools." @@ -5779,91 +5784,155 @@ msgid "Sets the text to appear in image window titles." msgstr "Установите форму текста, отображающегося в заголовке окна изображения" #: ../app/config/gimprc-blurbs.h:175 -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:179 -msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays." -msgstr "Установить свей цветовой карты может быть полезна при работе с 8-разрядными (256 цветов) дисплеями." +msgid "" +"Install a private colormap; might be useful on 8-bit (256 colors) displays." +msgstr "" +"Установить свей цветовой карты может быть полезна при работе с 8-разрядными " +"(256 цветов) дисплеями." #: ../app/config/gimprc-blurbs.h:182 -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:189 msgid "How many recently opened image filenames to keep on the File menu." msgstr "Количество названий ранее открывавшихся файлов, отображаемых в меню." #: ../app/config/gimprc-blurbs.h:192 -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:196 -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:200 msgid "When enabled, GIMP will show mnemonics in menus." msgstr "Если включено, GIMP отображает мнемонические клавиши в меню." #: ../app/config/gimprc-blurbs.h:203 -msgid "Generally only a concern for 8-bit displays, this sets the minimum number of system colors allocated for GIMP." -msgstr "Это касается только 8-разрядных мониторов. Параметр устанавливает минимальное количество системных цветов, предназначенных для GIMP." +msgid "" +"Generally only a concern for 8-bit displays, this sets the minimum number of " +"system colors allocated for GIMP." +msgstr "" +"Это касается только 8-разрядных мониторов. Параметр устанавливает " +"минимальное количество системных цветов, предназначенных для GIMP." #: ../app/config/gimprc-blurbs.h:213 -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:218 -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:223 -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:227 -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:231 msgid "Sets how many processors GIMP should try to use simultaneously." msgstr "Установить количество процессоров, используемых GIMP одновременно." #: ../app/config/gimprc-blurbs.h:244 -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. Perversely, 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. " +"Perversely, on some X servers enabling this option results in faster " +"painting." +msgstr "" +"Если включено, X-сервер определяет позицию мыши после каждого движения. Это " +"означает, что рисование большими кистями будет более точным, но медленным. " +"Однако на некоторых Х-серверах включение этой опции обеспечивает более " +"быструю работу." #: ../app/config/gimprc-blurbs.h:260 -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:265 -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:269 -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:273 -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:277 msgid "Let GIMP try to restore your last saved session on each startup." msgstr "Восстанавливать последнюю сохраненную позицию окон при каждом запуске." #: ../app/config/gimprc-blurbs.h:280 -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:284 -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:288 msgid "Save the positions and sizes of the main dialogs when GIMP exits." @@ -5874,52 +5943,100 @@ msgid "Save the tool options when GIMP exits." msgstr "Сохранить параметры инструментов при выходе из GIMP." #: ../app/config/gimprc-blurbs.h:297 -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:301 -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:306 -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:310 -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:314 -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:318 -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:322 -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:326 -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:330 -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:334 -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:338 -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:342 -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:346 msgid "Show a tooltip when the pointer hovers over an item." @@ -5930,20 +6047,40 @@ msgid "What to do when the space bar is pressed in the image window." msgstr "Что делать, когда в окне изображения нажимают пробел." #: ../app/config/gimprc-blurbs.h:352 -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:361 msgid "When enabled, menus can be torn off." msgstr "Если включено, меню можно отцепить от панели инструментов." #: ../app/config/gimprc-blurbs.h:364 -msgid "When enabled, dock windows (the toolbox and palettes) are set to be transient to the active image window. Most window managers will keep the dock windows above the image window then, but it may also have other effects." -msgstr "Если включено, все панели располагаются поверх окна изображения. В некоторых оконных менеджерах могут проявиться и другие эффекты." +msgid "" +"When enabled, dock windows (the toolbox and palettes) are set to be " +"transient to the active image window. Most window managers will keep the " +"dock windows above the image window then, but it may also have other effects." +msgstr "" +"Если включено, все панели располагаются поверх окна изображения. В некоторых " +"оконных менеджерах могут проявиться и другие эффекты." #: ../app/config/gimprc-blurbs.h:370 -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:374 msgid "Save changed keyboard shortcuts when GIMP exits." @@ -5954,24 +6091,45 @@ msgid "Restore saved keyboard shortcuts on each GIMP startup." msgstr "Восстановить сохраненные комбинации клавиш при запуске GIMP." #: ../app/config/gimprc-blurbs.h:380 -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:392 msgid "Sets the size of the thumbnail shown in the Open dialog." msgstr "Установить размер эскиза в диалоге открытия файлов." #: ../app/config/gimprc-blurbs.h:395 -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:399 -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:405 msgid "Show the current foreground and background colors in the toolbox." -msgstr "Показывать текущий цвет переднего и заднего плана в панели инструментов." +msgstr "" +"Показывать текущий цвет переднего и заднего плана в панели инструментов." #: ../app/config/gimprc-blurbs.h:408 msgid "Show the currently selected brush, pattern and gradient in the toolbox." @@ -5982,8 +6140,12 @@ msgid "Show the currently active image in the toolbox." msgstr "Показывать активное изображение в панели инструментов." #: ../app/config/gimprc-blurbs.h:417 -msgid "The window type hint that is set on the toolbox. This may affect how your window manager decorates and handles the toolbox window." -msgstr "От этого параметра зависит, как будет отображаться панель инструментов оконным менеджером." +msgid "" +"The window type hint that is set on the toolbox. This may affect how your " +"window manager decorates and handles the toolbox window." +msgstr "" +"От этого параметра зависит, как будет отображаться панель инструментов " +"оконным менеджером." #: ../app/config/gimprc-blurbs.h:421 msgid "Sets the manner in which transparency is displayed in images." @@ -5994,16 +6156,30 @@ msgid "Sets the size of the checkerboard used to display transparency." msgstr "Устанавливает размер клеток, отображающих прозрачность." #: ../app/config/gimprc-blurbs.h:427 -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:431 -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:435 -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:440 msgid "Sets the size of the previews in the Undo History." @@ -6015,13 +6191,19 @@ msgstr "Когда эта опция включена, кнопкой F1 выз #: ../app/config/gimprc-blurbs.h:454 #, c-format -msgid "Sets the external web browser to be used. This can be an absolute path or the name of an executable to search for in the user's PATH. If the command contains '%s' it will be replaced with the URL, else the URL will be appended to the command with a space separating the two." -msgstr "Укажите браузер, который будет использовать система помощи. По желанию можно указать полный путь или только команду для выполнения. Если команда содержит '%s', вместо этого выражения будет подставлен URL, если нет, то URL будет добавлен к команде через пробел." +msgid "" +"Sets the external web browser to be used. This can be an absolute path or " +"the name of an executable to search for in the user's PATH. If the command " +"contains '%s' it will be replaced with the URL, else the URL will be " +"appended to the command with a space separating the two." +msgstr "" +"Укажите браузер, который будет использовать система помощи. По желанию можно " +"указать полный путь или только команду для выполнения. Если команда содержит " +"'%s', вместо этого выражения будет подставлен URL, если нет, то URL будет " +"добавлен к команде через пробел." -#: ../app/config/gimprc-deserialize.c:134 -#: ../app/core/gimp-modules.c:133 -#: ../app/core/gimp-units.c:163 -#: ../app/gui/session.c:205 +#: ../app/config/gimprc-deserialize.c:134 ../app/core/gimp-modules.c:133 +#: ../app/core/gimp-units.c:163 ../app/gui/session.c:205 #: ../app/plug-in/plug-in-rc.c:212 msgid "fatal parse error" msgstr "неисправимая ошибка лекс.анализа" @@ -6416,50 +6598,42 @@ msgctxt "undo-type" msgid "Quick Mask" msgstr "Быстрая маска" -#: ../app/core/core-enums.c:880 -#: ../app/core/core-enums.c:910 +#: ../app/core/core-enums.c:880 ../app/core/core-enums.c:910 msgctxt "undo-type" msgid "Grid" msgstr "Сетка" -#: ../app/core/core-enums.c:881 -#: ../app/core/core-enums.c:912 +#: ../app/core/core-enums.c:881 ../app/core/core-enums.c:912 msgctxt "undo-type" msgid "Guide" msgstr "Направляющая" -#: ../app/core/core-enums.c:882 -#: ../app/core/core-enums.c:913 +#: ../app/core/core-enums.c:882 ../app/core/core-enums.c:913 msgctxt "undo-type" msgid "Sample Point" msgstr "Образцовая точка" -#: ../app/core/core-enums.c:883 -#: ../app/core/core-enums.c:914 +#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:914 msgctxt "undo-type" msgid "Layer/Channel" msgstr "Слой/Канал" -#: ../app/core/core-enums.c:884 -#: ../app/core/core-enums.c:915 +#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:915 msgctxt "undo-type" msgid "Layer/Channel modification" msgstr "Изменение слоя/канала" -#: ../app/core/core-enums.c:885 -#: ../app/core/core-enums.c:916 +#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:916 msgctxt "undo-type" msgid "Selection mask" msgstr "Маска выделения" -#: ../app/core/core-enums.c:886 -#: ../app/core/core-enums.c:919 +#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:919 msgctxt "undo-type" msgid "Item visibility" msgstr "Видимость объекта" -#: ../app/core/core-enums.c:887 -#: ../app/core/core-enums.c:920 +#: ../app/core/core-enums.c:887 ../app/core/core-enums.c:920 msgctxt "undo-type" msgid "Link/Unlink item" msgstr "(Рас)соединение объекта" @@ -6469,8 +6643,7 @@ msgctxt "undo-type" msgid "Item properties" msgstr "Свойства элемента" -#: ../app/core/core-enums.c:889 -#: ../app/core/core-enums.c:918 +#: ../app/core/core-enums.c:889 ../app/core/core-enums.c:918 msgctxt "undo-type" msgid "Move item" msgstr "Перемещение объекта" @@ -6490,20 +6663,17 @@ msgctxt "undo-type" msgid "Add layer" msgstr "Добавить слой" -#: ../app/core/core-enums.c:893 -#: ../app/core/core-enums.c:929 +#: ../app/core/core-enums.c:893 ../app/core/core-enums.c:929 msgctxt "undo-type" msgid "Add layer mask" msgstr "Добавить маску слоя" -#: ../app/core/core-enums.c:894 -#: ../app/core/core-enums.c:931 +#: ../app/core/core-enums.c:894 ../app/core/core-enums.c:931 msgctxt "undo-type" msgid "Apply layer mask" msgstr "Применить маску слоя" -#: ../app/core/core-enums.c:895 -#: ../app/core/core-enums.c:941 +#: ../app/core/core-enums.c:895 ../app/core/core-enums.c:941 msgctxt "undo-type" msgid "Floating selection to layer" msgstr "Плавающее выделение в слой" @@ -6533,26 +6703,22 @@ msgctxt "undo-type" msgid "Text" msgstr "Текст" -#: ../app/core/core-enums.c:901 -#: ../app/core/core-enums.c:942 +#: ../app/core/core-enums.c:901 ../app/core/core-enums.c:942 msgctxt "undo-type" msgid "Transform" msgstr "Преобразование" -#: ../app/core/core-enums.c:902 -#: ../app/core/core-enums.c:943 +#: ../app/core/core-enums.c:902 ../app/core/core-enums.c:943 msgctxt "undo-type" msgid "Paint" msgstr "Рисование" -#: ../app/core/core-enums.c:903 -#: ../app/core/core-enums.c:946 +#: ../app/core/core-enums.c:903 ../app/core/core-enums.c:946 msgctxt "undo-type" msgid "Attach parasite" msgstr "Добавить паразита" -#: ../app/core/core-enums.c:904 -#: ../app/core/core-enums.c:947 +#: ../app/core/core-enums.c:904 ../app/core/core-enums.c:947 msgctxt "undo-type" msgid "Remove parasite" msgstr "Убрать паразита" @@ -6762,17 +6928,14 @@ msgctxt "color-profile-policy" msgid "Convert to RGB workspace" msgstr "Преобразовать в рабочее пространство RGB" -#: ../app/core/gimp-contexts.c:154 -#: ../app/core/gimptooloptions.c:232 -#: ../app/gui/session.c:307 -#: ../app/menus/menus.c:441 +#: ../app/core/gimp-contexts.c:154 ../app/core/gimptooloptions.c:232 +#: ../app/gui/session.c:307 ../app/menus/menus.c:441 #: ../app/widgets/gimpdevices.c:258 #, c-format msgid "Deleting \"%s\" failed: %s" msgstr "Невозможно удалить \"%s\": %s" -#: ../app/core/gimp-edit.c:189 -#: ../app/core/gimp-edit.c:324 +#: ../app/core/gimp-edit.c:189 ../app/core/gimp-edit.c:324 msgid "Pasted Layer" msgstr "Вставленный слой" @@ -6840,27 +7003,33 @@ msgstr "tips-locale:ru" #: ../app/core/gimp-user-install.c:153 #, 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:158 #, 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:309 #, c-format msgid "Copying file '%s' from '%s'..." msgstr "Копирование файла '%s' из '%s'..." -#: ../app/core/gimp-user-install.c:324 -#: ../app/core/gimp-user-install.c:350 +#: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350 #, c-format msgid "Creating folder '%s'..." msgstr "Создание папки '%s'..." -#: ../app/core/gimp-user-install.c:335 -#: ../app/core/gimp-user-install.c:361 +#: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361 #, c-format msgid "Cannot create folder '%s': %s" msgstr "Не удается создать папку '%s': %s" @@ -6889,8 +7058,7 @@ msgid "Fonts (this may take a while)" msgstr "Шрифты (их загрузка может длиться долго)" #. initialize the module list -#: ../app/core/gimp.c:880 -#: ../app/dialogs/preferences-dialog.c:2771 +#: ../app/core/gimp.c:880 ../app/dialogs/preferences-dialog.c:2771 msgid "Modules" msgstr "Модули" @@ -6929,25 +7097,22 @@ msgstr "Неисправимая ошибка разбора файла кист msgid "Fatal parse error in brush file '%s': Unknown version %d." msgstr "Неисправимая ошибка разбора файла кисти '%s': неизвестная версия %d." -#: ../app/core/gimpbrush-load.c:267 -#: ../app/core/gimpbrush-load.c:387 +#: ../app/core/gimpbrush-load.c:267 ../app/core/gimpbrush-load.c:387 #: ../app/core/gimpbrush-load.c:719 #, c-format msgid "Fatal parse error in brush file '%s': File appears truncated." msgstr "Неисправимая ошибка разбора файла кисти '%s': файл, вероятно, оборван." -#: ../app/core/gimpbrush-load.c:275 -#: ../app/core/gimpbrushgenerated-load.c:127 +#: ../app/core/gimpbrush-load.c:275 ../app/core/gimpbrushgenerated-load.c:127 #: ../app/core/gimpbrushpipe-load.c:96 #, c-format msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Недопустимая строка UTF-8 в файле кисти '%s'." -#: ../app/core/gimpbrush-load.c:282 -#: ../app/core/gimpitem.c:619 +#: ../app/core/gimpbrush-load.c:282 ../app/core/gimpitem.c:619 #: ../app/core/gimppattern-load.c:145 #: ../app/dialogs/template-options-dialog.c:82 -#: ../app/tools/gimpvectortool.c:299 +#: ../app/tools/gimpvectortool.c:301 msgid "Unnamed" msgstr "Безымянный" @@ -6957,18 +7122,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:447 #, 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:614 #, c-format msgid "Fatal parse error in brush file '%s': Wide brushes are not supported." -msgstr "Неисправимая ошибка разбора файла кисти '%s': широкие кисти не поддерживаются." +msgstr "" +"Неисправимая ошибка разбора файла кисти '%s': широкие кисти не " +"поддерживаются." #: ../app/core/gimpbrush.c:136 msgid "Brush Spacing" @@ -6981,13 +7152,19 @@ msgstr "Неисправимая ошибка разбора файла кист #: ../app/core/gimpbrushgenerated-load.c:103 #, 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:149 #, 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:225 #, c-format @@ -7020,18 +7197,15 @@ msgstr "Лучи кисти" msgid "Brush Hardness" msgstr "Жесткость кисти" -#: ../app/core/gimpbrushgenerated.c:158 -#: ../app/paint/gimppaintoptions.c:250 +#: ../app/core/gimpbrushgenerated.c:158 ../app/paint/gimppaintoptions.c:250 msgid "Brush Aspect Ratio" msgstr "Соотношение сторон кисти" -#: ../app/core/gimpbrushgenerated.c:165 -#: ../app/paint/gimppaintoptions.c:254 +#: ../app/core/gimpbrushgenerated.c:165 ../app/paint/gimppaintoptions.c:254 msgid "Brush Angle" msgstr "Угол кисти" -#: ../app/core/gimpbrushpipe-load.c:112 -#: ../app/core/gimpbrushpipe-load.c:132 +#: ../app/core/gimpbrushpipe-load.c:112 ../app/core/gimpbrushpipe-load.c:132 #: ../app/core/gimpbrushpipe-load.c:222 #, c-format msgid "Fatal parse error in brush file '%s': File is corrupt." @@ -7061,8 +7235,7 @@ msgstr "Альфа-канал -> Выделенная область" msgid "%s Channel to Selection" msgstr "%s Канал -> Выделенная область" -#: ../app/core/gimpchannel-select.c:519 -#: ../app/tools/gimpfuzzyselecttool.c:80 +#: ../app/core/gimpchannel-select.c:519 ../app/tools/gimpfuzzyselecttool.c:80 msgctxt "command" msgid "Fuzzy Select" msgstr "Выделение связанной области" @@ -7101,8 +7274,7 @@ msgstr "Отражение канала" msgid "Rotate Channel" msgstr "Вращение канала" -#: ../app/core/gimpchannel.c:269 -#: ../app/core/gimpdrawable-transform.c:842 +#: ../app/core/gimpchannel.c:269 ../app/core/gimpdrawable-transform.c:885 msgid "Transform Channel" msgstr "Преобразование канала" @@ -7154,13 +7326,11 @@ msgstr "Установить цвет канала" msgid "Set Channel Opacity" msgstr "Установить непрозрачность канала" -#: ../app/core/gimpchannel.c:1872 -#: ../app/core/gimpselection.c:523 +#: ../app/core/gimpchannel.c:1872 ../app/core/gimpselection.c:523 msgid "Selection Mask" msgstr "Маска выделенной области" -#: ../app/core/gimpcontext.c:593 -#: ../app/tools/gimppaintoptions-gui.c:175 +#: ../app/core/gimpcontext.c:593 ../app/tools/gimppaintoptions-gui.c:175 msgid "Opacity" msgstr "Непрозрачность" @@ -7168,14 +7338,12 @@ msgstr "Непрозрачность" msgid "Paint Mode" msgstr "Режим рисования" -#: ../app/core/gimpdata.c:569 -#: ../app/core/gimptoolpresets.c:278 +#: ../app/core/gimpdata.c:569 ../app/core/gimptoolpresets.c:278 #, c-format msgid "Could not delete '%s': %s" msgstr "Невозможно удалить '%s': %s" -#: ../app/core/gimpdatafactory.c:436 -#: ../app/core/gimpdatafactory.c:596 +#: ../app/core/gimpdatafactory.c:436 ../app/core/gimpdatafactory.c:596 #: ../app/core/gimpdatafactory.c:616 #, c-format msgid "" @@ -7187,15 +7355,12 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdatafactory.c:515 -#: ../app/core/gimpdatafactory.c:518 -#: ../app/core/gimpitem.c:387 -#: ../app/core/gimpitem.c:390 +#: ../app/core/gimpdatafactory.c:515 ../app/core/gimpdatafactory.c:518 +#: ../app/core/gimpitem.c:387 ../app/core/gimpitem.c:390 msgid "copy" msgstr "копия" -#: ../app/core/gimpdatafactory.c:527 -#: ../app/core/gimpitem.c:399 +#: ../app/core/gimpdatafactory.c:527 ../app/core/gimpitem.c:399 #, c-format msgid "%s copy" msgstr "Копия %s" @@ -7215,8 +7380,7 @@ msgstr "" "\n" "%s" -#: ../app/core/gimpdrawable-blend.c:244 -#: ../app/tools/gimpblendtool.c:108 +#: ../app/core/gimpdrawable-blend.c:244 ../app/tools/gimpblendtool.c:109 msgid "Blend" msgstr "Градиентная заливка" @@ -7225,7 +7389,7 @@ msgid "Brightness_Contrast" msgstr "Яркость_Контраст" #: ../app/core/gimpdrawable-brightness-contrast.c:81 -#: ../app/tools/gimpbrightnesscontrasttool.c:110 +#: ../app/tools/gimpbrightnesscontrasttool.c:111 msgid "Brightness-Contrast" msgstr "Яркость-Контраст" @@ -7245,13 +7409,11 @@ msgid "Color Balance" msgstr "Цветовой баланс" #: ../app/core/gimpdrawable-colorize.c:72 -#: ../app/core/gimpdrawable-colorize.c:84 -#: ../app/tools/gimpcolorizetool.c:90 +#: ../app/core/gimpdrawable-colorize.c:84 ../app/tools/gimpcolorizetool.c:90 msgid "Colorize" msgstr "Тонировать" -#: ../app/core/gimpdrawable-curves.c:164 -#: ../app/core/gimpdrawable-curves.c:181 +#: ../app/core/gimpdrawable-curves.c:164 ../app/core/gimpdrawable-curves.c:181 #: ../app/tools/gimpcurvestool.c:140 msgid "Curves" msgstr "Кривые" @@ -7279,13 +7441,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 "Уровни" @@ -7295,8 +7455,7 @@ 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 "Постеризовать" @@ -7305,8 +7464,7 @@ msgid "Render Stroke" msgstr "Обвести контур" #: ../app/core/gimpdrawable-threshold.c:70 -#: ../app/core/gimpdrawable-threshold.c:81 -#: ../app/tools/gimpthresholdtool.c:90 +#: ../app/core/gimpdrawable-threshold.c:81 ../app/tools/gimpthresholdtool.c:90 msgid "Threshold" msgstr "Порог" @@ -7314,39 +7472,36 @@ msgstr "Порог" msgid "Transform" msgstr "Преобразование" -#: ../app/core/gimpdrawable-transform.c:628 -#: ../app/tools/gimpfliptool.c:116 +#: ../app/core/gimpdrawable-transform.c:644 ../app/tools/gimpfliptool.c:116 msgctxt "command" msgid "Flip" msgstr "Зеркало" -#: ../app/core/gimpdrawable-transform.c:715 -#: ../app/tools/gimprotatetool.c:121 +#: ../app/core/gimpdrawable-transform.c:744 ../app/tools/gimprotatetool.c:121 msgctxt "command" msgid "Rotate" msgstr "Вращение" -#: ../app/core/gimpdrawable-transform.c:840 -#: ../app/core/gimplayer.c:256 +#: ../app/core/gimpdrawable-transform.c:883 ../app/core/gimplayer.c:256 msgid "Transform Layer" msgstr "Преобразование слоя" -#: ../app/core/gimpdrawable-transform.c:855 +#: ../app/core/gimpdrawable-transform.c:898 msgid "Transformation" msgstr "Преобразование" -#: ../app/core/gimpgradient-load.c:70 -#: ../app/core/gimpgradient-load.c:95 -#: ../app/core/gimpgradient-load.c:116 -#: ../app/core/gimpgradient-load.c:167 +#: ../app/core/gimpgradient-load.c:70 ../app/core/gimpgradient-load.c:95 +#: ../app/core/gimpgradient-load.c:116 ../app/core/gimpgradient-load.c:167 #, 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:80 #, 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:108 #, c-format @@ -7358,17 +7513,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:217 -#: ../app/core/gimpgradient-load.c:228 +#: ../app/core/gimpgradient-load.c:217 ../app/core/gimpgradient-load.c:228 #, 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:240 -#: ../app/core/gimpgradient-load.c:254 +#: ../app/core/gimpgradient-load.c:240 ../app/core/gimpgradient-load.c:254 #, 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:333 #, c-format @@ -7389,7 +7545,8 @@ msgid "The foreground color of the grid." msgstr "Цвет переднего плана сетки." #: ../app/core/gimpgrid.c:94 -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:100 @@ -7401,12 +7558,17 @@ msgid "Vertical spacing of grid lines." msgstr "Расстояние между вертикальными линиями" #: ../app/core/gimpgrid.c:114 -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:121 msgid "Vertical offset of the first grid line; this may be a negative number." -msgstr "Смещение по вертикали для первой линии сетки. Значение может быть отрицательным." +msgstr "" +"Смещение по вертикали для первой линии сетки. Значение может быть " +"отрицательным." #: ../app/core/gimpimage-arrange.c:142 msgid "Arrange Objects" @@ -7453,13 +7615,11 @@ msgctxt "command" msgid "Crop Image" msgstr "Кадрирование изображения" -#: ../app/core/gimpimage-crop.c:131 -#: ../app/core/gimpimage-resize.c:89 +#: ../app/core/gimpimage-crop.c:131 ../app/core/gimpimage-resize.c:89 msgid "Resize Image" msgstr "Изменить размер изображения" -#: ../app/core/gimpimage-grid.c:57 -#: ../app/dialogs/grid-dialog.c:152 +#: ../app/core/gimpimage-grid.c:57 ../app/dialogs/grid-dialog.c:152 msgid "Grid" msgstr "Сетка" @@ -7471,8 +7631,7 @@ msgstr "Добавить горизонтальную направляющую" msgid "Add Vertical Guide" msgstr "Добавить вертикальную направляющую" -#: ../app/core/gimpimage-guides.c:114 -#: ../app/tools/gimpmovetool.c:566 +#: ../app/core/gimpimage-guides.c:114 ../app/tools/gimpmovetool.c:568 msgid "Remove Guide" msgstr "Удалить направляющую" @@ -7499,8 +7658,7 @@ msgstr "Вращать объекты" msgid "Transform Items" msgstr "Преобразовать объекты" -#: ../app/core/gimpimage-merge.c:102 -#: ../app/core/gimpimage-merge.c:114 +#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114 msgid "Merge Visible Layers" msgstr "Сведение видимых слоев" @@ -7518,7 +7676,8 @@ msgstr "Сведение видимых контуров" #: ../app/core/gimpimage-merge.c:289 msgid "Not enough visible paths for a merge. There must be at least two." -msgstr "Недостаточно видимых контуров для объединения. Должно быть хотя бы два." +msgstr "" +"Недостаточно видимых контуров для объединения. Должно быть хотя бы два." #: ../app/core/gimpimage-quick-mask.c:81 msgid "Enable Quick Mask" @@ -7532,8 +7691,7 @@ msgstr "Выключение быстрой маски" msgid "Add Sample Point" msgstr "Добавить образцовую точку" -#: ../app/core/gimpimage-sample-points.c:97 -#: ../app/tools/gimpcolortool.c:429 +#: ../app/core/gimpimage-sample-points.c:97 ../app/tools/gimpcolortool.c:431 msgid "Remove Sample Point" msgstr "Удаление образцовой точки" @@ -7546,126 +7704,123 @@ msgstr "Перемещение образцовой точки" msgid "Can't undo %s" msgstr "Невозможно отменить %s" -#: ../app/core/gimpimage.c:1525 +#: ../app/core/gimpimage.c:1527 msgid "Change Image Resolution" msgstr "Изменить разрешение изображения" -#: ../app/core/gimpimage.c:1569 +#: ../app/core/gimpimage.c:1571 msgid "Change Image Unit" msgstr "Изменить единицы измерения" -#: ../app/core/gimpimage.c:2429 +#: ../app/core/gimpimage.c:2467 msgid "Attach Parasite to Image" msgstr "Добавить шум к изображению" -#: ../app/core/gimpimage.c:2467 +#: ../app/core/gimpimage.c:2505 msgid "Remove Parasite from Image" msgstr "Удалить шум из изображения" -#: ../app/core/gimpimage.c:2973 +#: ../app/core/gimpimage.c:3011 msgid "Add Layer" msgstr "Добавка слоя" -#: ../app/core/gimpimage.c:3039 -#: ../app/core/gimpimage.c:3062 +#: ../app/core/gimpimage.c:3077 ../app/core/gimpimage.c:3100 msgid "Remove Layer" msgstr "Удаление слоя" -#: ../app/core/gimpimage.c:3055 +#: ../app/core/gimpimage.c:3093 msgid "Remove Floating Selection" msgstr "Удалить плавающее выделение" -#: ../app/core/gimpimage.c:3209 +#: ../app/core/gimpimage.c:3247 msgid "Layer cannot be raised higher." msgstr "Cлой невозможно поднять выше." -#: ../app/core/gimpimage.c:3214 +#: ../app/core/gimpimage.c:3252 msgid "Raise Layer" msgstr "Поднятие слоя" -#: ../app/core/gimpimage.c:3234 +#: ../app/core/gimpimage.c:3272 msgid "Layer cannot be lowered more." msgstr "Слой невозможно опустить ниже." -#: ../app/core/gimpimage.c:3239 +#: ../app/core/gimpimage.c:3277 msgid "Lower Layer" msgstr "Опускание слоя" -#: ../app/core/gimpimage.c:3250 +#: ../app/core/gimpimage.c:3288 msgid "Raise Layer to Top" msgstr "Сделать слой верхним" -#: ../app/core/gimpimage.c:3265 +#: ../app/core/gimpimage.c:3303 msgid "Lower Layer to Bottom" msgstr "Сделать слой нижним" -#: ../app/core/gimpimage.c:3318 +#: ../app/core/gimpimage.c:3356 msgid "Add Channel" msgstr "Добавить канал" -#: ../app/core/gimpimage.c:3368 -#: ../app/core/gimpimage.c:3381 +#: ../app/core/gimpimage.c:3406 ../app/core/gimpimage.c:3419 msgid "Remove Channel" msgstr "Удалить канал" -#: ../app/core/gimpimage.c:3440 +#: ../app/core/gimpimage.c:3478 msgid "Channel cannot be raised higher." msgstr "Канал не может быть поднят выше." -#: ../app/core/gimpimage.c:3445 +#: ../app/core/gimpimage.c:3483 msgid "Raise Channel" msgstr "Поднять канал" -#: ../app/core/gimpimage.c:3456 +#: ../app/core/gimpimage.c:3494 msgid "Raise Channel to Top" msgstr "Поднять канал на верх стопки" -#: ../app/core/gimpimage.c:3477 +#: ../app/core/gimpimage.c:3515 msgid "Channel cannot be lowered more." msgstr "Канал не может быть опущен ниже." -#: ../app/core/gimpimage.c:3482 +#: ../app/core/gimpimage.c:3520 msgid "Lower Channel" msgstr "Опустить канал" -#: ../app/core/gimpimage.c:3497 +#: ../app/core/gimpimage.c:3535 msgid "Lower Channel to Bottom" msgstr "Опустить канал в низ стопки" -#: ../app/core/gimpimage.c:3551 +#: ../app/core/gimpimage.c:3589 msgid "Add Path" msgstr "Добавка контура" -#: ../app/core/gimpimage.c:3595 +#: ../app/core/gimpimage.c:3633 msgid "Remove Path" msgstr "Удаление контура" -#: ../app/core/gimpimage.c:3648 +#: ../app/core/gimpimage.c:3686 msgid "Path cannot be raised higher." msgstr "Контур не может быть поднят выше." -#: ../app/core/gimpimage.c:3653 +#: ../app/core/gimpimage.c:3691 msgid "Raise Path" msgstr "Поднятие контура" -#: ../app/core/gimpimage.c:3664 +#: ../app/core/gimpimage.c:3702 msgid "Raise Path to Top" msgstr "Сделать контур верхним" -#: ../app/core/gimpimage.c:3684 +#: ../app/core/gimpimage.c:3722 msgid "Path cannot be lowered more." msgstr "Контур не может быть опущен ниже." -#: ../app/core/gimpimage.c:3689 +#: ../app/core/gimpimage.c:3727 msgid "Lower Path" msgstr "Опускание контура" -#: ../app/core/gimpimage.c:3704 +#: ../app/core/gimpimage.c:3742 msgid "Lower Path to Bottom" msgstr "Сделать контур нижним" -#: ../app/core/gimpimagefile.c:534 -#: ../app/dialogs/preferences-dialog.c:1726 +#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1726 msgid "Folder" msgstr "Каталог" @@ -7698,10 +7853,8 @@ msgid "(Preview may be out of date)" msgstr "(Возможно, эскиз устарел)" #. pixel size -#: ../app/core/gimpimagefile.c:611 -#: ../app/widgets/gimpimagepropview.c:446 -#: ../app/widgets/gimpsizebox.c:437 -#: ../app/widgets/gimptemplateeditor.c:565 +#: ../app/core/gimpimagefile.c:611 ../app/widgets/gimpimagepropview.c:446 +#: ../app/widgets/gimpsizebox.c:437 ../app/widgets/gimptemplateeditor.c:565 #, c-format msgid "%d × %d pixel" msgid_plural "%d × %d pixels" @@ -7709,8 +7862,7 @@ msgstr[0] "%d x %d точку растра" msgstr[1] "%d x %d точки растра" msgstr[2] "%d x %d точек растра" -#: ../app/core/gimpimagefile.c:634 -#: ../app/display/gimpdisplayshell-title.c:316 +#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:316 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -7731,8 +7883,7 @@ msgstr "Добавит шум" msgid "Attach Parasite to Item" msgstr "Добавить шум в элемент" -#: ../app/core/gimpitem.c:1401 -#: ../app/core/gimpitem.c:1408 +#: ../app/core/gimpitem.c:1401 ../app/core/gimpitem.c:1408 msgid "Remove Parasite from Item" msgstr "Удалить шум из элемента" @@ -7740,9 +7891,10 @@ msgstr "Удалить шум из элемента" msgid "Anchor Floating Selection" msgstr "Прицепить плавающее выделение" -#: ../app/core/gimplayer-floating-sel.c:131 -#: ../app/core/gimplayer.c:674 -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:131 ../app/core/gimplayer.c:674 +msgid "" +"Cannot create a new layer from the floating selection because it belongs to " +"a layer mask or channel." msgstr "" "Невозможно создать новый слой из плавающего\n" "выделения, потому что оно принадлежит\n" @@ -7760,8 +7912,7 @@ msgstr "Слой" msgid "Rename Layer" msgstr "Переименование слоя" -#: ../app/core/gimplayer.c:251 -#: ../app/pdb/layer-cmds.c:433 +#: ../app/core/gimplayer.c:251 ../app/pdb/layer-cmds.c:433 #: ../app/pdb/layer-cmds.c:471 msgid "Move Layer" msgstr "Перемещение слоя" @@ -7778,8 +7929,7 @@ msgstr "Отражение слоя" msgid "Rotate Layer" msgstr "Вращение слоя" -#: ../app/core/gimplayer.c:412 -#: ../app/core/gimplayer.c:1369 +#: ../app/core/gimplayer.c:412 ../app/core/gimplayer.c:1369 #: ../app/core/gimplayermask.c:211 #, c-format msgid "%s mask" @@ -7808,8 +7958,7 @@ msgstr "" msgid "Transfer Alpha to Mask" msgstr "Преобразовать альфа-канал в маску" -#: ../app/core/gimplayer.c:1599 -#: ../app/core/gimplayermask.c:238 +#: ../app/core/gimplayer.c:1599 ../app/core/gimplayermask.c:238 msgid "Apply Layer Mask" msgstr "Применение маски слоя" @@ -7852,14 +8001,13 @@ msgstr "Индекс %d" msgid "Unknown type of palette file: %s" msgstr "Неизвестный тип файла палитры: %s" -#: ../app/core/gimppalette-load.c:84 -#: ../app/core/gimppalette-load.c:110 -#: ../app/core/gimppalette-load.c:131 -#: ../app/core/gimppalette-load.c:160 +#: ../app/core/gimppalette-load.c:84 ../app/core/gimppalette-load.c:110 +#: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160 #: ../app/core/gimppalette-load.c:236 #, 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:94 #, c-format @@ -7873,8 +8021,12 @@ msgstr "Недопустимая строка UTF-8 файле палитры \" #: ../app/core/gimppalette-load.c:147 #, 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:183 #, c-format @@ -7894,30 +8046,33 @@ msgstr "Загружается палитра '%s': в строке %d отсу #: ../app/core/gimppalette-load.c:209 #, 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:472 #, c-format msgid "Could not read header from palette file '%s'" msgstr "Невозможно прочесть заголовок из файла палитры '%s'" -#: ../app/core/gimppalette-load.c:495 -#: ../app/core/gimppalette-load.c:583 +#: ../app/core/gimppalette-load.c:495 ../app/core/gimppalette-load.c:583 #, c-format msgid "Fatal parse error in palette file '%s'" msgstr "Неисправимая ошибка разбора файла палитры '%s'" -#: ../app/core/gimppattern-load.c:84 -#: ../app/core/gimppattern-load.c:130 +#: ../app/core/gimppattern-load.c:84 ../app/core/gimppattern-load.c:130 #: ../app/core/gimppattern-load.c:161 #, c-format msgid "Fatal parse error in pattern file '%s': File appears truncated." -msgstr "Неисправимая ошибка разбора файла текстуры '%s': вероятно, файл оборван." +msgstr "" +"Неисправимая ошибка разбора файла текстуры '%s': вероятно, файл оборван." #: ../app/core/gimppattern-load.c:103 #, 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:113 #, c-format @@ -7925,7 +8080,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:138 @@ -7933,19 +8089,16 @@ msgstr "" msgid "Invalid UTF-8 string in pattern file '%s'." msgstr "Недопустимая строка UTF-8 файле текстуры '%s'" -#: ../app/core/gimppdbprogress.c:287 -#: ../app/widgets/gimppdbdialog.c:351 +#: ../app/core/gimppdbprogress.c:287 ../app/widgets/gimppdbdialog.c:351 #, 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 "Подождите пожалуйста" -#: ../app/core/gimpselection.c:152 -#: ../app/tools/gimpeditselectiontool.c:240 +#: ../app/core/gimpselection.c:152 ../app/tools/gimpeditselectiontool.c:240 msgid "Move Selection" msgstr "Перемещение выделения" @@ -7973,23 +8126,28 @@ msgstr "Нет обводимого выделения" msgid "Unable to cut or copy because the selected region is empty." msgstr "Не удалось вырезать/скопировать: выделенная область пуста." -#: ../app/core/gimpselection.c:832 +#: ../app/core/gimpselection.c:834 msgid "Cannot float selection because the selected region is empty." msgstr "" "Невозможно создать плавающее выделение из-за того,\n" "что выделенная область пуста." -#: ../app/core/gimpselection.c:839 +#: ../app/core/gimpselection.c:841 msgid "Float Selection" msgstr "Плавающее выделение" -#: ../app/core/gimpselection.c:855 +#: ../app/core/gimpselection.c:857 msgid "Floated Layer" msgstr "Плавающий слой" #: ../app/core/gimpstrokeoptions.c:151 -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:105 msgid "The unit used for coordinate display when not in dot-for-dot mode." @@ -8067,8 +8225,7 @@ msgctxt "plural" msgid "percent" msgstr "проценты" -#: ../app/dialogs/about-dialog.c:113 -#: ../app/gui/gui.c:478 +#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478 msgid "About GIMP" msgstr "О GIMP" @@ -8121,8 +8278,7 @@ msgid "_Remove unused colors from colormap" msgstr "_Удалить неиспользуемые цвета из цветовой карты" #. dithering -#: ../app/dialogs/convert-dialog.c:233 -#: ../app/tools/gimpblendoptions.c:246 +#: ../app/dialogs/convert-dialog.c:233 ../app/tools/gimpblendoptions.c:246 msgid "Dithering" msgstr "Размывание" @@ -8138,13 +8294,11 @@ msgstr "Включить размывание прозрачности" msgid "Converting to indexed colors" msgstr "Преобразование в индексированное" -#: ../app/dialogs/convert-dialog.c:414 -#: ../app/pdb/convert-cmds.c:150 +#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150 msgid "Cannot convert to a palette with more than 256 colors." msgstr "Невозможно преобразовать в палитру больше 256 цветов." -#: ../app/dialogs/dialogs-constructors.c:192 -#: ../app/gui/gui.c:160 +#: ../app/dialogs/dialogs-constructors.c:192 ../app/gui/gui.c:160 #: ../app/gui/gui-message.c:147 msgid "GIMP Message" msgstr "Сообщение GIMP" @@ -8242,40 +8396,57 @@ msgstr "Введите путь (URI):" msgid "Export Image" msgstr "Экспорт изображения" -#: ../app/dialogs/file-save-dialog.c:460 -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:468 +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:587 -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:595 +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:594 -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:602 +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:600 -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:608 +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:614 +#: ../app/dialogs/file-save-dialog.c:622 msgid "Extension Mismatch" msgstr "Неправильное расширение" -#: ../app/dialogs/file-save-dialog.c:630 +#: ../app/dialogs/file-save-dialog.c:638 msgid "The given file extension does not match the chosen file type." msgstr "Указанное расширение не соответствует выбранному типу файла." -#: ../app/dialogs/file-save-dialog.c:634 +#: ../app/dialogs/file-save-dialog.c:642 msgid "Do you want to save the image using this name anyway?" msgstr "Вы всё равно хотите сохранить файл с таким именем?" -#: ../app/dialogs/file-save-dialog.c:689 +#: ../app/dialogs/file-save-dialog.c:697 msgid "Saving canceled" msgstr "Сохранение прервано" -#: ../app/dialogs/file-save-dialog.c:697 -#: ../app/widgets/gimpdnd-xds.c:183 +#: ../app/dialogs/file-save-dialog.c:705 ../app/widgets/gimpdnd-xds.c:183 #, c-format msgid "" "Saving '%s' failed:\n" @@ -8347,8 +8518,12 @@ msgstr "Вы пытаетесь создать изображение разме #: ../app/dialogs/image-new-dialog.c:328 #, 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 @@ -8378,11 +8553,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 @@ -8394,8 +8576,12 @@ msgid "Configure Keyboard Shortcuts" msgstr "Настройка комбинаций клавиш" #: ../app/dialogs/keyboard-shortcuts-dialog.c:72 -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:80 msgid "S_ave keyboard shortcuts on exit" @@ -8419,12 +8605,12 @@ msgstr "_Имя слоя:" #. The size labels #: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1067 +#: ../app/tools/gimpmeasuretool.c:1069 msgid "Width:" msgstr "Ширина:" #: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1095 +#: ../app/tools/gimpmeasuretool.c:1097 msgid "Height:" msgstr "Высота:" @@ -8491,10 +8677,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:197 -#: ../app/widgets/gimpgrideditor.c:275 +#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 +#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:275 msgid "Offset" msgstr "Смещение" @@ -8503,13 +8687,11 @@ msgstr "Смещение" msgid "_Offset" msgstr "_Смещение" -#: ../app/dialogs/offset-dialog.c:184 -#: ../app/dialogs/resize-dialog.c:226 +#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:226 msgid "_X:" msgstr "_X:" -#: ../app/dialogs/offset-dialog.c:186 -#: ../app/dialogs/resize-dialog.c:227 +#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:227 msgid "_Y:" msgstr "_Y:" @@ -8626,8 +8808,11 @@ msgid "Configure Input Devices" msgstr "Настроить устройства ввода" #: ../app/dialogs/preferences-dialog.c:576 -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:587 msgid "Remove all Keyboard Shortcuts" @@ -8638,16 +8823,28 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?" msgstr "Действительно удалить все комбинации клавиш из всех меню?" #: ../app/dialogs/preferences-dialog.c:650 -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:685 -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:720 -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:1288 msgid "Show _menubar" @@ -8926,8 +9123,7 @@ msgstr "Инструмент перемещения" msgid "Set layer or path as active" msgstr "Делать слой или контур активным" -#: ../app/dialogs/preferences-dialog.c:1965 -#: ../app/widgets/gimptoolbox.c:631 +#: ../app/dialogs/preferences-dialog.c:1965 ../app/widgets/gimptoolbox.c:631 msgid "Toolbox" msgstr "Панель инструментов" @@ -9100,8 +9296,7 @@ msgstr "Разрешение монитора" #. Pixels #: ../app/dialogs/preferences-dialog.c:2324 -#: ../app/display/gimpcursorview.c:202 -#: ../app/widgets/gimpgrideditor.c:268 +#: ../app/display/gimpcursorview.c:202 ../app/widgets/gimpgrideditor.c:268 #: ../app/widgets/gimpgrideditor.c:300 msgid "Pixels" msgstr "px" @@ -9399,33 +9594,28 @@ msgid "Print Size" msgstr "Размер при печати" #. the image size labels -#: ../app/dialogs/print-size-dialog.c:165 -#: ../app/widgets/gimpsizebox.c:201 +#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:201 #: ../app/widgets/gimptemplateeditor.c:160 msgid "_Width:" msgstr "_Ширина:" -#: ../app/dialogs/print-size-dialog.c:172 -#: ../app/widgets/gimpsizebox.c:205 +#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:205 #: ../app/widgets/gimptemplateeditor.c:167 msgid "H_eight:" msgstr "_Высота:" #. the resolution labels -#: ../app/dialogs/print-size-dialog.c:222 -#: ../app/widgets/gimpsizebox.c:263 +#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:263 #: ../app/widgets/gimptemplateeditor.c:287 msgid "_X resolution:" msgstr "Разрешение по X:" -#: ../app/dialogs/print-size-dialog.c:229 -#: ../app/widgets/gimpsizebox.c:266 +#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:266 #: ../app/widgets/gimptemplateeditor.c:294 msgid "_Y resolution:" msgstr "Разрешение по Y:" -#: ../app/dialogs/print-size-dialog.c:240 -#: ../app/widgets/gimpsizebox.c:259 +#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:259 #: ../app/widgets/gimptemplateeditor.c:307 #, c-format msgid "pixels/%a" @@ -9445,7 +9635,8 @@ msgstr "Если выйти из GIMP, то несохраненные изме #: ../app/dialogs/quit-dialog.c:167 msgid "If you close these images now, changes will be lost." -msgstr "Если вы сейчас закроете эти изображения, изменения в них будут потеряны." +msgstr "" +"Если вы сейчас закроете эти изображения, изменения в них будут потеряны." #: ../app/dialogs/quit-dialog.c:214 #, c-format @@ -9463,8 +9654,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 "Размер слоя" @@ -9489,8 +9679,7 @@ msgid "_Vertical:" msgstr "Вертикальная:" #. Image size frame -#: ../app/dialogs/scale-dialog.c:98 -#: ../app/widgets/gimptemplateeditor.c:138 +#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:138 msgid "Image Size" msgstr "Размер изображения" @@ -9503,8 +9692,12 @@ msgid "I_nterpolation:" msgstr "И_нтерполяция:" #: ../app/dialogs/scale-dialog.c:206 -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" @@ -9571,7 +9764,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" @@ -9674,34 +9869,24 @@ msgctxt "zoom-quality" msgid "High" msgstr "Высокое" -#: ../app/display/gimpcursorview.c:212 -#: ../app/display/gimpcursorview.c:218 -#: ../app/display/gimpcursorview.c:237 -#: ../app/display/gimpcursorview.c:243 -#: ../app/display/gimpcursorview.c:262 -#: ../app/display/gimpcursorview.c:268 -#: ../app/display/gimpcursorview.c:284 -#: ../app/display/gimpcursorview.c:291 -#: ../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:212 ../app/display/gimpcursorview.c:218 +#: ../app/display/gimpcursorview.c:237 ../app/display/gimpcursorview.c:243 +#: ../app/display/gimpcursorview.c:262 ../app/display/gimpcursorview.c:268 +#: ../app/display/gimpcursorview.c:284 ../app/display/gimpcursorview.c:291 +#: ../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:623 msgid "n/a" msgstr "н/д" -#: ../app/display/gimpcursorview.c:215 -#: ../app/display/gimpcursorview.c:240 +#: ../app/display/gimpcursorview.c:215 ../app/display/gimpcursorview.c:240 #: ../app/display/gimpcursorview.c:265 msgid "X" msgstr "X" -#: ../app/display/gimpcursorview.c:221 -#: ../app/display/gimpcursorview.c:246 +#: ../app/display/gimpcursorview.c:221 ../app/display/gimpcursorview.c:246 #: ../app/display/gimpcursorview.c:271 msgid "Y" msgstr "Y" @@ -9740,25 +9925,24 @@ msgstr "Изображение сохранено в '%s'" msgid "Image exported to '%s'" msgstr "Изображение экспортировано в '%s'" -#: ../app/display/gimpdisplayshell.c:1077 +#: ../app/display/gimpdisplayshell.c:1104 msgid "Access the image menu" msgstr "Доступ к меню изображения" -#: ../app/display/gimpdisplayshell.c:1182 +#: ../app/display/gimpdisplayshell.c:1209 msgid "Zoom image when window size changes" msgstr "При изменении размера окна изменять размер изображения" -#: ../app/display/gimpdisplayshell.c:1211 +#: ../app/display/gimpdisplayshell.c:1238 msgid "Toggle Quick Mask" msgstr "Переключить быструю маску" -#: ../app/display/gimpdisplayshell.c:1232 +#: ../app/display/gimpdisplayshell.c:1259 msgid "Navigate the image display" msgstr "Навигация по изображению" -#: ../app/display/gimpdisplayshell.c:1327 -#: ../app/display/gimpdisplayshell.c:1417 -#: ../app/widgets/gimptoolbox.c:220 +#: ../app/display/gimpdisplayshell.c:1354 +#: ../app/display/gimpdisplayshell.c:1444 ../app/widgets/gimptoolbox.c:220 msgid "Drop image files here to open them" msgstr "Перетащите сюда изображения, которые хотите открыть" @@ -9780,26 +9964,50 @@ msgstr "Сохранить изменения в изображениии '%s' #: ../app/display/gimpdisplayshell-close.c:246 #, 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:256 #, 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:267 #, 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-dnd.c:255 #: ../app/display/gimpdisplayshell-dnd.c:587 @@ -9817,8 +10025,7 @@ msgid "Drop layers" msgstr "Новые слои извне" #: ../app/display/gimpdisplayshell-dnd.c:648 -#: ../app/widgets/gimplayertreeview.c:828 -#: ../app/widgets/gimptoolbox-dnd.c:361 +#: ../app/widgets/gimplayertreeview.c:828 ../app/widgets/gimptoolbox-dnd.c:361 msgid "Dropped Buffer" msgstr "Перемещенный буфер" @@ -9864,20 +10071,24 @@ msgstr "(неизменен)" msgid "(none)" msgstr "(Нет)" -#. image name and source as shown in the title of -#. the image window -#: ../app/display/gimpdisplayshell-title.c:454 -#, c-format -msgid "%s (imported from %s)" -msgstr "%s (импортировано из %s)" +#: ../app/display/gimpdisplayshell-title.c:483 +msgid " (exported)" +msgstr " (экспортировано)" + +#: ../app/display/gimpdisplayshell-title.c:485 +msgid " (overwritten)" +msgstr " (перезаписано)" + +#: ../app/display/gimpdisplayshell-title.c:491 +msgid " (imported)" +msgstr " (импортировано)" #: ../app/display/gimpstatusbar.c:346 #, c-format msgid "Cancel %s" msgstr "Отменить %s" -#: ../app/file/file-open.c:133 -#: ../app/file/file-save.c:112 +#: ../app/file/file-open.c:133 ../app/file/file-save.c:112 msgid "Not a regular file" msgstr "Необычный файл" @@ -9891,24 +10102,28 @@ msgstr "Расширение %s успешно закончило работу, msgid "%s plug-In could not open image" msgstr "Расширение %s не может открыть изображение" -#: ../app/file/file-open.c:517 +#: ../app/file/file-open.c:513 msgid "Image doesn't contain any layers" msgstr "Изображение не содержит слоев" -#: ../app/file/file-open.c:570 +#: ../app/file/file-open.c:566 #, c-format msgid "Opening '%s' failed: %s" msgstr "Невозможно открыть '%s': %s" -#: ../app/file/file-open.c:676 -msgid "Color management has been disabled. It can be enabled again in the Preferences dialog." -msgstr "Управление цветом отключено. Его можно снова включить через диалог параметров GIMP." +#: ../app/file/file-open.c:675 +msgid "" +"Color management has been disabled. It can be enabled again in the " +"Preferences dialog." +msgstr "" +"Управление цветом отключено. Его можно снова включить через диалог " +"параметров GIMP." #: ../app/file/file-procedure.c:198 msgid "Unknown file type" msgstr "Неизвестный тип файлов" -#: ../app/file/file-save.c:185 +#: ../app/file/file-save.c:189 #, c-format msgid "%s plug-in could not save image" msgstr "Расширение %s не может сохранить изображение" @@ -9918,8 +10133,7 @@ msgstr "Расширение %s не может сохранить изобра 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:90 ../app/file/file-utils.c:126 msgid "Invalid character sequence in URI" msgstr "Неправильная последовательность символов в URI" @@ -9927,8 +10141,7 @@ msgstr "Неправильная последовательность симво msgid "not a GIMP Curves file" msgstr "не файл кривых GIMP" -#: ../app/gegl/gimpcurvesconfig.c:399 -#: ../app/gegl/gimplevelsconfig.c:710 +#: ../app/gegl/gimpcurvesconfig.c:399 ../app/gegl/gimplevelsconfig.c:710 msgid "parse error" msgstr "ошибка при синтаксическом разборе" @@ -9945,8 +10158,7 @@ msgstr "Документы" msgid "GIMP Startup" msgstr "Запуск GIMP" -#: ../app/paint/gimpairbrush.c:70 -#: ../app/tools/gimpairbrushtool.c:53 +#: ../app/paint/gimpairbrush.c:70 ../app/tools/gimpairbrushtool.c:53 msgid "Airbrush" msgstr "Аэрограф" @@ -9954,8 +10166,7 @@ msgstr "Аэрограф" msgid "No brushes available for use with this tool." msgstr "Нет кистей, доступных для использования с этим инструментом." -#: ../app/paint/gimpclone.c:100 -#: ../app/tools/gimpclonetool.c:60 +#: ../app/paint/gimpclone.c:100 ../app/tools/gimpclonetool.c:60 msgid "Clone" msgstr "Штамп" @@ -9967,17 +10178,15 @@ msgstr "Нет текстур, доступных для использован msgid "Convolve" msgstr "Размывание" -#: ../app/paint/gimpdodgeburn.c:88 +#: ../app/paint/gimpdodgeburn.c:89 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:116 -#: ../app/tools/gimphealtool.c:52 +#: ../app/paint/gimpheal.c:116 ../app/tools/gimphealtool.c:52 msgid "Heal" msgstr "Лечебная кисть" @@ -9985,8 +10194,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 "Перо" @@ -10002,12 +10210,11 @@ msgstr "Соотношение сторон капли Пера" msgid "Ink Blob Angle" msgstr "Угол Пера" -#: ../app/paint/gimppaintbrush.c:63 -#: ../app/tools/gimppaintbrushtool.c:50 +#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:50 msgid "Paintbrush" msgstr "Кисть" -#: ../app/paint/gimppaintcore-stroke.c:337 +#: ../app/paint/gimppaintcore-stroke.c:335 msgid "Not enough points to stroke" msgstr "Недостаточно точек для обводки" @@ -10019,13 +10226,12 @@ msgstr "Рисование" msgid "Brush Scale" msgstr "Масштаб кисти" -#: ../app/paint/gimppencil.c:41 -#: ../app/tools/gimppenciltool.c:50 +#: ../app/paint/gimppencil.c:41 ../app/tools/gimppenciltool.c:50 msgid "Pencil" msgstr "Карандаш" #: ../app/paint/gimpperspectiveclone.c:98 -#: ../app/tools/gimpperspectiveclonetool.c:126 +#: ../app/tools/gimpperspectiveclonetool.c:127 msgid "Perspective Clone" msgstr "Штамп по перспективе" @@ -10033,8 +10239,7 @@ msgstr "Штамп по перспективе" msgid "Perspective Clone does not operate on indexed layers." msgstr "Инструмент Штамп по перспективе не работает с индексированными слоями." -#: ../app/paint/gimpsmudge.c:81 -#: ../app/tools/gimpsmudgetool.c:52 +#: ../app/paint/gimpsmudge.c:81 ../app/tools/gimpsmudgetool.c:52 msgid "Smudge" msgstr "Палец" @@ -10092,15 +10297,13 @@ msgstr "Расширение" #: ../app/pdb/drawable-transform-cmds.c:309 #: ../app/pdb/drawable-transform-cmds.c:394 -#: ../app/pdb/transform-tools-cmds.c:145 -#: ../app/tools/gimpperspectivetool.c:69 +#: ../app/pdb/transform-tools-cmds.c:145 ../app/tools/gimpperspectivetool.c:69 msgid "Perspective" msgstr "Перспектива" #: ../app/pdb/drawable-transform-cmds.c:831 #: ../app/pdb/drawable-transform-cmds.c:903 -#: ../app/pdb/transform-tools-cmds.c:361 -#: ../app/tools/gimpsheartool.c:110 +#: ../app/pdb/transform-tools-cmds.c:361 ../app/tools/gimpsheartool.c:110 msgid "Shearing" msgstr "Искривление" @@ -10115,8 +10318,7 @@ msgstr "2D преобразование" msgid "2D Transforming" msgstr "2D преобразование" -#: ../app/pdb/edit-cmds.c:714 -#: ../app/tools/gimpblendtool.c:226 +#: ../app/pdb/edit-cmds.c:714 ../app/tools/gimpblendtool.c:228 msgid "Blending" msgstr "Заливка" @@ -10131,11 +10333,14 @@ msgstr "" "это не плавающее выделение." #: ../app/pdb/floating-sel-cmds.c:128 -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:306 +#: ../app/pdb/gimppdb-query.c:299 ../app/pdb/gimppdb.c:306 #: ../app/pdb/gimppdb.c:376 #, c-format msgid "Procedure '%s' not found" @@ -10226,8 +10431,11 @@ msgstr "Метод рисования '%s' не существует" #: ../app/pdb/gimppdb-utils.c:304 #, c-format -msgid "Item '%s' (%d) can not be used because it has not been added to an image" -msgstr "Невозможно использовать объект '%s' (%d), потому что он не добавлен в изображение" +msgid "" +"Item '%s' (%d) can not be used because it has not been added to an image" +msgstr "" +"Невозможно использовать объект '%s' (%d), потому что он не добавлен в " +"изображение" #: ../app/pdb/gimppdb-utils.c:326 #, c-format @@ -10242,12 +10450,16 @@ msgstr "Попытка добавить элемент '%s' (%d) в неправ #: ../app/pdb/gimppdb-utils.c:353 #, c-format msgid "Layer '%s' (%d) can not be used because it is not a text layer" -msgstr "Невозможно использовать объект '%s' (%d), потому что он не является текстовым слоем" +msgstr "" +"Невозможно использовать объект '%s' (%d), потому что он не является " +"текстовым слоем" #: ../app/pdb/gimppdb-utils.c:394 #, 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:417 #, c-format @@ -10261,63 +10473,98 @@ 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/gimpprocedure.c:365 -#: ../app/plug-in/gimppluginprocframe.c:208 +#: ../app/pdb/gimpprocedure.c:365 ../app/plug-in/gimppluginprocframe.c:208 #, c-format msgid "Procedure '%s' returned no return values" msgstr "Процедура '%s' не вернула какое-либо возвращаемое значение" #: ../app/pdb/gimpprocedure.c:621 #, 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:633 #, 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:665 #, 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:677 #, 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:693 #, 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:705 #, 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:725 #, 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:738 #, 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:2291 -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/selection-tools-cmds.c:217 -#: ../app/tools/gimpfreeselecttool.c:197 +#: ../app/pdb/selection-tools-cmds.c:217 ../app/tools/gimpfreeselecttool.c:198 msgid "Free Select" msgstr "Свободное выделение" @@ -10326,20 +10573,13 @@ msgstr "Свободное выделение" msgid "Failed to create text layer" msgstr "Не удалось создать текстовый слой" -#: ../app/pdb/text-layer-cmds.c:162 -#: ../app/pdb/text-layer-cmds.c:234 -#: ../app/pdb/text-layer-cmds.c:313 -#: ../app/pdb/text-layer-cmds.c:386 -#: ../app/pdb/text-layer-cmds.c:458 -#: ../app/pdb/text-layer-cmds.c:530 -#: ../app/pdb/text-layer-cmds.c:602 -#: ../app/pdb/text-layer-cmds.c:674 -#: ../app/pdb/text-layer-cmds.c:746 -#: ../app/pdb/text-layer-cmds.c:816 -#: ../app/pdb/text-layer-cmds.c:888 -#: ../app/pdb/text-layer-cmds.c:960 -#: ../app/pdb/text-layer-cmds.c:1032 -#: ../app/pdb/text-layer-cmds.c:1068 +#: ../app/pdb/text-layer-cmds.c:162 ../app/pdb/text-layer-cmds.c:234 +#: ../app/pdb/text-layer-cmds.c:313 ../app/pdb/text-layer-cmds.c:386 +#: ../app/pdb/text-layer-cmds.c:458 ../app/pdb/text-layer-cmds.c:530 +#: ../app/pdb/text-layer-cmds.c:602 ../app/pdb/text-layer-cmds.c:674 +#: ../app/pdb/text-layer-cmds.c:746 ../app/pdb/text-layer-cmds.c:816 +#: ../app/pdb/text-layer-cmds.c:888 ../app/pdb/text-layer-cmds.c:960 +#: ../app/pdb/text-layer-cmds.c:1032 ../app/pdb/text-layer-cmds.c:1068 #: ../app/pdb/text-layer-cmds.c:1147 msgid "Set text layer attribute" msgstr "Смена атрибутов текстового слоя" @@ -10392,7 +10632,8 @@ 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" @@ -10493,8 +10734,7 @@ msgstr "" "В чащах юга жил-был цитрус.\n" "Да, но фальшивый экземпляръ!" -#: ../app/text/gimptext-compat.c:107 -#: ../app/tools/gimptexttool.c:1748 +#: ../app/text/gimptext-compat.c:107 ../app/tools/gimptexttool.c:2152 msgid "Add Text Layer" msgstr "Добавить текстовый слой" @@ -10548,7 +10788,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" @@ -10572,131 +10813,126 @@ msgstr "Аэрограф: рисование кистью с переменны msgid "_Airbrush" msgstr "_Аэрограф" -#: ../app/tools/gimpairbrushtool.c:91 -#: ../app/tools/gimpconvolvetool.c:216 +#: ../app/tools/gimpairbrushtool.c:91 ../app/tools/gimpconvolvetool.c:216 #: ../app/tools/gimpsmudgetool.c:96 msgid "Rate:" msgstr "Скорость:" -#: ../app/tools/gimpairbrushtool.c:97 -#: ../app/tools/gimppaintoptions-gui.c:241 +#: ../app/tools/gimpairbrushtool.c:97 ../app/tools/gimppaintoptions-gui.c:241 msgid "Pressure:" msgstr "Нажим:" -#: ../app/tools/gimpaligntool.c:133 -#: ../app/tools/gimpaligntool.c:765 +#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:767 msgid "Align" msgstr "Выравнивание" -#: ../app/tools/gimpaligntool.c:134 +#: ../app/tools/gimpaligntool.c:135 msgid "Alignment Tool: Align or arrange layers and other objects" msgstr "Выравнивание: выравнивание или расстановка слоев и прочих объектов" -#: ../app/tools/gimpaligntool.c:135 +#: ../app/tools/gimpaligntool.c:136 msgid "_Align" msgstr "_Выравнивание" -#: ../app/tools/gimpaligntool.c:598 +#: ../app/tools/gimpaligntool.c:600 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers" -msgstr "Щелкните слой, контур или направляющую, либо используйте перетаскивание для выбора нескольких слоев" +msgstr "" +"Щелкните слой, контур или направляющую, либо используйте перетаскивание для " +"выбора нескольких слоев" -#: ../app/tools/gimpaligntool.c:607 +#: ../app/tools/gimpaligntool.c:609 msgid "Click to pick this layer as first item" msgstr "Щелкните, чтобы сделать этот слой первым объектом" -#: ../app/tools/gimpaligntool.c:615 +#: ../app/tools/gimpaligntool.c:617 msgid "Click to add this layer to the list" msgstr "Щелкните, чтобы добавить этот слой в список" -#: ../app/tools/gimpaligntool.c:619 +#: ../app/tools/gimpaligntool.c:621 msgid "Click to pick this guide as first item" msgstr "Щелкните, чтобы сделать эту направляющую первым объектом" -#: ../app/tools/gimpaligntool.c:627 +#: ../app/tools/gimpaligntool.c:629 msgid "Click to add this guide to the list" msgstr "Щелкните, чтобы добавить эту направляющую в список" -#: ../app/tools/gimpaligntool.c:631 +#: ../app/tools/gimpaligntool.c:633 msgid "Click to pick this path as first item" msgstr "Щелкните, чтобы сделать этот контур первым объектом" -#: ../app/tools/gimpaligntool.c:639 +#: ../app/tools/gimpaligntool.c:641 msgid "Click to add this path to the list" msgstr "Щелкните, чтобы добавить этот контур в список" -#: ../app/tools/gimpaligntool.c:777 +#: ../app/tools/gimpaligntool.c:779 msgid "Relative to:" msgstr "Ориентир:" -#: ../app/tools/gimpaligntool.c:795 +#: ../app/tools/gimpaligntool.c:797 msgid "Align left edge of target" msgstr "Выровнять по левому краю объекта" -#: ../app/tools/gimpaligntool.c:801 +#: ../app/tools/gimpaligntool.c:803 msgid "Align center of target" msgstr "Центрировать по вертикальной оси" -#: ../app/tools/gimpaligntool.c:807 +#: ../app/tools/gimpaligntool.c:809 msgid "Align right edge of target" msgstr "Выровнять по правому краю объекта" -#: ../app/tools/gimpaligntool.c:817 +#: ../app/tools/gimpaligntool.c:819 msgid "Align top edge of target" msgstr "Выровнять по верхнему краю объекта" -#: ../app/tools/gimpaligntool.c:823 +#: ../app/tools/gimpaligntool.c:825 msgid "Align middle of target" msgstr "Центрировать по горизонтальной оси" -#: ../app/tools/gimpaligntool.c:829 +#: ../app/tools/gimpaligntool.c:831 msgid "Align bottom of target" msgstr "Выровнять по нижнему краю объекта" -#: ../app/tools/gimpaligntool.c:833 +#: ../app/tools/gimpaligntool.c:835 msgid "Distribute" msgstr "Расположить" -#: ../app/tools/gimpaligntool.c:847 +#: ../app/tools/gimpaligntool.c:849 msgid "Distribute left edges of targets" msgstr "Равноудалённо расположить левые края объектов" -#: ../app/tools/gimpaligntool.c:854 +#: ../app/tools/gimpaligntool.c:856 msgid "Distribute horizontal centers of targets" msgstr "Равноудалённо расположить центры объектов по горизонтали" -#: ../app/tools/gimpaligntool.c:861 +#: ../app/tools/gimpaligntool.c:863 msgid "Distribute right edges of targets" msgstr "Равноудалённо расположить правые края объектов" -#: ../app/tools/gimpaligntool.c:871 +#: ../app/tools/gimpaligntool.c:873 msgid "Distribute top edges of targets" msgstr "Равноудалённо расположить верхние края объектов" -#: ../app/tools/gimpaligntool.c:878 +#: ../app/tools/gimpaligntool.c:880 msgid "Distribute vertical centers of targets" msgstr "Равноудалённо расположить центры объектов по вертикали" -#: ../app/tools/gimpaligntool.c:884 +#: ../app/tools/gimpaligntool.c:886 msgid "Distribute bottoms of targets" msgstr "Равноудалённо расположить нижние края объектов" -#: ../app/tools/gimpaligntool.c:892 -#: ../app/tools/gimpblendoptions.c:221 +#: ../app/tools/gimpaligntool.c:894 ../app/tools/gimpblendoptions.c:221 msgid "Offset:" msgstr "Смещение:" -#: ../app/tools/gimpblendoptions.c:215 -#: ../app/tools/gimppaintoptions-gui.c:890 +#: ../app/tools/gimpblendoptions.c:215 ../app/tools/gimppaintoptions-gui.c:890 msgid "Gradient:" msgstr "Градиент:" -#: ../app/tools/gimpblendoptions.c:231 -#: ../app/widgets/gimpbrusheditor.c:145 +#: ../app/tools/gimpblendoptions.c:231 ../app/widgets/gimpbrusheditor.c:145 msgid "Shape:" msgstr "Форма:" -#: ../app/tools/gimpblendoptions.c:238 -#: ../app/tools/gimppaintoptions-gui.c:914 +#: ../app/tools/gimpblendoptions.c:238 ../app/tools/gimppaintoptions-gui.c:914 msgid "Repeat:" msgstr "Повтор:" @@ -10714,66 +10950,65 @@ msgstr "Макс. глубина:" msgid "Threshold:" msgstr "Порог:" -#: ../app/tools/gimpblendtool.c:109 +#: ../app/tools/gimpblendtool.c:110 msgid "Blend Tool: Fill selected area with a color gradient" msgstr "Градиент: заливка цветным градиентом" -#: ../app/tools/gimpblendtool.c:110 +#: ../app/tools/gimpblendtool.c:111 msgid "Blen_d" msgstr "_Градиентная заливка" -#: ../app/tools/gimpblendtool.c:165 +#: ../app/tools/gimpblendtool.c:166 msgid "Blend does not operate on indexed layers." msgstr "Градиентная заливка не действует на индексированные слои." -#: ../app/tools/gimpblendtool.c:403 -#: ../app/tools/gimppainttool.c:567 +#: ../app/tools/gimpblendtool.c:405 ../app/tools/gimppainttool.c:571 #, c-format msgid "%s for constrained angles" msgstr "%s для ограничения шага угла" -#: ../app/tools/gimpblendtool.c:404 +#: ../app/tools/gimpblendtool.c:406 #, c-format msgid "%s to move the whole line" msgstr "%s для смещения всей линии" -#: ../app/tools/gimpblendtool.c:408 +#: ../app/tools/gimpblendtool.c:410 msgid "Blend: " msgstr "Градиентная заливка: " -#: ../app/tools/gimpbrightnesscontrasttool.c:111 +#: ../app/tools/gimpbrightnesscontrasttool.c:112 msgid "Brightness/Contrast Tool: Adjust brightness and contrast" msgstr "Яркость-Контраст: коррекция яркости и контраста" -#: ../app/tools/gimpbrightnesscontrasttool.c:112 +#: ../app/tools/gimpbrightnesscontrasttool.c:113 msgid "B_rightness-Contrast..." msgstr "_Яркость-Контраст..." -#: ../app/tools/gimpbrightnesscontrasttool.c:132 +#: ../app/tools/gimpbrightnesscontrasttool.c:133 msgid "Adjust Brightness and Contrast" msgstr "Коррекция яркости и контраста" -#: ../app/tools/gimpbrightnesscontrasttool.c:134 +#: ../app/tools/gimpbrightnesscontrasttool.c:135 msgid "Import Brightness-Contrast settings" msgstr "Импортировать параметры яркости-контраста" -#: ../app/tools/gimpbrightnesscontrasttool.c:135 +#: ../app/tools/gimpbrightnesscontrasttool.c:136 msgid "Export Brightness-Contrast settings" msgstr "Экспортировать параметры яркости-контраста" -#: ../app/tools/gimpbrightnesscontrasttool.c:183 +#: ../app/tools/gimpbrightnesscontrasttool.c:184 msgid "Brightness-Contrast does not operate on indexed layers." msgstr "Яркость-Контраст не действует на индексированные слои." -#: ../app/tools/gimpbrightnesscontrasttool.c:321 +#: ../app/tools/gimpbrightnesscontrasttool.c:323 msgid "_Brightness:" msgstr "_Яркость:" -#: ../app/tools/gimpbrightnesscontrasttool.c:336 +#: ../app/tools/gimpbrightnesscontrasttool.c:338 msgid "Con_trast:" msgstr "_Контраст:" -#: ../app/tools/gimpbrightnesscontrasttool.c:350 +#: ../app/tools/gimpbrightnesscontrasttool.c:352 msgid "Edit these Settings as Levels" msgstr "Изменить эти параметры как уровни" @@ -10818,11 +11053,9 @@ msgstr "Поиск похожих цветов" msgid "Fill transparent areas" msgstr "Залить прозрачные области" -#: ../app/tools/gimpbucketfilloptions.c:275 -#: ../app/tools/gimpclonetool.c:113 -#: ../app/tools/gimpcolorpickeroptions.c:150 -#: ../app/tools/gimphealtool.c:98 -#: ../app/tools/gimpperspectiveclonetool.c:941 +#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:113 +#: ../app/tools/gimpcolorpickeroptions.c:150 ../app/tools/gimphealtool.c:98 +#: ../app/tools/gimpperspectiveclonetool.c:938 #: ../app/tools/gimpregionselectoptions.c:207 msgid "Sample merged" msgstr "Сводить слои" @@ -10857,19 +11090,18 @@ 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:90 +#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:90 #, c-format msgid "%s to set a new clone source" msgstr "%s для создания источника штампа" @@ -10879,13 +11111,12 @@ msgid "Click to set a new clone source" msgstr "Нажмите для получения источника штампа" #: ../app/tools/gimpclonetool.c:108 -#: ../app/tools/gimpperspectiveclonetool.c:936 +#: ../app/tools/gimpperspectiveclonetool.c:933 msgid "Source" msgstr "Источник" -#: ../app/tools/gimpclonetool.c:129 -#: ../app/tools/gimphealtool.c:110 -#: ../app/tools/gimpperspectiveclonetool.c:957 +#: ../app/tools/gimpclonetool.c:129 ../app/tools/gimphealtool.c:110 +#: ../app/tools/gimpperspectiveclonetool.c:954 msgid "Alignment:" msgstr "Выравнивание:" @@ -10917,8 +11148,7 @@ msgstr "Цветовой баланс действует только на из msgid "Select Range to Adjust" msgstr "Выберите изменяемую область" -#: ../app/tools/gimpcolorbalancetool.c:279 -#: ../app/tools/gimplevelstool.c:172 +#: ../app/tools/gimpcolorbalancetool.c:279 ../app/tools/gimplevelstool.c:172 msgid "Adjust Color Levels" msgstr "Коррекция цветовых уровней" @@ -11046,13 +11276,11 @@ msgstr "_Пипетка" msgid "Click in any image to view its color" msgstr "Щелкните любое изображение для просмотра его цвета" -#: ../app/tools/gimpcolorpickertool.c:249 -#: ../app/tools/gimppainttool.c:472 +#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:476 msgid "Click in any image to pick the foreground color" msgstr "Щелкните любое изображение, чтобы снять его цвет переднего плана" -#: ../app/tools/gimpcolorpickertool.c:257 -#: ../app/tools/gimppainttool.c:478 +#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:482 msgid "Click in any image to pick the background color" msgstr "Щелкните любое изображение, чтобы снять его цвет фона" @@ -11065,16 +11293,15 @@ msgstr "Щелкните любое изображение, чтобы доба msgid "Color Picker Information" msgstr "Информация о цвете" -#: ../app/tools/gimpcolortool.c:258 -#: ../app/tools/gimpcolortool.c:437 +#: ../app/tools/gimpcolortool.c:260 ../app/tools/gimpcolortool.c:439 msgid "Move Sample Point: " msgstr "Сместить образцовую точку: " -#: ../app/tools/gimpcolortool.c:430 +#: ../app/tools/gimpcolortool.c:432 msgid "Cancel Sample Point" msgstr "Отменить образцовую точку" -#: ../app/tools/gimpcolortool.c:438 +#: ../app/tools/gimpcolortool.c:440 msgid "Add Sample Point: " msgstr "Добавить образцовую точку: " @@ -11084,7 +11311,8 @@ msgstr "Размывание/Резкость" #: ../app/tools/gimpconvolvetool.c:73 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush" -msgstr "Резкость или размывание: выборочное размывание или увеличение резкости кистью" +msgstr "" +"Резкость или размывание: выборочное размывание или увеличение резкости кистью" #: ../app/tools/gimpconvolvetool.c:74 msgid "Bl_ur / Sharpen" @@ -11130,19 +11358,19 @@ msgstr "Только текущий слой" msgid "Allow growing" msgstr "Разрешить наращивание" -#: ../app/tools/gimpcroptool.c:126 +#: ../app/tools/gimpcroptool.c:127 msgid "Crop" msgstr "Кадрирование" -#: ../app/tools/gimpcroptool.c:127 +#: ../app/tools/gimpcroptool.c:128 msgid "Crop Tool: Remove edge areas from image or layer" msgstr "Кадрирование: удаление областей с края изображения или слоя" -#: ../app/tools/gimpcroptool.c:128 +#: ../app/tools/gimpcroptool.c:129 msgid "_Crop" msgstr "_Кадрирование" -#: ../app/tools/gimpcroptool.c:269 +#: ../app/tools/gimpcroptool.c:271 msgid "Click or press Enter to crop" msgstr "Чтобы откадрировать, нажмите клавишу ввода" @@ -11180,15 +11408,15 @@ msgstr "Нажмите, чтобы добавить контрольные то #: ../app/tools/gimpcurvestool.c:336 msgid "Click to locate on curve (try Shift, Ctrl)" -msgstr "Щелкните мышкой для помещения точки под курсором на кривую (попробуйте с Shift, Ctrl)" +msgstr "" +"Щелкните мышкой для помещения точки под курсором на кривую (попробуйте с " +"Shift, Ctrl)" -#: ../app/tools/gimpcurvestool.c:449 -#: ../app/tools/gimplevelstool.c:380 +#: ../app/tools/gimpcurvestool.c:449 ../app/tools/gimplevelstool.c:380 msgid "Cha_nnel:" msgstr "_Канал:" -#: ../app/tools/gimpcurvestool.c:475 -#: ../app/tools/gimplevelstool.c:404 +#: ../app/tools/gimpcurvestool.c:475 ../app/tools/gimplevelstool.c:404 msgid "R_eset Channel" msgstr "_Восстановить" @@ -11196,8 +11424,7 @@ msgstr "_Восстановить" msgid "Curve _type:" msgstr "Тип _кривой:" -#: ../app/tools/gimpcurvestool.c:640 -#: ../app/tools/gimplevelstool.c:752 +#: ../app/tools/gimpcurvestool.c:640 ../app/tools/gimplevelstool.c:752 #, c-format msgid "Could not read header from '%s': %s" msgstr "Невозможно прочесть заголовок из '%s': %s" @@ -11343,8 +11570,11 @@ msgid "Flip" msgstr "Зеркало" #: ../app/tools/gimpfliptool.c:80 -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:82 msgid "_Flip" @@ -11364,8 +11594,12 @@ msgid "Size of the brush used for refinements" msgstr "Размер кисти для выделения" #: ../app/tools/gimpforegroundselectoptions.c:101 -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:120 msgid "Sensitivity for brightness component" @@ -11419,60 +11653,68 @@ msgstr "Цвет просмотра:" msgid "Color Sensitivity" msgstr "Чувствительность к цвету" -#: ../app/tools/gimpforegroundselecttool.c:145 +#: ../app/tools/gimpforegroundselecttool.c:146 msgid "Foreground Select" msgstr "Выделение переднего плана" -#: ../app/tools/gimpforegroundselecttool.c:146 -msgid "Foreground Select Tool: Select a region containing foreground objects" -msgstr "Выделение переднего плана: выделение области, содержащей объекты на переднем плане" - #: ../app/tools/gimpforegroundselecttool.c:147 +msgid "Foreground Select Tool: Select a region containing foreground objects" +msgstr "" +"Выделение переднего плана: выделение области, содержащей объекты на переднем " +"плане" + +#: ../app/tools/gimpforegroundselecttool.c:148 msgid "F_oreground Select" msgstr "Выделение _переднего плана" -#: ../app/tools/gimpforegroundselecttool.c:314 +#: ../app/tools/gimpforegroundselecttool.c:315 msgid "Add more strokes or press Enter to accept the selection" msgstr "Продолжите штриховку или нажмите Enter для подтверждения" -#: ../app/tools/gimpforegroundselecttool.c:316 +#: ../app/tools/gimpforegroundselecttool.c:317 msgid "Mark foreground by painting on the object to extract" msgstr "Заштрихуйте выделяемый объект" -#: ../app/tools/gimpforegroundselecttool.c:327 +#: ../app/tools/gimpforegroundselecttool.c:328 msgid "Roughly outline the object to extract" msgstr "Обведите извлекаемый объект на скорую руку" -#: ../app/tools/gimpforegroundselecttool.c:766 +#: ../app/tools/gimpforegroundselecttool.c:768 msgctxt "command" msgid "Foreground Select" msgstr "Выделение переднего плана" -#: ../app/tools/gimpfreeselecttool.c:198 -msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments" -msgstr "Свободное выделение: выделение области произвольными линиями или отрезками" - #: ../app/tools/gimpfreeselecttool.c:199 +msgid "" +"Free Select Tool: Select a hand-drawn region with free and polygonal segments" +msgstr "" +"Свободное выделение: выделение области произвольными линиями или отрезками" + +#: ../app/tools/gimpfreeselecttool.c:200 msgid "_Free Select" msgstr "С_вободное выделение" -#: ../app/tools/gimpfreeselecttool.c:1116 +#: ../app/tools/gimpfreeselecttool.c:1117 msgid "Click to complete selection" msgstr "Щелкните для завершения выделения" -#: ../app/tools/gimpfreeselecttool.c:1120 +#: ../app/tools/gimpfreeselecttool.c:1121 msgid "Click-Drag to move segment vertex" msgstr "Щелкните и потащите, чтобы переместить вершину сегмента" -#: ../app/tools/gimpfreeselecttool.c:1125 +#: ../app/tools/gimpfreeselecttool.c:1126 msgid "Return commits, Escape cancels, Backspace removes last segment" -msgstr "Ввод завершает выделение, Escape отменяет его, Забой убирает последний сегмент" +msgstr "" +"Ввод завершает выделение, Escape отменяет его, Забой убирает последний " +"сегмент" -#: ../app/tools/gimpfreeselecttool.c:1129 +#: ../app/tools/gimpfreeselecttool.c:1130 msgid "Click-Drag adds a free segment, Click adds a polygonal segment" -msgstr "Щелчок+перетаскивание рисует произвольную линию, щелчок добавляет прямой отрезок" +msgstr "" +"Щелчок+перетаскивание рисует произвольную линию, щелчок добавляет прямой " +"отрезок" -#: ../app/tools/gimpfreeselecttool.c:1581 +#: ../app/tools/gimpfreeselecttool.c:1583 msgctxt "command" msgid "Free Select" msgstr "Выделение от руки" @@ -11489,8 +11731,7 @@ msgstr "Выделение связанной области: выделение msgid "Fu_zzy Select" msgstr "В_ыделение связанной области" -#: ../app/tools/gimpgegltool.c:92 -#: ../app/tools/gimpgegltool.c:111 +#: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111 msgid "GEGL Operation" msgstr "Операция GEGL" @@ -11523,13 +11764,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:81 +#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:81 #, c-format msgid "%s to set a new heal source" msgstr "%s для выбора источника лечащего штампа" @@ -11623,7 +11862,7 @@ msgstr "_Предустановки:" msgid "Settings saved to '%s'" msgstr "Настройки сохранены в '%s'" -#: ../app/tools/gimpimagemaptool.c:319 +#: ../app/tools/gimpimagemaptool.c:315 msgid "_Preview" msgstr "Пр_едварительный просмотр" @@ -11632,15 +11871,12 @@ msgstr "Пр_едварительный просмотр" msgid "Adjustment" msgstr "Коррекция" -#: ../app/tools/gimpinkoptions-gui.c:67 -#: ../app/tools/gimpinkoptions-gui.c:92 -#: ../app/tools/gimprectangleoptions.c:972 -#: ../app/tools/gimptextoptions.c:452 +#: ../app/tools/gimpinkoptions-gui.c:67 ../app/tools/gimpinkoptions-gui.c:92 +#: ../app/tools/gimprectangleoptions.c:972 ../app/tools/gimptextoptions.c:452 msgid "Size:" msgstr "Размер:" -#: ../app/tools/gimpinkoptions-gui.c:75 -#: ../app/tools/gimpmeasuretool.c:1039 +#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1041 #: ../app/tools/gimppaintoptions-gui.c:168 #: ../app/widgets/gimpbrusheditor.c:207 msgid "Angle:" @@ -11681,46 +11917,44 @@ msgstr "П_еро" msgid "Interactive boundary" msgstr "Интерактивные границы" -#: ../app/tools/gimpiscissorstool.c:278 +#: ../app/tools/gimpiscissorstool.c:279 msgid "Scissors" msgstr "Ножницы" -#: ../app/tools/gimpiscissorstool.c:279 +#: ../app/tools/gimpiscissorstool.c:280 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting" msgstr "Умные ножницы: выделение фигур при помощи распознавания краёв" -#: ../app/tools/gimpiscissorstool.c:280 +#: ../app/tools/gimpiscissorstool.c:281 msgid "Intelligent _Scissors" msgstr "_Умные ножницы" -#: ../app/tools/gimpiscissorstool.c:940 -#: ../app/tools/gimpmeasuretool.c:610 +#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpmeasuretool.c:612 msgid "Click-Drag to move this point" msgstr "Нажмите и потащите, чтобы переместить точку" -#: ../app/tools/gimpiscissorstool.c:942 -#: ../app/tools/gimpiscissorstool.c:1007 +#: ../app/tools/gimpiscissorstool.c:944 ../app/tools/gimpiscissorstool.c:1009 #, c-format msgid "%s: disable auto-snap" msgstr "%s: отключить автоприлипание" -#: ../app/tools/gimpiscissorstool.c:959 +#: ../app/tools/gimpiscissorstool.c:961 msgid "Click to close the curve" msgstr "Щелкните для закрытия контура" -#: ../app/tools/gimpiscissorstool.c:965 +#: ../app/tools/gimpiscissorstool.c:967 msgid "Click to add a point on this segment" msgstr "Щелкните для добавления узла в сегмент" -#: ../app/tools/gimpiscissorstool.c:979 +#: ../app/tools/gimpiscissorstool.c:981 msgid "Click or press Enter to convert to a selection" msgstr "Щелкните и нажите ввод для преобразования в выделение" -#: ../app/tools/gimpiscissorstool.c:989 +#: ../app/tools/gimpiscissorstool.c:991 msgid "Press Enter to convert to a selection" msgstr "Нажмите ввод для преобразования в выделение" -#: ../app/tools/gimpiscissorstool.c:1004 +#: ../app/tools/gimpiscissorstool.c:1006 msgid "Click or Click-Drag to add a point" msgstr "Щелкните или щелкните и потащите для добавления узла" @@ -11775,8 +12009,7 @@ msgstr "Уровни на выходе" msgid "All Channels" msgstr "Все каналы" -#: ../app/tools/gimplevelstool.c:653 -#: ../app/tools/gimpthresholdtool.c:264 +#: ../app/tools/gimplevelstool.c:653 ../app/tools/gimpthresholdtool.c:264 msgid "_Auto" msgstr "_Авто" @@ -11797,21 +12030,20 @@ msgid "Auto-resize window" msgstr "Изменять размер окна" #. tool toggle -#: ../app/tools/gimpmagnifyoptions.c:171 -#: ../app/tools/gimpmoveoptions.c:187 +#: ../app/tools/gimpmagnifyoptions.c:171 ../app/tools/gimpmoveoptions.c:187 #, c-format msgid "Tool Toggle (%s)" msgstr "Переключатель инструмента (%s)" -#: ../app/tools/gimpmagnifytool.c:86 +#: ../app/tools/gimpmagnifytool.c:87 msgid "Zoom" msgstr "Лупа" -#: ../app/tools/gimpmagnifytool.c:87 +#: ../app/tools/gimpmagnifytool.c:88 msgid "Zoom Tool: Adjust the zoom level" msgstr "Лупа: изменение масштаба отображения" -#: ../app/tools/gimpmagnifytool.c:88 +#: ../app/tools/gimpmagnifytool.c:89 msgid "tool|_Zoom" msgstr "_Лупа" @@ -11819,56 +12051,54 @@ msgstr "_Лупа" msgid "Use info window" msgstr "Информационное окно" -#: ../app/tools/gimpmeasuretool.c:121 +#: ../app/tools/gimpmeasuretool.c:122 msgid "Measure" msgstr "Измеритель" -#: ../app/tools/gimpmeasuretool.c:122 +#: ../app/tools/gimpmeasuretool.c:123 msgid "Measure Tool: Measure distances and angles" msgstr "Измеритель: измерение расстояний и углов" -#: ../app/tools/gimpmeasuretool.c:123 +#: ../app/tools/gimpmeasuretool.c:124 msgid "_Measure" msgstr "_Измеритель" -#: ../app/tools/gimpmeasuretool.c:241 +#: ../app/tools/gimpmeasuretool.c:243 msgid "Add Guides" msgstr "Добавить направляющие" -#: ../app/tools/gimpmeasuretool.c:561 +#: ../app/tools/gimpmeasuretool.c:563 msgid "Click to place vertical and horizontal guides" msgstr "Щелкните для размещения вертикальной или горизонтальной направляющей" -#: ../app/tools/gimpmeasuretool.c:570 +#: ../app/tools/gimpmeasuretool.c:572 msgid "Click to place a horizontal guide" msgstr "Щелкните для размещения горизонтальной направляющей" -#: ../app/tools/gimpmeasuretool.c:585 +#: ../app/tools/gimpmeasuretool.c:587 msgid "Click to place a vertical guide" msgstr "Щелкните для размещения вертикальной направляющей" -#: ../app/tools/gimpmeasuretool.c:599 +#: ../app/tools/gimpmeasuretool.c:601 msgid "Click-Drag to add a new point" msgstr "Щелкните и потащите, чтобы добавить новую точку" -#: ../app/tools/gimpmeasuretool.c:630 +#: ../app/tools/gimpmeasuretool.c:632 msgid "Click-Drag to move all points" msgstr "Щелкните и потащите, чтобы переместить все точки" -#: ../app/tools/gimpmeasuretool.c:879 -#: ../app/tools/gimpmeasuretool.c:1022 -#: ../app/tools/gimpmeasuretool.c:1078 -#: ../app/tools/gimpmeasuretool.c:1106 -#: ../app/tools/gimppainttool.c:576 +#: ../app/tools/gimpmeasuretool.c:881 ../app/tools/gimpmeasuretool.c:1024 +#: ../app/tools/gimpmeasuretool.c:1080 ../app/tools/gimpmeasuretool.c:1108 +#: ../app/tools/gimppainttool.c:580 msgid "pixels" msgstr "точки растра" #. tool->display->shell -#: ../app/tools/gimpmeasuretool.c:991 +#: ../app/tools/gimpmeasuretool.c:993 msgid "Measure Distances and Angles" msgstr "Измерение расстояний и углов" -#: ../app/tools/gimpmeasuretool.c:1011 +#: ../app/tools/gimpmeasuretool.c:1013 msgid "Distance:" msgstr "Расстояние:" @@ -11896,29 +12126,28 @@ msgstr "Переместить активный контур" msgid "Move:" msgstr "Перемещение:" -#: ../app/tools/gimpmovetool.c:127 +#: ../app/tools/gimpmovetool.c:128 msgctxt "tool" msgid "Move" msgstr "Перемещение" -#: ../app/tools/gimpmovetool.c:128 +#: ../app/tools/gimpmovetool.c:129 msgid "Move Tool: Move layers, selections, and other objects" msgstr "Перемещение: перемещение слоев, выделений и прочих объектов" -#: ../app/tools/gimpmovetool.c:129 +#: ../app/tools/gimpmovetool.c:130 msgid "_Move" msgstr "_Перемещение" -#: ../app/tools/gimpmovetool.c:276 -#: ../app/tools/gimpmovetool.c:572 +#: ../app/tools/gimpmovetool.c:278 ../app/tools/gimpmovetool.c:574 msgid "Move Guide: " msgstr "Переместить направляющую:" -#: ../app/tools/gimpmovetool.c:566 +#: ../app/tools/gimpmovetool.c:568 msgid "Cancel Guide" msgstr "Отменить направляющую" -#: ../app/tools/gimpmovetool.c:572 +#: ../app/tools/gimpmovetool.c:574 msgid "Add Guide: " msgstr "Добавить направляющую:" @@ -11932,15 +12161,13 @@ msgstr "_Кисть" #: ../app/tools/gimppaintoptions-gui.c:121 #: ../app/tools/gimpselectionoptions.c:210 -#: ../app/widgets/gimpbrushselect.c:193 -#: ../app/widgets/gimplayertreeview.c:296 +#: ../app/widgets/gimpbrushselect.c:193 ../app/widgets/gimplayertreeview.c:296 msgid "Mode:" msgstr "Режим:" #: ../app/tools/gimppaintoptions-gui.c:136 #: ../app/tools/gimptransformoptions.c:347 -#: ../app/widgets/gimpbrushselect.c:180 -#: ../app/widgets/gimplayertreeview.c:311 +#: ../app/widgets/gimpbrushselect.c:180 ../app/widgets/gimplayertreeview.c:311 msgid "Opacity:" msgstr "Непрозр.:" @@ -12025,20 +12252,20 @@ msgstr "Степень:" msgid "Use color from gradient" msgstr "Взять цвет из градиента" -#: ../app/tools/gimppainttool.c:136 +#: ../app/tools/gimppainttool.c:137 msgid "Click to paint" msgstr "Нажмите, чтобы нарисовать" -#: ../app/tools/gimppainttool.c:137 +#: ../app/tools/gimppainttool.c:138 msgid "Click to draw the line" msgstr "Нажмите, чтобы нарисовать линию" -#: ../app/tools/gimppainttool.c:138 +#: ../app/tools/gimppainttool.c:139 #, c-format msgid "%s to pick a color" msgstr "%s, чтобы взять пипеткой цвет" -#: ../app/tools/gimppainttool.c:623 +#: ../app/tools/gimppainttool.c:627 #, c-format msgid "%s for a straight line" msgstr "%s для рисования прямой линии" @@ -12051,15 +12278,19 @@ msgstr "Карандаш: рисование резкими штрихами" msgid "Pe_ncil" msgstr "Кара_ндаш" -#: ../app/tools/gimpperspectiveclonetool.c:127 -msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation" -msgstr "Штамп по перспективе: применение инструмента «Штамп» с учетом перспективы изображения" +#: ../app/tools/gimpperspectiveclonetool.c:128 +msgid "" +"Perspective Clone Tool: Clone from an image source after applying a " +"perspective transformation" +msgstr "" +"Штамп по перспективе: применение инструмента «Штамп» с учетом перспективы " +"изображения" -#: ../app/tools/gimpperspectiveclonetool.c:129 +#: ../app/tools/gimpperspectiveclonetool.c:130 msgid "_Perspective Clone" msgstr "Штамп по п_ерспективе" -#: ../app/tools/gimpperspectiveclonetool.c:692 +#: ../app/tools/gimpperspectiveclonetool.c:694 msgid "Ctrl-Click to set a clone source" msgstr "Нажмите Ctrl для получения источника штампа" @@ -12142,20 +12373,19 @@ msgstr "Во всех слоях" msgid "Rounded corners" msgstr "Закруглённые углы" -#: ../app/tools/gimprectangleselecttool.c:167 +#: ../app/tools/gimprectangleselecttool.c:168 msgid "Rectangle Select" msgstr "Прямоугольное выделение" -#: ../app/tools/gimprectangleselecttool.c:168 +#: ../app/tools/gimprectangleselecttool.c:169 msgid "Rectangle Select Tool: Select a rectangular region" msgstr "Прямоугольное выделение: выделение прямоугольной области" -#: ../app/tools/gimprectangleselecttool.c:169 +#: ../app/tools/gimprectangleselecttool.c:170 msgid "_Rectangle Select" msgstr "Пр_ямоугольное выделение" -#: ../app/tools/gimprectangletool.c:1151 -#: ../app/tools/gimprectangletool.c:2091 +#: ../app/tools/gimprectangletool.c:1151 ../app/tools/gimprectangletool.c:2091 msgid "Rectangle: " msgstr "Прямоугольник: " @@ -12175,7 +12405,7 @@ msgstr "Выделять прозрачные области" msgid "Select by:" msgstr "Выбор по:" -#: ../app/tools/gimpregionselecttool.c:162 +#: ../app/tools/gimpregionselecttool.c:164 msgid "Move the mouse to change threshold" msgstr "Переместите мышь для смены порога" @@ -12220,8 +12450,7 @@ msgctxt "command" msgid "Scale" msgstr "Масштаб" -#: ../app/tools/gimpselectionoptions.c:257 -#: ../app/tools/gimptextoptions.c:465 +#: ../app/tools/gimpselectionoptions.c:257 ../app/tools/gimptextoptions.c:465 msgid "Antialiasing" msgstr "Сглаживание" @@ -12307,8 +12536,11 @@ msgid "Click to smudge the line" msgstr "Нажмите для размазывания линией" #: ../app/tools/gimptextoptions.c:130 -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:152 msgid "Indentation of the first line" @@ -12323,8 +12555,12 @@ msgid "Adjust letter spacing" msgstr "Интервал между буквами" #: ../app/tools/gimptextoptions.c:171 -msgid "Use an external editor window for text entry, instead of direct-on-canvas editing" -msgstr "Использовать окно с редактором текста вместо редактирования текста прямо на холсте" +msgid "" +"Use an external editor window for text entry, instead of direct-on-canvas " +"editing" +msgstr "" +"Использовать окно с редактором текста вместо редактирования текста прямо на " +"холсте" #: ../app/tools/gimptextoptions.c:445 msgid "Font:" @@ -12350,42 +12586,44 @@ msgstr "Цвет:" msgid "Justify:" msgstr "Выключка:" -#: ../app/tools/gimptexttool.c:208 +#: ../app/tools/gimptexttool.c:225 msgid "Text" msgstr "Текст" -#: ../app/tools/gimptexttool.c:209 +#: ../app/tools/gimptexttool.c:226 msgid "Text Tool: Create or edit text layers" msgstr "Текст: создание и редактирование текстовых слоев" -#: ../app/tools/gimptexttool.c:210 +#: ../app/tools/gimptexttool.c:227 msgid "Te_xt" msgstr "_Текст" -#: ../app/tools/gimptexttool.c:1361 +#: ../app/tools/gimptexttool.c:1337 msgid "Reshape Text Layer" msgstr "Смена размера текстового слоя" -#: ../app/tools/gimptexttool.c:1826 +#: ../app/tools/gimptexttool.c:2230 msgid "GIMP Text Editor" msgstr "Текстовый редактор GIMP" -#: ../app/tools/gimptexttool.c:1955 -#: ../app/tools/gimptexttool.c:1958 +#: ../app/tools/gimptexttool.c:2352 ../app/tools/gimptexttool.c:2355 msgid "Confirm Text Editing" msgstr "Подтвердите изменение текста" -#: ../app/tools/gimptexttool.c:1962 +#: ../app/tools/gimptexttool.c:2359 msgid "Create _New Layer" msgstr "_Создать новый слой" -#: ../app/tools/gimptexttool.c:1986 +#: ../app/tools/gimptexttool.c:2383 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" "Вы можете продолжить редактировать этот слой или создать новый." @@ -12417,7 +12655,7 @@ msgstr "Порог не работает с индексированными с msgid "Automatically adjust to optimal binarization threshold" msgstr "Автоматически установить оптимальную бинаризацию порога" -#: ../app/tools/gimptool.c:850 +#: ../app/tools/gimptool.c:857 msgid "Can't work on an empty image, add a layer first" msgstr "Работа с пустым изображением невозможна, для начала добавьте слой" @@ -12452,15 +12690,15 @@ msgstr "15 градусов (%s)" msgid "Keep aspect (%s)" msgstr "Сохранить пропорции (%s)" -#: ../app/tools/gimptransformtool.c:236 +#: ../app/tools/gimptransformtool.c:237 msgid "Transforming" msgstr "Преобразование" -#: ../app/tools/gimptransformtool.c:1163 +#: ../app/tools/gimptransformtool.c:1165 msgid "There is no layer to transform." msgstr "Нет слоя для преобразования." -#: ../app/tools/gimptransformtool.c:1174 +#: ../app/tools/gimptransformtool.c:1176 msgid "There is no path to transform." msgstr "Нет контура для преобразования." @@ -12494,261 +12732,259 @@ msgstr "" msgid "Selection from Path" msgstr "Выделение из контура" -#: ../app/tools/gimpvectortool.c:161 +#: ../app/tools/gimpvectortool.c:162 msgid "Paths Tool: Create and edit paths" msgstr "Контуры: создание и правка контуров" -#: ../app/tools/gimpvectortool.c:162 +#: ../app/tools/gimpvectortool.c:163 msgid "Pat_hs" msgstr "Ко_нтуры" -#: ../app/tools/gimpvectortool.c:322 +#: ../app/tools/gimpvectortool.c:324 msgid "Add Stroke" msgstr "Добавить контур" -#: ../app/tools/gimpvectortool.c:345 +#: ../app/tools/gimpvectortool.c:347 msgid "Add Anchor" msgstr "Добавка узла" -#: ../app/tools/gimpvectortool.c:370 +#: ../app/tools/gimpvectortool.c:372 msgid "Insert Anchor" msgstr "Вставка узла" -#: ../app/tools/gimpvectortool.c:400 +#: ../app/tools/gimpvectortool.c:402 msgid "Drag Handle" msgstr "Перемещение рычага" -#: ../app/tools/gimpvectortool.c:429 +#: ../app/tools/gimpvectortool.c:431 msgid "Drag Anchor" msgstr "Перемещение узла" -#: ../app/tools/gimpvectortool.c:446 +#: ../app/tools/gimpvectortool.c:448 msgid "Drag Anchors" msgstr "Переместить узлы" -#: ../app/tools/gimpvectortool.c:468 +#: ../app/tools/gimpvectortool.c:470 msgid "Drag Curve" msgstr "Перемещение контура" -#: ../app/tools/gimpvectortool.c:496 +#: ../app/tools/gimpvectortool.c:498 msgid "Connect Strokes" msgstr "Соединить контуры" -#: ../app/tools/gimpvectortool.c:527 +#: ../app/tools/gimpvectortool.c:529 msgid "Drag Path" msgstr "Перемещение контура" -#: ../app/tools/gimpvectortool.c:537 +#: ../app/tools/gimpvectortool.c:539 msgid "Convert Edge" msgstr "Преобразовать угол" -#: ../app/tools/gimpvectortool.c:567 +#: ../app/tools/gimpvectortool.c:569 msgid "Delete Anchor" msgstr "Удаление узла" -#: ../app/tools/gimpvectortool.c:589 +#: ../app/tools/gimpvectortool.c:591 msgid "Delete Segment" msgstr "Удаление сегмента" -#: ../app/tools/gimpvectortool.c:807 +#: ../app/tools/gimpvectortool.c:809 msgid "Move Anchors" msgstr "Перемещение узлов" -#: ../app/tools/gimpvectortool.c:1167 +#: ../app/tools/gimpvectortool.c:1169 msgid "Click to pick path to edit" msgstr "Нажмите, чтобы выбрать контур для правки" -#: ../app/tools/gimpvectortool.c:1171 +#: ../app/tools/gimpvectortool.c:1173 msgid "Click to create a new path" msgstr "Нажмите, чтобы создать новый контур" -#: ../app/tools/gimpvectortool.c:1175 +#: ../app/tools/gimpvectortool.c:1177 msgid "Click to create a new component of the path" msgstr "Нажмите, чтобы создать новый компонент контура" -#: ../app/tools/gimpvectortool.c:1179 +#: ../app/tools/gimpvectortool.c:1181 msgid "Click or Click-Drag to create a new anchor" msgstr "Щелкните или щелкните и потащите для создания нового узла" -#: ../app/tools/gimpvectortool.c:1189 -#: ../app/tools/gimpvectortool.c:1196 +#: ../app/tools/gimpvectortool.c:1191 ../app/tools/gimpvectortool.c:1198 msgid "Click-Drag to move the anchor around" msgstr "Нажмите и потащите, чтобы переместить узел" -#: ../app/tools/gimpvectortool.c:1200 -#: ../app/tools/gimpvectortool.c:1213 +#: ../app/tools/gimpvectortool.c:1202 ../app/tools/gimpvectortool.c:1215 msgid "Click-Drag to move the anchors around" msgstr "Нажмите и потащите, чтобы переместить узлы" -#: ../app/tools/gimpvectortool.c:1204 +#: ../app/tools/gimpvectortool.c:1206 msgid "Click-Drag to move the handle around" msgstr "Нажмите и потащите, чтобы переместить рычаг" -#: ../app/tools/gimpvectortool.c:1218 +#: ../app/tools/gimpvectortool.c:1220 msgid "Click-Drag to change the shape of the curve" msgstr "Нажмите и потащите, чтобы изменить фигуру кривой" -#: ../app/tools/gimpvectortool.c:1221 +#: ../app/tools/gimpvectortool.c:1223 #, c-format msgid "%s: symmetrical" msgstr "%s: симметрично" -#: ../app/tools/gimpvectortool.c:1226 +#: ../app/tools/gimpvectortool.c:1228 msgid "Click-Drag to move the component around" msgstr "Нажмите и потащите, чтобы переместить компонент" -#: ../app/tools/gimpvectortool.c:1234 +#: ../app/tools/gimpvectortool.c:1236 msgid "Click-Drag to move the path around" msgstr "Нажмите и потащите, чтобы переместить контур" -#: ../app/tools/gimpvectortool.c:1238 +#: ../app/tools/gimpvectortool.c:1240 msgid "Click-Drag to insert an anchor on the path" msgstr "Нажмите, чтобы вставить узел в контур" -#: ../app/tools/gimpvectortool.c:1246 +#: ../app/tools/gimpvectortool.c:1248 msgid "Click to delete this anchor" msgstr "Нажмите, чтобы удалить этот узел" -#: ../app/tools/gimpvectortool.c:1250 +#: ../app/tools/gimpvectortool.c:1252 msgid "Click to connect this anchor with the selected endpoint" msgstr "Нажмите, чтобы соединить этот узел с выбранным конечным узлом" -#: ../app/tools/gimpvectortool.c:1255 +#: ../app/tools/gimpvectortool.c:1257 msgid "Click to open up the path" msgstr "Нажмите, чтобы разомкнуть контур" -#: ../app/tools/gimpvectortool.c:1259 +#: ../app/tools/gimpvectortool.c:1261 msgid "Click to make this node angular" msgstr "Нажмите, чтобы сделать этот узел угловым" -#: ../app/tools/gimpvectortool.c:1766 +#: ../app/tools/gimpvectortool.c:1768 msgid "Delete Anchors" msgstr "Удалить узлы" -#: ../app/tools/gimpvectortool.c:1912 +#: ../app/tools/gimpvectortool.c:1914 msgid "Path to selection" msgstr "Контур → Выделение" -#: ../app/tools/gimpvectortool.c:1939 +#: ../app/tools/gimpvectortool.c:1941 msgid "There is no active layer or channel to stroke to" msgstr "Нет активного слоя или канала для обводки" -#: ../app/tools/tools-enums.c:60 +#: ../app/tools/tools-enums.c:91 msgctxt "rectangle-guide" msgid "No guides" msgstr "Без направляющих" -#: ../app/tools/tools-enums.c:61 +#: ../app/tools/tools-enums.c:92 msgctxt "rectangle-guide" msgid "Center lines" msgstr "Линии по центру" -#: ../app/tools/tools-enums.c:62 +#: ../app/tools/tools-enums.c:93 msgctxt "rectangle-guide" msgid "Rule of thirds" msgstr "Правило третей" -#: ../app/tools/tools-enums.c:63 +#: ../app/tools/tools-enums.c:94 msgctxt "rectangle-guide" msgid "Golden sections" msgstr "Золотое сечение" -#: ../app/tools/tools-enums.c:64 +#: ../app/tools/tools-enums.c:95 msgctxt "rectangle-guide" msgid "Diagonal lines" msgstr "Диагональные линии" -#: ../app/tools/tools-enums.c:154 +#: ../app/tools/tools-enums.c:185 msgctxt "rectangle-tool-fixed-rule" msgid "Aspect ratio" msgstr "Соотношение сторон" -#: ../app/tools/tools-enums.c:155 +#: ../app/tools/tools-enums.c:186 msgctxt "rectangle-tool-fixed-rule" msgid "Width" msgstr "Ширина" -#: ../app/tools/tools-enums.c:156 +#: ../app/tools/tools-enums.c:187 msgctxt "rectangle-tool-fixed-rule" msgid "Height" msgstr "Высота" -#: ../app/tools/tools-enums.c:157 +#: ../app/tools/tools-enums.c:188 msgctxt "rectangle-tool-fixed-rule" msgid "Size" msgstr "Размер" -#: ../app/tools/tools-enums.c:186 +#: ../app/tools/tools-enums.c:217 msgctxt "rect-select-mode" msgid "Free select" msgstr "Свободное выделение" -#: ../app/tools/tools-enums.c:187 +#: ../app/tools/tools-enums.c:218 msgctxt "rect-select-mode" msgid "Fixed size" msgstr "Фикс. размер" -#: ../app/tools/tools-enums.c:188 +#: ../app/tools/tools-enums.c:219 msgctxt "rect-select-mode" msgid "Fixed aspect ratio" msgstr "Фиксированные пропорции" -#: ../app/tools/tools-enums.c:217 +#: ../app/tools/tools-enums.c:248 msgctxt "transform-type" msgid "Layer" msgstr "Слой" -#: ../app/tools/tools-enums.c:218 +#: ../app/tools/tools-enums.c:249 msgctxt "transform-type" msgid "Selection" msgstr "Выделение" -#: ../app/tools/tools-enums.c:219 +#: ../app/tools/tools-enums.c:250 msgctxt "transform-type" msgid "Path" msgstr "Контур" -#: ../app/tools/tools-enums.c:249 +#: ../app/tools/tools-enums.c:280 msgctxt "transform-preview-type" msgid "Outline" msgstr "Контур" -#: ../app/tools/tools-enums.c:250 +#: ../app/tools/tools-enums.c:281 msgctxt "transform-preview-type" msgid "Grid" msgstr "Сетка" -#: ../app/tools/tools-enums.c:251 +#: ../app/tools/tools-enums.c:282 msgctxt "transform-preview-type" msgid "Image" msgstr "Изображение" -#: ../app/tools/tools-enums.c:252 +#: ../app/tools/tools-enums.c:283 msgctxt "transform-preview-type" msgid "Image + Grid" msgstr "Изображение + Сетка" -#: ../app/tools/tools-enums.c:280 +#: ../app/tools/tools-enums.c:311 msgctxt "transform-grid-type" msgid "Number of grid lines" msgstr "Число линий сетки" -#: ../app/tools/tools-enums.c:281 +#: ../app/tools/tools-enums.c:312 msgctxt "transform-grid-type" msgid "Grid line spacing" msgstr "Интервал между линиями" -#: ../app/tools/tools-enums.c:310 +#: ../app/tools/tools-enums.c:341 msgctxt "vector-mode" msgid "Design" msgstr "Создание" -#: ../app/tools/tools-enums.c:311 +#: ../app/tools/tools-enums.c:342 msgctxt "vector-mode" msgid "Edit" msgstr "Правка" -#: ../app/tools/tools-enums.c:312 +#: ../app/tools/tools-enums.c:343 msgctxt "vector-mode" msgid "Move" msgstr "Перемещение" @@ -12761,8 +12997,7 @@ msgstr "Контур" msgid "Rename Path" msgstr "Переименование контура" -#: ../app/vectors/gimpvectors.c:194 -#: ../app/vectors/gimpvectors.c:316 +#: ../app/vectors/gimpvectors.c:194 ../app/vectors/gimpvectors.c:316 msgid "Move Path" msgstr "Перемещение контура" @@ -12774,18 +13009,15 @@ msgstr "Масштабирование контура" msgid "Resize Path" msgstr "Смена размера контура" -#: ../app/vectors/gimpvectors.c:197 -#: ../app/vectors/gimpvectors.c:415 +#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:415 msgid "Flip Path" msgstr "Отразить контур" -#: ../app/vectors/gimpvectors.c:198 -#: ../app/vectors/gimpvectors.c:446 +#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:446 msgid "Rotate Path" msgstr "Вращать контур" -#: ../app/vectors/gimpvectors.c:199 -#: ../app/vectors/gimpvectors.c:476 +#: ../app/vectors/gimpvectors.c:199 ../app/vectors/gimpvectors.c:476 msgid "Transform Path" msgstr "Преобразовать контур" @@ -12838,8 +13070,7 @@ msgstr "Комбинация" msgid "Name" msgstr "Название" -#: ../app/widgets/gimpactionview.c:632 -#: ../app/widgets/gimpactionview.c:832 +#: ../app/widgets/gimpactionview.c:632 ../app/widgets/gimpactionview.c:832 msgid "Changing shortcut failed." msgstr "Не удалось изменить комбинацию клавиш." @@ -12854,12 +13085,14 @@ msgstr "Назначить" #: ../app/widgets/gimpactionview.c:690 #, 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:694 #, c-format msgid "Reassigning the shortcut will cause it to be removed from \"%s\"." -msgstr "Назначая эти клавиши вы отказываетесь от доступа по ним к пункту \"%s\"." +msgstr "" +"Назначая эти клавиши вы отказываетесь от доступа по ним к пункту \"%s\"." #: ../app/widgets/gimpactionview.c:767 msgid "Invalid shortcut." @@ -12891,8 +13124,7 @@ msgstr "Интервал:" msgid "Percentage of width of brush" msgstr "Скорость рисования" -#: ../app/widgets/gimpbufferview.c:173 -#: ../app/widgets/gimpbufferview.c:257 +#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257 #: ../app/widgets/gimpeditor.c:745 msgid "(None)" msgstr "(Нет)" @@ -12944,30 +13176,30 @@ msgid "No filter selected" msgstr "Фильтр не выбран" #: ../app/widgets/gimpcoloreditor.c:262 -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:501 msgid "Index:" msgstr "Номер:" -#: ../app/widgets/gimpcolorframe.c:514 -#: ../app/widgets/gimpcolorframe.c:540 +#: ../app/widgets/gimpcolorframe.c:514 ../app/widgets/gimpcolorframe.c:540 msgid "Red:" msgstr "Красный:" -#: ../app/widgets/gimpcolorframe.c:515 -#: ../app/widgets/gimpcolorframe.c:541 +#: ../app/widgets/gimpcolorframe.c:515 ../app/widgets/gimpcolorframe.c:541 msgid "Green:" msgstr "Зеленый:" -#: ../app/widgets/gimpcolorframe.c:516 -#: ../app/widgets/gimpcolorframe.c:542 +#: ../app/widgets/gimpcolorframe.c:516 ../app/widgets/gimpcolorframe.c:542 msgid "Blue:" msgstr "Синий:" -#: ../app/widgets/gimpcolorframe.c:529 -#: ../app/widgets/gimpcolorframe.c:562 +#: ../app/widgets/gimpcolorframe.c:529 ../app/widgets/gimpcolorframe.c:562 msgid "Value:" msgstr "Яркость" @@ -13200,13 +13432,16 @@ msgstr "Удалить контроллер '%s'?" #: ../app/widgets/gimpcontrollerlist.c:574 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:626 msgid "Configure Input Controller" @@ -13341,15 +13576,15 @@ msgstr "Определено автоматически" msgid "By Extension" msgstr "По расширению" -#: ../app/widgets/gimpfiledialog.c:770 +#: ../app/widgets/gimpfiledialog.c:775 msgid "All files" msgstr "Все файлы" -#: ../app/widgets/gimpfiledialog.c:775 +#: ../app/widgets/gimpfiledialog.c:780 msgid "All images" msgstr "Все изображения" -#: ../app/widgets/gimpfiledialog.c:904 +#: ../app/widgets/gimpfiledialog.c:909 #, c-format msgid "Select File _Type (%s)" msgstr "Выберите _тип файла (%s)" @@ -13481,13 +13716,11 @@ msgstr "Цвет _фона:" msgid "Spacing" msgstr "Ячейки" -#: ../app/widgets/gimpgrideditor.c:264 -#: ../app/widgets/gimpgrideditor.c:296 +#: ../app/widgets/gimpgrideditor.c:264 ../app/widgets/gimpgrideditor.c:296 msgid "Width" msgstr "Ширина" -#: ../app/widgets/gimpgrideditor.c:266 -#: ../app/widgets/gimpgrideditor.c:298 +#: ../app/widgets/gimpgrideditor.c:266 ../app/widgets/gimpgrideditor.c:298 msgid "Height" msgstr "Высота" @@ -13500,8 +13733,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" @@ -13528,8 +13765,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:" @@ -13667,8 +13908,11 @@ msgid "Auto" msgstr "Авто" #: ../app/widgets/gimpmenudock.c:170 -msgid "When enabled the dialog automatically follows the image you are working on." -msgstr "Если включено, содержимое диалога меняется в соответствии с тем, какое изображение активно в данный момент." +msgid "" +"When enabled the dialog automatically follows the image you are working on." +msgstr "" +"Если включено, содержимое диалога меняется в соответствии с тем, какое " +"изображение активно в данный момент." #: ../app/widgets/gimpmessagebox.c:442 #, c-format @@ -13873,19 +14117,16 @@ msgstr "" msgid "Pr_eview" msgstr "_Предпросмотр" -#: ../app/widgets/gimpthumbbox.c:416 -#: ../app/widgets/gimpthumbbox.c:480 +#: ../app/widgets/gimpthumbbox.c:416 ../app/widgets/gimpthumbbox.c:480 msgid "No selection" msgstr "Нет выделения" -#: ../app/widgets/gimpthumbbox.c:608 -#: ../app/widgets/gimpthumbbox.c:629 +#: ../app/widgets/gimpthumbbox.c:608 ../app/widgets/gimpthumbbox.c:629 #, c-format msgid "Thumbnail %d of %d" msgstr "Миниатюра %d из %d" -#: ../app/widgets/gimpthumbbox.c:742 -#: ../app/widgets/gimpthumbbox.c:752 +#: ../app/widgets/gimpthumbbox.c:742 ../app/widgets/gimpthumbbox.c:752 msgid "Creating preview..." msgstr "Создание пред. просмотра..." @@ -14173,11 +14414,16 @@ msgid "Keep above" msgstr "Всегда наверху" #: ../app/xcf/xcf-load.c:278 -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:287 -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:325 @@ -14199,15 +14445,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:98 -#: ../app/xcf/xcf.c:166 +#: ../app/xcf/xcf.c:98 ../app/xcf/xcf.c:166 msgid "GIMP XCF image" msgstr "Файл GIMP XCF" @@ -14269,130 +14512,186 @@ msgstr "Убедитесь, что панель инструментов вид msgid "Couldn't start '%s': %s" msgstr "Невозможно запустить '%s': %s" +#~ msgctxt "edit-action" +#~ msgid "Copy the selected region to a named buffer" +#~ msgstr "Скопировать выделенную область в именованный буфер обмена" + #~ msgctxt "context-action" #~ msgid "_Aspect" #~ msgstr "GIMP" + #~ msgctxt "edit-action" #~ msgid "Fill with P_attern" #~ msgstr "Залить _текстурой" + #~ msgctxt "file-action" #~ msgid "Save as _Template..." #~ msgstr "Сохранить как _шаблон..." + #~ msgid "Do_n't Save" #~ msgstr "_Не сохранять" + #~ msgid "RGB-empty" #~ msgstr "RGB-пусто" + #~ msgid "RGB" #~ msgstr "RGB" + #~ msgid "grayscale-empty" #~ msgstr "градации серого-пусто" + #~ msgid "grayscale" #~ msgstr "градации серого" + #~ msgid "indexed-empty" #~ msgstr "индексированное-пусто" + #~ msgid "indexed" #~ msgstr "индексированное" + #~ msgid "Query" #~ msgstr "Запросить" + #~ msgid "Assign" #~ msgstr "Назначить" + #~ msgid "New brush" #~ msgstr "Новая кисть" + #~ msgid "Sample Merged" #~ msgstr "Объединять по образцу" + #~ msgid "Remove dangling entries" #~ msgstr "Удалить устаревшие записи" + #~ msgid "Save error log" #~ msgstr "Сохранить журнал ошибок" + #~ msgid "Save selection" #~ msgstr "Сохранить выделение" + #~ msgid "Rescan font list" #~ msgstr "Перечитать список шрифтов" + #~ msgid "New gradient" #~ msgstr "Новый градиент" + #~ msgid "Set Opacity" #~ msgstr "Смена непрозрачности слоя" + #~ msgid "Delete color" #~ msgstr "Удалить цвет" + #~ msgid "New palette" #~ msgstr "Новая палитра" + #~ msgid "New pattern" #~ msgstr "Новая текстура" + #~ msgid "select|_All" #~ msgstr "Вс_ё" + #~ msgid "select|_None" #~ msgstr "Сн_ять" + #~ msgid "Edit the selected template" #~ msgstr "Изменить выбранный шаблон" + #~ msgid "Delete the selected template" #~ msgstr "Удалить выбранный шаблон" + #~ msgid "Raise tool" #~ msgstr "Поднять инструмент" + #~ msgid "New path..." #~ msgstr "Новый контур..." + #~ msgid "_New Path" #~ msgstr "_Новый контур" + #~ msgid "Add" #~ msgstr "Добавление" + #~ msgid "Subtract" #~ msgstr "Вычитание" + #~ msgid "Intersect" #~ msgstr "Пересечение" + #~ msgid "plural|percent" #~ msgstr "проценты" + #~ msgid "Remove floating selection" #~ msgstr "Удалить плавающее выделение" + #~ msgid "Rigor floating selection" #~ msgstr "Сохранить данные в плавающем выделении" + #~ msgid "Relax floating selection" #~ msgstr "Восстановить данные в плавающее выделение" + #~ msgid "quality|Low" #~ msgstr "Низкое" + #~ msgid "quality|High" #~ msgstr "Высокое" + #~ msgid "Cannot rigor this layer because it is not a floating selection." #~ msgstr "GIMP" + #~ msgid "Cannot relax this layer because it is not a floating selection." #~ msgstr "GIMP" + #~ msgid "" #~ "If available, hints from the font are used but you may prefer to always " #~ "use the automatic hinter" #~ msgstr "" #~ "Если доступны, используются инструкции из шрифта, но вы можете " #~ "предпочесть всегда использовать автоинструктирование." + #~ msgid "Force auto-hinter" #~ msgstr "Автоинструктирование" + #~ msgid "Ne_w" #~ msgstr "Соз_дать" + #~ msgid "Channel is already on top." #~ msgstr "Канал уже на самом верху." + #~ msgid "Channel is already on the bottom." #~ msgstr "Слой уже в самом низу." + #~ msgid "Path is already on top." #~ msgstr "Контур уже на самом верху." + #~ msgid "Path is already on the bottom." #~ msgstr "Контур уже в самом низу." + #~ msgid "Cannot add layer mask to layer which is not part of an image." #~ msgstr "" #~ "Невозможно добавить маску слоя к слою, не являющемуся частью изображения." + #~ msgid "Reading palette '%s': Missing GREEN component in line %d." #~ msgstr "" #~ "Загружается палитра '%s':\n" #~ "Неправильный компонент \"Зелёный\" в строке %d." + #~ msgid "" #~ "PDB calling error:\n" #~ "Procedure '%s' not found" #~ msgstr "" #~ "Ошибка вызова PDB:\n" #~ "Процедура '%s' не найдена" + #~ msgid "" #~ "PDB calling error for procedure '%s':\n" #~ "Argument #%d type mismatch (expected %s, got %s)" #~ msgstr "" #~ "Ошибка вызова PDB для процедуры '%s':\n" #~ "Argument #%d type mismatch (expected %s, got %s)" + #~ msgid "Clibboard" #~ msgstr "Буфер обмена" + #~ msgid "Copy the selected region to the clipboard" #~ msgstr "Скопировать выделенную часть в буфер обмена" - From d86a7c004459d4b4388e901d8ff3e7564a09016d Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Mon, 13 Jul 2009 13:23:35 +0200 Subject: [PATCH 38/70] Add Makefile.am rule to generate ChangeLog from git log Add Makefile.am rule to generate ChangeLog from git log copied from pango and Behdad Esfahbod. --- .gitignore | 9 +++++---- ChangeLog => ChangeLog.pre-git | 32 -------------------------------- Makefile.am | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 36 deletions(-) rename ChangeLog => ChangeLog.pre-git (99%) diff --git a/.gitignore b/.gitignore index 5ccb71df97..dcf009f24b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +*.la +*.lo +*.o +/ChangeLog /Makefile /Makefile.in /aclocal.m4 @@ -15,9 +19,9 @@ /configure /depcomp /gimp-2.0.pc +/gimp-zip /gimpthumb-2.0.pc /gimpui-2.0.pc -/gimp-zip /gtk-doc.make /install-sh /intltool-extract @@ -35,6 +39,3 @@ /stamp-h /stamp-h.in /stamp-h1 -*.la -*.lo -*.o diff --git a/ChangeLog b/ChangeLog.pre-git similarity index 99% rename from ChangeLog rename to ChangeLog.pre-git index 0fa59c3274..ba8b16818f 100644 --- a/ChangeLog +++ b/ChangeLog.pre-git @@ -1,36 +1,4 @@ - - - - NOTE: After the migration to git this ChangeLog is no longer used - during development. Instead, it will be updated prior to every - release based on the git log. - - - - - -2009-04-25 Martin Nordholts - - * app/dialogs/file-save-dialog.c: Introduce - file_save_dialog_unkown_ext_msg() so that we don't need to have a - copy-pasted huge error message (and prepare for more intricate - message handling). - -2009-04-24 Martin Nordholts - - Convert Subversion references to git - - * HACKING - * INSTALL - * README.i18n - * autogen.sh - -2009-04-24 Martin Nordholts - - * README: Update link to GTK+ themes in README. Patch from - Shlomi Fish. - 2009-04-16 Michael Natterer * app/paint/gimppaintcore.[ch]: made GimpCoords* parameter of diff --git a/Makefile.am b/Makefile.am index e14583e1eb..9530a24204 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,3 +95,24 @@ endif all-local: AUTHORS dist-hook: check-defs validate-authors + + + +CHANGELOG_START = 74424325abb54620b370f2595445b2b2a19fe5e7 + +ChangeLog: $(srcdir)/ChangeLog $(srcdir)/ChangeLog.pre-git +$(srcdir)/ChangeLog: + @echo Creating $@ based on git log + @if test -d "$(srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run \ + git log $(CHANGELOG_START)^.. --stat) | fmt --split-only > $@.tmp \ + && mv -f $@.tmp $@ && echo Appending ChangeLog.pre-git && cat ChangeLog.pre-git >> $@ \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> $@)); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> $@); \ + fi +.PHONY: $(srcdir)/ChangeLog From e2f080b9d744a5a519cce3cf9ad7eaa6930f20da Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 14 Jul 2009 11:32:52 +0200 Subject: [PATCH 39/70] Fix typo in NEWS --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 432e2c8397..2d5cf57da7 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ Plug-ins: layer mode in GIMP - Add JPEG2000 load plug-in - Add X11 mouse cursor plug-in - - Addd support for loading 16bit (RGB565) raw data + - Add support for loading 16bit (RGB565) raw data GEGL: From 7976f21a35154cd78ad6dcf8d5586125b03b67f4 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 14 Jul 2009 11:48:03 +0200 Subject: [PATCH 40/70] plug-ins: Remove unused read_extended_data_block() in file-psd.c --- plug-ins/common/file-psp.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 22ee9e4fb5..1e77b26205 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -852,39 +852,6 @@ try_fseek (FILE *f, return 0; } -static gint -read_extended_data_block (FILE *f, - gint image_ID, - guint total_len, - PSPimage *ia) -{ - long data_start; - guchar buf[4]; - guint16 keyword; - guint32 length; - - data_start = ftell (f); - - while (ftell (f) < data_start + total_len) - { - if (fread (buf, 4, 1, f) < 1 - || fread (&keyword, 2, 1, f) < 1 - || fread (&length, 4, 1, f) < 1) - { - g_message ("Error reading extended data chunk"); - return -1; - } - if (memcmp (buf, "~FL\0", 4) != 0) - { - g_message ("Invalid extended data chunk header"); - return -1; - } - /* TODO Read keyword and assign it to PSPExtendedDataID */ - } - - return 0; -} - static gint From c6798bc247c0b5e3063f8e7eae0c46c685e5d75e Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 14 Jul 2009 11:49:54 +0200 Subject: [PATCH 41/70] plug-ins: Use string literal as format in metadata plug-in --- plug-ins/metadata/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plug-ins/metadata/interface.c b/plug-ins/metadata/interface.c index 1fb1372b1f..e261bdb49a 100644 --- a/plug-ins/metadata/interface.c +++ b/plug-ins/metadata/interface.c @@ -427,7 +427,7 @@ metadata_message_dialog (GtkMessageType type, { GtkWidget *dlg; - dlg = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, message); + dlg = gtk_message_dialog_new (parent, 0, type, GTK_BUTTONS_OK, "%s", message); if (title) gtk_window_set_title (GTK_WINDOW (dlg), title); From 0d94e6e9313914b963ddbee4d6e1d0ad1cba2747 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Tue, 14 Jul 2009 20:13:15 +0200 Subject: [PATCH 42/70] Enable automake silent-rules by default Enable silent build rules by default, requires at least Automake-1.11. Disable by either passing --disable-silent-rules to configure or passing V=1 to make. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index bbb81b1063..653b9a2d01 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,11 @@ AC_CONFIG_SRCDIR([app/core/gimp.c]) AM_INIT_AUTOMAKE(no-define dist-bzip2) AM_CONFIG_HEADER(config.h) +# Enable silent build rules by default, requires at least +# Automake-1.11. Disable by either passing --disable-silent-rules to +# configure or passing V=1 to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + GIMP_MAJOR_VERSION=gimp_major_version GIMP_MINOR_VERSION=gimp_minor_version GIMP_MICRO_VERSION=gimp_micro_version From facb13fdba865121c4817d00a90e13a256bd6130 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 01:53:30 +0200 Subject: [PATCH 43/70] Use GtkOrientable API instead of accessing range->orientation directly --- libgimpwidgets/gimpcolorscale.c | 36 ++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/libgimpwidgets/gimpcolorscale.c b/libgimpwidgets/gimpcolorscale.c index c275dbc013..5d8f9f633f 100644 --- a/libgimpwidgets/gimpcolorscale.c +++ b/libgimpwidgets/gimpcolorscale.c @@ -79,13 +79,15 @@ gimp_color_scale_init (GimpColorScale *scale) GTK_SCALE (scale)->draw_value = FALSE; range->slider_size_fixed = TRUE; - range->orientation = GTK_ORIENTATION_HORIZONTAL; range->flippable = TRUE; /* range->update_policy = GTK_UPDATE_DELAYED; */ scale->channel = GIMP_COLOR_SELECTOR_VALUE; scale->needs_render = TRUE; + gtk_orientable_set_orientation (GTK_ORIENTABLE (range), + GTK_ORIENTATION_HORIZONTAL); + gimp_rgba_set (&scale->rgb, 0.0, 0.0, 0.0, 1.0); gimp_rgb_to_hsv (&scale->rgb, &scale->hsv); } @@ -142,7 +144,7 @@ gimp_color_scale_size_allocate (GtkWidget *widget, scale_width = range->range_rect.width - 2 * (focus + trough_border); scale_height = range->range_rect.height - 2 * (focus + trough_border); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: scale_width -= range->min_slider_size - 1; @@ -311,7 +313,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_gc_set_clip_rectangle (style->black_gc, &area); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: gdk_draw_rgb_image_dithalign (window, @@ -351,7 +353,7 @@ gimp_color_scale_expose (GtkWidget *widget, range->range_rect.width, range->range_rect.height); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: area.x = widget->allocation.x + range->slider_start; @@ -377,7 +379,8 @@ gimp_color_scale_expose (GtkWidget *widget, style->dark_gc[GTK_STATE_INSENSITIVE]); gdk_gc_set_clip_rectangle (gc, &expose_area); - switch (range->orientation) + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (w = area.width, x = area.x, y = area.y; @@ -390,6 +393,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_draw_line (window, gc, x, y, x, y + h - 1); break; } + gdk_gc_set_clip_rectangle (gc, NULL); gc = (GTK_WIDGET_IS_SENSITIVE (widget) ? @@ -397,7 +401,8 @@ gimp_color_scale_expose (GtkWidget *widget, style->light_gc[GTK_STATE_INSENSITIVE]); gdk_gc_set_clip_rectangle (gc, &expose_area); - switch (range->orientation) + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (w = area.width, x = area.x, y = area.y + area.height - 1; @@ -410,6 +415,7 @@ gimp_color_scale_expose (GtkWidget *widget, gdk_draw_line (window, gc, x, y, x, y + h - 1); break; } + gdk_gc_set_clip_rectangle (gc, NULL); } @@ -429,16 +435,13 @@ GtkWidget * gimp_color_scale_new (GtkOrientation orientation, GimpColorSelectorChannel channel) { - GimpColorScale *scale; - GtkRange *range; - - scale = g_object_new (GIMP_TYPE_COLOR_SCALE, NULL); + GimpColorScale *scale = g_object_new (GIMP_TYPE_COLOR_SCALE, + "orientation", orientation, + NULL); scale->channel = channel; - range = GTK_RANGE (scale); - range->orientation = orientation; - range->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL); + GTK_RANGE (scale)->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL); return GTK_WIDGET (scale); } @@ -493,7 +496,8 @@ gimp_color_scale_set_color (GimpColorScale *scale, static gboolean should_invert (GtkRange *range) { - if (range->orientation == GTK_ORIENTATION_HORIZONTAL) + if (gtk_orientable_get_orientation (GTK_ORIENTABLE (range)) == + GTK_ORIENTATION_HORIZONTAL) return (range->inverted && !range->flippable) || (range->inverted && range->flippable && @@ -555,7 +559,7 @@ gimp_color_scale_render (GimpColorScale *scale) invert = should_invert (range); - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: for (x = 0, d = buf; x < scale->width; x++, d += 3) @@ -625,7 +629,7 @@ gimp_color_scale_render_alpha (GimpColorScale *scale) buf = scale->buf; rgb = scale->rgb; - switch (range->orientation) + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (range))) { case GTK_ORIENTATION_HORIZONTAL: { From 84e933d80ba9d0511437604304543385dbac1727 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 03:58:30 +0200 Subject: [PATCH 44/70] Use accessors instead of widget->window and widget->style --- app/widgets/gimptagentry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/widgets/gimptagentry.c b/app/widgets/gimptagentry.c index d37902c869..6d11728ea4 100644 --- a/app/widgets/gimptagentry.c +++ b/app/widgets/gimptagentry.c @@ -1206,7 +1206,7 @@ gimp_tag_entry_expose (GtkWidget *widget, const char *display_text; /* eeeeeek */ - if (widget->window == event->window) + if (gtk_widget_get_window (widget) == event->window) return FALSE; if (! GIMP_TAG_ENTRY (widget)->description_shown) @@ -1236,7 +1236,7 @@ gimp_tag_entry_expose (GtkWidget *widget, &layout_width, &layout_height); offset = (window_height - PANGO_PIXELS (layout_height)) / 2; - gtk_paint_layout (widget->style, + gtk_paint_layout (gtk_widget_get_style (widget), event->window, GTK_STATE_INSENSITIVE, TRUE, From 65421aa0b657bfc1ece16540294f8db5bf6def8f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 04:05:24 +0200 Subject: [PATCH 45/70] Use accessors instead of widget->style and widget->window --- app/widgets/gimptagpopup.c | 49 ++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index f26032df74..443add722f 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -567,21 +567,22 @@ gimp_tag_popup_border_expose (GtkWidget *widget, GdkEventExpose *event, GimpTagPopup *popup) { - GdkRectangle border; - GdkRectangle upper; - GdkRectangle lower; - gint arrow_space; - gint arrow_size; + GdkWindow *window = gtk_widget_get_window (widget); + GtkStyle *style = gtk_widget_get_style (widget); + GdkRectangle border; + GdkRectangle upper; + GdkRectangle lower; + gint arrow_space; + gint arrow_size; - if (event->window != widget->window) + if (event->window != gtk_widget_get_window (widget)) return FALSE; get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space); arrow_size = 0.7 * arrow_space; - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, GTK_STATE_NORMAL, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -591,8 +592,7 @@ gimp_tag_popup_border_expose (GtkWidget *widget, { /* upper arrow */ - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -601,21 +601,19 @@ gimp_tag_popup_border_expose (GtkWidget *widget, upper.width, upper.height); - gtk_paint_arrow (widget->style, - widget->window, + gtk_paint_arrow (style, window, popup->upper_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu_scroll_arrow_up", GTK_ARROW_UP, TRUE, upper.x + (upper.width - arrow_size) / 2, - upper.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + upper.y + style->ythickness + (arrow_space - arrow_size) / 2, arrow_size, arrow_size); /* lower arrow */ - gtk_paint_box (widget->style, - widget->window, + gtk_paint_box (style, window, popup->lower_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu", @@ -624,15 +622,14 @@ gimp_tag_popup_border_expose (GtkWidget *widget, lower.width, lower.height); - gtk_paint_arrow (widget->style, - widget->window, + gtk_paint_arrow (style, window, popup->lower_arrow_state, GTK_SHADOW_OUT, &event->area, widget, "menu_scroll_arrow_down", GTK_ARROW_DOWN, TRUE, lower.x + (lower.width - arrow_size) / 2, - lower.y + widget->style->ythickness + (arrow_space - arrow_size) / 2, + lower.y + style->ythickness + (arrow_space - arrow_size) / 2, arrow_size, arrow_size); } @@ -651,15 +648,15 @@ gimp_tag_popup_border_event (GtkWidget *widget, gint x; gint y; - if (button_event->window == widget->window && + if (button_event->window == gtk_widget_get_window (widget) && gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; } - gdk_window_get_pointer (widget->window, &x, &y, NULL); + gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL); - if (button_event->window != popup->tag_area->window && + if (button_event->window != gtk_widget_get_window (popup->tag_area) && (x < widget->allocation.y || y < widget->allocation.x || x > widget->allocation.x + widget->allocation.width || @@ -678,7 +675,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, { GdkEventMotion *motion_event = (GdkEventMotion *) event; - if (motion_event->window == widget->window) + if (motion_event->window == gtk_widget_get_window (widget)) { gint x = motion_event->x + widget->allocation.x; gint y = motion_event->y + widget->allocation.y; @@ -693,7 +690,7 @@ gimp_tag_popup_border_event (GtkWidget *widget, popup->single_select_disabled = TRUE; - if (button_event->window == widget->window && + if (button_event->window == gtk_widget_get_window (widget) && gimp_tag_popup_button_scroll (popup, button_event)) { return TRUE; @@ -1215,7 +1212,7 @@ gimp_tag_popup_scroll_by (GimpTagPopup *popup, { popup->scroll_y = new_scroll_y; - gdk_window_scroll (popup->tag_area->window, 0, -step); + gdk_window_scroll (gtk_widget_get_window (popup->tag_area), 0, -step); } } @@ -1330,7 +1327,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { popup->upper_arrow_state = arrow_state; - gdk_window_invalidate_rect (GTK_WIDGET (popup)->window, + gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)), &rect, FALSE); } } @@ -1431,7 +1428,7 @@ gimp_tag_popup_handle_scrolling (GimpTagPopup *popup, { popup->lower_arrow_state = arrow_state; - gdk_window_invalidate_rect (GTK_WIDGET (popup)->window, + gdk_window_invalidate_rect (gtk_widget_get_window (GTK_WIDGET (popup)), &rect, FALSE); } } From 2bfc48df7498a5d3ad41d0fc836de3a2fd420d8b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 14:29:43 +0200 Subject: [PATCH 46/70] Use accessors instead of sealed GTK+ members --- app/display/gimpdisplayshell-callbacks.c | 36 +++++++++++++----------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c index 1e308392e3..4a697a65a7 100644 --- a/app/display/gimpdisplayshell-callbacks.c +++ b/app/display/gimpdisplayshell-callbacks.c @@ -456,7 +456,7 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell, gimp_display_shell_start_scrolling (shell, coords.x, coords.y); - gdk_pointer_grab (shell->canvas->window, FALSE, + gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK, NULL, NULL, time); @@ -482,7 +482,7 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell, break; } - gdk_keyboard_grab (shell->canvas->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (shell->canvas), FALSE, time); shell->space_pressed = TRUE; } @@ -839,7 +839,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, /* we expect a FOCUS_IN event to follow, but can't rely * on it, so force one */ - gdk_window_focus (canvas->window, time); + gdk_window_focus (gtk_widget_get_window (canvas), time); } /* ignore new mouse events */ @@ -871,11 +871,11 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, } } - gdk_pointer_grab (canvas->window, + gdk_pointer_grab (gtk_widget_get_window (canvas), FALSE, event_mask, NULL, NULL, time); if (! shell->space_pressed && ! shell->space_release_pending) - gdk_keyboard_grab (canvas->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (canvas), FALSE, time); if (active_tool && (! gimp_image_is_empty (image) || @@ -1174,9 +1174,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas, value = (gtk_adjustment_get_value (adj) + ((direction == GDK_SCROLL_UP || direction == GDK_SCROLL_LEFT) ? - -adj->page_increment / 2 : - adj->page_increment / 2)); - value = CLAMP (value, adj->lower, adj->upper - adj->page_size); + -gtk_adjustment_get_page_increment (adj) / 2 : + gtk_adjustment_get_page_increment (adj) / 2)); + value = CLAMP (value, + gtk_adjustment_get_lower (adj), + gtk_adjustment_get_upper (adj) - + gtk_adjustment_get_page_size (adj)); gtk_adjustment_set_value (adj, value); } @@ -1749,17 +1752,18 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget, /* we expect a FOCUS_IN event to follow, but can't rely * on it, so force one */ - gdk_window_focus (shell->canvas->window, + gdk_window_focus (gtk_widget_get_window (shell->canvas), gdk_event_get_time ((GdkEvent *) event)); } - gdk_pointer_grab (shell->canvas->window, FALSE, + gdk_pointer_grab (gtk_widget_get_window (shell->canvas), FALSE, GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK | GDK_BUTTON_RELEASE_MASK, NULL, NULL, event->time); - gdk_keyboard_grab (shell->canvas->window, FALSE, event->time); + gdk_keyboard_grab (gtk_widget_get_window (shell->canvas), + FALSE, event->time); if (sample_point) gimp_color_tool_start_sample_point (active_tool, display); @@ -1834,11 +1838,11 @@ void gimp_display_shell_quick_mask_toggled (GtkWidget *widget, GimpDisplayShell *shell) { - if (GTK_TOGGLE_BUTTON (widget)->active != - gimp_image_get_quick_mask_state (shell->display->image)) + gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + + if (active != gimp_image_get_quick_mask_state (shell->display->image)) { - gimp_image_set_quick_mask_state (shell->display->image, - GTK_TOGGLE_BUTTON (widget)->active); + gimp_image_set_quick_mask_state (shell->display->image, active); gimp_image_flush (shell->display->image); } @@ -2175,7 +2179,7 @@ gimp_display_shell_canvas_expose_drop_zone (GimpDisplayShell *shell, { cairo_t *cr; - cr = gdk_cairo_create (shell->canvas->window); + cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas)); gdk_cairo_region (cr, eevent->region); cairo_clip (cr); From 2d442e4576e28c6d9a3e1a5bb9919b703d8213b8 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 14:52:27 +0200 Subject: [PATCH 47/70] Use gtk_widget_get_window() instead of widget->window --- app/display/gimpdisplayshell-coords.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/display/gimpdisplayshell-coords.c b/app/display/gimpdisplayshell-coords.c index 9b4e787f97..ae3051497d 100644 --- a/app/display/gimpdisplayshell-coords.c +++ b/app/display/gimpdisplayshell-coords.c @@ -92,7 +92,8 @@ gimp_display_shell_get_device_coords (GimpDisplayShell *shell, { gdouble axes[GDK_AXIS_LAST]; - gdk_device_get_state (device, shell->canvas->window, axes, NULL); + gdk_device_get_state (device, gtk_widget_get_window (shell->canvas), + axes, NULL); gdk_device_get_axis (device, axes, GDK_AXIS_X, &coords->x); gdk_device_get_axis (device, axes, GDK_AXIS_Y, &coords->y); @@ -186,7 +187,8 @@ gimp_display_shell_get_device_state (GimpDisplayShell *shell, GdkDevice *device, GdkModifierType *state) { - gdk_device_get_state (device, shell->canvas->window, NULL, state); + gdk_device_get_state (device, gtk_widget_get_window (shell->canvas), + NULL, state); } /** From 4da5ed3a8b86142967168f0f337c833f159eb3b6 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 15:02:31 +0200 Subject: [PATCH 48/70] Use gtk_widget_get_window() instead of widget->window --- app/display/gimpdisplay-foreach.c | 3 ++- app/display/gimpdisplayshell-cursor.c | 2 +- app/display/gimpdisplayshell-draw.c | 8 ++++---- app/display/gimpdisplayshell-layer-select.c | 2 +- app/display/gimpdisplayshell-preview.c | 8 ++++---- app/display/gimpdisplayshell-progress.c | 12 ++++++++---- app/display/gimpdisplayshell-title.c | 6 ++++-- app/display/gimpnavigationeditor.c | 3 ++- app/display/gimpstatusbar.c | 11 ++++++----- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/display/gimpdisplay-foreach.c b/app/display/gimpdisplay-foreach.c index 549dd3c53b..1abbec4807 100644 --- a/app/display/gimpdisplay-foreach.c +++ b/app/display/gimpdisplay-foreach.c @@ -246,7 +246,8 @@ gimp_displays_get_num_visible (Gimp *gimp) if (GTK_WIDGET_DRAWABLE (display->shell)) { - GdkWindowState state = gdk_window_get_state (display->shell->window); + GdkWindow *window = gtk_widget_get_window (display->shell); + GdkWindowState state = gdk_window_get_state (window); if ((state & (GDK_WINDOW_STATE_WITHDRAWN | GDK_WINDOW_STATE_ICONIFIED)) == 0) diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c index 9cf94a5e34..9aa7acb3d0 100644 --- a/app/display/gimpdisplayshell-cursor.c +++ b/app/display/gimpdisplayshell-cursor.c @@ -231,7 +231,7 @@ gimp_display_shell_real_set_cursor (GimpDisplayShell *shell, shell->current_cursor = cursor_type; if (GTK_WIDGET_DRAWABLE (shell->canvas)) - gdk_window_set_cursor (shell->canvas->window, NULL); + gdk_window_set_cursor (gtk_widget_get_window (shell->canvas), NULL); return; } diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c index 14814958fb..5c95aa01b0 100644 --- a/app/display/gimpdisplayshell-draw.c +++ b/app/display/gimpdisplayshell-draw.c @@ -146,7 +146,7 @@ gimp_display_shell_draw_guide (const GimpDisplayShell *shell, x1 = 0; y1 = 0; - gdk_drawable_get_size (shell->canvas->window, &x2, &y2); + gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &x2, &y2); switch (gimp_guide_get_orientation (guide)) { @@ -429,7 +429,7 @@ gimp_display_shell_draw_sample_point (const GimpDisplayShell *shell, y1 = floor (y - GIMP_SAMPLE_POINT_DRAW_SIZE); y2 = ceil (y + GIMP_SAMPLE_POINT_DRAW_SIZE); - gdk_drawable_get_size (shell->canvas->window, &w, &h); + gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &w, &h); if (x < - GIMP_SAMPLE_POINT_DRAW_SIZE || y < - GIMP_SAMPLE_POINT_DRAW_SIZE || @@ -663,7 +663,7 @@ gimp_display_shell_get_grid_gc (GimpDisplayShell *shell, values.join_style = GDK_JOIN_MITER; - shell->grid_gc = gdk_gc_new_with_values (shell->canvas->window, + shell->grid_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas), &values, (GDK_GC_LINE_STYLE | GDK_GC_JOIN_STYLE)); @@ -692,7 +692,7 @@ gimp_display_shell_get_pen_gc (GimpDisplayShell *shell, values.cap_style = GDK_CAP_ROUND; values.join_style = GDK_JOIN_ROUND; - shell->pen_gc = gdk_gc_new_with_values (shell->canvas->window, + shell->pen_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas), &values, (GDK_GC_LINE_STYLE | GDK_GC_CAP_STYLE | GDK_GC_JOIN_STYLE)); diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c index e6ec0e0b01..faeae5d916 100644 --- a/app/display/gimpdisplayshell-layer-select.c +++ b/app/display/gimpdisplayshell-layer-select.c @@ -93,7 +93,7 @@ gimp_display_shell_layer_select_init (GimpDisplayShell *shell, gtk_widget_show (layer_select->shell); - gdk_keyboard_grab (layer_select->shell->window, FALSE, time); + gdk_keyboard_grab (gtk_widget_get_window (layer_select->shell), FALSE, time); } diff --git a/app/display/gimpdisplayshell-preview.c b/app/display/gimpdisplayshell-preview.c index 2c7aaf53ab..68163deda9 100644 --- a/app/display/gimpdisplayshell-preview.c +++ b/app/display/gimpdisplayshell-preview.c @@ -318,10 +318,10 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell) k = columns * rows; for (j = 0; j < k; j++) gimp_display_shell_draw_quad (tool->drawable, - GDK_DRAWABLE (GTK_WIDGET (shell->canvas)->window), - mask, mask_offx, mask_offy, - x[j], y[j], u[j], v[j], - opacity); + GDK_DRAWABLE (gtk_widget_get_window (shell->canvas)), + mask, mask_offx, mask_offy, + x[j], y[j], u[j], v[j], + opacity); } diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c index 62b1fce212..8b311fd6e8 100644 --- a/app/display/gimpdisplayshell-progress.c +++ b/app/display/gimpdisplayshell-progress.c @@ -51,7 +51,8 @@ gimp_display_shell_progress_start (GimpProgress *progress, if (progress && gimp_display_shell_is_iconified (shell)) { - gdk_window_set_title (GTK_WIDGET (shell)->window, message); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + message); } return progress; @@ -87,7 +88,8 @@ gimp_display_shell_progress_set_text (GimpProgress *progress, if (gimp_progress_is_active (GIMP_PROGRESS (shell->statusbar)) && gimp_display_shell_is_iconified (shell)) { - gdk_window_set_title (GTK_WIDGET (shell)->window, message); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + message); } } @@ -165,7 +167,8 @@ gimp_display_shell_is_iconified (GimpDisplayShell *shell) GtkWidget *widget = GTK_WIDGET (shell); return (GTK_WIDGET_DRAWABLE (widget) && - gdk_window_get_state (widget->window) == GDK_WINDOW_STATE_ICONIFIED); + gdk_window_get_state (gtk_widget_get_window (widget)) == + GDK_WINDOW_STATE_ICONIFIED); } @@ -195,7 +198,8 @@ gimp_display_shell_progress_window_state_changed (GimpDisplayShell *shell) "progress"); if (msg) { - gdk_window_set_title (GTK_WIDGET (shell)->window, msg); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + msg); return; } } diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c index ec6d3533bd..eabf786baf 100644 --- a/app/display/gimpdisplayshell-title.c +++ b/app/display/gimpdisplayshell-title.c @@ -107,7 +107,8 @@ gimp_display_shell_update_title_idle (gpointer data) g_strlcpy (title + len, GIMP_ACRONYM, sizeof (title) - len); - gdk_window_set_title (GTK_WIDGET (shell)->window, title); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + title); /* format the statusbar */ gimp_display_shell_format_title (shell, title, sizeof (title), @@ -118,7 +119,8 @@ gimp_display_shell_update_title_idle (gpointer data) } else { - gdk_window_set_title (GTK_WIDGET (shell)->window, GIMP_NAME); + gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)), + GIMP_NAME); gimp_statusbar_replace (GIMP_STATUSBAR (shell->statusbar), "title", NULL, " "); diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c index fa6eb715e3..af5966dc61 100644 --- a/app/display/gimpnavigationeditor.c +++ b/app/display/gimpnavigationeditor.c @@ -277,7 +277,8 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell, gint border_width, border_height; gint screen_click_x, screen_click_y; - gdk_window_get_origin (widget->window, &x_origin, &y_origin); + gdk_window_get_origin (gtk_widget_get_window (widget), + &x_origin, &y_origin); screen_click_x = x_origin + click_x; screen_click_y = y_origin + click_y; diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c index 42d55b942b..7c860f3214 100644 --- a/app/display/gimpstatusbar.c +++ b/app/display/gimpstatusbar.c @@ -368,7 +368,7 @@ gimp_statusbar_progress_start (GimpProgress *progress, } if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); return progress; } @@ -426,7 +426,7 @@ gimp_statusbar_progress_set_text (GimpProgress *progress, gimp_statusbar_replace (statusbar, "progress", NULL, "%s", message); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } @@ -450,7 +450,7 @@ gimp_statusbar_progress_set_value (GimpProgress *progress, gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } } @@ -480,7 +480,7 @@ gimp_statusbar_progress_pulse (GimpProgress *progress) gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar)); if (GTK_WIDGET_DRAWABLE (bar)) - gdk_window_process_updates (bar->window, TRUE); + gdk_window_process_updates (gtk_widget_get_window (bar), TRUE); } } @@ -1269,7 +1269,8 @@ gimp_statusbar_label_expose (GtkWidget *widget, PANGO_PIXELS (rect.width) : 0); y += PANGO_PIXELS (rect.y); - gdk_draw_pixbuf (widget->window, gtk_widget_get_style (widget)->black_gc, + gdk_draw_pixbuf (gtk_widget_get_window (widget), + gtk_widget_get_style (widget)->black_gc, statusbar->icon, 0, 0, x, y, From 997111bf0ae5abab53cd6cceb82a00b15f1cfd3a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 16:19:32 +0200 Subject: [PATCH 49/70] Use gtk_dialog_get_content_area() instead of dialog->vbox --- app/actions/gradient-editor-commands.c | 6 ++++-- app/dialogs/about-dialog.c | 2 +- app/dialogs/channel-options-dialog.c | 3 ++- app/dialogs/convert-dialog.c | 2 +- app/dialogs/fade-dialog.c | 3 ++- app/dialogs/file-open-location-dialog.c | 2 +- app/dialogs/grid-dialog.c | 2 +- app/dialogs/image-merge-layers-dialog.c | 3 ++- app/dialogs/image-new-dialog.c | 2 +- app/dialogs/image-properties-dialog.c | 4 ++-- app/dialogs/keyboard-shortcuts-dialog.c | 3 ++- app/dialogs/layer-add-mask-dialog.c | 3 ++- app/dialogs/layer-options-dialog.c | 2 +- app/dialogs/module-dialog.c | 3 ++- app/dialogs/offset-dialog.c | 2 +- app/dialogs/palette-import-dialog.c | 2 +- app/dialogs/preferences-dialog.c | 3 ++- app/dialogs/print-size-dialog.c | 2 +- app/dialogs/resize-dialog.c | 3 ++- app/dialogs/resolution-calibrate-dialog.c | 3 ++- app/dialogs/scale-dialog.c | 3 ++- app/dialogs/stroke-dialog.c | 3 ++- app/dialogs/template-options-dialog.c | 3 ++- app/dialogs/tips-dialog.c | 2 +- app/dialogs/user-install-dialog.c | 4 ++-- app/dialogs/vectors-options-dialog.c | 3 ++- app/display/gimpdisplayshell-filter-dialog.c | 3 ++- app/display/gimpdisplayshell-scale-dialog.c | 2 +- app/gui/gui.c | 3 ++- app/tools/gimpcolorpickertool.c | 4 ++-- app/tools/gimpimagemaptool.c | 3 ++- app/tools/gimpmeasuretool.c | 3 ++- app/tools/gimpperspectivetool.c | 4 ++-- app/tools/gimprotatetool.c | 4 ++-- app/tools/gimpscaletool.c | 4 ++-- app/tools/gimpsheartool.c | 4 ++-- app/tools/gimptexttool.c | 2 +- libgimpwidgets/gimpunitmenu.c | 3 ++- 38 files changed, 66 insertions(+), 46 deletions(-) diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c index 5895e279cf..5aed984f29 100644 --- a/app/actions/gradient-editor-commands.c +++ b/app/actions/gradient-editor-commands.c @@ -483,7 +483,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Instructions */ @@ -585,7 +586,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action, /* The main vbox */ vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Instructions */ diff --git a/app/dialogs/about-dialog.c b/app/dialogs/about-dialog.c index e190b8d75b..2d68ce9338 100644 --- a/app/dialogs/about-dialog.c +++ b/app/dialogs/about-dialog.c @@ -146,7 +146,7 @@ about_dialog_create (GimpContext *context) dialog); /* kids, don't try this at home! */ - container = GTK_DIALOG (widget)->vbox; + container = gtk_dialog_get_content_area (GTK_DIALOG (widget)); children = gtk_container_get_children (GTK_CONTAINER (container)); if (GTK_IS_VBOX (children->data)) diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c index dd77a3ec87..7d80dc9c3d 100644 --- a/app/dialogs/channel-options-dialog.c +++ b/app/dialogs/channel-options-dialog.c @@ -124,7 +124,8 @@ channel_options_dialog_new (GimpImage *image, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + hbox); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 6); diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c index a411c9234b..7b6cbb7863 100644 --- a/app/dialogs/convert-dialog.c +++ b/app/dialogs/convert-dialog.c @@ -158,7 +158,7 @@ convert_dialog_new (GimpImage *image, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox); gtk_widget_show (main_vbox); diff --git a/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c index e60d68da6c..4284909f31 100644 --- a/app/dialogs/fade-dialog.c +++ b/app/dialogs/fade-dialog.c @@ -141,7 +141,8 @@ fade_dialog_new (GimpImage *image, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); table = gtk_table_new (3, 3, FALSE); diff --git a/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c index 38f88cdffd..b3e39d8b76 100644 --- a/app/dialogs/file-open-location-dialog.c +++ b/app/dialogs/file-open-location-dialog.c @@ -90,7 +90,7 @@ file_open_location_dialog_new (Gimp *gimp) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/app/dialogs/grid-dialog.c b/app/dialogs/grid-dialog.c index fc8d03c68c..de3483f89f 100644 --- a/app/dialogs/grid-dialog.c +++ b/app/dialogs/grid-dialog.c @@ -108,7 +108,7 @@ grid_dialog_new (GimpImage *image, editor = gimp_grid_editor_new (grid, context, xres, yres); gtk_container_set_border_width (GTK_CONTAINER (editor), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), editor); gtk_widget_show (editor); diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c index 4376effa05..60f088843d 100644 --- a/app/dialogs/image-merge-layers-dialog.c +++ b/app/dialogs/image-merge-layers-dialog.c @@ -85,7 +85,8 @@ image_merge_layers_dialog_new (GimpImage *image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), + vbox); gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Final, Merged Layer should be:"), diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c index ba13c7732b..28ad571f9f 100644 --- a/app/dialogs/image-new-dialog.c +++ b/app/dialogs/image-new-dialog.c @@ -122,7 +122,7 @@ image_new_dialog_new (GimpContext *context) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog->dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); diff --git a/app/dialogs/image-properties-dialog.c b/app/dialogs/image-properties-dialog.c index d96f23796f..70832b4656 100644 --- a/app/dialogs/image-properties-dialog.c +++ b/app/dialogs/image-properties-dialog.c @@ -74,8 +74,8 @@ image_properties_dialog_new (GimpImage *image, NULL); notebook = gtk_notebook_new (); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + notebook, FALSE, FALSE, 0); gtk_widget_show (notebook); view = gimp_image_prop_view_new (image); diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c index 185351a2d8..a1193b5857 100644 --- a/app/dialogs/keyboard-shortcuts-dialog.c +++ b/app/dialogs/keyboard-shortcuts-dialog.c @@ -61,7 +61,8 @@ keyboard_shortcuts_dialog_new (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); editor = gimp_action_editor_new (gimp_ui_managers_from_name ("")->data, diff --git a/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c index be0e16d39b..c5d8f99c17 100644 --- a/app/dialogs/layer-add-mask-dialog.c +++ b/app/dialogs/layer-add-mask-dialog.c @@ -102,7 +102,8 @@ layer_add_mask_dialog_new (GimpLayer *layer, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), + vbox); gtk_widget_show (vbox); frame = diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c index 9932cfcba1..2e0ba8d615 100644 --- a/app/dialogs/layer-options-dialog.c +++ b/app/dialogs/layer-options-dialog.c @@ -109,7 +109,7 @@ layer_options_dialog_new (GimpImage *image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), vbox); gtk_widget_show (vbox); diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c index f44537302f..eba3377579 100644 --- a/app/dialogs/module-dialog.c +++ b/app/dialogs/module-dialog.c @@ -143,7 +143,8 @@ module_dialog_new (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + vbox); gtk_widget_show (vbox); dialog->hint = gimp_hint_box_new (_("You will have to restart GIMP " diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c index 1fd4ecb7dc..0be7e31efd 100644 --- a/app/dialogs/offset-dialog.c +++ b/app/dialogs/offset-dialog.c @@ -144,7 +144,7 @@ offset_dialog_new (GimpDrawable *drawable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_vbox); gtk_widget_show (main_vbox); diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c index 2d71469d7b..602d9c6e66 100644 --- a/app/dialogs/palette-import-dialog.c +++ b/app/dialogs/palette-import-dialog.c @@ -189,7 +189,7 @@ palette_import_dialog_new (GimpContext *context) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog))), main_hbox); gtk_widget_show (main_hbox); diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index bb1c4bb95c..9b59ea01da 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1437,7 +1437,8 @@ prefs_dialog_new (Gimp *gimp, /* The main hbox */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox); gtk_widget_show (hbox); /* The categories tree */ diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c index f2aa1aac65..d8c72905f6 100644 --- a/app/dialogs/print-size-dialog.c +++ b/app/dialogs/print-size-dialog.c @@ -137,7 +137,7 @@ print_size_dialog_new (GimpImage *image, frame = gimp_frame_new (_("Print Size")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c index f4880f23ec..a6a3be3c75 100644 --- a/app/dialogs/resize-dialog.c +++ b/app/dialogs/resize-dialog.c @@ -184,7 +184,8 @@ resize_dialog_new (GimpViewable *viewable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (text); diff --git a/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c index fcae657938..6e4d4810bf 100644 --- a/app/dialogs/resolution-calibrate-dialog.c +++ b/app/dialogs/resolution-calibrate-dialog.c @@ -92,7 +92,8 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry, table = gtk_table_new (4, 4, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table); gtk_widget_show (table); if (pixbuf) diff --git a/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c index 9b3240b966..5f7fb897de 100644 --- a/app/dialogs/scale-dialog.c +++ b/app/dialogs/scale-dialog.c @@ -162,7 +162,8 @@ scale_dialog_new (GimpViewable *viewable, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); frame = gimp_frame_new (text); diff --git a/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c index 72a82af693..1a2f1b9266 100644 --- a/app/dialogs/stroke-dialog.c +++ b/app/dialogs/stroke-dialog.c @@ -123,7 +123,8 @@ stroke_dialog_new (GimpItem *item, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); radio_box = gimp_prop_enum_radio_box_new (G_OBJECT (options), "method", diff --git a/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c index 3c0b6af882..282f6f9d1f 100644 --- a/app/dialogs/template-options-dialog.c +++ b/app/dialogs/template-options-dialog.c @@ -103,7 +103,8 @@ template_options_dialog_new (GimpTemplate *template, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + vbox); gtk_widget_show (vbox); options->editor = gimp_template_editor_new (template, options->gimp, TRUE); diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c index 6eb2a185ca..0bbb9045ad 100644 --- a/app/dialogs/tips-dialog.c +++ b/app/dialogs/tips-dialog.c @@ -156,7 +156,7 @@ tips_dialog_create (Gimp *gimp) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tips_dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tips_dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 28619ec60f..c59761e228 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -97,8 +97,8 @@ user_install_dialog_new (GimpUserInstall *install) frame = gimp_frame_new (_("Installation Log")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + frame, TRUE, TRUE, 0); gtk_widget_show (frame); scrolled = gtk_scrolled_window_new (NULL, NULL); diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c index b28c76d214..9beac8825e 100644 --- a/app/dialogs/vectors-options-dialog.c +++ b/app/dialogs/vectors-options-dialog.c @@ -101,7 +101,8 @@ vectors_options_dialog_new (GimpImage *image, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (options->dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (options->dialog))), + hbox); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 6); diff --git a/app/display/gimpdisplayshell-filter-dialog.c b/app/display/gimpdisplayshell-filter-dialog.c index 41753261ef..58a39b07c6 100644 --- a/app/display/gimpdisplayshell-filter-dialog.c +++ b/app/display/gimpdisplayshell-filter-dialog.c @@ -116,7 +116,8 @@ gimp_display_shell_filter_dialog_new (GimpDisplayShell *shell) editor = gimp_color_display_editor_new (shell->filter_stack); gtk_container_set_border_width (GTK_CONTAINER (editor), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cdd->dialog)->vbox), editor); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cdd->dialog))), + editor); gtk_widget_show (editor); return cdd->dialog; diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c index 59a1c99324..9a9f255741 100644 --- a/app/display/gimpdisplayshell-scale-dialog.c +++ b/app/display/gimpdisplayshell-scale-dialog.c @@ -147,7 +147,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell->scale_dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell->scale_dialog))), table); gtk_widget_show (table); diff --git a/app/gui/gui.c b/app/gui/gui.c index d7addf44f3..5a3971e5ac 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -171,7 +171,8 @@ gui_abort (const gchar *abort_message) gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + box); gtk_widget_show (box); gimp_dialog_run (GIMP_DIALOG (dialog)); diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c index 302260cdfe..5166ef97db 100644 --- a/app/tools/gimpcolorpickertool.c +++ b/app/tools/gimpcolorpickertool.c @@ -334,8 +334,8 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool) hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (picker_tool->dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (picker_tool->dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); picker_tool->color_frame1 = gimp_color_frame_new (); diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c index 9ac0f7dd5f..cfcb9ce3b7 100644 --- a/app/tools/gimpimagemaptool.c +++ b/app/tools/gimpimagemaptool.c @@ -304,7 +304,8 @@ gimp_image_map_tool_initialize (GimpTool *tool, image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (shell)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + vbox); if (klass->settings_name) gimp_image_map_tool_add_settings_gui (image_map_tool); diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c index 4ee2c1d010..67edcdb218 100644 --- a/app/tools/gimpmeasuretool.c +++ b/app/tools/gimpmeasuretool.c @@ -1006,7 +1006,8 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table); gtk_widget_show (table); diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index f1b1cfddc5..630a967c94 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -114,8 +114,8 @@ gimp_perspective_tool_dialog (GimpTransformTool *tr_tool) frame = gimp_frame_new (_("Transformation Matrix")); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), frame, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + frame, FALSE, FALSE, 0); gtk_widget_show (frame); table = gtk_table_new (3, 3, FALSE); diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index 50a47635a8..8677203f0a 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -177,8 +177,8 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool) gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacing (GTK_TABLE (table), 1, 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); button = gimp_spin_button_new (&rotate->angle_adj, diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index 03563bc5b4..5bef6d94d1 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -170,8 +170,8 @@ gimp_scale_tool_prepare (GimpTransformTool *tr_tool, NULL); gtk_container_set_border_width (GTK_CONTAINER (scale->box), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), scale->box, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + scale->box, FALSE, FALSE, 0); gtk_widget_show (scale->box); g_signal_connect (scale->box, "notify", diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 3239320392..082ae82e82 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -123,8 +123,8 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool) gtk_container_set_border_width (GTK_CONTAINER (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 2); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (tr_tool->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (tr_tool->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); button = gimp_spin_button_new (&shear->x_adj, diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index c59103d874..dbfcc3822d 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -2376,7 +2376,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool) vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c index c58408855a..b2b944d390 100644 --- a/libgimpwidgets/gimpunitmenu.c +++ b/libgimpwidgets/gimpunitmenu.c @@ -606,7 +606,8 @@ gimp_unit_menu_create_selection (GimpUnitMenu *menu) /* the main vbox */ vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (menu->selection)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (menu->selection))), + vbox); gtk_widget_show (vbox); /* the selection list */ From e805cb0cf4177ad11cde0119347ffe952e8797a2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 15 Jul 2009 18:57:12 +0200 Subject: [PATCH 50/70] Use gtk_dialog_get_content_area() instead of dialog->vbox --- plug-ins/color-rotate/color-rotate-dialog.c | 4 ++-- plug-ins/common/alien-map.c | 3 ++- plug-ins/common/align-layers.c | 4 ++-- plug-ins/common/apply-canvas.c | 3 ++- plug-ins/common/blinds.c | 3 ++- plug-ins/common/blur-gauss-selective.c | 3 ++- plug-ins/common/blur-gauss.c | 3 ++- plug-ins/common/blur-motion.c | 3 ++- plug-ins/common/border-average.c | 3 ++- plug-ins/common/bump-map.c | 3 ++- plug-ins/common/cartoon.c | 3 ++- plug-ins/common/channel-mixer.c | 3 ++- plug-ins/common/checkerboard.c | 3 ++- plug-ins/common/cml-explorer.c | 8 ++++---- plug-ins/common/color-cube-analyze.c | 4 ++-- plug-ins/common/color-exchange.c | 3 ++- plug-ins/common/color-to-alpha.c | 3 ++- plug-ins/common/colorify.c | 3 ++- plug-ins/common/colormap-remap.c | 3 ++- plug-ins/common/compose.c | 3 ++- plug-ins/common/contrast-retinex.c | 3 ++- plug-ins/common/convolution-matrix.c | 3 ++- plug-ins/common/cubism.c | 3 ++- plug-ins/common/curve-bend.c | 3 ++- plug-ins/common/decompose.c | 4 ++-- plug-ins/common/deinterlace.c | 3 ++- plug-ins/common/depth-merge.c | 2 +- plug-ins/common/despeckle.c | 3 ++- plug-ins/common/destripe.c | 3 ++- plug-ins/common/diffraction.c | 4 ++-- plug-ins/common/displace.c | 3 ++- plug-ins/common/edge-dog.c | 3 ++- plug-ins/common/edge-neon.c | 3 ++- plug-ins/common/edge-sobel.c | 3 ++- plug-ins/common/edge.c | 3 ++- plug-ins/common/emboss.c | 3 ++- plug-ins/common/engrave.c | 3 ++- plug-ins/common/file-aa.c | 2 +- plug-ins/common/file-csource.c | 3 ++- plug-ins/common/file-gbr.c | 3 ++- plug-ins/common/file-gif-save.c | 3 ++- plug-ins/common/file-gih.c | 3 ++- plug-ins/common/file-html-table.c | 4 ++-- plug-ins/common/file-mng.c | 3 ++- plug-ins/common/file-pat.c | 3 ++- plug-ins/common/file-pdf.c | 3 ++- plug-ins/common/file-png.c | 2 +- plug-ins/common/file-pnm.c | 2 +- plug-ins/common/file-ps.c | 8 ++++---- plug-ins/common/file-psp.c | 2 +- plug-ins/common/file-raw.c | 7 ++++--- plug-ins/common/file-sunras.c | 2 +- plug-ins/common/file-svg.c | 4 ++-- plug-ins/common/file-tga.c | 2 +- plug-ins/common/file-tiff-load.c | 3 ++- plug-ins/common/file-tiff-save.c | 2 +- plug-ins/common/file-wmf.c | 4 ++-- plug-ins/common/file-xbm.c | 2 +- plug-ins/common/file-xmc.c | 2 +- plug-ins/common/file-xpm.c | 2 +- plug-ins/common/film.c | 3 ++- plug-ins/common/filter-pack.c | 3 ++- plug-ins/common/fractal-trace.c | 3 ++- plug-ins/common/gee-zoom.c | 2 +- plug-ins/common/gee.c | 2 +- plug-ins/common/grid.c | 3 ++- plug-ins/common/hot.c | 3 ++- plug-ins/common/illusion.c | 3 ++- plug-ins/common/iwarp.c | 4 ++-- plug-ins/common/jigsaw.c | 3 ++- plug-ins/common/lcms.c | 6 ++++-- plug-ins/common/lens-apply.c | 3 ++- plug-ins/common/lens-distortion.c | 3 ++- plug-ins/common/lens-flare.c | 3 ++- plug-ins/common/mail.c | 2 +- plug-ins/common/max-rgb.c | 3 ++- plug-ins/common/mosaic.c | 3 ++- plug-ins/common/newsprint.c | 3 ++- plug-ins/common/nl-filter.c | 3 ++- plug-ins/common/noise-hsv.c | 3 ++- plug-ins/common/noise-randomize.c | 3 ++- plug-ins/common/noise-rgb.c | 3 ++- plug-ins/common/noise-solid.c | 3 ++- plug-ins/common/noise-spread.c | 3 ++- plug-ins/common/nova.c | 3 ++- plug-ins/common/oilify.c | 3 ++- plug-ins/common/photocopy.c | 3 ++- plug-ins/common/pixelize.c | 3 ++- plug-ins/common/plasma.c | 3 ++- plug-ins/common/plugin-browser.c | 2 +- plug-ins/common/polar-coords.c | 3 ++- plug-ins/common/qbist.c | 4 ++-- plug-ins/common/red-eye-removal.c | 3 ++- plug-ins/common/ripple.c | 3 ++- plug-ins/common/sample-colorize.c | 2 +- plug-ins/common/screenshot.c | 4 ++-- plug-ins/common/sharpen.c | 3 ++- plug-ins/common/shift.c | 3 ++- plug-ins/common/sinus.c | 4 ++-- plug-ins/common/smooth-palette.c | 5 +++-- plug-ins/common/softglow.c | 3 ++- plug-ins/common/sparkle.c | 3 ++- plug-ins/common/sphere-designer.c | 3 ++- plug-ins/common/threshold-alpha.c | 3 ++- plug-ins/common/tile-glass.c | 3 ++- plug-ins/common/tile-paper.c | 3 ++- plug-ins/common/tile-small.c | 4 ++-- plug-ins/common/tile.c | 3 ++- plug-ins/common/unit-editor.c | 10 +++++----- plug-ins/common/unsharp-mask.c | 3 ++- plug-ins/common/value-propagate.c | 3 ++- plug-ins/common/van-gogh-lic.c | 3 ++- plug-ins/common/video.c | 3 ++- plug-ins/common/warp.c | 3 ++- plug-ins/common/waves.c | 3 ++- plug-ins/common/whirl-pinch.c | 3 ++- plug-ins/common/wind.c | 3 ++- plug-ins/file-bmp/bmp-write.c | 3 ++- plug-ins/file-fits/fits.c | 4 ++-- plug-ins/file-fli/fli-gimp.c | 8 ++++---- plug-ins/file-ico/ico-dialog.c | 4 ++-- plug-ins/file-jpeg/jpeg-exif.c | 2 +- plug-ins/file-jpeg/jpeg-save.c | 6 ++++-- plug-ins/file-sgi/sgi.c | 2 +- plug-ins/file-xjt/xjt.c | 3 ++- plug-ins/flame/flame.c | 8 ++++---- .../fractal-explorer/fractal-explorer-dialogs.c | 4 ++-- plug-ins/fractal-explorer/fractal-explorer.c | 4 ++-- plug-ins/gfig/gfig-dialog.c | 14 ++++++++------ plug-ins/gimpressionist/gimpressionist.c | 3 ++- plug-ins/gimpressionist/orientmap.c | 2 +- plug-ins/gimpressionist/presets.c | 3 ++- plug-ins/gimpressionist/sizemap.c | 3 ++- plug-ins/gradient-flare/gradient-flare.c | 8 ++++---- plug-ins/ifs-compose/ifs-compose.c | 12 ++++++------ plug-ins/imagemap/imap_default_dialog.c | 4 ++-- plug-ins/lighting/lighting-ui.c | 4 ++-- plug-ins/map-object/map-object-ui.c | 4 ++-- plug-ins/maze/maze-dialog.c | 2 +- plug-ins/metadata/interface.c | 4 ++-- plug-ins/pagecurl/pagecurl.c | 2 +- plug-ins/script-fu/script-fu-console.c | 4 ++-- plug-ins/script-fu/script-fu-interface.c | 2 +- plug-ins/script-fu/script-fu-server.c | 2 +- plug-ins/selection-to-path/selection-to-path.c | 3 ++- plug-ins/win-snap/winsnap.c | 3 ++- 146 files changed, 299 insertions(+), 202 deletions(-) diff --git a/plug-ins/color-rotate/color-rotate-dialog.c b/plug-ins/color-rotate/color-rotate-dialog.c index e23f563943..1817bdb562 100644 --- a/plug-ins/color-rotate/color-rotate-dialog.c +++ b/plug-ins/color-rotate/color-rotate-dialog.c @@ -675,8 +675,8 @@ color_rotate_dialog (void) /* H-Box */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (hbox), previews, TRUE, TRUE, 0); diff --git a/plug-ins/common/alien-map.c b/plug-ins/common/alien-map.c index 83c02536f7..ccd27ceb5f 100644 --- a/plug-ins/common/alien-map.c +++ b/plug-ins/common/alien-map.c @@ -407,7 +407,8 @@ alienmap2_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 6daebd10b5..be11a7ac03 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -416,8 +416,8 @@ align_layers_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); combo = gimp_int_combo_box_new (_("None"), H_NONE, diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c index dc6f4614fa..f11db63e9e 100644 --- a/plug-ins/common/apply-canvas.c +++ b/plug-ins/common/apply-canvas.c @@ -1277,7 +1277,8 @@ struc_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index a2aebdbffe..53d8d173e1 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -237,7 +237,8 @@ blinds_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss-selective.c b/plug-ins/common/blur-gauss-selective.c index 74c87ef85a..aa32cbb476 100644 --- a/plug-ins/common/blur-gauss-selective.c +++ b/plug-ins/common/blur-gauss-selective.c @@ -246,7 +246,8 @@ sel_gauss_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-gauss.c b/plug-ins/common/blur-gauss.c index 57f93c56b1..3a483f6dce 100644 --- a/plug-ins/common/blur-gauss.c +++ b/plug-ins/common/blur-gauss.c @@ -492,7 +492,8 @@ gauss_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/blur-motion.c b/plug-ins/common/blur-motion.c index 475aa84a4a..cfb4fff9f7 100644 --- a/plug-ins/common/blur-motion.c +++ b/plug-ins/common/blur-motion.c @@ -1026,7 +1026,8 @@ mblur_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index 6e09c56ff0..66f4b85aae 100644 --- a/plug-ins/common/border-average.c +++ b/plug-ins/common/border-average.c @@ -365,7 +365,8 @@ borderaverage_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Border Size")); diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c index ac05020eb8..99a29b0f21 100644 --- a/plug-ins/common/bump-map.c +++ b/plug-ins/common/bump-map.c @@ -780,7 +780,8 @@ bumpmap_dialog (void) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c index 4c7caa94f3..d3069de204 100644 --- a/plug-ins/common/cartoon.c +++ b/plug-ins/common/cartoon.c @@ -825,7 +825,8 @@ cartoon_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/channel-mixer.c b/plug-ins/common/channel-mixer.c index a8f7bff959..374683d0d5 100644 --- a/plug-ins/common/channel-mixer.c +++ b/plug-ins/common/channel-mixer.c @@ -506,7 +506,8 @@ cm_dialog (CmParamsType *mix, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 423a9ea4d8..72cff6af30 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -360,7 +360,8 @@ checkerboard_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index 919151cf06..e3f07134a8 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -1193,8 +1193,8 @@ CML_explorer_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); @@ -1826,8 +1826,8 @@ function_graph_new (GtkWidget *widget, frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), frame, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + frame, FALSE, FALSE, 0); gtk_widget_show (frame); preview = gtk_drawing_area_new (); diff --git a/plug-ins/common/color-cube-analyze.c b/plug-ins/common/color-cube-analyze.c index 77bde0dffc..23f46deb58 100644 --- a/plug-ins/common/color-cube-analyze.c +++ b/plug-ins/common/color-cube-analyze.c @@ -364,8 +364,8 @@ doDialog (void) vbox = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c index dbec3aa84d..07f39ed714 100644 --- a/plug-ins/common/color-exchange.c +++ b/plug-ins/common/color-exchange.c @@ -302,7 +302,8 @@ exchange_dialog (GimpDrawable *drawable) /* do some boxes here */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Middle-Click Inside Preview to Pick \"From Color\"")); diff --git a/plug-ins/common/color-to-alpha.c b/plug-ins/common/color-to-alpha.c index cba41ca369..d3f3a73eff 100644 --- a/plug-ins/common/color-to-alpha.c +++ b/plug-ins/common/color-to-alpha.c @@ -391,7 +391,8 @@ color_to_alpha_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index e850ef6cf4..3b5a0243db 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -269,7 +269,8 @@ colorify_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 810e07e621..9436a397cb 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -612,7 +612,8 @@ remap_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); cmap = gimp_image_get_colormap (image_ID, &ncols); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 27dae2fea7..fa8b9123f9 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -1506,7 +1506,8 @@ compose_dialog (const gchar *compose_type, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Compose type combo */ diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index 12568e1290..669e91ad42 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -300,7 +300,8 @@ retinex_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/convolution-matrix.c b/plug-ins/common/convolution-matrix.c index 9b50106d70..5d4e94a37f 100644 --- a/plug-ins/common/convolution-matrix.c +++ b/plug-ins/common/convolution-matrix.c @@ -922,7 +922,8 @@ convolve_image_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index 454e9f1429..face4febe4 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -282,7 +282,8 @@ cubism_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, &cvals.preview); diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 217c0cbbf3..ee1b0dd5e7 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -1240,7 +1240,8 @@ bender_new_dialog (GimpDrawable *drawable) /* The main hbox */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (cd->shell)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (cd->shell))), + main_hbox); gtk_widget_show (main_hbox); /* Left side column */ diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index e6292841a0..d55e96459d 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -1495,8 +1495,8 @@ decompose_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Extract Channels")); diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index e57580a8b6..4a8942becd 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -336,7 +336,8 @@ deinterlace_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index 0df53fcd70..1ba05fda6b 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -659,7 +659,7 @@ DepthMerge_dialog (DepthMerge *dm) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 08765f0770..773d457ff3 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -439,7 +439,8 @@ despeckle_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 4bd13aa9a9..dc5d6932f5 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -452,7 +452,8 @@ destripe_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index 54fcbca932..3787a770c9 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -448,8 +448,8 @@ diffraction_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* Preview */ diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 6031e9b695..b0dc342567 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -340,7 +340,8 @@ displace_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c index 7451837f5d..ba96cc7d81 100644 --- a/plug-ins/common/edge-dog.c +++ b/plug-ins/common/edge-dog.c @@ -314,7 +314,8 @@ dog_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c index a2584ae852..6e6632cf5c 100644 --- a/plug-ins/common/edge-neon.c +++ b/plug-ins/common/edge-neon.c @@ -709,7 +709,8 @@ neon_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge-sobel.c b/plug-ins/common/edge-sobel.c index f73123c72b..3d645b5ab6 100644 --- a/plug-ins/common/edge-sobel.c +++ b/plug-ins/common/edge-sobel.c @@ -245,7 +245,8 @@ sobel_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 77af9e437a..383092dd84 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -643,7 +643,8 @@ edge_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 64a1978271..c9ee2b6ac5 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -461,7 +461,8 @@ emboss_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index f81505a609..eeaee31d80 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -223,7 +223,8 @@ engrave_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c index 57d344fa24..7a86991404 100644 --- a/plug-ins/common/file-aa.c +++ b/plug-ins/common/file-aa.c @@ -363,7 +363,7 @@ aa_dialog (gint selected) hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c index 507a081e8f..7f6a76ae94 100644 --- a/plug-ins/common/file-csource.c +++ b/plug-ins/common/file-csource.c @@ -674,7 +674,8 @@ run_save_dialog (Config *config) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); table = gtk_table_new (2, 2, FALSE); diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c index 7d877cd9aa..4380ce5655 100644 --- a/plug-ins/common/file-gbr.c +++ b/plug-ins/common/file-gbr.c @@ -749,7 +749,8 @@ save_dialog (void) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); spinbutton = gimp_spin_button_new (&adj, diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c index b63c5f714f..7162e497de 100644 --- a/plug-ins/common/file-gif-save.c +++ b/plug-ins/common/file-gif-save.c @@ -1023,7 +1023,8 @@ save_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* regular gif parameter settings */ diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c index f4116ebd61..f33a67c79f 100644 --- a/plug-ins/common/file-gih.c +++ b/plug-ins/common/file-gih.c @@ -880,7 +880,8 @@ gih_save_dialog (gint32 image_ID) gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c index b3e278c791..e1c9bdbdbc 100644 --- a/plug-ins/common/file-html-table.c +++ b/plug-ins/common/file-html-table.c @@ -423,8 +423,8 @@ save_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); if (gimp_image_width (image_ID) * gimp_image_height (image_ID) > 4096) { diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c index e9d6a4e75a..f95bb337c6 100644 --- a/plug-ins/common/file-mng.c +++ b/plug-ins/common/file-mng.c @@ -1268,7 +1268,8 @@ mng_save_dialog (gint32 image_id) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); frame = gimp_frame_new (_("MNG Options")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c index a3f9fa3fde..b4d2977f75 100644 --- a/plug-ins/common/file-pat.c +++ b/plug-ins/common/file-pat.c @@ -544,7 +544,8 @@ save_dialog (void) table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, TRUE, TRUE, 0); gtk_widget_show (table); entry = gtk_entry_new (); diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c index 36fa328c1b..bebffcc2f2 100644 --- a/plug-ins/common/file-pdf.c +++ b/plug-ins/common/file-pdf.c @@ -832,7 +832,8 @@ load_dialog (PopplerDocument *doc, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Title */ diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 8ebde1a6e0..dad23335a8 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -1808,7 +1808,7 @@ save_dialog (gint32 image_ID, gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index 64b5aa5043..e245258336 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -1207,7 +1207,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 083125ab93..ba84323b6c 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -3106,8 +3106,8 @@ load_dialog (const gchar *filename, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); if (page_count > 1) @@ -3345,8 +3345,8 @@ save_dialog (void) /* Main hbox */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, FALSE, FALSE, 0); main_vbox[0] = main_vbox[1] = NULL; for (j = 0; j < G_N_ELEMENTS (main_vbox); j++) diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index 1e77b26205..a347fa5aab 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -664,7 +664,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-raw.c b/plug-ins/common/file-raw.c index 0d8b8cab92..b630a1239e 100644 --- a/plug-ins/common/file-raw.c +++ b/plug-ins/common/file-raw.c @@ -1065,7 +1065,8 @@ load_dialog (const gchar *filename) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gtk_frame_new (NULL); @@ -1243,8 +1244,8 @@ save_dialog (const gchar *filename, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); frame = gimp_int_radio_group_new (TRUE, _("RGB Save Type"), diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index fd731e6b4a..560de91487 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -1652,7 +1652,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index b29bad9a35..7646ab4fac 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -746,8 +746,8 @@ load_dialog (const gchar *filename, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The SVG preview */ diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index 86170609dc..736a76446d 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -1382,7 +1382,7 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c index 6060fbfccf..35af888c24 100644 --- a/plug-ins/common/file-tiff-load.c +++ b/plug-ins/common/file-tiff-load.c @@ -493,7 +493,8 @@ load_dialog (TIFF *tif, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); /* Page Selector */ diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c index 70d61a9dae..03b3d9fbc4 100644 --- a/plug-ins/common/file-tiff-save.c +++ b/plug-ins/common/file-tiff-save.c @@ -1076,7 +1076,7 @@ save_dialog (gboolean has_alpha, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, TRUE, 0); /* compression */ diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index a97be67291..fe2ee46b43 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -516,8 +516,8 @@ load_dialog (const gchar *filename) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* The WMF preview */ diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index 90d44ec1fc..81a00f2431 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -1201,7 +1201,7 @@ save_dialog (gint32 drawable_ID) /* parameter settings */ frame = gimp_frame_new (_("XBM Options")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 811fb18872..1894bb7b7f 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -1076,7 +1076,7 @@ save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange) */ frame = gimp_frame_new (_("XMC Options")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index da8a398285..f6873cdd3c 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -820,7 +820,7 @@ save_dialog (void) table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); gtk_widget_show (table); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index c82b9e3e0e..5515bc4ce4 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -1262,7 +1262,8 @@ film_dialog (gint32 image_ID) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); notebook = gtk_notebook_new (); diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c index 2bf820a780..2d7930489c 100644 --- a/plug-ins/common/filter-pack.c +++ b/plug-ins/common/filter-pack.c @@ -1241,7 +1241,8 @@ fp_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); gtk_table_attach (GTK_TABLE (table), bna, 0, 2, 0, 1, diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c index 48abb55c1c..2d07c42292 100644 --- a/plug-ins/common/fractal-trace.c +++ b/plug-ins/common/fractal-trace.c @@ -705,7 +705,8 @@ dialog_show (void) mainbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (mainbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), mainbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + mainbox); gtk_widget_show (mainbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/gee-zoom.c b/plug-ins/common/gee-zoom.c index 60eb28f85a..0fd61f0f1d 100644 --- a/plug-ins/common/gee-zoom.c +++ b/plug-ins/common/gee-zoom.c @@ -217,7 +217,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/gee.c b/plug-ins/common/gee.c index b40f699b22..2d66d2c1cc 100644 --- a/plug-ins/common/gee.c +++ b/plug-ins/common/gee.c @@ -178,7 +178,7 @@ build_dialog (void) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, FALSE, FALSE, 0); gtk_widget_show (frame); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 69b1c34f39..15a0c51ac9 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -653,7 +653,8 @@ dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 0feb0544b9..0f105f2b95 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -600,7 +600,8 @@ plugin_dialog (piArgs *argp) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index 8988e45f6b..a63e22cc91 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -364,7 +364,8 @@ illusion_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 2f22edd843..2264beb8f6 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -1308,8 +1308,8 @@ iwarp_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index 4c9fa93d46..264168dde7 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -2430,7 +2430,8 @@ jigsaw_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c index 1985a5840e..7bf2898240 100644 --- a/plug-ins/common/lcms.c +++ b/plug-ins/common/lcms.c @@ -1246,7 +1246,8 @@ lcms_icc_apply_dialog (gint32 image, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); label = lcms_icc_profile_src_label_new (image, src_profile); @@ -1471,7 +1472,8 @@ lcms_dialog (GimpColorConfig *config, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Current Color Profile")); diff --git a/plug-ins/common/lens-apply.c b/plug-ins/common/lens-apply.c index cc31e83a03..773d0468b0 100644 --- a/plug-ins/common/lens-apply.c +++ b/plug-ins/common/lens-apply.c @@ -407,7 +407,8 @@ lens_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/lens-distortion.c b/plug-ins/common/lens-distortion.c index dcaac58c15..ee82a151bc 100644 --- a/plug-ins/common/lens-distortion.c +++ b/plug-ins/common/lens-distortion.c @@ -497,7 +497,8 @@ lens_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/lens-flare.c b/plug-ins/common/lens-flare.c index 5ec7971daf..6f665fae42 100644 --- a/plug-ins/common/lens-flare.c +++ b/plug-ins/common/lens-flare.c @@ -320,7 +320,8 @@ flare_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index e84a22c2c6..fc13a08e6a 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -422,7 +422,7 @@ save_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); diff --git a/plug-ins/common/max-rgb.c b/plug-ins/common/max-rgb.c index aa9dfc0200..c46a559544 100644 --- a/plug-ins/common/max-rgb.c +++ b/plug-ins/common/max-rgb.c @@ -273,7 +273,8 @@ max_rgb_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 6e13ed6ca1..88348cfc69 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -607,7 +607,8 @@ mosaic_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* A preview */ diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index 10021d5915..c4696095d1 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -1202,7 +1202,8 @@ newsprint_dialog (GimpDrawable *drawable) paned = gtk_hpaned_new (); gtk_container_set_border_width (GTK_CONTAINER (paned), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), paned); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + paned); gtk_widget_show (paned); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index 668582c29a..7da64514db 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -1030,7 +1030,8 @@ nlfilter_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-hsv.c b/plug-ins/common/noise-hsv.c index 059b232a57..ae28a789f2 100644 --- a/plug-ins/common/noise-hsv.c +++ b/plug-ins/common/noise-hsv.c @@ -378,7 +378,8 @@ scatter_hsv_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-randomize.c b/plug-ins/common/noise-randomize.c index 61fdbabda9..6e7d0d6b28 100644 --- a/plug-ins/common/noise-randomize.c +++ b/plug-ins/common/noise-randomize.c @@ -746,7 +746,8 @@ randomize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-rgb.c b/plug-ins/common/noise-rgb.c index e42b68e317..23daf7a559 100644 --- a/plug-ins/common/noise-rgb.c +++ b/plug-ins/common/noise-rgb.c @@ -464,7 +464,8 @@ noisify_dialog (GimpDrawable *drawable, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c index b8fdb58517..59c91542da 100644 --- a/plug-ins/common/noise-solid.c +++ b/plug-ins/common/noise-solid.c @@ -577,7 +577,8 @@ solid_noise_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/noise-spread.c b/plug-ins/common/noise-spread.c index 74e70b7479..ae4b2344eb 100644 --- a/plug-ins/common/noise-spread.c +++ b/plug-ins/common/noise-spread.c @@ -358,7 +358,8 @@ spread_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index b79787a5b3..54835eade2 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -318,7 +318,8 @@ nova_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index eb20b933e9..9bb783b794 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -791,7 +791,8 @@ oilify_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c index dc712ceb55..1d11ca0226 100644 --- a/plug-ins/common/photocopy.c +++ b/plug-ins/common/photocopy.c @@ -853,7 +853,8 @@ photocopy_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index f107a46a63..2d2074daa2 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -330,7 +330,8 @@ pixelize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index 4027400211..b93012d484 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -314,7 +314,8 @@ plasma_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_aspect_preview_new (drawable, NULL); diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index bbfc974f2c..c4a08e90d2 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -564,7 +564,7 @@ browser_dialog_new (void) browser->browser = gimp_browser_new (); gtk_container_set_border_width (GTK_CONTAINER (browser->browser), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (browser->dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (browser->dialog))), browser->browser); gtk_widget_show (browser->browser); diff --git a/plug-ins/common/polar-coords.c b/plug-ins/common/polar-coords.c index 4a60efe7fd..7593febf7b 100644 --- a/plug-ins/common/polar-coords.c +++ b/plug-ins/common/polar-coords.c @@ -607,7 +607,8 @@ polarize_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Preview */ diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index 3136d6cbaa..611e97ef02 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -817,8 +817,8 @@ dialog_run (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, FALSE, FALSE, 0); gtk_widget_show (vbox); table = gtk_table_new (3, 3, FALSE); diff --git a/plug-ins/common/red-eye-removal.c b/plug-ins/common/red-eye-removal.c index c41d1cf255..31a113a79b 100644 --- a/plug-ins/common/red-eye-removal.c +++ b/plug-ins/common/red-eye-removal.c @@ -154,7 +154,8 @@ dialog (gint32 image_id, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index 1782107029..8066f2268b 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -498,7 +498,8 @@ ripple_dialog (GimpDrawable *drawable) /* The main vbox */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index 640fe3eb4d..91b63315e2 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -1343,7 +1343,7 @@ smp_dialog (void) gtk_table_set_row_spacings (GTK_TABLE (table), 12); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), table, TRUE, TRUE, 0); ty = 0; diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index 9d7d6ac7c0..475d95bfa3 100644 --- a/plug-ins/common/screenshot.c +++ b/plug-ins/common/screenshot.c @@ -1082,8 +1082,8 @@ shoot_dialog (GdkScreen **screen) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); /* Hints */ diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index bf3ef3ace1..2c14e431c5 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -490,7 +490,8 @@ sharpen_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 6be8d1e140..0361cea21e 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -369,7 +369,8 @@ shift_dialog (gint32 image_ID, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index d55273aecc..47a075c0b1 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -662,8 +662,8 @@ sinus_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_hbox, TRUE, TRUE, 0); gtk_widget_show (main_hbox); /* Create preview */ diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 8249169868..82fa274b98 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -442,8 +442,9 @@ dialog (GimpDrawable *drawable) 1, GIMP_MAX_IMAGE_SIZE, 1, GIMP_MAX_IMAGE_SIZE); gtk_container_set_border_width (GTK_CONTAINER (sizeentry), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), sizeentry, - FALSE, FALSE, 0); gtk_widget_show (sizeentry); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + sizeentry, FALSE, FALSE, 0); + gtk_widget_show (sizeentry); spinbutton = gimp_spin_button_new (&adj, config.ntries, 1, 1024, 1, 10, 0, 1, 0); diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c index 951ee024d1..bc15b6555f 100644 --- a/plug-ins/common/softglow.c +++ b/plug-ins/common/softglow.c @@ -646,7 +646,8 @@ softglow_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index f46a3b2f89..a544ab968c 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -351,7 +351,8 @@ sparkle_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 38d42d4e82..7578e201b1 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -2564,7 +2564,8 @@ makewindow (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + main_vbox); gtk_widget_show (main_vbox); main_hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/threshold-alpha.c b/plug-ins/common/threshold-alpha.c index e4871c0053..5f0b82c936 100644 --- a/plug-ins/common/threshold-alpha.c +++ b/plug-ins/common/threshold-alpha.c @@ -262,7 +262,8 @@ threshold_alpha_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-glass.c b/plug-ins/common/tile-glass.c index d395dc7dfc..ba47a01435 100644 --- a/plug-ins/common/tile-glass.c +++ b/plug-ins/common/tile-glass.c @@ -264,7 +264,8 @@ glasstile_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/tile-paper.c b/plug-ins/common/tile-paper.c index 56f45d60e8..189f0de693 100644 --- a/plug-ins/common/tile-paper.c +++ b/plug-ins/common/tile-paper.c @@ -257,7 +257,8 @@ open_dialog (void) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_hbox); gtk_widget_show (main_hbox); /* Left */ diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index 23df220635..e3cf44e6c0 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -378,8 +378,8 @@ tileit_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 0411b10c3d..08af0294f3 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -415,7 +415,8 @@ tile_dialog (gint32 image_ID, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Tile to New Size")); diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c index d5761bf769..dcda56f2c6 100644 --- a/plug-ins/common/unit-editor.c +++ b/plug-ins/common/unit-editor.c @@ -222,8 +222,8 @@ new_unit_dialog (GtkWidget *main_dialog, gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); entry = identifier_entry = gtk_entry_new (); @@ -449,8 +449,8 @@ unit_editor_dialog (void) -1, NULL); toolbar = gtk_ui_manager_get_widget (ui_manager, "/unit-editor-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); scrolled_win = gtk_scrolled_window_new (NULL, NULL); @@ -460,7 +460,7 @@ unit_editor_dialog (void) GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_container_set_border_width (GTK_CONTAINER (scrolled_win), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled_win); gtk_widget_show (scrolled_win); diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c index a784eda93c..de23822d09 100644 --- a/plug-ins/common/unsharp-mask.c +++ b/plug-ins/common/unsharp-mask.c @@ -844,7 +844,8 @@ unsharp_mask_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/value-propagate.c b/plug-ins/common/value-propagate.c index b926a66f3b..cf27cc4a7f 100644 --- a/plug-ins/common/value-propagate.c +++ b/plug-ins/common/value-propagate.c @@ -1103,7 +1103,8 @@ vpropagate_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index ee0e879d53..98353b1aff 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -655,7 +655,8 @@ create_main_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox); gtk_widget_show (vbox); hbox = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index e422de90d7..6b432e5d18 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -2031,7 +2031,8 @@ video_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + hbox, TRUE, TRUE, 0); gtk_widget_show (hbox); /* frame for the radio buttons */ diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 173c24d7fb..beaf28a927 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -390,7 +390,8 @@ warp_dialog (GimpDrawable *drawable) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_frame_new (_("Basic Options")); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 9a67406eef..bdf12495b8 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -263,7 +263,8 @@ waves_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/whirl-pinch.c b/plug-ins/common/whirl-pinch.c index b2a3f19485..060a46ba41 100644 --- a/plug-ins/common/whirl-pinch.c +++ b/plug-ins/common/whirl-pinch.c @@ -542,7 +542,8 @@ whirl_pinch_dialog (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_zoom_preview_new (drawable); diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 3c17ad236e..2999615ff7 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -893,7 +893,8 @@ dialog_box (GimpDrawable *drawable) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); preview = gimp_drawable_preview_new (drawable, NULL); diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c index cb5f8cde24..7e08cff5d3 100644 --- a/plug-ins/file-bmp/bmp-write.c +++ b/plug-ins/file-bmp/bmp-write.c @@ -809,7 +809,8 @@ save_dialog (gint channels) vbox_main = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox_main), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox_main); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox_main); gtk_widget_show (vbox_main); toggle = gtk_check_button_new_with_mnemonic (_("_Run-Length Encoded")); diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 02c30b8d40..a4c92c3f26 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -1009,8 +1009,8 @@ load_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); frame = gimp_int_radio_group_new (TRUE, _("Replacement for undefined pixels"), diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index 86cc9cc046..2f4bbaf529 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -860,8 +860,8 @@ load_dialog (const gchar *filename) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* @@ -930,8 +930,8 @@ save_dialog (gint32 image_id) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX(GTK_DIALOG (dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); /* diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c index c1942756db..26c1690cc5 100644 --- a/plug-ins/file-ico/ico-dialog.c +++ b/plug-ins/file-ico/ico-dialog.c @@ -78,8 +78,8 @@ ico_dialog_new (IcoSaveInfo *info) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); gtk_widget_show (main_vbox); frame = gimp_frame_new (_("Icon Details")); diff --git a/plug-ins/file-jpeg/jpeg-exif.c b/plug-ins/file-jpeg/jpeg-exif.c index 5d66629674..3df5e5925c 100644 --- a/plug-ins/file-jpeg/jpeg-exif.c +++ b/plug-ins/file-jpeg/jpeg-exif.c @@ -307,7 +307,7 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c index dffd49ae25..35bebc0231 100644 --- a/plug-ins/file-jpeg/jpeg-save.c +++ b/plug-ins/file-jpeg/jpeg-save.c @@ -854,7 +854,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); table = gtk_table_new (1, 3, FALSE); @@ -1179,7 +1180,8 @@ save_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); tabledefaults = gtk_table_new (1, 3, FALSE); diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index 952daa2ce0..5c9913b2fb 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -655,7 +655,7 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), frame, TRUE, TRUE, 0); gtk_widget_show (frame); diff --git a/plug-ins/file-xjt/xjt.c b/plug-ins/file-xjt/xjt.c index 58c0383c22..22d3293dc2 100644 --- a/plug-ins/file-xjt/xjt.c +++ b/plug-ins/file-xjt/xjt.c @@ -882,7 +882,8 @@ save_dialog (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table, TRUE, TRUE, 0); gtk_widget_show (table); toggle = gtk_check_button_new_with_label (_("Optimize")); diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 0720647abc..f83eac26f4 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -662,8 +662,8 @@ edit_callback (GtkWidget *widget, main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (edit_dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (edit_dialog))), + main_vbox, FALSE, FALSE, 0); frame = gimp_frame_new (_("Directions")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0); @@ -982,8 +982,8 @@ flame_dialog (void) main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, FALSE, FALSE, 0); gtk_widget_show (main_vbox); box = gtk_hbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c index e0f33888b6..88ec2f0a88 100644 --- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c +++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c @@ -585,8 +585,8 @@ explorer_dialog (void) top_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (top_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), top_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + top_hbox, FALSE, FALSE, 0); gtk_widget_show (top_hbox); left_vbox = gtk_vbox_new (FALSE, 12); diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index 770d9082ad..5d1eca21d1 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -1132,8 +1132,8 @@ fractalexplorer_rescan_list (GtkWidget *widget, patheditor = gimp_path_editor_new (_("Add FractalExplorer Path"), fractalexplorer_path); gtk_container_set_border_width (GTK_CONTAINER (patheditor), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), patheditor, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + patheditor, TRUE, TRUE, 0); gtk_widget_show (patheditor); if (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK) diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index 43f5d86318..c27558bc3c 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -306,12 +306,12 @@ gfig_dialog (void) /* build the menu */ ui_manager = create_ui_manager (top_level_dlg); menubar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-menubar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), menubar, FALSE, FALSE, 0); gtk_widget_show (menubar); toolbar = gtk_ui_manager_get_widget (ui_manager, "/ui/gfig-toolbar"); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); @@ -320,8 +320,8 @@ gfig_dialog (void) /* Main box */ main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_end (GTK_BOX (GTK_DIALOG (top_level_dlg)->vbox), main_hbox, - TRUE, TRUE, 0); + gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))), + main_hbox, TRUE, TRUE, 0); /* Preview itself */ gtk_box_pack_start (GTK_BOX (main_hbox), make_preview (), FALSE, FALSE, 0); @@ -1220,7 +1220,8 @@ gfig_prefs_action_callback (GtkAction *widget, main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); /* Put buttons in */ @@ -1368,7 +1369,8 @@ gfig_grid_action_callback (GtkAction *action, main_vbox = gtk_vbox_new (FALSE, 0); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox); gtk_widget_show (main_vbox); hbox = gtk_hbox_new (FALSE, 6); diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c index e4a3efe7ff..72771a4738 100644 --- a/plug-ins/gimpressionist/gimpressionist.c +++ b/plug-ins/gimpressionist/gimpressionist.c @@ -160,7 +160,8 @@ create_dialog (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hbox); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + hbox); gtk_widget_show (hbox); preview_box = create_preview (); diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c index 2f8bfc525c..f9491d702a 100644 --- a/plug-ins/gimpressionist/orientmap.c +++ b/plug-ins/gimpressionist/orientmap.c @@ -547,7 +547,7 @@ create_orientmap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (orient_map_window)->vbox), + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (orient_map_window))), table1); gtk_widget_show (table1); diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c index 2c795f14ae..746b0114ee 100644 --- a/plug-ins/gimpressionist/presets.c +++ b/plug-ins/gimpressionist/presets.c @@ -659,7 +659,8 @@ create_save_preset (GtkWidget *parent) box = gtk_vbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (window)->vbox), box); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), + box); gtk_widget_show (box); label = gtk_label_new (_("Description:")); diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c index 953023a5da..8fbec985a8 100644 --- a/plug-ins/gimpressionist/sizemap.c +++ b/plug-ins/gimpressionist/sizemap.c @@ -422,7 +422,8 @@ create_sizemap_dialog (GtkWidget *parent) table1 = gtk_table_new (2, 5, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table1), 6); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (smwindow)->vbox), table1); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (smwindow))), + table1); gtk_widget_show (table1); tmpw2 = tmpw = gtk_frame_new (_("Smvectors")); diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index d06c6fb856..5273d8f97d 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -2373,8 +2373,8 @@ dlg_run (void) hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* @@ -3342,8 +3342,8 @@ ed_run (GtkWindow *parent, hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (shell)->vbox), hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))), + hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 110de80a7c..f58194e4e9 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -801,15 +801,15 @@ ifs_compose_dialog (GimpDrawable *drawable) toolbar = gtk_ui_manager_get_widget (ifsDesign->ui_manager, "/ifs-compose-toolbar"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), toolbar, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + toolbar, FALSE, FALSE, 0); gtk_widget_show (toolbar); /* The main vbox */ main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + main_vbox, TRUE, TRUE, 0); /* The design area */ @@ -1191,8 +1191,8 @@ ifs_options_dialog (GtkWidget *parent) gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ifsOptD->dialog)->vbox), table, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (ifsOptD->dialog))), + table, FALSE, FALSE, 0); gtk_widget_show (table); label = gtk_label_new (_("Max. memory:")); diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c index 13a31d9489..309fad37f3 100644 --- a/plug-ins/imagemap/imap_default_dialog.c +++ b/plug-ins/imagemap/imap_default_dialog.c @@ -121,8 +121,8 @@ make_default_dialog (const gchar *title) data->vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (data->dialog)->vbox), data->vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))), + data->vbox, TRUE, TRUE, 0); gtk_widget_show (data->vbox); return data; diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c index d2888ec9d8..67b0e85064 100644 --- a/plug-ins/lighting/lighting-ui.c +++ b/plug-ins/lighting/lighting-ui.c @@ -1033,8 +1033,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c index c6dde1d2f8..0066bf200d 100644 --- a/plug-ins/map-object/map-object-ui.c +++ b/plug-ins/map-object/map-object-ui.c @@ -1350,8 +1350,8 @@ main_dialog (GimpDrawable *drawable) main_hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (appwin)->vbox), main_hbox, - FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))), + main_hbox, FALSE, FALSE, 0); gtk_widget_show (main_hbox); /* Create the Preview */ diff --git a/plug-ins/maze/maze-dialog.c b/plug-ins/maze/maze-dialog.c index 9ac8a8c572..d52d9de9d5 100644 --- a/plug-ins/maze/maze-dialog.c +++ b/plug-ins/maze/maze-dialog.c @@ -186,7 +186,7 @@ maze_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, FALSE, FALSE, 0); /* The maze size frame */ diff --git a/plug-ins/metadata/interface.c b/plug-ins/metadata/interface.c index e261bdb49a..12cf001d2f 100644 --- a/plug-ins/metadata/interface.c +++ b/plug-ins/metadata/interface.c @@ -682,8 +682,8 @@ metadata_dialog (gint32 image_ID, notebook = gtk_notebook_new (); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_TOP); gtk_container_set_border_width (GTK_CONTAINER (notebook), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (mgui.dlg)->vbox), notebook, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (mgui.dlg))), + notebook, TRUE, TRUE, 0); gtk_widget_show (notebook); mgui.xmp_model = xmp_model; diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 0ad65b6a77..8db61dac1f 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -454,7 +454,7 @@ dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c index e31c34ba37..456a54b973 100644 --- a/plug-ins/script-fu/script-fu-console.c +++ b/plug-ins/script-fu/script-fu-console.c @@ -154,8 +154,8 @@ script_fu_console_interface (void) /* The main vbox */ vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (console.dialog)->vbox), vbox, - TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (console.dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); /* The output text widget */ diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c index 76d55041d3..b289f660f4 100644 --- a/plug-ins/script-fu/script-fu-interface.c +++ b/plug-ins/script-fu/script-fu-interface.c @@ -254,7 +254,7 @@ script_fu_interface (SFScript *script, vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); diff --git a/plug-ins/script-fu/script-fu-server.c b/plug-ins/script-fu/script-fu-server.c index 0957bed7e7..35585f6c5f 100644 --- a/plug-ins/script-fu/script-fu-server.c +++ b/plug-ins/script-fu/script-fu-server.c @@ -735,7 +735,7 @@ server_interface (void) gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), table, FALSE, FALSE, 0); /* The server port */ diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c index b7ca2b50d7..09dde9f364 100644 --- a/plug-ins/selection-to-path/selection-to-path.c +++ b/plug-ins/selection-to-path/selection-to-path.c @@ -326,7 +326,8 @@ sel2path_dialog (SELVALS *sels) table = dialog_create_selection_area (sels); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), table); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dlg))), + table); gtk_widget_show (table); gtk_widget_show (dlg); diff --git a/plug-ins/win-snap/winsnap.c b/plug-ins/win-snap/winsnap.c index a426a86307..2c92e82563 100644 --- a/plug-ins/win-snap/winsnap.c +++ b/plug-ins/win-snap/winsnap.c @@ -872,7 +872,8 @@ snap_dialog (void) vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); winsnapintf.single_button = From f455e5c56e359bf33a929552137b297b87788dda Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Wed, 15 Jul 2009 21:26:23 +0200 Subject: [PATCH 51/70] Add 'General' section to NEWS --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 2d5cf57da7..63334ca685 100644 --- a/NEWS +++ b/NEWS @@ -73,3 +73,10 @@ Core: PDB: - Add procedures to manipulate size of text box + + +General: + + - Changed licence to (L)GPLv3+ + - Use the automake 1.11 feature 'silent build rules' by default + - Lots of bug fixes and cleanup From 07dcd8ce107b505735c5a5a72317da69feb797b4 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Thu, 16 Jul 2009 17:48:22 +0400 Subject: [PATCH 52/70] Updated Russian translation --- po-plug-ins/ru.po | 1611 +++++++++++++++++++++++---------------------- 1 file changed, 812 insertions(+), 799 deletions(-) diff --git a/po-plug-ins/ru.po b/po-plug-ins/ru.po index e790f675a9..d04da7afa7 100644 --- a/po-plug-ins/ru.po +++ b/po-plug-ins/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp-plug-ins trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-22 15:16+0400\n" -"PO-Revision-Date: 2009-06-23 18:18+0400\n" +"POT-Creation-Date: 2009-07-16 17:48+0400\n" +"PO-Revision-Date: 2009-07-16 17:47+0400\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -43,7 +43,7 @@ msgstr "Весь слой" #. Create selection #: ../plug-ins/color-rotate/color-rotate-dialog.c:172 #: ../plug-ins/common/film.c:965 ../plug-ins/imagemap/imap_selection.c:366 -#: ../plug-ins/selection-to-path/selection-to-path.c:432 +#: ../plug-ins/selection-to-path/selection-to-path.c:433 msgid "Selection" msgstr "Выделение" @@ -54,7 +54,7 @@ msgstr "Контекст" #. spinbutton 1 #: ../plug-ins/color-rotate/color-rotate-dialog.c:298 #: ../plug-ins/color-rotate/color-rotate-dialog.c:376 -#: ../plug-ins/common/color-to-alpha.c:409 ../plug-ins/file-fli/fli-gimp.c:874 +#: ../plug-ins/common/color-to-alpha.c:410 ../plug-ins/file-fli/fli-gimp.c:874 #: ../plug-ins/file-fli/fli-gimp.c:944 msgid "From:" msgstr "Из:" @@ -249,27 +249,27 @@ msgstr "Чужое отображение: преобразование" msgid "Alien Map" msgstr "Чужое отображение" -#: ../plug-ins/common/alien-map.c:440 ../plug-ins/common/alien-map.c:464 -#: ../plug-ins/common/alien-map.c:488 +#: ../plug-ins/common/alien-map.c:441 ../plug-ins/common/alien-map.c:465 +#: ../plug-ins/common/alien-map.c:489 msgid "Number of cycles covering full value range" msgstr "Количество циклов, покрывающее все возможные значения" -#: ../plug-ins/common/alien-map.c:452 ../plug-ins/common/alien-map.c:476 -#: ../plug-ins/common/alien-map.c:500 +#: ../plug-ins/common/alien-map.c:453 ../plug-ins/common/alien-map.c:477 +#: ../plug-ins/common/alien-map.c:501 msgid "Phase angle, range 0-360" msgstr "Угол от 0 до 360" #. Propagate Mode -#: ../plug-ins/common/alien-map.c:514 ../plug-ins/common/hot.c:610 -#: ../plug-ins/common/value-propagate.c:1122 ../plug-ins/common/waves.c:277 +#: ../plug-ins/common/alien-map.c:515 ../plug-ins/common/hot.c:611 +#: ../plug-ins/common/value-propagate.c:1123 ../plug-ins/common/waves.c:278 msgid "Mode" msgstr "Режим" -#: ../plug-ins/common/alien-map.c:518 +#: ../plug-ins/common/alien-map.c:519 msgid "_RGB color model" msgstr "_Цветовая модель RGB" -#: ../plug-ins/common/alien-map.c:519 +#: ../plug-ins/common/alien-map.c:520 msgid "_HSL color model" msgstr "Цветовая _модель HSL" @@ -534,29 +534,29 @@ msgstr "Применить холст" #. ***************************************************** #. radio buttons for choosing LEFT or RIGHT #. ************************************************* -#: ../plug-ins/common/apply-canvas.c:1291 ../plug-ins/common/wind.c:944 +#: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945 #: ../plug-ins/lighting/lighting-ui.c:517 msgid "Direction" msgstr "Направление" -#: ../plug-ins/common/apply-canvas.c:1295 +#: ../plug-ins/common/apply-canvas.c:1296 msgid "_Top-right" msgstr "С_верху справа" -#: ../plug-ins/common/apply-canvas.c:1296 +#: ../plug-ins/common/apply-canvas.c:1297 msgid "Top-_left" msgstr "Сверху с_лева" -#: ../plug-ins/common/apply-canvas.c:1297 +#: ../plug-ins/common/apply-canvas.c:1298 msgid "_Bottom-left" msgstr "С_низу слева" -#: ../plug-ins/common/apply-canvas.c:1298 +#: ../plug-ins/common/apply-canvas.c:1299 msgid "Bottom-_right" msgstr "Снизу с_права" -#: ../plug-ins/common/apply-canvas.c:1323 ../plug-ins/common/bump-map.c:915 -#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractal-trace.c:795 +#: ../plug-ins/common/apply-canvas.c:1324 ../plug-ins/common/bump-map.c:916 +#: ../plug-ins/common/emboss.c:524 ../plug-ins/common/fractal-trace.c:796 #: ../plug-ins/map-object/map-object-ui.c:573 msgid "_Depth:" msgstr "_Глубина:" @@ -578,16 +578,16 @@ msgid "Blinds" msgstr "Жалюзи" #. Orientation toggle box -#: ../plug-ins/common/blinds.c:256 ../plug-ins/common/ripple.c:553 +#: ../plug-ins/common/blinds.c:257 ../plug-ins/common/ripple.c:554 msgid "Orientation" msgstr "Ориентация" -#: ../plug-ins/common/blinds.c:260 ../plug-ins/common/ripple.c:557 +#: ../plug-ins/common/blinds.c:261 ../plug-ins/common/ripple.c:558 #: ../plug-ins/common/tile-small.c:425 ../plug-ins/pagecurl/pagecurl.c:533 msgid "_Horizontal" msgstr "По _горизонтали" -#: ../plug-ins/common/blinds.c:263 ../plug-ins/common/ripple.c:560 +#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:561 #: ../plug-ins/common/tile-small.c:435 ../plug-ins/pagecurl/pagecurl.c:532 msgid "_Vertical" msgstr "По _вертикали" @@ -595,7 +595,7 @@ msgstr "По _вертикали" #. #. * Create the "background" layer to hold the image... #. -#: ../plug-ins/common/blinds.c:277 ../plug-ins/common/compose.c:934 +#: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:934 #: ../plug-ins/common/decompose.c:722 ../plug-ins/common/file-cel.c:361 #: ../plug-ins/common/file-cel.c:364 ../plug-ins/common/file-dicom.c:556 #: ../plug-ins/common/file-gif-load.c:927 @@ -603,7 +603,7 @@ msgstr "По _вертикали" #: ../plug-ins/common/file-pcx.c:417 ../plug-ins/common/file-pix.c:381 #: ../plug-ins/common/file-png.c:851 ../plug-ins/common/file-pnm.c:584 #: ../plug-ins/common/file-raw.c:759 ../plug-ins/common/file-sunras.c:974 -#: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:997 +#: ../plug-ins/common/file-tga.c:1063 ../plug-ins/common/file-tiff-load.c:998 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:745 #: ../plug-ins/common/smooth-palette.c:256 ../plug-ins/common/tile.c:266 #: ../plug-ins/file-bmp/bmp-read.c:589 ../plug-ins/file-faxg3/faxg3.c:477 @@ -611,22 +611,22 @@ msgstr "По _вертикали" #: ../plug-ins/file-jpeg/jpeg-load.c:760 #: ../plug-ins/file-psd/psd-image-res-load.c:994 #: ../plug-ins/file-psd/psd-load.c:1525 ../plug-ins/file-sgi/sgi.c:383 -#: ../plug-ins/gfig/gfig-dialog.c:1283 +#: ../plug-ins/gfig/gfig-dialog.c:1284 #: ../plug-ins/gimpressionist/general.c:139 ../plug-ins/twain/twain.c:567 -#: ../plug-ins/win-snap/winsnap.c:1154 +#: ../plug-ins/win-snap/winsnap.c:1155 msgid "Background" msgstr "Фон" -#: ../plug-ins/common/blinds.c:281 ../plug-ins/common/fractal-trace.c:737 -#: ../plug-ins/common/tile-paper.c:383 +#: ../plug-ins/common/blinds.c:282 ../plug-ins/common/fractal-trace.c:738 +#: ../plug-ins/common/tile-paper.c:384 msgid "_Transparent" msgstr "П_розрачный" -#: ../plug-ins/common/blinds.c:307 +#: ../plug-ins/common/blinds.c:308 msgid "_Displacement:" msgstr "_Перемещение:" -#: ../plug-ins/common/blinds.c:319 +#: ../plug-ins/common/blinds.c:320 msgid "_Number of segments:" msgstr "_Число сегментов:" @@ -649,16 +649,16 @@ msgstr "Выборочное Гауссово размывание" #: ../plug-ins/common/edge-dog.c:266 ../plug-ins/common/edge-neon.c:227 #: ../plug-ins/common/edge-sobel.c:211 ../plug-ins/common/photocopy.c:243 #: ../plug-ins/common/pixelize.c:292 ../plug-ins/common/softglow.c:223 -#: ../plug-ins/file-sgi/sgi.c:535 ../plug-ins/file-xjt/xjt.c:1698 +#: ../plug-ins/file-sgi/sgi.c:535 ../plug-ins/file-xjt/xjt.c:1699 #: ../plug-ins/gradient-flare/gradient-flare.c:965 msgid "Cannot operate on indexed color images." msgstr "Невозможно использовать для работы с индексированными изображениями" -#: ../plug-ins/common/blur-gauss-selective.c:270 +#: ../plug-ins/common/blur-gauss-selective.c:271 msgid "_Blur radius:" msgstr "_Радиус размывания:" -#: ../plug-ins/common/blur-gauss-selective.c:280 +#: ../plug-ins/common/blur-gauss-selective.c:281 msgid "_Max. delta:" msgstr "_Предел разницы:" @@ -680,29 +680,29 @@ msgid "Gaussian Blur" msgstr "Гауссово размывание" #. parameter settings -#: ../plug-ins/common/blur-gauss.c:507 +#: ../plug-ins/common/blur-gauss.c:508 msgid "Blur Radius" msgstr "Радиус размывания" -#: ../plug-ins/common/blur-gauss.c:521 ../plug-ins/common/jigsaw.c:2456 -#: ../plug-ins/common/noise-spread.c:381 +#: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457 +#: ../plug-ins/common/noise-spread.c:384 msgid "_Horizontal:" msgstr "По _горизонтали:" -#: ../plug-ins/common/blur-gauss.c:525 ../plug-ins/common/jigsaw.c:2473 -#: ../plug-ins/common/noise-spread.c:385 +#: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474 +#: ../plug-ins/common/noise-spread.c:388 msgid "_Vertical:" msgstr "По _вертикали:" -#: ../plug-ins/common/blur-gauss.c:548 +#: ../plug-ins/common/blur-gauss.c:549 msgid "Blur Method" msgstr "Тип размывания" -#: ../plug-ins/common/blur-gauss.c:552 +#: ../plug-ins/common/blur-gauss.c:553 msgid "_IIR" msgstr "_IIR" -#: ../plug-ins/common/blur-gauss.c:553 +#: ../plug-ins/common/blur-gauss.c:554 msgid "_RLE" msgstr "_RLE" @@ -722,59 +722,59 @@ msgstr "Размывание движением" msgid "Motion Blur" msgstr "Размывание движением" -#: ../plug-ins/common/blur-motion.c:1044 +#: ../plug-ins/common/blur-motion.c:1045 msgid "Blur Type" msgstr "Тип размывания" -#: ../plug-ins/common/blur-motion.c:1048 +#: ../plug-ins/common/blur-motion.c:1049 msgctxt "blur-type" msgid "_Linear" msgstr "_Линейное" -#: ../plug-ins/common/blur-motion.c:1049 +#: ../plug-ins/common/blur-motion.c:1050 msgctxt "blur-type" msgid "_Radial" msgstr "_Радиальное" -#: ../plug-ins/common/blur-motion.c:1050 +#: ../plug-ins/common/blur-motion.c:1051 msgctxt "blur-type" msgid "_Zoom" msgstr "_Наезд камерой" -#: ../plug-ins/common/blur-motion.c:1057 +#: ../plug-ins/common/blur-motion.c:1058 msgid "Blur Center" msgstr "Центр размывания" -#: ../plug-ins/common/blur-motion.c:1093 ../plug-ins/common/lens-flare.c:771 -#: ../plug-ins/common/nova.c:462 ../plug-ins/common/tile-paper.c:281 +#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:772 +#: ../plug-ins/common/nova.c:463 ../plug-ins/common/tile-paper.c:282 #: ../plug-ins/flame/flame.c:1250 #: ../plug-ins/gradient-flare/gradient-flare.c:2724 #: ../plug-ins/lighting/lighting-ui.c:476 msgid "_X:" msgstr "_X:" -#: ../plug-ins/common/blur-motion.c:1098 ../plug-ins/common/lens-flare.c:776 -#: ../plug-ins/common/nova.c:467 ../plug-ins/common/tile-paper.c:290 +#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:777 +#: ../plug-ins/common/nova.c:468 ../plug-ins/common/tile-paper.c:291 #: ../plug-ins/flame/flame.c:1264 #: ../plug-ins/gradient-flare/gradient-flare.c:2728 #: ../plug-ins/lighting/lighting-ui.c:491 msgid "_Y:" msgstr "_Y:" -#: ../plug-ins/common/blur-motion.c:1100 +#: ../plug-ins/common/blur-motion.c:1101 msgid "Blur _outward" msgstr "Размыть _наружу" -#: ../plug-ins/common/blur-motion.c:1113 +#: ../plug-ins/common/blur-motion.c:1114 msgid "Blur Parameters" msgstr "Параметры размывания" -#: ../plug-ins/common/blur-motion.c:1124 +#: ../plug-ins/common/blur-motion.c:1125 #: ../plug-ins/map-object/map-object-ui.c:1252 msgid "L_ength:" msgstr "_Длина:" -#: ../plug-ins/common/blur-motion.c:1137 ../plug-ins/common/newsprint.c:1000 +#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:1000 msgid "_Angle:" msgstr "_Угол:" @@ -808,21 +808,21 @@ msgstr "Поиск среднего значения цвета" msgid "Borderaverage" msgstr "Средний цвет рамки" -#: ../plug-ins/common/border-average.c:371 +#: ../plug-ins/common/border-average.c:372 msgid "Border Size" msgstr "Размер рамки" -#: ../plug-ins/common/border-average.c:379 +#: ../plug-ins/common/border-average.c:380 msgid "_Thickness:" msgstr "_Толщина:" #. Number of Colors frame -#: ../plug-ins/common/border-average.c:414 +#: ../plug-ins/common/border-average.c:415 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:907 msgid "Number of Colors" msgstr "Число цветов" -#: ../plug-ins/common/border-average.c:422 +#: ../plug-ins/common/border-average.c:423 msgid "_Bucket size:" msgstr "_Количество цветов:" @@ -842,58 +842,58 @@ msgstr "Создание рельефа" msgid "Bump Map" msgstr "Рельеф" -#: ../plug-ins/common/bump-map.c:831 +#: ../plug-ins/common/bump-map.c:832 msgid "_Bump map:" msgstr "_Карта рельефа:" #. Map type menu -#: ../plug-ins/common/bump-map.c:834 ../plug-ins/flame/flame.c:747 +#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:747 #: ../plug-ins/lighting/lighting-ui.c:841 msgid "Linear" msgstr "Линейный" -#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:749 +#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:749 #: ../plug-ins/lighting/lighting-ui.c:844 msgid "Spherical" msgstr "Сферический" -#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:748 +#: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:748 #: ../plug-ins/lighting/lighting-ui.c:843 msgid "Sinusoidal" msgstr "Синусоидальный" -#: ../plug-ins/common/bump-map.c:843 +#: ../plug-ins/common/bump-map.c:844 msgid "_Map type:" msgstr "_Тип карты:" #. Compensate darkening -#: ../plug-ins/common/bump-map.c:848 +#: ../plug-ins/common/bump-map.c:849 msgid "Co_mpensate for darkening" msgstr "Ко_мпенсировать затемнение" #. Invert bumpmap -#: ../plug-ins/common/bump-map.c:862 +#: ../plug-ins/common/bump-map.c:863 msgid "I_nvert bumpmap" msgstr "_Инвертировать рельеф" #. Tile bumpmap -#: ../plug-ins/common/bump-map.c:876 +#: ../plug-ins/common/bump-map.c:877 msgid "_Tile bumpmap" msgstr "_Повторяющийся рельеф" -#: ../plug-ins/common/bump-map.c:891 ../plug-ins/common/emboss.c:499 +#: ../plug-ins/common/bump-map.c:892 ../plug-ins/common/emboss.c:500 msgid "_Azimuth:" msgstr "_Азимут:" -#: ../plug-ins/common/bump-map.c:903 +#: ../plug-ins/common/bump-map.c:904 msgid "_Elevation:" msgstr "_Возвышение:" -#: ../plug-ins/common/bump-map.c:929 ../plug-ins/common/file-ps.c:3394 +#: ../plug-ins/common/bump-map.c:930 ../plug-ins/common/file-ps.c:3394 msgid "_X offset:" msgstr "_Смещение по X:" -#: ../plug-ins/common/bump-map.c:932 ../plug-ins/common/bump-map.c:946 +#: ../plug-ins/common/bump-map.c:933 ../plug-ins/common/bump-map.c:947 msgid "" "The offset can be adjusted by dragging the preview using the middle mouse " "button." @@ -901,15 +901,15 @@ msgstr "" "Смещение можно установить при помощи средней кнопки мыши, перемещая " "изображение предварительного просмотра." -#: ../plug-ins/common/bump-map.c:943 ../plug-ins/common/file-ps.c:3403 +#: ../plug-ins/common/bump-map.c:944 ../plug-ins/common/file-ps.c:3403 msgid "_Y offset:" msgstr "См_ещение по Y:" -#: ../plug-ins/common/bump-map.c:957 +#: ../plug-ins/common/bump-map.c:958 msgid "_Waterlevel:" msgstr "Ватер_линия:" -#: ../plug-ins/common/bump-map.c:969 +#: ../plug-ins/common/bump-map.c:970 msgid "A_mbient:" msgstr "Осве_щение:" @@ -925,11 +925,11 @@ msgstr "_Комикс..." msgid "Cartoon" msgstr "Комикс" -#: ../plug-ins/common/cartoon.c:847 ../plug-ins/common/photocopy.c:875 +#: ../plug-ins/common/cartoon.c:848 ../plug-ins/common/photocopy.c:876 msgid "_Mask radius:" msgstr "_Радиус маски:" -#: ../plug-ins/common/cartoon.c:861 +#: ../plug-ins/common/cartoon.c:862 msgid "_Percent black:" msgstr "_Процент чёрного:" @@ -949,66 +949,66 @@ msgstr "_Микшер каналов..." msgid "Channel Mixer" msgstr "Микшер каналов" -#: ../plug-ins/common/channel-mixer.c:528 +#: ../plug-ins/common/channel-mixer.c:529 msgid "O_utput channel:" msgstr "К_анал вывода:" #. Redmode radio frame -#: ../plug-ins/common/channel-mixer.c:537 ../plug-ins/common/decompose.c:173 +#: ../plug-ins/common/channel-mixer.c:538 ../plug-ins/common/decompose.c:173 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:990 msgid "Red" msgstr "Красный" #. Greenmode radio frame -#: ../plug-ins/common/channel-mixer.c:542 ../plug-ins/common/decompose.c:174 +#: ../plug-ins/common/channel-mixer.c:543 ../plug-ins/common/decompose.c:174 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1031 msgid "Green" msgstr "Зеленый" #. Bluemode radio frame -#: ../plug-ins/common/channel-mixer.c:547 ../plug-ins/common/decompose.c:175 +#: ../plug-ins/common/channel-mixer.c:548 ../plug-ins/common/decompose.c:175 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1072 msgid "Blue" msgstr "Синий" -#: ../plug-ins/common/channel-mixer.c:582 -#: ../plug-ins/common/color-exchange.c:397 ../plug-ins/common/compose.c:189 +#: ../plug-ins/common/channel-mixer.c:583 +#: ../plug-ins/common/color-exchange.c:398 ../plug-ins/common/compose.c:189 #: ../plug-ins/common/compose.c:200 ../plug-ins/common/diffraction.c:500 #: ../plug-ins/common/diffraction.c:538 ../plug-ins/common/diffraction.c:576 -#: ../plug-ins/common/noise-rgb.c:531 ../plug-ins/common/noise-rgb.c:538 +#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539 msgid "_Red:" msgstr "_Красный:" -#: ../plug-ins/common/channel-mixer.c:600 -#: ../plug-ins/common/color-exchange.c:457 ../plug-ins/common/compose.c:190 +#: ../plug-ins/common/channel-mixer.c:601 +#: ../plug-ins/common/color-exchange.c:458 ../plug-ins/common/compose.c:190 #: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:509 #: ../plug-ins/common/diffraction.c:547 ../plug-ins/common/diffraction.c:585 -#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539 +#: ../plug-ins/common/noise-rgb.c:533 ../plug-ins/common/noise-rgb.c:540 msgid "_Green:" msgstr "_Зеленый:" -#: ../plug-ins/common/channel-mixer.c:619 -#: ../plug-ins/common/color-exchange.c:518 ../plug-ins/common/compose.c:191 +#: ../plug-ins/common/channel-mixer.c:620 +#: ../plug-ins/common/color-exchange.c:519 ../plug-ins/common/compose.c:191 #: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:518 #: ../plug-ins/common/diffraction.c:556 ../plug-ins/common/diffraction.c:594 -#: ../plug-ins/common/noise-rgb.c:533 ../plug-ins/common/noise-rgb.c:540 +#: ../plug-ins/common/noise-rgb.c:534 ../plug-ins/common/noise-rgb.c:541 msgid "_Blue:" msgstr "С_иний:" -#: ../plug-ins/common/channel-mixer.c:635 +#: ../plug-ins/common/channel-mixer.c:636 msgid "_Monochrome" msgstr "_Монохромный" -#: ../plug-ins/common/channel-mixer.c:648 +#: ../plug-ins/common/channel-mixer.c:649 msgid "Preserve _luminosity" msgstr "Сохранять _яркость" -#: ../plug-ins/common/channel-mixer.c:877 +#: ../plug-ins/common/channel-mixer.c:878 msgid "Load Channel Mixer Settings" msgstr "Загрузить установки микшера каналов" #. stat error (file does not exist) -#: ../plug-ins/common/channel-mixer.c:981 +#: ../plug-ins/common/channel-mixer.c:982 #: ../plug-ins/common/cml-explorer.c:2177 ../plug-ins/common/curve-bend.c:884 #: ../plug-ins/common/file-cel.c:311 ../plug-ins/common/file-compressor.c:497 #: ../plug-ins/common/file-compressor.c:665 @@ -1020,12 +1020,12 @@ msgstr "Загрузить установки микшера каналов" #: ../plug-ins/common/file-pdf.c:550 ../plug-ins/common/file-pix.c:342 #: ../plug-ins/common/file-png.c:720 ../plug-ins/common/file-pnm.c:493 #: ../plug-ins/common/file-ps.c:1037 ../plug-ins/common/file-ps.c:3044 -#: ../plug-ins/common/file-psp.c:1750 ../plug-ins/common/file-raw.c:253 +#: ../plug-ins/common/file-psp.c:1717 ../plug-ins/common/file-raw.c:253 #: ../plug-ins/common/file-raw.c:707 ../plug-ins/common/file-sunras.c:390 #: ../plug-ins/common/file-svg.c:332 ../plug-ins/common/file-svg.c:717 #: ../plug-ins/common/file-tga.c:441 ../plug-ins/common/file-tiff-load.c:291 -#: ../plug-ins/common/file-xbm.c:736 ../plug-ins/common/file-xmc.c:665 -#: ../plug-ins/common/file-xmc.c:852 ../plug-ins/common/file-xwd.c:432 +#: ../plug-ins/common/file-xbm.c:736 ../plug-ins/common/file-xmc.c:666 +#: ../plug-ins/common/file-xmc.c:853 ../plug-ins/common/file-xwd.c:432 #: ../plug-ins/common/sphere-designer.c:2001 #: ../plug-ins/file-bmp/bmp-read.c:153 ../plug-ins/file-faxg3/faxg3.c:232 #: ../plug-ins/file-fits/fits.c:357 ../plug-ins/file-fli/fli-gimp.c:459 @@ -1034,7 +1034,7 @@ msgstr "Загрузить установки микшера каналов" #: ../plug-ins/file-jpeg/jpeg-load.c:830 ../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:189 -#: ../plug-ins/file-xjt/xjt.c:2540 ../plug-ins/file-xjt/xjt.c:2548 +#: ../plug-ins/file-xjt/xjt.c:2541 ../plug-ins/file-xjt/xjt.c:2549 #: ../plug-ins/flame/flame.c:411 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1862 #: ../plug-ins/fractal-explorer/fractal-explorer.c:928 @@ -1045,11 +1045,11 @@ msgstr "Загрузить установки микшера каналов" msgid "Could not open '%s' for reading: %s" msgstr "Не удалось открыть '%s' для записи: %s" -#: ../plug-ins/common/channel-mixer.c:1004 +#: ../plug-ins/common/channel-mixer.c:1005 msgid "Save Channel Mixer Settings" msgstr "Сохранить установки микшера каналов" -#: ../plug-ins/common/channel-mixer.c:1059 +#: ../plug-ins/common/channel-mixer.c:1060 #: ../plug-ins/common/cml-explorer.c:2004 ../plug-ins/common/curve-bend.c:832 #: ../plug-ins/common/file-cel.c:582 ../plug-ins/common/file-compressor.c:425 #: ../plug-ins/common/file-compressor.c:507 @@ -1057,7 +1057,7 @@ msgstr "Сохранить установки микшера каналов" #: ../plug-ins/common/file-compressor.c:676 #: ../plug-ins/common/file-csource.c:405 ../plug-ins/common/file-dicom.c:800 #: ../plug-ins/common/file-gbr.c:634 ../plug-ins/common/file-gif-save.c:761 -#: ../plug-ins/common/file-gih.c:1276 ../plug-ins/common/file-html-table.c:235 +#: ../plug-ins/common/file-gih.c:1277 ../plug-ins/common/file-html-table.c:235 #: ../plug-ins/common/file-mng.c:574 ../plug-ins/common/file-mng.c:908 #: ../plug-ins/common/file-pat.c:461 ../plug-ins/common/file-pcx.c:665 #: ../plug-ins/common/file-pix.c:523 ../plug-ins/common/file-png.c:1269 @@ -1065,13 +1065,13 @@ msgstr "Сохранить установки микшера каналов" #: ../plug-ins/common/file-raw.c:587 ../plug-ins/common/file-raw.c:615 #: ../plug-ins/common/file-sunras.c:562 ../plug-ins/common/file-tga.c:1169 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034 -#: ../plug-ins/common/file-xmc.c:1474 ../plug-ins/common/file-xwd.c:613 +#: ../plug-ins/common/file-xmc.c:1475 ../plug-ins/common/file-xwd.c:613 #: ../plug-ins/common/sphere-designer.c:2111 #: ../plug-ins/file-bmp/bmp-write.c:295 ../plug-ins/file-fits/fits.c:475 #: ../plug-ins/file-fli/fli-gimp.c:749 ../plug-ins/file-ico/ico-save.c:1007 #: ../plug-ins/file-jpeg/jpeg-save.c:329 ../plug-ins/file-psd/psd-save.c:1637 #: ../plug-ins/file-uri/uri-backend-libcurl.c:162 -#: ../plug-ins/file-xjt/xjt.c:1291 ../plug-ins/file-xjt/xjt.c:1726 +#: ../plug-ins/file-xjt/xjt.c:1292 ../plug-ins/file-xjt/xjt.c:1727 #: ../plug-ins/flame/flame.c:442 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545 #: ../plug-ins/gfig/gfig.c:793 ../plug-ins/ifs-compose/ifs-compose.c:2374 @@ -1080,7 +1080,7 @@ msgstr "Сохранить установки микшера каналов" msgid "Could not open '%s' for writing: %s" msgstr "Не удалось открыть '%s' для записи: %s" -#: ../plug-ins/common/channel-mixer.c:1067 +#: ../plug-ins/common/channel-mixer.c:1068 #: ../plug-ins/common/cml-explorer.c:2059 #, c-format msgid "Parameters were saved to '%s'" @@ -1102,12 +1102,12 @@ msgstr "Создание шахматной доски" msgid "Checkerboard" msgstr "Шахматная доска" -#: ../plug-ins/common/checkerboard.c:411 ../plug-ins/common/file-xmc.c:1181 -#: ../plug-ins/gimpressionist/sizemap.c:510 +#: ../plug-ins/common/checkerboard.c:412 ../plug-ins/common/file-xmc.c:1182 +#: ../plug-ins/gimpressionist/sizemap.c:511 msgid "_Size:" msgstr "_Размер:" -#: ../plug-ins/common/checkerboard.c:420 +#: ../plug-ins/common/checkerboard.c:421 msgid "_Psychobilly" msgstr "_Психоделия" @@ -1351,7 +1351,7 @@ msgid "Random Seed" msgstr "Случайное зерно" #: ../plug-ins/common/cml-explorer.c:1287 ../plug-ins/common/filter-pack.c:699 -#: ../plug-ins/common/van-gogh-lic.c:670 +#: ../plug-ins/common/van-gogh-lic.c:671 msgid "_Hue" msgstr "_Тон" @@ -1599,39 +1599,39 @@ msgstr "_Замена цвета..." msgid "Color Exchange" msgstr "Замена цвета" -#: ../plug-ins/common/color-exchange.c:308 +#: ../plug-ins/common/color-exchange.c:309 msgid "Middle-Click Inside Preview to Pick \"From Color\"" msgstr "Нажмите средней кнопкой мыши внутри для выбора «С цвета»" -#: ../plug-ins/common/color-exchange.c:346 +#: ../plug-ins/common/color-exchange.c:347 msgid "To Color" msgstr "На цвет" -#: ../plug-ins/common/color-exchange.c:346 +#: ../plug-ins/common/color-exchange.c:347 msgid "From Color" msgstr "С цвета" -#: ../plug-ins/common/color-exchange.c:364 +#: ../plug-ins/common/color-exchange.c:365 msgid "Color Exchange: To Color" msgstr "Замена цвета: На цвет" -#: ../plug-ins/common/color-exchange.c:365 +#: ../plug-ins/common/color-exchange.c:366 msgid "Color Exchange: From Color" msgstr "Замена цвета: С цвета" -#: ../plug-ins/common/color-exchange.c:423 +#: ../plug-ins/common/color-exchange.c:424 msgid "R_ed threshold:" msgstr "Порог _красного:" -#: ../plug-ins/common/color-exchange.c:483 +#: ../plug-ins/common/color-exchange.c:484 msgid "G_reen threshold:" msgstr "Порог _зелёного:" -#: ../plug-ins/common/color-exchange.c:544 +#: ../plug-ins/common/color-exchange.c:545 msgid "B_lue threshold:" msgstr "Порог _синего:" -#: ../plug-ins/common/color-exchange.c:572 +#: ../plug-ins/common/color-exchange.c:573 msgid "Lock _thresholds" msgstr "За_фиксировать пороги" @@ -1651,11 +1651,11 @@ msgstr "Удаление цвета" msgid "Color to Alpha" msgstr "Цвет в альфа-канал" -#: ../plug-ins/common/color-to-alpha.c:413 +#: ../plug-ins/common/color-to-alpha.c:414 msgid "Color to Alpha Color Picker" msgstr "Выбор цвета в альфа-канале" -#: ../plug-ins/common/color-to-alpha.c:428 +#: ../plug-ins/common/color-to-alpha.c:429 msgid "to alpha" msgstr "в альфа-канал" @@ -1675,11 +1675,11 @@ msgstr "Окрашивание" msgid "Colorify" msgstr "Окрашивание" -#: ../plug-ins/common/colorify.c:288 +#: ../plug-ins/common/colorify.c:289 msgid "Custom color:" msgstr "Выбор цвета:" -#: ../plug-ins/common/colorify.c:293 +#: ../plug-ins/common/colorify.c:294 msgid "Colorify Custom Color" msgstr "Окрашивание выбранным цветом" @@ -1733,7 +1733,7 @@ msgstr "Сбросить порядок" msgid "Rearrange Colormap" msgstr "Перестроить цветовую карту" -#: ../plug-ins/common/colormap-remap.c:698 +#: ../plug-ins/common/colormap-remap.c:699 msgid "" "Drag and drop colors to rearrange the colormap. The numbers shown are the " "original indices. Right-click for a menu with sort options." @@ -1743,7 +1743,7 @@ msgstr "" "правой кнопкой мыши." #: ../plug-ins/common/compose.c:188 ../plug-ins/common/decompose.c:169 -#: ../plug-ins/common/file-raw.c:1095 +#: ../plug-ins/common/file-raw.c:1096 msgid "RGB" msgstr "RGB" @@ -1751,8 +1751,8 @@ msgstr "RGB" msgid "RGBA" msgstr "RGBA" -#: ../plug-ins/common/compose.c:203 ../plug-ins/common/noise-rgb.c:526 -#: ../plug-ins/common/noise-rgb.c:541 +#: ../plug-ins/common/compose.c:203 ../plug-ins/common/noise-rgb.c:527 +#: ../plug-ins/common/noise-rgb.c:542 msgid "_Alpha:" msgstr "Альфа:" @@ -1765,11 +1765,11 @@ msgid "_Hue:" msgstr "_Тон:" #: ../plug-ins/common/compose.c:212 ../plug-ins/common/compose.c:220 -#: ../plug-ins/common/noise-hsv.c:423 +#: ../plug-ins/common/noise-hsv.c:424 msgid "_Saturation:" msgstr "Насыщенность:" -#: ../plug-ins/common/compose.c:213 ../plug-ins/common/noise-hsv.c:435 +#: ../plug-ins/common/compose.c:213 ../plug-ins/common/noise-hsv.c:436 msgid "_Value:" msgstr "Яркость:" @@ -1896,7 +1896,7 @@ msgstr "Не удалось получить слои изображения %d" msgid "Composing" msgstr "Сборка" -#: ../plug-ins/common/compose.c:696 ../plug-ins/common/compose.c:1734 +#: ../plug-ins/common/compose.c:696 ../plug-ins/common/compose.c:1735 msgid "At least one image is needed to compose" msgstr "Для сборки необходимо по крайней мере одно изображение" @@ -1931,20 +1931,20 @@ msgid "Compose" msgstr "Собрать" #. Compose type combo -#: ../plug-ins/common/compose.c:1514 +#: ../plug-ins/common/compose.c:1515 msgid "Compose Channels" msgstr "Собрать каналы" -#: ../plug-ins/common/compose.c:1524 ../plug-ins/common/decompose.c:1514 +#: ../plug-ins/common/compose.c:1525 ../plug-ins/common/decompose.c:1514 msgid "Color _model:" msgstr "Цветовая _модель:" #. Channel representation table -#: ../plug-ins/common/compose.c:1556 +#: ../plug-ins/common/compose.c:1557 msgid "Channel Representations" msgstr "Представление канала" -#: ../plug-ins/common/compose.c:1619 +#: ../plug-ins/common/compose.c:1620 msgid "Mask value" msgstr "Значение маски" @@ -1953,7 +1953,7 @@ msgid "Stretch brightness values to cover the full range" msgstr "Предельно растянуть значения яркости" #: ../plug-ins/common/contrast-normalize.c:91 -#: ../plug-ins/common/edge-dog.c:358 +#: ../plug-ins/common/edge-dog.c:359 msgid "_Normalize" msgstr "_Упорядочить" @@ -1977,35 +1977,35 @@ msgstr "Ретинекс" msgid "Retinex Image Enhancement" msgstr "Улучшение изображения при помощи ретинекса" -#: ../plug-ins/common/contrast-retinex.c:320 +#: ../plug-ins/common/contrast-retinex.c:321 msgid "Uniform" msgstr "Равномерный" -#: ../plug-ins/common/contrast-retinex.c:321 +#: ../plug-ins/common/contrast-retinex.c:322 msgid "Low" msgstr "Низкий" -#: ../plug-ins/common/contrast-retinex.c:322 +#: ../plug-ins/common/contrast-retinex.c:323 msgid "High" msgstr "Высокий" -#: ../plug-ins/common/contrast-retinex.c:333 +#: ../plug-ins/common/contrast-retinex.c:334 msgid "_Level:" msgstr "_Уровень:" -#: ../plug-ins/common/contrast-retinex.c:338 +#: ../plug-ins/common/contrast-retinex.c:339 msgid "_Scale:" msgstr "Масштаб:" -#: ../plug-ins/common/contrast-retinex.c:353 +#: ../plug-ins/common/contrast-retinex.c:354 msgid "Scale _division:" msgstr "Дел_ение:" -#: ../plug-ins/common/contrast-retinex.c:368 +#: ../plug-ins/common/contrast-retinex.c:369 msgid "Dy_namic:" msgstr "Дин_амика:" -#: ../plug-ins/common/contrast-retinex.c:641 +#: ../plug-ins/common/contrast-retinex.c:642 msgid "Retinex: filtering" msgstr "Ретинекс: фильтрование..." @@ -2068,8 +2068,8 @@ msgid "E_xtend" msgstr "_Расширить" #: ../plug-ins/common/convolution-matrix.c:73 -#: ../plug-ins/common/displace.c:471 ../plug-ins/common/edge.c:704 -#: ../plug-ins/common/fractal-trace.c:735 ../plug-ins/common/ripple.c:581 +#: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:705 +#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:582 msgid "_Wrap" msgstr "З_авернуть" @@ -2097,32 +2097,32 @@ msgstr "Применение свертки" msgid "Convolution Matrix" msgstr "Матрица свёртки" -#: ../plug-ins/common/convolution-matrix.c:943 +#: ../plug-ins/common/convolution-matrix.c:944 msgid "Matrix" msgstr "Матрица" -#: ../plug-ins/common/convolution-matrix.c:981 +#: ../plug-ins/common/convolution-matrix.c:982 msgid "D_ivisor:" msgstr "Делитель:" -#: ../plug-ins/common/convolution-matrix.c:1007 -#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1116 +#: ../plug-ins/common/convolution-matrix.c:1008 +#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1117 msgid "O_ffset:" msgstr "Смещение:" -#: ../plug-ins/common/convolution-matrix.c:1036 +#: ../plug-ins/common/convolution-matrix.c:1037 msgid "N_ormalise" msgstr "Н_ормализовать" -#: ../plug-ins/common/convolution-matrix.c:1048 +#: ../plug-ins/common/convolution-matrix.c:1049 msgid "A_lpha-weighting" msgstr "А_льфа-нагрузка" -#: ../plug-ins/common/convolution-matrix.c:1067 +#: ../plug-ins/common/convolution-matrix.c:1068 msgid "Border" msgstr "Рамка" -#: ../plug-ins/common/convolution-matrix.c:1094 +#: ../plug-ins/common/convolution-matrix.c:1095 msgid "Channels" msgstr "Каналы" @@ -2175,19 +2175,19 @@ msgstr "К_убизм..." msgid "Cubism" msgstr "Кубизм" -#: ../plug-ins/common/cubism.c:304 +#: ../plug-ins/common/cubism.c:305 msgid "_Tile size:" msgstr "_Размер элемента:" -#: ../plug-ins/common/cubism.c:317 +#: ../plug-ins/common/cubism.c:318 msgid "T_ile saturation:" msgstr "_Насыщенность элемента:" -#: ../plug-ins/common/cubism.c:328 +#: ../plug-ins/common/cubism.c:329 msgid "_Use background color" msgstr "_Использовать цвет фона" -#: ../plug-ins/common/cubism.c:418 +#: ../plug-ins/common/cubism.c:419 msgid "Cubistic transformation" msgstr "Кубистическое преобразование" @@ -2219,130 +2219,130 @@ msgstr "Ошибка при чтении '%s'. %s" #. Possibly retrieve data from a previous run #. The shell and main vbox -#: ../plug-ins/common/curve-bend.c:1216 ../plug-ins/common/curve-bend.c:2937 +#: ../plug-ins/common/curve-bend.c:1216 ../plug-ins/common/curve-bend.c:2938 msgid "Curve Bend" msgstr "Изгиб по кривой" #. Preview area, top of column #. preview -#: ../plug-ins/common/curve-bend.c:1252 +#: ../plug-ins/common/curve-bend.c:1253 #: ../plug-ins/gimpressionist/orientmap.c:591 -#: ../plug-ins/gimpressionist/sizemap.c:460 +#: ../plug-ins/gimpressionist/sizemap.c:461 #: ../plug-ins/print/print-page-layout.c:171 msgid "Preview" msgstr "Просмотр" #. The preview button -#: ../plug-ins/common/curve-bend.c:1281 +#: ../plug-ins/common/curve-bend.c:1282 msgid "_Preview Once" msgstr "_Просмотреть" #. The preview toggle -#: ../plug-ins/common/curve-bend.c:1290 +#: ../plug-ins/common/curve-bend.c:1291 msgid "Automatic pre_view" msgstr "_Автообновление просмотра" #. Options area, bottom of column #. Options section -#: ../plug-ins/common/curve-bend.c:1300 ../plug-ins/common/ripple.c:519 +#: ../plug-ins/common/curve-bend.c:1301 ../plug-ins/common/ripple.c:520 #: ../plug-ins/gfig/gfig-dialog.c:1206 msgid "Options" msgstr "Параметры" #. Rotate spinbutton -#: ../plug-ins/common/curve-bend.c:1314 +#: ../plug-ins/common/curve-bend.c:1315 msgid "Rotat_e:" msgstr "_Вращение:" #. The smoothing toggle -#: ../plug-ins/common/curve-bend.c:1333 +#: ../plug-ins/common/curve-bend.c:1334 msgid "Smoo_thing" msgstr "С_глаживание изображения" #. The antialiasing toggle -#: ../plug-ins/common/curve-bend.c:1343 ../plug-ins/common/mosaic.c:730 -#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:528 +#: ../plug-ins/common/curve-bend.c:1344 ../plug-ins/common/mosaic.c:731 +#: ../plug-ins/common/qbist.c:852 ../plug-ins/common/ripple.c:529 msgid "_Antialiasing" msgstr "Сглаживание _края" #. The work_on_copy toggle -#: ../plug-ins/common/curve-bend.c:1353 +#: ../plug-ins/common/curve-bend.c:1354 msgid "Work on cop_y" msgstr "_Работать с копией" #. The curves graph -#: ../plug-ins/common/curve-bend.c:1363 +#: ../plug-ins/common/curve-bend.c:1364 msgid "Modify Curves" msgstr "Корректирующие кривые" -#: ../plug-ins/common/curve-bend.c:1391 +#: ../plug-ins/common/curve-bend.c:1392 msgid "Curve for Border" msgstr "Кривая для края:" -#: ../plug-ins/common/curve-bend.c:1395 +#: ../plug-ins/common/curve-bend.c:1396 msgid "_Upper" msgstr "В_ерхнего" -#: ../plug-ins/common/curve-bend.c:1396 +#: ../plug-ins/common/curve-bend.c:1397 msgid "_Lower" msgstr "_Нижнего" -#: ../plug-ins/common/curve-bend.c:1406 +#: ../plug-ins/common/curve-bend.c:1407 msgid "Curve Type" msgstr "Тип кривой:" -#: ../plug-ins/common/curve-bend.c:1410 +#: ../plug-ins/common/curve-bend.c:1411 msgid "Smoot_h" msgstr "Гл_адкая" -#: ../plug-ins/common/curve-bend.c:1411 +#: ../plug-ins/common/curve-bend.c:1412 msgid "_Free" msgstr "_Свободная" #. The Copy button -#: ../plug-ins/common/curve-bend.c:1426 +#: ../plug-ins/common/curve-bend.c:1427 msgid "_Copy" msgstr "Ско_пировать" -#: ../plug-ins/common/curve-bend.c:1431 +#: ../plug-ins/common/curve-bend.c:1432 msgid "Copy the active curve to the other border" msgstr "Скопировать активную кривую на другой край" #. The CopyInv button -#: ../plug-ins/common/curve-bend.c:1438 +#: ../plug-ins/common/curve-bend.c:1439 msgid "_Mirror" msgstr "Отра_зить" -#: ../plug-ins/common/curve-bend.c:1443 +#: ../plug-ins/common/curve-bend.c:1444 msgid "Mirror the active curve to the other border" msgstr "Зеркально отразить активную кривую на другой край" #. The Swap button -#: ../plug-ins/common/curve-bend.c:1451 +#: ../plug-ins/common/curve-bend.c:1452 msgid "S_wap" msgstr "Перестав_ить" -#: ../plug-ins/common/curve-bend.c:1456 +#: ../plug-ins/common/curve-bend.c:1457 msgid "Swap the two curves" msgstr "Переставить две кривые" -#: ../plug-ins/common/curve-bend.c:1468 +#: ../plug-ins/common/curve-bend.c:1469 msgid "Reset the active curve" msgstr "Сбросить активную кривую" -#: ../plug-ins/common/curve-bend.c:1485 +#: ../plug-ins/common/curve-bend.c:1486 msgid "Load the curves from a file" msgstr "Загрузить кривые из файла" -#: ../plug-ins/common/curve-bend.c:1497 +#: ../plug-ins/common/curve-bend.c:1498 msgid "Save the curves to a file" msgstr "Сохранить кривые в файле" -#: ../plug-ins/common/curve-bend.c:2035 +#: ../plug-ins/common/curve-bend.c:2036 msgid "Load Curve Points from File" msgstr "Загрузить точки кривой из файла" -#: ../plug-ins/common/curve-bend.c:2070 +#: ../plug-ins/common/curve-bend.c:2071 msgid "Save Curve Points to File" msgstr "Сохранить точки кривой в файле" @@ -2554,11 +2554,11 @@ msgstr "_Убрать черезстрочность..." msgid "Deinterlace" msgstr "Убрать черезстрочность" -#: ../plug-ins/common/deinterlace.c:353 +#: ../plug-ins/common/deinterlace.c:354 msgid "Keep o_dd fields" msgstr "Сохранить нечетные поля" -#: ../plug-ins/common/deinterlace.c:354 +#: ../plug-ins/common/deinterlace.c:355 msgid "Keep _even fields" msgstr "Сохранить четные поля" @@ -2610,35 +2610,35 @@ msgstr "Удалить из изображения шум, создаваемы msgid "Des_peckle..." msgstr "Удаление _пятен..." -#: ../plug-ins/common/despeckle.c:424 ../plug-ins/common/despeckle.c:644 +#: ../plug-ins/common/despeckle.c:424 ../plug-ins/common/despeckle.c:645 msgid "Despeckle" msgstr "Удаление пятен" -#: ../plug-ins/common/despeckle.c:453 +#: ../plug-ins/common/despeckle.c:454 msgid "Median" msgstr "Среднее" -#: ../plug-ins/common/despeckle.c:461 +#: ../plug-ins/common/despeckle.c:462 msgid "_Adaptive" msgstr "_Адаптивное" -#: ../plug-ins/common/despeckle.c:471 +#: ../plug-ins/common/despeckle.c:472 msgid "R_ecursive" msgstr "_Рекурсивное" -#: ../plug-ins/common/despeckle.c:492 ../plug-ins/common/edge-neon.c:731 -#: ../plug-ins/common/nl-filter.c:1089 ../plug-ins/common/nova.c:365 -#: ../plug-ins/common/unsharp-mask.c:865 ../plug-ins/common/whirl-pinch.c:588 +#: ../plug-ins/common/despeckle.c:493 ../plug-ins/common/edge-neon.c:732 +#: ../plug-ins/common/nl-filter.c:1090 ../plug-ins/common/nova.c:366 +#: ../plug-ins/common/unsharp-mask.c:866 ../plug-ins/common/whirl-pinch.c:589 #: ../plug-ins/gradient-flare/gradient-flare.c:2757 #: ../plug-ins/imagemap/imap_circle.c:277 msgid "_Radius:" msgstr "_Радиус:" -#: ../plug-ins/common/despeckle.c:508 +#: ../plug-ins/common/despeckle.c:509 msgid "_Black level:" msgstr "Уровень _черного:" -#: ../plug-ins/common/despeckle.c:524 +#: ../plug-ins/common/despeckle.c:525 msgid "_White level:" msgstr "Уровень _белого:" @@ -2658,17 +2658,17 @@ msgstr "Удаление штрихов" msgid "Destripe" msgstr "Удаление штрихов" -#: ../plug-ins/common/destripe.c:472 ../plug-ins/common/file-html-table.c:594 +#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:594 #: ../plug-ins/common/file-ps.c:3167 ../plug-ins/common/file-ps.c:3376 -#: ../plug-ins/common/file-raw.c:1129 ../plug-ins/common/smooth-palette.c:435 -#: ../plug-ins/common/tile-paper.c:301 ../plug-ins/common/tile.c:430 +#: ../plug-ins/common/file-raw.c:1130 ../plug-ins/common/smooth-palette.c:435 +#: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431 #: ../plug-ins/imagemap/imap_cmd_guides.c:164 #: ../plug-ins/imagemap/imap_rectangle.c:402 #: ../plug-ins/print/print-page-layout.c:264 msgid "_Width:" msgstr "_Ширина:" -#: ../plug-ins/common/destripe.c:483 +#: ../plug-ins/common/destripe.c:484 msgid "Create _histogram" msgstr "Создать _гистограмму" @@ -2705,7 +2705,7 @@ msgstr "Контуры" msgid "Sharp Edges" msgstr "Резкие края" -#: ../plug-ins/common/diffraction.c:614 ../plug-ins/common/softglow.c:682 +#: ../plug-ins/common/diffraction.c:614 ../plug-ins/common/softglow.c:683 #: ../plug-ins/flame/flame.c:1080 msgid "_Brightness:" msgstr "_Яркость:" @@ -2755,38 +2755,38 @@ msgid "Displace" msgstr "Смещение" #. X options -#: ../plug-ins/common/displace.c:361 +#: ../plug-ins/common/displace.c:362 msgid "_X displacement:" msgstr "Смещение по _Х:" #. Y Options -#: ../plug-ins/common/displace.c:408 +#: ../plug-ins/common/displace.c:409 msgid "_Y displacement:" msgstr "Смещение по _Y:" -#: ../plug-ins/common/displace.c:458 +#: ../plug-ins/common/displace.c:459 msgid "Displacement Mode" msgstr "Вид смещения:" -#: ../plug-ins/common/displace.c:461 +#: ../plug-ins/common/displace.c:462 msgid "_Cartesian" msgstr "_Картезианский" -#: ../plug-ins/common/displace.c:462 +#: ../plug-ins/common/displace.c:463 msgid "_Polar" msgstr "_Полярный" -#: ../plug-ins/common/displace.c:467 +#: ../plug-ins/common/displace.c:468 msgid "Edge Behavior" msgstr "Край" -#: ../plug-ins/common/displace.c:473 ../plug-ins/common/edge.c:717 -#: ../plug-ins/common/ripple.c:582 ../plug-ins/common/waves.c:281 +#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:718 +#: ../plug-ins/common/ripple.c:583 ../plug-ins/common/waves.c:282 msgid "_Smear" msgstr "_Размыть" -#: ../plug-ins/common/displace.c:475 ../plug-ins/common/edge.c:730 -#: ../plug-ins/common/fractal-trace.c:739 ../plug-ins/common/newsprint.c:397 +#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:731 +#: ../plug-ins/common/fractal-trace.c:740 ../plug-ins/common/newsprint.c:397 msgid "_Black" msgstr "_Черный" @@ -2802,19 +2802,19 @@ msgstr "_Разница по Гауссу..." msgid "DoG Edge Detect" msgstr "Выделение края" -#: ../plug-ins/common/edge-dog.c:328 +#: ../plug-ins/common/edge-dog.c:329 msgid "Smoothing Parameters" msgstr "Параметры сглаживания" -#: ../plug-ins/common/edge-dog.c:342 +#: ../plug-ins/common/edge-dog.c:343 msgid "_Radius 1:" msgstr "_Радиус 1:" -#: ../plug-ins/common/edge-dog.c:346 +#: ../plug-ins/common/edge-dog.c:347 msgid "R_adius 2:" msgstr "Р_адиус 2:" -#: ../plug-ins/common/edge-dog.c:369 ../plug-ins/gimpressionist/paper.c:166 +#: ../plug-ins/common/edge-dog.c:370 ../plug-ins/gimpressionist/paper.c:166 msgid "_Invert" msgstr "_Инвертировать" @@ -2826,7 +2826,7 @@ msgstr "Выделение края с высоким разрешением" msgid "_Laplace" msgstr "_Лаплас" -#: ../plug-ins/common/edge-laplace.c:242 ../plug-ins/common/edge.c:668 +#: ../plug-ins/common/edge-laplace.c:242 ../plug-ins/common/edge.c:669 msgid "Laplace" msgstr "Лаплас" @@ -2850,7 +2850,7 @@ msgstr "Неон" msgid "Neon Detection" msgstr "Выделение края — неон" -#: ../plug-ins/common/edge-neon.c:746 ../plug-ins/common/unsharp-mask.c:878 +#: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:879 msgid "_Amount:" msgstr "_Величина:" @@ -2866,19 +2866,19 @@ msgstr "_Собел..." msgid "Sobel Edge Detection" msgstr "Выделение края по Sobel" -#: ../plug-ins/common/edge-sobel.c:259 +#: ../plug-ins/common/edge-sobel.c:260 msgid "Sobel _horizontally" msgstr "_Горизонтальное размывание по Sobel" -#: ../plug-ins/common/edge-sobel.c:271 +#: ../plug-ins/common/edge-sobel.c:272 msgid "Sobel _vertically" msgstr "_Вертикальное размывание по Sobel" -#: ../plug-ins/common/edge-sobel.c:283 +#: ../plug-ins/common/edge-sobel.c:284 msgid "_Keep sign of result (one direction only)" msgstr "_Сохранять знак результата (только одно направление)" -#: ../plug-ins/common/edge-sobel.c:369 +#: ../plug-ins/common/edge-sobel.c:370 msgid "Sobel edge detecting" msgstr "Выделение края по Sobel" @@ -2898,31 +2898,31 @@ msgstr "Выделение края" msgid "Edge Detection" msgstr "Выделение края" -#: ../plug-ins/common/edge.c:663 +#: ../plug-ins/common/edge.c:664 msgid "Sobel" msgstr "Собел" -#: ../plug-ins/common/edge.c:664 +#: ../plug-ins/common/edge.c:665 msgid "Prewitt compass" msgstr "По Превитту" -#: ../plug-ins/common/edge.c:665 ../plug-ins/common/sinus.c:903 +#: ../plug-ins/common/edge.c:666 ../plug-ins/common/sinus.c:903 msgid "Gradient" msgstr "Градиент" -#: ../plug-ins/common/edge.c:666 +#: ../plug-ins/common/edge.c:667 msgid "Roberts" msgstr "По Робертсу" -#: ../plug-ins/common/edge.c:667 +#: ../plug-ins/common/edge.c:668 msgid "Differential" msgstr "Дифференциальный" -#: ../plug-ins/common/edge.c:677 +#: ../plug-ins/common/edge.c:678 msgid "_Algorithm:" msgstr "_Алгоритм:" -#: ../plug-ins/common/edge.c:685 +#: ../plug-ins/common/edge.c:686 msgid "A_mount:" msgstr "_Величина:" @@ -2938,19 +2938,19 @@ msgstr "_Барельеф..." msgid "Emboss" msgstr "Барельеф" -#: ../plug-ins/common/emboss.c:474 +#: ../plug-ins/common/emboss.c:475 msgid "Function" msgstr "Функция" -#: ../plug-ins/common/emboss.c:478 +#: ../plug-ins/common/emboss.c:479 msgid "_Bumpmap" msgstr "_Рельеф" -#: ../plug-ins/common/emboss.c:479 +#: ../plug-ins/common/emboss.c:480 msgid "_Emboss" msgstr "_Барельеф" -#: ../plug-ins/common/emboss.c:511 +#: ../plug-ins/common/emboss.c:512 msgid "E_levation:" msgstr "_Возвышение:" @@ -2970,17 +2970,17 @@ msgstr "Гравировка" msgid "Engrave" msgstr "Гравировка" -#: ../plug-ins/common/engrave.c:243 ../plug-ins/common/file-html-table.c:610 +#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:610 #: ../plug-ins/common/file-ps.c:3177 ../plug-ins/common/file-ps.c:3385 -#: ../plug-ins/common/file-raw.c:1142 ../plug-ins/common/film.c:1002 -#: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:312 -#: ../plug-ins/common/tile.c:434 ../plug-ins/imagemap/imap_cmd_guides.c:174 +#: ../plug-ins/common/file-raw.c:1143 ../plug-ins/common/film.c:1002 +#: ../plug-ins/common/smooth-palette.c:440 ../plug-ins/common/tile-paper.c:313 +#: ../plug-ins/common/tile.c:435 ../plug-ins/imagemap/imap_cmd_guides.c:174 #: ../plug-ins/imagemap/imap_rectangle.c:409 #: ../plug-ins/print/print-page-layout.c:266 msgid "_Height:" msgstr "_Высота:" -#: ../plug-ins/common/engrave.c:254 +#: ../plug-ins/common/engrave.c:255 msgid "_Limit line width" msgstr "_Ограничение ширины линии" @@ -3017,13 +3017,13 @@ msgstr "Загрузка палитры KISS" #: ../plug-ins/common/file-png.c:727 ../plug-ins/common/file-pnm.c:498 #: ../plug-ins/common/file-ps.c:1043 ../plug-ins/common/file-raw.c:712 #: ../plug-ins/common/file-sunras.c:485 ../plug-ins/common/file-tga.c:446 -#: ../plug-ins/common/file-tiff-load.c:603 ../plug-ins/common/file-wmf.c:993 -#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:677 +#: ../plug-ins/common/file-tiff-load.c:604 ../plug-ins/common/file-wmf.c:993 +#: ../plug-ins/common/file-xbm.c:741 ../plug-ins/common/file-xmc.c:678 #: ../plug-ins/common/file-xpm.c:351 ../plug-ins/common/file-xwd.c:519 #: ../plug-ins/file-bmp/bmp-read.c:158 ../plug-ins/file-faxg3/faxg3.c:216 #: ../plug-ins/file-fli/fli-gimp.c:501 ../plug-ins/file-ico/ico-load.c:645 #: ../plug-ins/file-jpeg/jpeg-load.c:114 ../plug-ins/file-psd/psd-load.c:135 -#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3343 +#: ../plug-ins/file-sgi/sgi.c:330 ../plug-ins/file-xjt/xjt.c:3344 #, c-format msgid "Opening '%s'" msgstr "Открывается \"%s\"" @@ -3040,18 +3040,18 @@ msgstr "Неподдерживаемое число цветов (%d)!" #. init the progress meter #. And let's begin the progress #: ../plug-ins/common/file-cel.c:587 ../plug-ins/common/file-gbr.c:639 -#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1281 +#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1282 #: ../plug-ins/common/file-html-table.c:255 ../plug-ins/common/file-pat.c:466 #: ../plug-ins/common/file-pcx.c:626 ../plug-ins/common/file-pix.c:528 #: ../plug-ins/common/file-png.c:1276 ../plug-ins/common/file-pnm.c:981 #: ../plug-ins/common/file-ps.c:1219 ../plug-ins/common/file-sunras.c:567 #: ../plug-ins/common/file-tga.c:1174 ../plug-ins/common/file-tiff-save.c:693 -#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1479 +#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xmc.c:1480 #: ../plug-ins/common/file-xpm.c:636 ../plug-ins/common/file-xwd.c:618 #: ../plug-ins/file-bmp/bmp-write.c:306 ../plug-ins/file-fits/fits.c:480 #: ../plug-ins/file-fli/fli-gimp.c:717 ../plug-ins/file-ico/ico-save.c:1001 #: ../plug-ins/file-jpeg/jpeg-save.c:286 ../plug-ins/file-psd/psd-save.c:1642 -#: ../plug-ins/file-sgi/sgi.c:553 ../plug-ins/file-xjt/xjt.c:1707 +#: ../plug-ins/file-sgi/sgi.c:553 ../plug-ins/file-xjt/xjt.c:1708 #, c-format msgid "Saving '%s'" msgstr "Сохранение \"%s\"" @@ -3080,45 +3080,45 @@ msgstr "Исходный код С" msgid "Save as C-Source" msgstr "Сохранить как исходный код C" -#: ../plug-ins/common/file-csource.c:690 +#: ../plug-ins/common/file-csource.c:691 msgid "_Prefixed name:" msgstr "Префиксное имя:" -#: ../plug-ins/common/file-csource.c:699 +#: ../plug-ins/common/file-csource.c:700 msgid "Co_mment:" msgstr "Комментарий:" #. Use Comment #. -#: ../plug-ins/common/file-csource.c:706 +#: ../plug-ins/common/file-csource.c:707 msgid "_Save comment to file" msgstr "Сохранить комментарий в файл" #. GLib types #. -#: ../plug-ins/common/file-csource.c:718 +#: ../plug-ins/common/file-csource.c:719 msgid "_Use GLib types (guint8*)" msgstr "Использовать типы GLib (guint8*)" #. Use Macros #. -#: ../plug-ins/common/file-csource.c:730 +#: ../plug-ins/common/file-csource.c:731 msgid "Us_e macros instead of struct" msgstr "Использовать макросы вместо структур" #. Use RLE #. -#: ../plug-ins/common/file-csource.c:742 +#: ../plug-ins/common/file-csource.c:743 msgid "Use _1 byte Run-Length-Encoding" msgstr "Использовать 1-байтное RLE" #. Alpha #. -#: ../plug-ins/common/file-csource.c:754 +#: ../plug-ins/common/file-csource.c:755 msgid "Sa_ve alpha channel (RGBA/RGB)" msgstr "Сохранить альфа-канал (RGBA/RGB)" -#: ../plug-ins/common/file-csource.c:772 +#: ../plug-ins/common/file-csource.c:773 msgid "Op_acity:" msgstr "Непрозрачность:" @@ -3153,7 +3153,7 @@ msgstr "Невозможно сохранить изображения с аль #: ../plug-ins/common/file-dicom.c:783 ../plug-ins/common/file-ps.c:1204 #: ../plug-ins/common/file-xwd.c:603 ../plug-ins/file-fits/fits.c:465 -#: ../plug-ins/file-xjt/xjt.c:1702 +#: ../plug-ins/file-xjt/xjt.c:1703 msgid "Cannot operate on unknown image types." msgstr "Невозможно выполнить действия с изображением неизвестного типа" @@ -3176,7 +3176,7 @@ msgid "Invalid UTF-8 string in brush file '%s'." msgstr "Ошибочная строка UTF-8 в файле кисти '%s'" #: ../plug-ins/common/file-gbr.c:438 ../plug-ins/common/file-gih.c:491 -#: ../plug-ins/common/file-gih.c:1155 +#: ../plug-ins/common/file-gih.c:1156 #: ../plug-ins/gradient-flare/gradient-flare.c:3062 msgid "Unnamed" msgstr "Безымянное" @@ -3190,12 +3190,12 @@ msgid "Save as Brush" msgstr "Сохранить как кисть" #. attach labels -#: ../plug-ins/common/file-gbr.c:758 ../plug-ins/common/grid.c:789 +#: ../plug-ins/common/file-gbr.c:759 ../plug-ins/common/grid.c:790 msgid "Spacing:" msgstr "Интервал: " -#: ../plug-ins/common/file-gbr.c:769 ../plug-ins/common/file-gih.c:906 -#: ../plug-ins/common/file-pat.c:555 ../plug-ins/gimpressionist/presets.c:665 +#: ../plug-ins/common/file-gbr.c:770 ../plug-ins/common/file-gih.c:907 +#: ../plug-ins/common/file-pat.c:556 ../plug-ins/gimpressionist/presets.c:666 msgid "Description:" msgstr "Описание:" @@ -3299,65 +3299,65 @@ msgid "Save as GIF" msgstr "Сохранить как GIF" #. regular gif parameter settings -#: ../plug-ins/common/file-gif-save.c:1030 +#: ../plug-ins/common/file-gif-save.c:1031 msgid "GIF Options" msgstr "Параметры GIF" -#: ../plug-ins/common/file-gif-save.c:1036 +#: ../plug-ins/common/file-gif-save.c:1037 msgid "I_nterlace" msgstr "Черезстрочность" -#: ../plug-ins/common/file-gif-save.c:1052 +#: ../plug-ins/common/file-gif-save.c:1053 msgid "_GIF comment:" msgstr "Комментарий GIF:" #. additional animated gif parameter settings -#: ../plug-ins/common/file-gif-save.c:1110 +#: ../plug-ins/common/file-gif-save.c:1111 msgid "Animated GIF Options" msgstr "Параметры анимированного GIF" -#: ../plug-ins/common/file-gif-save.c:1116 +#: ../plug-ins/common/file-gif-save.c:1117 msgid "_Loop forever" msgstr "Бесконечный цикл" -#: ../plug-ins/common/file-gif-save.c:1129 +#: ../plug-ins/common/file-gif-save.c:1130 msgid "_Delay between frames where unspecified:" msgstr "Если задержка между кадрами не указана, она равна:" -#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1473 +#: ../plug-ins/common/file-gif-save.c:1145 ../plug-ins/common/file-mng.c:1474 msgid "milliseconds" msgstr "миллисекунд" -#: ../plug-ins/common/file-gif-save.c:1154 +#: ../plug-ins/common/file-gif-save.c:1155 msgid "_Frame disposal where unspecified:" msgstr "Расположение кадра, если не указано: " -#: ../plug-ins/common/file-gif-save.c:1158 +#: ../plug-ins/common/file-gif-save.c:1159 msgid "I don't care" msgstr "Не важно" -#: ../plug-ins/common/file-gif-save.c:1160 +#: ../plug-ins/common/file-gif-save.c:1161 msgid "Cumulative layers (combine)" msgstr "Наложение слоев (об'единение)" -#: ../plug-ins/common/file-gif-save.c:1162 +#: ../plug-ins/common/file-gif-save.c:1163 msgid "One frame per layer (replace)" msgstr "Один кадр на слой (замена)" #. The "Always use default values" toggles -#: ../plug-ins/common/file-gif-save.c:1178 +#: ../plug-ins/common/file-gif-save.c:1179 msgid "_Use delay entered above for all frames" msgstr "_Использовать указанную задержку в дальнейшем" -#: ../plug-ins/common/file-gif-save.c:1188 +#: ../plug-ins/common/file-gif-save.c:1189 msgid "U_se disposal entered above for all frames" msgstr "И_спользовать указанное расположение в дальнейшем" -#: ../plug-ins/common/file-gif-save.c:2341 +#: ../plug-ins/common/file-gif-save.c:2342 msgid "Error writing output file." msgstr "Ошибка при записи в файл вывода." -#: ../plug-ins/common/file-gif-save.c:2411 +#: ../plug-ins/common/file-gif-save.c:2412 #, c-format msgid "The default comment is limited to %d characters." msgstr "Комментарий по умолчанию ограничен длиной в %d символов." @@ -3382,47 +3382,47 @@ msgstr "Не удалось загрузить одну из кистей в п msgid "Save as Brush Pipe" msgstr "Сохранить как последовательность кистей" -#: ../plug-ins/common/file-gih.c:892 +#: ../plug-ins/common/file-gih.c:893 msgid "Spacing (percent):" msgstr "Интервал (проценты):" -#: ../plug-ins/common/file-gih.c:959 +#: ../plug-ins/common/file-gih.c:960 msgid "Pixels" msgstr "Точки растра" -#: ../plug-ins/common/file-gih.c:964 +#: ../plug-ins/common/file-gih.c:965 msgid "Cell size:" msgstr "Размер ячейки:" -#: ../plug-ins/common/file-gih.c:976 +#: ../plug-ins/common/file-gih.c:977 msgid "Number of cells:" msgstr "Число ячеек:" -#: ../plug-ins/common/file-gih.c:1001 +#: ../plug-ins/common/file-gih.c:1002 msgid " Rows of " msgstr " строк " -#: ../plug-ins/common/file-gih.c:1013 +#: ../plug-ins/common/file-gih.c:1014 msgid " Columns on each layer" msgstr " столбцов на каждом слое" -#: ../plug-ins/common/file-gih.c:1017 +#: ../plug-ins/common/file-gih.c:1018 msgid " (Width Mismatch!) " msgstr " (ошибочная ширина!) " -#: ../plug-ins/common/file-gih.c:1021 +#: ../plug-ins/common/file-gih.c:1022 msgid " (Height Mismatch!) " msgstr " (ошибочная высота!) " -#: ../plug-ins/common/file-gih.c:1026 +#: ../plug-ins/common/file-gih.c:1027 msgid "Display as:" msgstr "Показать как:" -#: ../plug-ins/common/file-gih.c:1035 +#: ../plug-ins/common/file-gih.c:1036 msgid "Dimension:" msgstr "Размер:" -#: ../plug-ins/common/file-gih.c:1110 +#: ../plug-ins/common/file-gih.c:1111 msgid "Ranks:" msgstr "Количество кадров:" @@ -3590,99 +3590,99 @@ msgstr "" msgid "Save as MNG" msgstr "Сохранить как MNG" -#: ../plug-ins/common/file-mng.c:1273 +#: ../plug-ins/common/file-mng.c:1274 msgid "MNG Options" msgstr "Параметры MNG" -#: ../plug-ins/common/file-mng.c:1279 +#: ../plug-ins/common/file-mng.c:1280 msgid "Interlace" msgstr "Черезстрочность" -#: ../plug-ins/common/file-mng.c:1291 +#: ../plug-ins/common/file-mng.c:1292 msgid "Save background color" msgstr "Сохранить цвет фона" -#: ../plug-ins/common/file-mng.c:1302 +#: ../plug-ins/common/file-mng.c:1303 msgid "Save gamma" msgstr "Сохранить гамму" -#: ../plug-ins/common/file-mng.c:1312 +#: ../plug-ins/common/file-mng.c:1313 msgid "Save resolution" msgstr "Сохранить разрешение" -#: ../plug-ins/common/file-mng.c:1323 +#: ../plug-ins/common/file-mng.c:1324 msgid "Save creation time" msgstr "Сохранить время создания" -#: ../plug-ins/common/file-mng.c:1342 +#: ../plug-ins/common/file-mng.c:1343 msgid "PNG" msgstr "PNG" -#: ../plug-ins/common/file-mng.c:1343 +#: ../plug-ins/common/file-mng.c:1344 msgid "JNG" msgstr "JNG" -#: ../plug-ins/common/file-mng.c:1346 +#: ../plug-ins/common/file-mng.c:1347 msgid "PNG + delta PNG" msgstr "PNG + delta PNG" -#: ../plug-ins/common/file-mng.c:1347 +#: ../plug-ins/common/file-mng.c:1348 msgid "JNG + delta PNG" msgstr "JNG + delta PNG" -#: ../plug-ins/common/file-mng.c:1348 +#: ../plug-ins/common/file-mng.c:1349 msgid "All PNG" msgstr "Все PNG" -#: ../plug-ins/common/file-mng.c:1349 +#: ../plug-ins/common/file-mng.c:1350 msgid "All JNG" msgstr "Все JNG" -#: ../plug-ins/common/file-mng.c:1361 +#: ../plug-ins/common/file-mng.c:1362 msgid "Default chunks type:" msgstr "Тип по умолчанию:" -#: ../plug-ins/common/file-mng.c:1364 +#: ../plug-ins/common/file-mng.c:1365 msgid "Combine" msgstr "Объединить" -#: ../plug-ins/common/file-mng.c:1365 +#: ../plug-ins/common/file-mng.c:1366 msgid "Replace" msgstr "Заместить" -#: ../plug-ins/common/file-mng.c:1376 +#: ../plug-ins/common/file-mng.c:1377 msgid "Default frame disposal:" msgstr "Кадры:" -#: ../plug-ins/common/file-mng.c:1388 +#: ../plug-ins/common/file-mng.c:1389 msgid "PNG compression level:" msgstr "Степень сжатия PNG:" -#: ../plug-ins/common/file-mng.c:1396 ../plug-ins/common/file-png.c:1907 +#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1907 msgid "Choose a high compression level for small file size" msgstr "Выберите большую степень сжатия для получения файла меньшего размера" -#: ../plug-ins/common/file-mng.c:1410 +#: ../plug-ins/common/file-mng.c:1411 msgid "JPEG compression quality:" msgstr "Качество сжатия JPEG:" -#: ../plug-ins/common/file-mng.c:1427 +#: ../plug-ins/common/file-mng.c:1428 msgid "JPEG smoothing factor:" msgstr "Показатель сглаживания JPEG:" -#: ../plug-ins/common/file-mng.c:1437 +#: ../plug-ins/common/file-mng.c:1438 msgid "Animated MNG Options" msgstr "Параметры анимированного MNG" -#: ../plug-ins/common/file-mng.c:1443 +#: ../plug-ins/common/file-mng.c:1444 msgid "Loop" msgstr "Цикл" -#: ../plug-ins/common/file-mng.c:1457 +#: ../plug-ins/common/file-mng.c:1458 msgid "Default frame delay:" msgstr "Задержка кадра по умолчанию:" -#: ../plug-ins/common/file-mng.c:1530 +#: ../plug-ins/common/file-mng.c:1531 msgid "MNG animation" msgstr "Параметры MNG" @@ -3783,19 +3783,19 @@ msgstr "Импорт из PDF" msgid "_Import" msgstr "_Импортировать" -#: ../plug-ins/common/file-pdf.c:888 +#: ../plug-ins/common/file-pdf.c:889 msgid "_Width (pixels):" msgstr "_Ширина (пикселов):" -#: ../plug-ins/common/file-pdf.c:889 +#: ../plug-ins/common/file-pdf.c:890 msgid "_Height (pixels):" msgstr "_Высота (пикселов):" -#: ../plug-ins/common/file-pdf.c:891 +#: ../plug-ins/common/file-pdf.c:892 msgid "_Resolution:" msgstr "_Разрешение:" -#: ../plug-ins/common/file-pdf.c:1165 +#: ../plug-ins/common/file-pdf.c:1166 #, c-format msgid "pixels/%s" msgstr "точек растра/%s" @@ -3877,7 +3877,7 @@ msgstr "Сохранить значения цвета прозрачных то msgid "Co_mpression level:" msgstr "Степень сжатия:" -#: ../plug-ins/common/file-png.c:1921 ../plug-ins/file-jpeg/jpeg-save.c:1190 +#: ../plug-ins/common/file-png.c:1921 ../plug-ins/file-jpeg/jpeg-save.c:1192 msgid "_Load Defaults" msgstr "З_агрузить исходные параметры" @@ -3995,7 +3995,7 @@ msgstr "" "местоположения исполняемого файла Ghostscript.\n" "(%s)" -#: ../plug-ins/common/file-ps.c:1931 ../plug-ins/common/file-tiff-load.c:999 +#: ../plug-ins/common/file-ps.c:1931 ../plug-ins/common/file-tiff-load.c:1000 #, c-format msgid "Page %d" msgstr "Страница %d" @@ -4030,7 +4030,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:3200 ../plug-ins/common/sphere-designer.c:2642 +#: ../plug-ins/common/file-ps.c:3200 ../plug-ins/common/sphere-designer.c:2643 msgid "Layers" msgstr "Слои" @@ -4172,79 +4172,79 @@ msgstr "Raw Image Data" msgid "Load Image from Raw Data" msgstr "Загрузка изображения из Raw-данных" -#: ../plug-ins/common/file-raw.c:1085 +#: ../plug-ins/common/file-raw.c:1086 msgid "Image" msgstr "Изображение" -#: ../plug-ins/common/file-raw.c:1096 +#: ../plug-ins/common/file-raw.c:1097 msgid "RGB Alpha" msgstr "RGB с альфа-каналом" -#: ../plug-ins/common/file-raw.c:1097 +#: ../plug-ins/common/file-raw.c:1098 msgid "RGB565" msgstr "RGB565" -#: ../plug-ins/common/file-raw.c:1098 +#: ../plug-ins/common/file-raw.c:1099 msgid "Planar RGB" msgstr "Planar RGB" -#: ../plug-ins/common/file-raw.c:1099 +#: ../plug-ins/common/file-raw.c:1100 msgid "Indexed" msgstr "Индексированное" -#: ../plug-ins/common/file-raw.c:1100 +#: ../plug-ins/common/file-raw.c:1101 msgid "Indexed Alpha" msgstr "Индексированное с альфа-каналом" -#: ../plug-ins/common/file-raw.c:1105 +#: ../plug-ins/common/file-raw.c:1106 msgid "Image _Type:" msgstr "Тип изображения:" -#: ../plug-ins/common/file-raw.c:1155 +#: ../plug-ins/common/file-raw.c:1156 msgid "Palette" msgstr "Палитра" -#: ../plug-ins/common/file-raw.c:1165 ../plug-ins/common/file-raw.c:1264 +#: ../plug-ins/common/file-raw.c:1166 ../plug-ins/common/file-raw.c:1265 msgid "R, G, B (normal)" msgstr "R, G, B (normal)" -#: ../plug-ins/common/file-raw.c:1166 ../plug-ins/common/file-raw.c:1266 +#: ../plug-ins/common/file-raw.c:1167 ../plug-ins/common/file-raw.c:1267 msgid "B, G, R, X (BMP style)" msgstr "B, G, R, X (BMP-стиль)" -#: ../plug-ins/common/file-raw.c:1171 +#: ../plug-ins/common/file-raw.c:1172 msgid "_Palette Type:" msgstr "Тип _палитры:" -#: ../plug-ins/common/file-raw.c:1182 +#: ../plug-ins/common/file-raw.c:1183 msgid "Off_set:" msgstr "С_мещение:" -#: ../plug-ins/common/file-raw.c:1194 +#: ../plug-ins/common/file-raw.c:1195 msgid "Select Palette File" msgstr "Выберите файл палитры" -#: ../plug-ins/common/file-raw.c:1200 +#: ../plug-ins/common/file-raw.c:1201 msgid "Pal_ette File:" msgstr "_Файл палитры:" -#: ../plug-ins/common/file-raw.c:1228 +#: ../plug-ins/common/file-raw.c:1229 msgid "Raw Image Save" msgstr "Сохранить Raw" -#: ../plug-ins/common/file-raw.c:1250 +#: ../plug-ins/common/file-raw.c:1251 msgid "RGB Save Type" msgstr "Тип сохранения RGB" -#: ../plug-ins/common/file-raw.c:1254 +#: ../plug-ins/common/file-raw.c:1255 msgid "Standard (R,G,B)" msgstr "Стандартный (R,G,B)" -#: ../plug-ins/common/file-raw.c:1255 +#: ../plug-ins/common/file-raw.c:1256 msgid "Planar (RRR,GGG,BBB)" msgstr "Planar (RRR,GGG,BBB)" -#: ../plug-ins/common/file-raw.c:1260 +#: ../plug-ins/common/file-raw.c:1261 msgid "Indexed Palette Type" msgstr "Тип индексированной палитры" @@ -4380,7 +4380,7 @@ msgstr "Создать Scalable Vector Graphics" #. Width and Height #: ../plug-ins/common/file-svg.c:794 ../plug-ins/common/file-wmf.c:570 -#: ../plug-ins/common/grid.c:723 +#: ../plug-ins/common/grid.c:724 msgid "Width:" msgstr "Ширина:" @@ -4477,16 +4477,16 @@ msgstr "TIFF '%s' не содержит каталоги" msgid "Import from TIFF" msgstr "Импорт TIFF" -#: ../plug-ins/common/file-tiff-load.c:780 +#: ../plug-ins/common/file-tiff-load.c:781 #, c-format msgid "%s-%d-of-%d-pages" msgstr "%s-%d-из-%d-страниц" -#: ../plug-ins/common/file-tiff-load.c:1015 +#: ../plug-ins/common/file-tiff-load.c:1016 msgid "TIFF Channel" msgstr "Канал TIFF" -#: ../plug-ins/common/file-tiff-load.c:1024 +#: ../plug-ins/common/file-tiff-load.c:1025 #: ../plug-ins/file-psd/psd-load.c:324 msgid "" "Warning:\n" @@ -4667,81 +4667,81 @@ msgstr "Записать дополнительный файл маски" msgid "_Mask file extension:" msgstr "Расширение файла маски:" -#: ../plug-ins/common/file-xmc.c:331 ../plug-ins/common/file-xmc.c:371 +#: ../plug-ins/common/file-xmc.c:332 ../plug-ins/common/file-xmc.c:372 msgid "X11 Mouse Cursor" msgstr "Указатель мыши X11" -#: ../plug-ins/common/file-xmc.c:479 +#: ../plug-ins/common/file-xmc.c:480 #, c-format msgid "" "Cannot set the hotspot!\n" "You must arrange layers so that all of them have an intersection." msgstr "" -#: ../plug-ins/common/file-xmc.c:672 +#: ../plug-ins/common/file-xmc.c:673 #, c-format msgid "'%s' is not a valid X cursor." msgstr "'%s' не является корректным курсором X." -#: ../plug-ins/common/file-xmc.c:688 +#: ../plug-ins/common/file-xmc.c:689 #, c-format msgid "The width of frame %d of '%s' is too big for X cursor." msgstr "" -#: ../plug-ins/common/file-xmc.c:695 +#: ../plug-ins/common/file-xmc.c:696 #, c-format msgid "The height of frame %d of '%s' is too big for X cursor." msgstr "" -#: ../plug-ins/common/file-xmc.c:900 +#: ../plug-ins/common/file-xmc.c:901 #, c-format msgid "there is no image chunk in \"%s\"." msgstr "" -#: ../plug-ins/common/file-xmc.c:942 +#: ../plug-ins/common/file-xmc.c:943 #, c-format msgid "The width of '%s' is too big for X cursor." msgstr "Ширина '%s' слишком велика для указателя X." -#: ../plug-ins/common/file-xmc.c:949 +#: ../plug-ins/common/file-xmc.c:950 #, c-format msgid "The height of '%s' is too big for X cursor." msgstr "Высота '%s' слишком велика для указателя X." -#: ../plug-ins/common/file-xmc.c:1019 +#: ../plug-ins/common/file-xmc.c:1020 #, c-format msgid "A read error occurred." msgstr "Произошла ошибка при чтении." -#: ../plug-ins/common/file-xmc.c:1056 +#: ../plug-ins/common/file-xmc.c:1057 msgid "Save as X11 Mouse Cursor" msgstr "Сохранить как указатель мыши X11" #. #. * parameter settings #. -#: ../plug-ins/common/file-xmc.c:1076 +#: ../plug-ins/common/file-xmc.c:1077 msgid "XMC Options" msgstr "Параметры XMC" -#: ../plug-ins/common/file-xmc.c:1104 +#: ../plug-ins/common/file-xmc.c:1105 msgid "Enter the X coordinate of the hotspot.The origin is top left corner." msgstr "" -#: ../plug-ins/common/file-xmc.c:1108 +#: ../plug-ins/common/file-xmc.c:1109 #, fuzzy msgid "Hotspot _X:" msgstr "«Горячая точка» X:" -#: ../plug-ins/common/file-xmc.c:1122 +#: ../plug-ins/common/file-xmc.c:1123 msgid "Enter the Y coordinate of the hotspot.The origin is top left corner." msgstr "" -#: ../plug-ins/common/file-xmc.c:1133 +#: ../plug-ins/common/file-xmc.c:1134 msgid "_Auto-Crop all frames." msgstr "_Автокадрировать все кадры" -#: ../plug-ins/common/file-xmc.c:1146 +#: ../plug-ins/common/file-xmc.c:1147 msgid "" "Remove the empty borders of all frames.\n" "This reduces the file size and may fix the problem that some large cursors " @@ -4749,7 +4749,7 @@ msgid "" "Uncheck if you plan to edit the exported cursor using other programs." msgstr "" -#: ../plug-ins/common/file-xmc.c:1169 +#: ../plug-ins/common/file-xmc.c:1170 msgid "" "Choose the nominal size of frames.\n" "If you don't have plans to make multi-sized cursor, or you have no idea, " @@ -4760,53 +4760,53 @@ msgid "" "theme-size\"." msgstr "" -#: ../plug-ins/common/file-xmc.c:1186 +#: ../plug-ins/common/file-xmc.c:1187 msgid "_Use this value only for a frame which size is not specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1189 +#: ../plug-ins/common/file-xmc.c:1190 msgid "_Replace the size of all frames even if it is specified." -msgstr "" +msgstr "_Заменить размер всех кадров, ладе если он уже указан" -#: ../plug-ins/common/file-xmc.c:1223 +#: ../plug-ins/common/file-xmc.c:1224 msgid "Enter time span in milliseconds in which each frame is rendered." msgstr "" -#: ../plug-ins/common/file-xmc.c:1226 +#: ../plug-ins/common/file-xmc.c:1227 msgid "_Delay:" msgstr "_Задержка:" -#: ../plug-ins/common/file-xmc.c:1231 +#: ../plug-ins/common/file-xmc.c:1232 msgid "_Use this value only for a frame which delay is not specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1234 +#: ../plug-ins/common/file-xmc.c:1235 msgid "_Replace the delay of all frames even if it is specified." msgstr "" -#: ../plug-ins/common/file-xmc.c:1259 +#: ../plug-ins/common/file-xmc.c:1260 msgid "" "The part of copyright information that exceeded 65535 characters was removed." msgstr "" -#: ../plug-ins/common/file-xmc.c:1269 +#: ../plug-ins/common/file-xmc.c:1270 msgid "Enter copyright information." -msgstr "" +msgstr "Укажите информацию об авторских правах" -#: ../plug-ins/common/file-xmc.c:1271 +#: ../plug-ins/common/file-xmc.c:1272 msgid "_Copyright:" msgstr "_Авторские права:" -#: ../plug-ins/common/file-xmc.c:1287 +#: ../plug-ins/common/file-xmc.c:1288 msgid "" "The part of license information that exceeded 65535 characters was removed." msgstr "" -#: ../plug-ins/common/file-xmc.c:1297 +#: ../plug-ins/common/file-xmc.c:1298 msgid "Enter license information." msgstr "Введите информацию о лицензии" -#: ../plug-ins/common/file-xmc.c:1299 +#: ../plug-ins/common/file-xmc.c:1300 msgid "_License:" msgstr "_Лицензия:" @@ -4815,47 +4815,47 @@ msgstr "_Лицензия:" #. #. 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:1306 +#: ../plug-ins/common/file-xmc.c:1307 msgid "_Other:" msgstr "_Прочее:" -#: ../plug-ins/common/file-xmc.c:1340 +#: ../plug-ins/common/file-xmc.c:1341 msgid "Enter other comment if you want." msgstr "" -#: ../plug-ins/common/file-xmc.c:1390 +#: ../plug-ins/common/file-xmc.c:1391 #, c-format msgid "Comment is limited to %d characters." msgstr "Комментарий ограничен %d символами." -#: ../plug-ins/common/file-xmc.c:1508 +#: ../plug-ins/common/file-xmc.c:1509 #, c-format msgid "This plug-in can only handle RGBA image format with 8bit color depth." msgstr "" -#: ../plug-ins/common/file-xmc.c:1526 +#: ../plug-ins/common/file-xmc.c:1527 #, c-format msgid "Width of '%s' is too large. Please reduce more than %dpx)" msgstr "" -#: ../plug-ins/common/file-xmc.c:1533 +#: ../plug-ins/common/file-xmc.c:1534 #, c-format msgid "Height of '%s' is too large. Please reduce more than %dpx)" msgstr "" -#: ../plug-ins/common/file-xmc.c:1540 +#: ../plug-ins/common/file-xmc.c:1541 #, c-format msgid "The size of '%s' is zero!" msgstr "Размер '%s' равен нулю!" -#: ../plug-ins/common/file-xmc.c:1580 +#: ../plug-ins/common/file-xmc.c:1581 #, c-format msgid "" "Cannot save the cursor because the hotspot is not on '%s'.\n" "Try to change the hotspot position, layer geometry or save without auto-crop." msgstr "" -#: ../plug-ins/common/file-xmc.c:1735 +#: ../plug-ins/common/file-xmc.c:1736 #, c-format msgid "" "Your cursor was successfully saved but it contains one or more frames which " @@ -4863,22 +4863,27 @@ msgid "" "It will clutter the screen in some environments." msgstr "" -#: ../plug-ins/common/file-xmc.c:1742 +#: ../plug-ins/common/file-xmc.c:1743 msgid "" "Your cursor was successfully saved but it contains one or more frames which " "nominal size is not supported by gnome-appearance-properties.\n" "You can satisfy it by checking \"Replace the size of all frame...\" in save " "dialog, or Your cursor may not appear in gnome-appearance-properties." msgstr "" +"Курсор был успешно сохранен, но размер некоторых его кадров не " +"поддерживается апплетом gnome-appearance-properties.\n" +"Вы можете исправить это, включив функцию «Заменить размер всех кадров...» в " +"диалоге сохранения. В противном случае курсор не появится в апплете " +"настройки внешнего вида рабочей среды." -#: ../plug-ins/common/file-xmc.c:1979 +#: ../plug-ins/common/file-xmc.c:1980 #, c-format msgid "" "The parasite \"%s\" is too long for X cursor.\n" "The overflowed string was dropped." msgstr "" -#: ../plug-ins/common/file-xmc.c:2181 +#: ../plug-ins/common/file-xmc.c:2182 #, c-format msgid "" "Sorry, this plug-in cannot handle a cursor which contains over %i different " @@ -4986,7 +4991,7 @@ msgid "Select Film Color" msgstr "Выбрать цвет пленки" #: ../plug-ins/common/film.c:1025 ../plug-ins/common/film.c:1075 -#: ../plug-ins/common/nova.c:352 +#: ../plug-ins/common/nova.c:353 msgid "Co_lor:" msgstr "_Цвет:" @@ -5139,7 +5144,7 @@ msgstr "Варианты тона" msgid "Roughness" msgstr "Шероховатость" -#: ../plug-ins/common/filter-pack.c:673 ../plug-ins/common/filter-pack.c:1316 +#: ../plug-ins/common/filter-pack.c:673 ../plug-ins/common/filter-pack.c:1317 msgid "Affected Range" msgstr "Обрабатываемый диапазон" @@ -5159,7 +5164,7 @@ msgstr "Я_ркие участки:" msgid "Windows" msgstr "Окна" -#: ../plug-ins/common/filter-pack.c:703 ../plug-ins/common/van-gogh-lic.c:671 +#: ../plug-ins/common/filter-pack.c:703 ../plug-ins/common/van-gogh-lic.c:672 msgid "_Saturation" msgstr "_Насыщенность" @@ -5211,24 +5216,24 @@ msgstr "Выделение в контексте" msgid "Filter Pack Simulation" msgstr "Моделирование набора фильтров" -#: ../plug-ins/common/filter-pack.c:1289 +#: ../plug-ins/common/filter-pack.c:1290 msgid "Shadows:" msgstr "Тени:" -#: ../plug-ins/common/filter-pack.c:1290 +#: ../plug-ins/common/filter-pack.c:1291 msgid "Midtones:" msgstr "Полутона:" -#: ../plug-ins/common/filter-pack.c:1291 +#: ../plug-ins/common/filter-pack.c:1292 msgid "Highlights:" msgstr "Блики:" -#: ../plug-ins/common/filter-pack.c:1304 +#: ../plug-ins/common/filter-pack.c:1305 msgid "Advanced Filter Pack Options" msgstr "Дополнительные параметры пакета фильтров" #. ****************** MISC OPTIONS ************************** -#: ../plug-ins/common/filter-pack.c:1416 +#: ../plug-ins/common/filter-pack.c:1417 msgid "Preview Size" msgstr "Размер просмотра" @@ -5246,31 +5251,31 @@ msgid "Fractal Trace" msgstr "Фрактальный след" #. Settings -#: ../plug-ins/common/fractal-trace.c:730 +#: ../plug-ins/common/fractal-trace.c:731 msgid "Outside Type" msgstr "Тип вывода" -#: ../plug-ins/common/fractal-trace.c:741 +#: ../plug-ins/common/fractal-trace.c:742 msgid "_White" msgstr "_Белый" -#: ../plug-ins/common/fractal-trace.c:748 +#: ../plug-ins/common/fractal-trace.c:749 msgid "Mandelbrot Parameters" msgstr "Параметры Мандельброта" -#: ../plug-ins/common/fractal-trace.c:759 +#: ../plug-ins/common/fractal-trace.c:760 msgid "X_1:" msgstr "X1:" -#: ../plug-ins/common/fractal-trace.c:768 +#: ../plug-ins/common/fractal-trace.c:769 msgid "X_2:" msgstr "X2:" -#: ../plug-ins/common/fractal-trace.c:777 +#: ../plug-ins/common/fractal-trace.c:778 msgid "Y_1:" msgstr "Y1:" -#: ../plug-ins/common/fractal-trace.c:786 +#: ../plug-ins/common/fractal-trace.c:787 msgid "Y_2:" msgstr "Y2:" @@ -5336,39 +5341,39 @@ msgstr "_Сетка..." msgid "Drawing grid" msgstr "Рисование сетки" -#: ../plug-ins/common/grid.c:634 ../plug-ins/gfig/gfig-dialog.c:1354 +#: ../plug-ins/common/grid.c:634 ../plug-ins/gfig/gfig-dialog.c:1355 #: ../plug-ins/imagemap/imap_menu.c:208 msgid "Grid" msgstr "Сетка" #. attach labels -#: ../plug-ins/common/grid.c:716 +#: ../plug-ins/common/grid.c:717 msgid "Horizontal" msgstr "Горизонталь" -#: ../plug-ins/common/grid.c:718 +#: ../plug-ins/common/grid.c:719 msgid "Vertical" msgstr "Вертикаль" -#: ../plug-ins/common/grid.c:720 +#: ../plug-ins/common/grid.c:721 msgid "Intersection" msgstr "Пересечение" #. attach labels -#: ../plug-ins/common/grid.c:856 +#: ../plug-ins/common/grid.c:857 msgid "Offset:" msgstr "Смещение:" #. attach color selectors -#: ../plug-ins/common/grid.c:895 +#: ../plug-ins/common/grid.c:896 msgid "Horizontal Color" msgstr "Цвет для горизонталей" -#: ../plug-ins/common/grid.c:913 +#: ../plug-ins/common/grid.c:914 msgid "Vertical Color" msgstr "Цвет для вертикалей" -#: ../plug-ins/common/grid.c:931 +#: ../plug-ins/common/grid.c:932 msgid "Intersection Color" msgstr "Цвет пересечений" @@ -5396,23 +5401,23 @@ msgstr "«Горячие» _цвета..." msgid "Hot" msgstr "«Горячие» цвета" -#: ../plug-ins/common/hot.c:622 +#: ../plug-ins/common/hot.c:623 msgid "Create _new layer" msgstr "Создать _новый слой" -#: ../plug-ins/common/hot.c:631 +#: ../plug-ins/common/hot.c:632 msgid "Action" msgstr "Действие" -#: ../plug-ins/common/hot.c:635 +#: ../plug-ins/common/hot.c:636 msgid "Reduce _Luminance" msgstr "Уменьшить _яркость" -#: ../plug-ins/common/hot.c:636 +#: ../plug-ins/common/hot.c:637 msgid "Reduce _Saturation" msgstr "Уменьшить на_сыщенность" -#: ../plug-ins/common/hot.c:637 ../plug-ins/common/waves.c:282 +#: ../plug-ins/common/hot.c:638 ../plug-ins/common/waves.c:283 msgid "_Blacken" msgstr "Сделать _чёрным" @@ -5428,15 +5433,15 @@ msgstr "_Иллюзия..." msgid "Illusion" msgstr "Иллюзия" -#: ../plug-ins/common/illusion.c:387 +#: ../plug-ins/common/illusion.c:388 msgid "_Divisions:" msgstr "_Деление:" -#: ../plug-ins/common/illusion.c:397 +#: ../plug-ins/common/illusion.c:398 msgid "Mode _1" msgstr "Режим _1" -#: ../plug-ins/common/illusion.c:412 +#: ../plug-ins/common/illusion.c:413 msgid "Mode _2" msgstr "Режим _2" @@ -5568,56 +5573,56 @@ msgstr "Сборка головоломки" msgid "Jigsaw" msgstr "Головоломка" -#: ../plug-ins/common/jigsaw.c:2444 +#: ../plug-ins/common/jigsaw.c:2445 msgid "Number of Tiles" msgstr "Число частей головоломки" -#: ../plug-ins/common/jigsaw.c:2459 +#: ../plug-ins/common/jigsaw.c:2460 msgid "Number of pieces going across" msgstr "Число частей по горизонтали" -#: ../plug-ins/common/jigsaw.c:2476 +#: ../plug-ins/common/jigsaw.c:2477 msgid "Number of pieces going down" msgstr "Число частей по вертикали" -#: ../plug-ins/common/jigsaw.c:2490 +#: ../plug-ins/common/jigsaw.c:2491 msgid "Bevel Edges" msgstr "Фаска краёв" -#: ../plug-ins/common/jigsaw.c:2500 +#: ../plug-ins/common/jigsaw.c:2501 msgid "_Bevel width:" msgstr "_Рельеф краев:" -#: ../plug-ins/common/jigsaw.c:2504 +#: ../plug-ins/common/jigsaw.c:2505 msgid "Degree of slope of each piece's edge" msgstr "Степень наклона кромки" -#: ../plug-ins/common/jigsaw.c:2517 +#: ../plug-ins/common/jigsaw.c:2518 msgid "H_ighlight:" msgstr "_Блики:" -#: ../plug-ins/common/jigsaw.c:2521 +#: ../plug-ins/common/jigsaw.c:2522 msgid "The amount of highlighting on the edges of each piece" msgstr "Размер блика на краях каждого кусочка" #. frame for primitive radio buttons -#: ../plug-ins/common/jigsaw.c:2538 +#: ../plug-ins/common/jigsaw.c:2539 msgid "Jigsaw Style" msgstr "Стиль элементов головоломки" -#: ../plug-ins/common/jigsaw.c:2542 +#: ../plug-ins/common/jigsaw.c:2543 msgid "_Square" msgstr "_Квадратные" -#: ../plug-ins/common/jigsaw.c:2543 +#: ../plug-ins/common/jigsaw.c:2544 msgid "C_urved" msgstr "_Искривленные" -#: ../plug-ins/common/jigsaw.c:2547 +#: ../plug-ins/common/jigsaw.c:2548 msgid "Each piece has straight sides" msgstr "Каждый кусочек имеет прямые стороны" -#: ../plug-ins/common/jigsaw.c:2548 +#: ../plug-ins/common/jigsaw.c:2549 msgid "Each piece has curved sides" msgstr "Каждый кусочек имеет искривленные стороны" @@ -5705,60 +5710,60 @@ msgstr "_Оставить как есть" msgid "_Convert" msgstr "_Преобразовать" -#: ../plug-ins/common/lcms.c:1262 ../plug-ins/file-jpeg/jpeg-exif.c:376 +#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:376 msgid "_Don't ask me again" msgstr "_Больше не спрашивать" -#: ../plug-ins/common/lcms.c:1326 +#: ../plug-ins/common/lcms.c:1327 msgid "Select destination profile" msgstr "Выберите конечный профиль" -#: ../plug-ins/common/lcms.c:1353 +#: ../plug-ins/common/lcms.c:1354 msgid "All files (*.*)" msgstr "Все файлы (*.*)" -#: ../plug-ins/common/lcms.c:1358 +#: ../plug-ins/common/lcms.c:1359 msgid "ICC color profile (*.icc, *.icm)" msgstr "Цветовой ICC-профиль (*.icc, *.icm)" -#: ../plug-ins/common/lcms.c:1401 +#: ../plug-ins/common/lcms.c:1402 #, c-format msgid "RGB workspace (%s)" msgstr "Рабочее пространство RGB (%s)" -#: ../plug-ins/common/lcms.c:1451 +#: ../plug-ins/common/lcms.c:1452 msgid "Convert to ICC Color Profile" msgstr "Преобразовать в цветовой ICC-профиль" -#: ../plug-ins/common/lcms.c:1452 +#: ../plug-ins/common/lcms.c:1453 msgid "Assign ICC Color Profile" msgstr "Назначить цветовой профиль" -#: ../plug-ins/common/lcms.c:1460 +#: ../plug-ins/common/lcms.c:1461 msgid "_Assign" msgstr "_Назначить" -#: ../plug-ins/common/lcms.c:1477 +#: ../plug-ins/common/lcms.c:1479 msgid "Current Color Profile" msgstr "Текущий цветовой профиль" -#: ../plug-ins/common/lcms.c:1492 +#: ../plug-ins/common/lcms.c:1494 msgid "Convert to" msgstr "Преобразовать в" -#: ../plug-ins/common/lcms.c:1492 +#: ../plug-ins/common/lcms.c:1494 msgid "Assign" msgstr "Назначить" -#: ../plug-ins/common/lcms.c:1516 +#: ../plug-ins/common/lcms.c:1518 msgid "_Rendering Intent:" msgstr "_Цель цветопередачи:" -#: ../plug-ins/common/lcms.c:1532 +#: ../plug-ins/common/lcms.c:1534 msgid "_Black Point Compensation" msgstr "Использовать _компенсацию черной точки" -#: ../plug-ins/common/lcms.c:1574 +#: ../plug-ins/common/lcms.c:1576 msgid "Destination profile is not for RGB color space." msgstr "Профиль вывода не предназначен для цветового пространства RGB." @@ -5778,23 +5783,23 @@ msgstr "Применяется линза" msgid "Lens Effect" msgstr "Эффект линзы" -#: ../plug-ins/common/lens-apply.c:426 +#: ../plug-ins/common/lens-apply.c:427 msgid "_Keep original surroundings" msgstr "_Сохранять исходное окружение" -#: ../plug-ins/common/lens-apply.c:441 +#: ../plug-ins/common/lens-apply.c:442 msgid "_Set surroundings to index 0" msgstr "_Устанавливать окружение в индекс 0" -#: ../plug-ins/common/lens-apply.c:442 +#: ../plug-ins/common/lens-apply.c:443 msgid "_Set surroundings to background color" msgstr "_Устанавливать окружение в цвет фона" -#: ../plug-ins/common/lens-apply.c:457 +#: ../plug-ins/common/lens-apply.c:458 msgid "_Make surroundings transparent" msgstr "_Делать окружение прозрачным" -#: ../plug-ins/common/lens-apply.c:474 +#: ../plug-ins/common/lens-apply.c:475 msgid "_Lens refraction index:" msgstr "_Коэффициент преломления линзы:" @@ -5814,27 +5819,27 @@ msgstr "Коррекция искажений оптики" msgid "Lens Distortion" msgstr "Коррекция искажений оптики" -#: ../plug-ins/common/lens-distortion.c:518 +#: ../plug-ins/common/lens-distortion.c:519 msgid "_Main:" msgstr "_Главная:" -#: ../plug-ins/common/lens-distortion.c:532 +#: ../plug-ins/common/lens-distortion.c:533 msgid "_Edge:" msgstr "_Край:" -#: ../plug-ins/common/lens-distortion.c:546 ../plug-ins/flame/flame.c:1236 +#: ../plug-ins/common/lens-distortion.c:547 ../plug-ins/flame/flame.c:1236 msgid "_Zoom:" msgstr "_Масштаб:" -#: ../plug-ins/common/lens-distortion.c:560 +#: ../plug-ins/common/lens-distortion.c:561 msgid "_Brighten:" msgstr "_Яркость:" -#: ../plug-ins/common/lens-distortion.c:574 +#: ../plug-ins/common/lens-distortion.c:575 msgid "_X shift:" msgstr "Сдвиг по _Х:" -#: ../plug-ins/common/lens-distortion.c:588 +#: ../plug-ins/common/lens-distortion.c:589 msgid "_Y shift:" msgstr "Сдвиг по _Y:" @@ -5854,11 +5859,11 @@ msgstr "Создание отблеска" msgid "Lens Flare" msgstr "Отблеск линзы" -#: ../plug-ins/common/lens-flare.c:752 +#: ../plug-ins/common/lens-flare.c:753 msgid "Center of Flare Effect" msgstr "Центр отблеска" -#: ../plug-ins/common/lens-flare.c:792 ../plug-ins/common/nova.c:483 +#: ../plug-ins/common/lens-flare.c:793 ../plug-ins/common/nova.c:484 msgid "Show _position" msgstr "_Показать позицию" @@ -5925,11 +5930,11 @@ msgstr "Макс. RGB" msgid "Maximum RGB Value" msgstr "Макс. значение RGB" -#: ../plug-ins/common/max-rgb.c:291 +#: ../plug-ins/common/max-rgb.c:292 msgid "_Hold the maximal channels" msgstr "Сохранять _максимальные каналы" -#: ../plug-ins/common/max-rgb.c:294 +#: ../plug-ins/common/max-rgb.c:295 msgid "Ho_ld the minimal channels" msgstr "Сохранять м_инимальные каналы" @@ -5955,63 +5960,63 @@ msgstr "Визуализация элементов" msgid "Mosaic" msgstr "Мозаика" -#: ../plug-ins/common/mosaic.c:632 +#: ../plug-ins/common/mosaic.c:633 msgid "Squares" msgstr "Квадраты" -#: ../plug-ins/common/mosaic.c:633 +#: ../plug-ins/common/mosaic.c:634 msgid "Hexagons" msgstr "Шестиугольники" -#: ../plug-ins/common/mosaic.c:634 +#: ../plug-ins/common/mosaic.c:635 msgid "Octagons & squares" msgstr "Восьмиугольники и квадраты" -#: ../plug-ins/common/mosaic.c:635 +#: ../plug-ins/common/mosaic.c:636 msgid "Triangles" msgstr "Треугольники" -#: ../plug-ins/common/mosaic.c:643 +#: ../plug-ins/common/mosaic.c:644 msgid "_Tiling primitives:" msgstr "_Элементы мозаики:" -#: ../plug-ins/common/mosaic.c:651 +#: ../plug-ins/common/mosaic.c:652 msgid "Tile _size:" msgstr "_Размер элемента:" -#: ../plug-ins/common/mosaic.c:663 ../plug-ins/common/tile-glass.c:302 +#: ../plug-ins/common/mosaic.c:664 ../plug-ins/common/tile-glass.c:303 msgid "Tile _height:" msgstr "_Высота блока:" -#: ../plug-ins/common/mosaic.c:676 +#: ../plug-ins/common/mosaic.c:677 msgid "Til_e spacing:" msgstr "_Интервал между элементами:" -#: ../plug-ins/common/mosaic.c:688 +#: ../plug-ins/common/mosaic.c:689 msgid "Tile _neatness:" msgstr "Ро_вность элементов:" -#: ../plug-ins/common/mosaic.c:701 +#: ../plug-ins/common/mosaic.c:702 msgid "Light _direction:" msgstr "_Направление освещения:" -#: ../plug-ins/common/mosaic.c:713 +#: ../plug-ins/common/mosaic.c:714 msgid "Color _variation:" msgstr "Цветовые в_ариации:" -#: ../plug-ins/common/mosaic.c:742 +#: ../plug-ins/common/mosaic.c:743 msgid "Co_lor averaging" msgstr "_Усреднение цвета" -#: ../plug-ins/common/mosaic.c:755 +#: ../plug-ins/common/mosaic.c:756 msgid "Allo_w tile splitting" msgstr "_Разрешить расщепление элементов" -#: ../plug-ins/common/mosaic.c:768 +#: ../plug-ins/common/mosaic.c:769 msgid "_Pitted surfaces" msgstr "Пов_ерхности с выемками" -#: ../plug-ins/common/mosaic.c:781 +#: ../plug-ins/common/mosaic.c:782 msgid "_FG/BG lighting" msgstr "Осве_тление переднего плана/фона" @@ -6078,62 +6083,62 @@ msgid "_Spot function:" msgstr "_Спот-функция:" #. resolution settings -#: ../plug-ins/common/newsprint.c:1239 +#: ../plug-ins/common/newsprint.c:1240 msgid "Resolution" msgstr "Разрешение" -#: ../plug-ins/common/newsprint.c:1258 +#: ../plug-ins/common/newsprint.c:1259 msgid "_Input SPI:" msgstr "SPI на _входе:" -#: ../plug-ins/common/newsprint.c:1272 +#: ../plug-ins/common/newsprint.c:1273 msgid "O_utput LPI:" msgstr "LPI на в_ыходе:" -#: ../plug-ins/common/newsprint.c:1285 +#: ../plug-ins/common/newsprint.c:1286 msgid "C_ell size:" msgstr "_Размер ячейки:" #. screen settings -#: ../plug-ins/common/newsprint.c:1298 +#: ../plug-ins/common/newsprint.c:1299 #: ../plug-ins/gradient-flare/gradient-flare.c:553 msgid "Screen" msgstr "Экран" -#: ../plug-ins/common/newsprint.c:1317 +#: ../plug-ins/common/newsprint.c:1318 msgid "B_lack pullout (%):" msgstr "_Черная составляющая (%):" -#: ../plug-ins/common/newsprint.c:1339 +#: ../plug-ins/common/newsprint.c:1340 msgid "Separate to:" msgstr "Разделить на:" -#: ../plug-ins/common/newsprint.c:1343 +#: ../plug-ins/common/newsprint.c:1344 msgid "_RGB" msgstr "_RGB" -#: ../plug-ins/common/newsprint.c:1360 +#: ../plug-ins/common/newsprint.c:1361 msgid "C_MYK" msgstr "C_MYK" -#: ../plug-ins/common/newsprint.c:1377 +#: ../plug-ins/common/newsprint.c:1378 msgid "I_ntensity" msgstr "_Интенсивность" -#: ../plug-ins/common/newsprint.c:1402 +#: ../plug-ins/common/newsprint.c:1403 msgid "_Lock channels" msgstr "_Фиксировать каналы" -#: ../plug-ins/common/newsprint.c:1415 +#: ../plug-ins/common/newsprint.c:1416 msgid "_Factory Defaults" msgstr "_По умолчанию" #. anti-alias control -#: ../plug-ins/common/newsprint.c:1441 ../plug-ins/gfig/gfig-dialog.c:1255 +#: ../plug-ins/common/newsprint.c:1442 ../plug-ins/gfig/gfig-dialog.c:1256 msgid "Antialiasing" msgstr "Сглаживание" -#: ../plug-ins/common/newsprint.c:1449 +#: ../plug-ins/common/newsprint.c:1450 msgid "O_versample:" msgstr "П_ерекрывание:" @@ -6149,23 +6154,23 @@ msgstr "_Нелинейный фильтр..." msgid "NL Filter" msgstr "Нелинейный фильтр" -#: ../plug-ins/common/nl-filter.c:1044 +#: ../plug-ins/common/nl-filter.c:1045 msgid "Filter" msgstr "Фильтр" -#: ../plug-ins/common/nl-filter.c:1048 +#: ../plug-ins/common/nl-filter.c:1049 msgid "_Alpha trimmed mean" msgstr "Альфа-усеченное среднее" -#: ../plug-ins/common/nl-filter.c:1050 +#: ../plug-ins/common/nl-filter.c:1051 msgid "Op_timal estimation" msgstr "Оптимальный расчет" -#: ../plug-ins/common/nl-filter.c:1052 +#: ../plug-ins/common/nl-filter.c:1053 msgid "_Edge enhancement" msgstr "Усиление края" -#: ../plug-ins/common/nl-filter.c:1077 +#: ../plug-ins/common/nl-filter.c:1078 msgid "A_lpha:" msgstr "_Альфа:" @@ -6181,11 +6186,11 @@ msgstr "Шум HSV..." msgid "HSV Noise" msgstr "Шум HSV" -#: ../plug-ins/common/noise-hsv.c:399 +#: ../plug-ins/common/noise-hsv.c:400 msgid "_Holdness:" msgstr "_Фиксированность:" -#: ../plug-ins/common/noise-hsv.c:411 +#: ../plug-ins/common/noise-hsv.c:412 msgid "H_ue:" msgstr "_Тон:" @@ -6225,24 +6230,24 @@ msgstr "Случайный _выбор..." msgid "_Slur..." msgstr "_Таяние..." -#: ../plug-ins/common/noise-randomize.c:770 -#: ../plug-ins/common/noise-solid.c:601 +#: ../plug-ins/common/noise-randomize.c:771 +#: ../plug-ins/common/noise-solid.c:602 msgid "_Random seed:" msgstr "_Случайное зерно:" -#: ../plug-ins/common/noise-randomize.c:779 +#: ../plug-ins/common/noise-randomize.c:780 msgid "R_andomization (%):" msgstr "С_лучайность (%):" -#: ../plug-ins/common/noise-randomize.c:782 +#: ../plug-ins/common/noise-randomize.c:783 msgid "Percentage of pixels to be filtered" msgstr "Процент фильтруемых пикселов" -#: ../plug-ins/common/noise-randomize.c:794 +#: ../plug-ins/common/noise-randomize.c:795 msgid "R_epeat:" msgstr "_Повторов:" -#: ../plug-ins/common/noise-randomize.c:797 +#: ../plug-ins/common/noise-randomize.c:798 msgid "Number of times to apply filter" msgstr "Число применений фильтра" @@ -6262,19 +6267,19 @@ msgstr "Добавление шума" msgid "RGB Noise" msgstr "Шум RGB" -#: ../plug-ins/common/noise-rgb.c:482 +#: ../plug-ins/common/noise-rgb.c:483 msgid "Co_rrelated noise" msgstr "_Корреляция шума" -#: ../plug-ins/common/noise-rgb.c:497 +#: ../plug-ins/common/noise-rgb.c:498 msgid "_Independent RGB" msgstr "_Независимые каналы RGB" -#: ../plug-ins/common/noise-rgb.c:521 ../plug-ins/common/noise-rgb.c:525 +#: ../plug-ins/common/noise-rgb.c:522 ../plug-ins/common/noise-rgb.c:526 msgid "_Gray:" msgstr "_Серый:" -#: ../plug-ins/common/noise-rgb.c:551 +#: ../plug-ins/common/noise-rgb.c:552 #, c-format msgid "Channel #%d:" msgstr "Канал #%d:" @@ -6292,25 +6297,25 @@ msgstr "_Сплошной шум..." msgid "Solid Noise" msgstr "Сплошной шум" -#: ../plug-ins/common/noise-solid.c:614 +#: ../plug-ins/common/noise-solid.c:615 msgid "_Detail:" msgstr "_Детализация:" #. Turbulent -#: ../plug-ins/common/noise-solid.c:624 +#: ../plug-ins/common/noise-solid.c:625 msgid "T_urbulent" msgstr "_Турбулентный" #. Tilable -#: ../plug-ins/common/noise-solid.c:638 +#: ../plug-ins/common/noise-solid.c:639 msgid "T_ilable" msgstr "_Мозаичный" -#: ../plug-ins/common/noise-solid.c:653 +#: ../plug-ins/common/noise-solid.c:654 msgid "_X size:" msgstr "Размер по _Х:" -#: ../plug-ins/common/noise-solid.c:666 +#: ../plug-ins/common/noise-solid.c:667 msgid "_Y size:" msgstr "Размер по _Y:" @@ -6326,11 +6331,11 @@ msgstr "_Рассеивание..." msgid "Spreading" msgstr "Применяется рассеивание..." -#: ../plug-ins/common/noise-spread.c:341 +#: ../plug-ins/common/noise-spread.c:343 msgid "Spread" msgstr "Рассеять" -#: ../plug-ins/common/noise-spread.c:366 +#: ../plug-ins/common/noise-spread.c:369 msgid "Spread Amount" msgstr "Степень рассеивания" @@ -6350,19 +6355,19 @@ msgstr "Визуализация Сверхновой" msgid "Supernova" msgstr "Сверхновая" -#: ../plug-ins/common/nova.c:348 +#: ../plug-ins/common/nova.c:349 msgid "Supernova Color Picker" msgstr "Пипетка цвета Сверхновой" -#: ../plug-ins/common/nova.c:377 +#: ../plug-ins/common/nova.c:378 msgid "_Spokes:" msgstr "_Лучей:" -#: ../plug-ins/common/nova.c:392 +#: ../plug-ins/common/nova.c:393 msgid "R_andom hue:" msgstr "С_лучайный тон:" -#: ../plug-ins/common/nova.c:445 +#: ../plug-ins/common/nova.c:446 msgid "Center of Nova" msgstr "Центр Сверхновой" @@ -6382,32 +6387,32 @@ msgstr "Рисование маслом" msgid "Oilify" msgstr "Масляная краска" -#: ../plug-ins/common/oilify.c:814 +#: ../plug-ins/common/oilify.c:815 msgid "_Mask size:" msgstr "Размер маски:" #. #. * Mask-size map check button #. -#: ../plug-ins/common/oilify.c:829 +#: ../plug-ins/common/oilify.c:830 msgid "Use m_ask-size map:" msgstr "Использовать к_арту размером с маску:" -#: ../plug-ins/common/oilify.c:866 ../plug-ins/common/sinus.c:921 +#: ../plug-ins/common/oilify.c:867 ../plug-ins/common/sinus.c:921 msgid "_Exponent:" msgstr "_Экспонента:" #. #. * Exponent map check button #. -#: ../plug-ins/common/oilify.c:881 +#: ../plug-ins/common/oilify.c:882 msgid "Use e_xponent map:" msgstr "Использовать карту _экспоненты:" #. #. * Intensity algorithm check button #. -#: ../plug-ins/common/oilify.c:917 +#: ../plug-ins/common/oilify.c:918 msgid "_Use intensity algorithm" msgstr "_Использовать алгоритм интенсивности" @@ -6424,16 +6429,16 @@ msgstr "_Фотокопия..." msgid "Photocopy" msgstr "Фотокопия" -#: ../plug-ins/common/photocopy.c:889 ../plug-ins/common/sharpen.c:510 -#: ../plug-ins/common/softglow.c:696 +#: ../plug-ins/common/photocopy.c:890 ../plug-ins/common/sharpen.c:511 +#: ../plug-ins/common/softglow.c:697 msgid "_Sharpness:" msgstr "_Резкость:" -#: ../plug-ins/common/photocopy.c:903 +#: ../plug-ins/common/photocopy.c:904 msgid "Percent _black:" msgstr "Процент _чёрного:" -#: ../plug-ins/common/photocopy.c:917 +#: ../plug-ins/common/photocopy.c:918 msgid "Percent _white:" msgstr "Процент _белого:" @@ -6453,11 +6458,11 @@ msgstr "Пикселизация" msgid "Pixelize" msgstr "Пикселизация" -#: ../plug-ins/common/pixelize.c:351 +#: ../plug-ins/common/pixelize.c:352 msgid "Pixel _width:" msgstr "_Ширина точки:" -#: ../plug-ins/common/pixelize.c:356 +#: ../plug-ins/common/pixelize.c:357 msgid "Pixel _height:" msgstr "_Высота точки:" @@ -6473,11 +6478,11 @@ msgstr "_Плазма..." msgid "Plasma" msgstr "Плазма" -#: ../plug-ins/common/plasma.c:336 +#: ../plug-ins/common/plasma.c:337 msgid "Random _seed:" msgstr "Случайное зерно:" -#: ../plug-ins/common/plasma.c:347 +#: ../plug-ins/common/plasma.c:348 msgid "T_urbulence:" msgstr "Т_урбулентность:" @@ -6564,19 +6569,19 @@ msgstr "Полярные координаты" msgid "Polar Coordinates" msgstr "Полярные координаты" -#: ../plug-ins/common/polar-coords.c:631 +#: ../plug-ins/common/polar-coords.c:632 msgid "Circle _depth in percent:" msgstr "_Глубина круга в процентах:" -#: ../plug-ins/common/polar-coords.c:643 +#: ../plug-ins/common/polar-coords.c:644 msgid "Offset _angle:" msgstr "_Угол смещения:" -#: ../plug-ins/common/polar-coords.c:658 +#: ../plug-ins/common/polar-coords.c:659 msgid "_Map backwards" msgstr "_Развернуть" -#: ../plug-ins/common/polar-coords.c:664 +#: ../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." @@ -6584,11 +6589,11 @@ msgstr "" "Если отмечено, отображение начнется с правой стороны, в противном случае - с " "левой." -#: ../plug-ins/common/polar-coords.c:675 +#: ../plug-ins/common/polar-coords.c:676 msgid "Map from _top" msgstr "Отобразить с_верху" -#: ../plug-ins/common/polar-coords.c:681 +#: ../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." @@ -6596,11 +6601,11 @@ msgstr "" "Если не отмечено, то нижняя часть будет помещена в центр, а\n" "верхняя - на внешнюю сторону. Если отмечено - то наоборот." -#: ../plug-ins/common/polar-coords.c:693 +#: ../plug-ins/common/polar-coords.c:694 msgid "To _polar" msgstr "В _полярное" -#: ../plug-ins/common/polar-coords.c:699 +#: ../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." @@ -6656,22 +6661,22 @@ msgstr "Удалить эффект _красных глаз..." msgid "Red Eye Removal" msgstr "Удаление эффекта красных глаз" -#: ../plug-ins/common/red-eye-removal.c:169 -#: ../plug-ins/common/unsharp-mask.c:891 ../plug-ins/common/wind.c:1007 +#: ../plug-ins/common/red-eye-removal.c:170 +#: ../plug-ins/common/unsharp-mask.c:892 ../plug-ins/common/wind.c:1008 #: ../plug-ins/imagemap/imap_preferences.c:440 #: ../plug-ins/map-object/map-object-ui.c:585 msgid "_Threshold:" msgstr "_Порог:" -#: ../plug-ins/common/red-eye-removal.c:175 +#: ../plug-ins/common/red-eye-removal.c:176 msgid "Threshold for the red eye color to remove." msgstr "Порог удаляемого цвета красных глаз" -#: ../plug-ins/common/red-eye-removal.c:180 +#: ../plug-ins/common/red-eye-removal.c:181 msgid "Manually selecting the eyes may improve the results." msgstr "Выделение области глаз может улучшить результат" -#: ../plug-ins/common/red-eye-removal.c:300 +#: ../plug-ins/common/red-eye-removal.c:301 msgid "Removing red eye" msgstr "Удалить эффект красных глаз" @@ -6691,41 +6696,41 @@ msgstr "Создание ряби" msgid "Ripple" msgstr "Создать рябь" -#: ../plug-ins/common/ripple.c:540 +#: ../plug-ins/common/ripple.c:541 msgid "_Retain tilability" msgstr "Сохранить _бесшовность" #. Edges toggle box -#: ../plug-ins/common/ripple.c:577 +#: ../plug-ins/common/ripple.c:578 msgid "Edges" msgstr "Края" -#: ../plug-ins/common/ripple.c:583 +#: ../plug-ins/common/ripple.c:584 msgid "_Blank" msgstr "О_чистить" #. Wave toggle box -#: ../plug-ins/common/ripple.c:605 +#: ../plug-ins/common/ripple.c:606 msgid "Wave Type" msgstr "Тип волны" -#: ../plug-ins/common/ripple.c:609 +#: ../plug-ins/common/ripple.c:610 msgid "Saw_tooth" msgstr "_Пилообразная" -#: ../plug-ins/common/ripple.c:610 +#: ../plug-ins/common/ripple.c:611 msgid "S_ine" msgstr "_Синус" -#: ../plug-ins/common/ripple.c:633 +#: ../plug-ins/common/ripple.c:634 msgid "_Period:" msgstr "_Период:" -#: ../plug-ins/common/ripple.c:646 +#: ../plug-ins/common/ripple.c:647 msgid "A_mplitude:" msgstr "_Амплитуда:" -#: ../plug-ins/common/ripple.c:659 +#: ../plug-ins/common/ripple.c:660 msgid "Phase _shift:" msgstr "Cдвиг по _фазе:" @@ -6961,15 +6966,15 @@ msgstr "Выполняется сдвиг" msgid "Shift" msgstr "Сдвиг" -#: ../plug-ins/common/shift.c:387 +#: ../plug-ins/common/shift.c:388 msgid "Shift _horizontally" msgstr "Горизонтальный сдвиг" -#: ../plug-ins/common/shift.c:390 +#: ../plug-ins/common/shift.c:391 msgid "Shift _vertically" msgstr "Вертикальный сдвиг" -#: ../plug-ins/common/shift.c:421 +#: ../plug-ins/common/shift.c:422 msgid "Shift _amount:" msgstr "Величина сдвига:" @@ -7114,7 +7119,7 @@ msgstr "Извлечение гладкой палитры" msgid "Smooth Palette" msgstr "Гладкая палитра" -#: ../plug-ins/common/smooth-palette.c:451 +#: ../plug-ins/common/smooth-palette.c:452 msgid "_Search depth:" msgstr "_Глубина поиска:" @@ -7130,7 +7135,7 @@ msgstr "_Рассеянный свет..." msgid "Softglow" msgstr "Рассеянный свет" -#: ../plug-ins/common/softglow.c:668 +#: ../plug-ins/common/softglow.c:669 msgid "_Glow radius:" msgstr "_Радиус свечения" @@ -7154,123 +7159,123 @@ msgstr "Применяется искрение..." msgid "Sparkle" msgstr "Искрение" -#: ../plug-ins/common/sparkle.c:372 +#: ../plug-ins/common/sparkle.c:373 msgid "Luminosity _threshold:" msgstr "Порог _яркости:" -#: ../plug-ins/common/sparkle.c:375 +#: ../plug-ins/common/sparkle.c:376 msgid "Adjust the luminosity threshold" msgstr "Подбор порога яркости" -#: ../plug-ins/common/sparkle.c:385 +#: ../plug-ins/common/sparkle.c:386 msgid "F_lare intensity:" msgstr "Интенсивность _вспышки:" -#: ../plug-ins/common/sparkle.c:388 +#: ../plug-ins/common/sparkle.c:389 msgid "Adjust the flare intensity" msgstr "Подбор интенсивности вспышки" -#: ../plug-ins/common/sparkle.c:398 +#: ../plug-ins/common/sparkle.c:399 msgid "_Spike length:" msgstr "Длина _лучей:" -#: ../plug-ins/common/sparkle.c:401 +#: ../plug-ins/common/sparkle.c:402 msgid "Adjust the spike length" msgstr "Подбор длины луча" -#: ../plug-ins/common/sparkle.c:411 +#: ../plug-ins/common/sparkle.c:412 msgid "Sp_ike points:" msgstr "_Число лучей:" -#: ../plug-ins/common/sparkle.c:414 +#: ../plug-ins/common/sparkle.c:415 msgid "Adjust the number of spikes" msgstr "Подбор числа лучей" -#: ../plug-ins/common/sparkle.c:424 +#: ../plug-ins/common/sparkle.c:425 msgid "Spi_ke angle (-1: random):" msgstr "Угол луча (-1: случайный):" -#: ../plug-ins/common/sparkle.c:427 +#: ../plug-ins/common/sparkle.c:428 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)" msgstr "Подбор угла луча (-1 означает выбор случайного угла)" -#: ../plug-ins/common/sparkle.c:438 +#: ../plug-ins/common/sparkle.c:439 msgid "Spik_e density:" msgstr "П_лотность луча:" -#: ../plug-ins/common/sparkle.c:441 +#: ../plug-ins/common/sparkle.c:442 msgid "Adjust the spike density" msgstr "Подбор плотности луча" -#: ../plug-ins/common/sparkle.c:451 +#: ../plug-ins/common/sparkle.c:452 msgid "Tr_ansparency:" msgstr "Полупрозра_чность:" -#: ../plug-ins/common/sparkle.c:454 +#: ../plug-ins/common/sparkle.c:455 msgid "Adjust the opacity of the spikes" msgstr "Подбор непрозрачности лучей" -#: ../plug-ins/common/sparkle.c:464 +#: ../plug-ins/common/sparkle.c:465 msgid "_Random hue:" msgstr "С_лучайный тон:" -#: ../plug-ins/common/sparkle.c:467 +#: ../plug-ins/common/sparkle.c:468 msgid "Adjust how much the hue should be changed randomly" msgstr "Подбор степени случайного изменения тона" -#: ../plug-ins/common/sparkle.c:477 +#: ../plug-ins/common/sparkle.c:478 msgid "Rando_m saturation:" msgstr "Случайная нас_ыщенность:" -#: ../plug-ins/common/sparkle.c:480 +#: ../plug-ins/common/sparkle.c:481 msgid "Adjust how much the saturation should be changed randomly" msgstr "Подбор степени случайного изменения насыщенности" -#: ../plug-ins/common/sparkle.c:497 +#: ../plug-ins/common/sparkle.c:498 msgid "_Preserve luminosity" msgstr "Со_хранять яркость" -#: ../plug-ins/common/sparkle.c:504 +#: ../plug-ins/common/sparkle.c:505 msgid "Should the luminosity be preserved?" msgstr "Нужно ли сохранять яркость?" -#: ../plug-ins/common/sparkle.c:513 +#: ../plug-ins/common/sparkle.c:514 msgid "In_verse" msgstr "_Инвертировать" -#: ../plug-ins/common/sparkle.c:519 +#: ../plug-ins/common/sparkle.c:520 msgid "Should the effect be inversed?" msgstr "Нужно ли инвертировать эффект?" -#: ../plug-ins/common/sparkle.c:528 +#: ../plug-ins/common/sparkle.c:529 msgid "A_dd border" msgstr "_Добавить рамку" -#: ../plug-ins/common/sparkle.c:534 +#: ../plug-ins/common/sparkle.c:535 msgid "Draw a border of spikes around the image" msgstr "Нарисовать рамку из лучей вокруг изображения" -#: ../plug-ins/common/sparkle.c:548 +#: ../plug-ins/common/sparkle.c:549 msgid "_Natural color" msgstr "_Естественный цвет" -#: ../plug-ins/common/sparkle.c:549 +#: ../plug-ins/common/sparkle.c:550 msgid "_Foreground color" msgstr "Цвет _переднего плана" -#: ../plug-ins/common/sparkle.c:550 +#: ../plug-ins/common/sparkle.c:551 msgid "_Background color" msgstr "Цвет _фона" -#: ../plug-ins/common/sparkle.c:557 +#: ../plug-ins/common/sparkle.c:558 msgid "Use the color of the image" msgstr "Использовать цвет изображения" -#: ../plug-ins/common/sparkle.c:558 +#: ../plug-ins/common/sparkle.c:559 msgid "Use the foreground color" msgstr "Использовать цвет переднего плана" -#: ../plug-ins/common/sparkle.c:559 +#: ../plug-ins/common/sparkle.c:560 msgid "Use the background color" msgstr "Использовать цвет фона" @@ -7312,7 +7317,7 @@ msgid "Spots" msgstr "Пятна" #: ../plug-ins/common/sphere-designer.c:1741 -#: ../plug-ins/common/sphere-designer.c:2689 +#: ../plug-ins/common/sphere-designer.c:2690 msgid "Texture" msgstr "Текстура" @@ -7321,7 +7326,7 @@ msgid "Bumpmap" msgstr "Рельеф" #: ../plug-ins/common/sphere-designer.c:1745 -#: ../plug-ins/common/sphere-designer.c:2691 +#: ../plug-ins/common/sphere-designer.c:2692 msgid "Light" msgstr "Свет" @@ -7342,106 +7347,106 @@ msgstr "Сохранить файл" msgid "Sphere Designer" msgstr "Создание сферы" -#: ../plug-ins/common/sphere-designer.c:2674 +#: ../plug-ins/common/sphere-designer.c:2675 msgid "Properties" msgstr "Сво_йства" -#: ../plug-ins/common/sphere-designer.c:2690 +#: ../plug-ins/common/sphere-designer.c:2691 msgid "Bump" msgstr "Рельеф" #. row labels -#: ../plug-ins/common/sphere-designer.c:2698 +#: ../plug-ins/common/sphere-designer.c:2699 #: ../plug-ins/lighting/lighting-ui.c:404 msgid "Type:" msgstr "Тип:" -#: ../plug-ins/common/sphere-designer.c:2717 +#: ../plug-ins/common/sphere-designer.c:2718 msgid "Texture:" msgstr "Текстура:" -#: ../plug-ins/common/sphere-designer.c:2722 +#: ../plug-ins/common/sphere-designer.c:2723 msgid "Colors:" msgstr "Цвета:" -#: ../plug-ins/common/sphere-designer.c:2725 -#: ../plug-ins/common/sphere-designer.c:2736 +#: ../plug-ins/common/sphere-designer.c:2726 +#: ../plug-ins/common/sphere-designer.c:2737 msgid "Color Selection Dialog" msgstr "Диалог выбора цвета" #. Scale -#: ../plug-ins/common/sphere-designer.c:2747 +#: ../plug-ins/common/sphere-designer.c:2748 #: ../plug-ins/gimpressionist/paper.c:193 #: ../plug-ins/ifs-compose/ifs-compose.c:553 msgid "Scale:" msgstr "Масштаб:" -#: ../plug-ins/common/sphere-designer.c:2755 +#: ../plug-ins/common/sphere-designer.c:2756 msgid "Turbulence:" msgstr "Турбулентность:" -#: ../plug-ins/common/sphere-designer.c:2762 +#: ../plug-ins/common/sphere-designer.c:2763 msgid "Amount:" msgstr "Прозрачность:" -#: ../plug-ins/common/sphere-designer.c:2769 +#: ../plug-ins/common/sphere-designer.c:2770 msgid "Exp.:" msgstr "Экспонента:" -#: ../plug-ins/common/sphere-designer.c:2776 +#: ../plug-ins/common/sphere-designer.c:2777 msgid "Transformations" msgstr "Преобразования" -#: ../plug-ins/common/sphere-designer.c:2792 +#: ../plug-ins/common/sphere-designer.c:2793 #: ../plug-ins/map-object/map-object-ui.c:1143 msgid "Scale X:" msgstr "Масштаб X:" -#: ../plug-ins/common/sphere-designer.c:2799 +#: ../plug-ins/common/sphere-designer.c:2800 msgid "Scale Y:" msgstr "Масштаб Y:" -#: ../plug-ins/common/sphere-designer.c:2805 +#: ../plug-ins/common/sphere-designer.c:2806 msgid "Scale Z:" msgstr "Масштаб Z:" -#: ../plug-ins/common/sphere-designer.c:2812 +#: ../plug-ins/common/sphere-designer.c:2813 msgid "Rotate X:" msgstr "Вращение по X:" -#: ../plug-ins/common/sphere-designer.c:2819 +#: ../plug-ins/common/sphere-designer.c:2820 msgid "Rotate Y:" msgstr "Вращение по Y:" -#: ../plug-ins/common/sphere-designer.c:2826 +#: ../plug-ins/common/sphere-designer.c:2827 msgid "Rotate Z:" msgstr "Вращение по Z:" -#: ../plug-ins/common/sphere-designer.c:2833 +#: ../plug-ins/common/sphere-designer.c:2834 msgid "Position X:" msgstr "Позиция X:" -#: ../plug-ins/common/sphere-designer.c:2840 +#: ../plug-ins/common/sphere-designer.c:2841 msgid "Position Y:" msgstr "Позиция Y:" -#: ../plug-ins/common/sphere-designer.c:2847 +#: ../plug-ins/common/sphere-designer.c:2848 msgid "Position Z:" msgstr "Позиция Z:" -#: ../plug-ins/common/sphere-designer.c:2962 +#: ../plug-ins/common/sphere-designer.c:2963 msgid "Rendering sphere" msgstr "Визуализация сферы" -#: ../plug-ins/common/sphere-designer.c:3012 +#: ../plug-ins/common/sphere-designer.c:3013 msgid "Create an image of a textured sphere" msgstr "Создать сферу с заданной текстурой" -#: ../plug-ins/common/sphere-designer.c:3019 +#: ../plug-ins/common/sphere-designer.c:3020 msgid "Sphere _Designer..." msgstr "_Создание сферы..." -#: ../plug-ins/common/sphere-designer.c:3073 +#: ../plug-ins/common/sphere-designer.c:3074 msgid "Region selected for plug-in is empty" msgstr "Выбранная для расширения область пуста" @@ -7469,7 +7474,7 @@ msgstr "Рисование прозрачности" msgid "Threshold Alpha" msgstr "Порог альфа-канала" -#: ../plug-ins/common/threshold-alpha.c:282 +#: ../plug-ins/common/threshold-alpha.c:283 msgid "Threshold:" msgstr "Порог:" @@ -7487,87 +7492,87 @@ msgstr "_Стеклянные блоки..." msgid "Glass Tile" msgstr "Стеклянные блоки" -#: ../plug-ins/common/tile-glass.c:288 +#: ../plug-ins/common/tile-glass.c:289 msgid "Tile _width:" msgstr "_Ширина блока:" -#: ../plug-ins/common/tile-paper.c:242 ../plug-ins/common/tile-paper.c:555 +#: ../plug-ins/common/tile-paper.c:242 ../plug-ins/common/tile-paper.c:556 msgid "Paper Tile" msgstr "Разрез бумаги" -#: ../plug-ins/common/tile-paper.c:268 +#: ../plug-ins/common/tile-paper.c:269 msgid "Division" msgstr "Сегменты" -#: ../plug-ins/common/tile-paper.c:318 +#: ../plug-ins/common/tile-paper.c:319 msgid "Fractional Pixels" msgstr "Дробные пикселы" -#: ../plug-ins/common/tile-paper.c:323 +#: ../plug-ins/common/tile-paper.c:324 msgid "_Background" msgstr "Фон" -#: ../plug-ins/common/tile-paper.c:325 +#: ../plug-ins/common/tile-paper.c:326 msgid "_Ignore" msgstr "Игнорировать" -#: ../plug-ins/common/tile-paper.c:327 +#: ../plug-ins/common/tile-paper.c:328 msgid "_Force" msgstr "Усиливать" -#: ../plug-ins/common/tile-paper.c:334 +#: ../plug-ins/common/tile-paper.c:335 msgid "C_entering" msgstr "Центрирование" -#: ../plug-ins/common/tile-paper.c:349 +#: ../plug-ins/common/tile-paper.c:350 msgid "Movement" msgstr "Движение" -#: ../plug-ins/common/tile-paper.c:362 +#: ../plug-ins/common/tile-paper.c:363 msgid "_Max (%):" msgstr "Макс.(%):" -#: ../plug-ins/common/tile-paper.c:368 +#: ../plug-ins/common/tile-paper.c:369 msgid "_Wrap around" msgstr "Бесшовное изображение" -#: ../plug-ins/common/tile-paper.c:378 +#: ../plug-ins/common/tile-paper.c:379 msgid "Background Type" msgstr "Тип фона" -#: ../plug-ins/common/tile-paper.c:385 +#: ../plug-ins/common/tile-paper.c:386 msgid "I_nverted image" msgstr "Инвертированное изображение" -#: ../plug-ins/common/tile-paper.c:387 +#: ../plug-ins/common/tile-paper.c:388 msgid "Im_age" msgstr "Изображение" -#: ../plug-ins/common/tile-paper.c:389 +#: ../plug-ins/common/tile-paper.c:390 msgid "Fo_reground color" msgstr "Цвет _переднего плана" -#: ../plug-ins/common/tile-paper.c:391 +#: ../plug-ins/common/tile-paper.c:392 msgid "Bac_kground color" msgstr "Цвет _фона" -#: ../plug-ins/common/tile-paper.c:393 +#: ../plug-ins/common/tile-paper.c:394 msgid "S_elect here:" msgstr "Вы_брать:" -#: ../plug-ins/common/tile-paper.c:400 +#: ../plug-ins/common/tile-paper.c:401 msgid "Background Color" msgstr "Цвет фона" -#: ../plug-ins/common/tile-paper.c:845 +#: ../plug-ins/common/tile-paper.c:846 msgid "Cut image into paper tiles, and slide them" msgstr "Разрезать изображение на части и сдвинуть их относительно друг друга" -#: ../plug-ins/common/tile-paper.c:850 +#: ../plug-ins/common/tile-paper.c:851 msgid "September 31, 1999" msgstr "Сентябрь 31, 1999" -#: ../plug-ins/common/tile-paper.c:851 +#: ../plug-ins/common/tile-paper.c:852 msgid "_Paper Tile..." msgstr "_Разрез бумаги..." @@ -7653,11 +7658,11 @@ msgstr "_Черепица..." msgid "Tile" msgstr "Черепица" -#: ../plug-ins/common/tile.c:421 +#: ../plug-ins/common/tile.c:422 msgid "Tile to New Size" msgstr "Размер покрываемой площади" -#: ../plug-ins/common/tile.c:443 +#: ../plug-ins/common/tile.c:444 msgid "C_reate new image" msgstr "_Создать новое изображение" @@ -7892,43 +7897,43 @@ msgid "Value Propagate" msgstr "Распространение яркости" #. Parameter settings -#: ../plug-ins/common/value-propagate.c:1154 +#: ../plug-ins/common/value-propagate.c:1155 msgid "Propagate" msgstr "Распространение" -#: ../plug-ins/common/value-propagate.c:1167 +#: ../plug-ins/common/value-propagate.c:1168 msgid "Lower t_hreshold:" msgstr "_Нижний порог:" -#: ../plug-ins/common/value-propagate.c:1179 +#: ../plug-ins/common/value-propagate.c:1180 msgid "_Upper threshold:" msgstr "_Верхний порог:" -#: ../plug-ins/common/value-propagate.c:1191 +#: ../plug-ins/common/value-propagate.c:1192 msgid "_Propagating rate:" msgstr "_Скорость распространения:" -#: ../plug-ins/common/value-propagate.c:1202 +#: ../plug-ins/common/value-propagate.c:1203 msgid "To l_eft" msgstr "Н_алево" -#: ../plug-ins/common/value-propagate.c:1205 +#: ../plug-ins/common/value-propagate.c:1206 msgid "To _right" msgstr "На_право" -#: ../plug-ins/common/value-propagate.c:1208 +#: ../plug-ins/common/value-propagate.c:1209 msgid "To _top" msgstr "Вв_ерх" -#: ../plug-ins/common/value-propagate.c:1211 +#: ../plug-ins/common/value-propagate.c:1212 msgid "To _bottom" msgstr "Вн_из" -#: ../plug-ins/common/value-propagate.c:1220 +#: ../plug-ins/common/value-propagate.c:1221 msgid "Propagating _alpha channel" msgstr "Распространение а_льфа-канала" -#: ../plug-ins/common/value-propagate.c:1231 +#: ../plug-ins/common/value-propagate.c:1232 msgid "Propagating value channel" msgstr "Распространение канала _яркости" @@ -7936,67 +7941,67 @@ msgstr "Распространение канала _яркости" msgid "Van Gogh (LIC)" msgstr "Ван Гог (LIC)" -#: ../plug-ins/common/van-gogh-lic.c:665 +#: ../plug-ins/common/van-gogh-lic.c:666 msgid "Effect Channel" msgstr "Канал эффекта" -#: ../plug-ins/common/van-gogh-lic.c:672 +#: ../plug-ins/common/van-gogh-lic.c:673 msgid "_Brightness" msgstr "Яркость" -#: ../plug-ins/common/van-gogh-lic.c:678 +#: ../plug-ins/common/van-gogh-lic.c:679 msgid "Effect Operator" msgstr "Оператор эффекта" -#: ../plug-ins/common/van-gogh-lic.c:683 +#: ../plug-ins/common/van-gogh-lic.c:684 msgid "_Derivative" msgstr "Производная" -#: ../plug-ins/common/van-gogh-lic.c:684 +#: ../plug-ins/common/van-gogh-lic.c:685 msgid "_Gradient" msgstr "Градиент" -#: ../plug-ins/common/van-gogh-lic.c:690 +#: ../plug-ins/common/van-gogh-lic.c:691 msgid "Convolve" msgstr "Свертка" -#: ../plug-ins/common/van-gogh-lic.c:695 +#: ../plug-ins/common/van-gogh-lic.c:696 msgid "_With white noise" msgstr "С белым шумом" -#: ../plug-ins/common/van-gogh-lic.c:696 +#: ../plug-ins/common/van-gogh-lic.c:697 msgid "W_ith source image" msgstr "С исходным изображением" -#: ../plug-ins/common/van-gogh-lic.c:715 +#: ../plug-ins/common/van-gogh-lic.c:716 msgid "_Effect image:" msgstr "Изображение эффекта:" -#: ../plug-ins/common/van-gogh-lic.c:726 +#: ../plug-ins/common/van-gogh-lic.c:727 msgid "_Filter length:" msgstr "Длина фильтра:" -#: ../plug-ins/common/van-gogh-lic.c:735 +#: ../plug-ins/common/van-gogh-lic.c:736 msgid "_Noise magnitude:" msgstr "Величина шума:" -#: ../plug-ins/common/van-gogh-lic.c:744 +#: ../plug-ins/common/van-gogh-lic.c:745 msgid "In_tegration steps:" msgstr "Интеграционные шаги:" -#: ../plug-ins/common/van-gogh-lic.c:753 +#: ../plug-ins/common/van-gogh-lic.c:754 msgid "_Minimum value:" msgstr "Минимальное значение:" -#: ../plug-ins/common/van-gogh-lic.c:762 +#: ../plug-ins/common/van-gogh-lic.c:763 msgid "M_aximum value:" msgstr "_Максимальное значение:" -#: ../plug-ins/common/van-gogh-lic.c:808 +#: ../plug-ins/common/van-gogh-lic.c:809 msgid "Special effects that nobody understands" msgstr "Специальные эффекты, смысл которых никому не известен" -#: ../plug-ins/common/van-gogh-lic.c:813 +#: ../plug-ins/common/van-gogh-lic.c:814 msgid "_Van Gogh (LIC)..." msgstr "_Ван Гог (LIC)..." @@ -8049,15 +8054,15 @@ msgid "Video" msgstr "Видео" #. frame for the radio buttons -#: ../plug-ins/common/video.c:2038 +#: ../plug-ins/common/video.c:2039 msgid "Video Pattern" msgstr "Шаблон видео" -#: ../plug-ins/common/video.c:2082 +#: ../plug-ins/common/video.c:2083 msgid "_Additive" msgstr "Допол_няющий" -#: ../plug-ins/common/video.c:2092 +#: ../plug-ins/common/video.c:2093 msgid "_Rotated" msgstr "По_вёрнутый" @@ -8073,117 +8078,117 @@ msgstr "_Деформация..." msgid "Warp" msgstr "Деформация" -#: ../plug-ins/common/warp.c:396 +#: ../plug-ins/common/warp.c:397 msgid "Basic Options" msgstr "Основные параметры" -#: ../plug-ins/common/warp.c:418 +#: ../plug-ins/common/warp.c:419 msgid "Step size:" msgstr "Размер шага:" -#: ../plug-ins/common/warp.c:432 +#: ../plug-ins/common/warp.c:433 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:769 #: ../plug-ins/ifs-compose/ifs-compose.c:1211 msgid "Iterations:" msgstr "Число повторов:" #. Displacement map menu -#: ../plug-ins/common/warp.c:441 +#: ../plug-ins/common/warp.c:442 msgid "Displacement map:" msgstr "Карта замещения:" #. ======================================================================= #. Displacement Type -#: ../plug-ins/common/warp.c:459 +#: ../plug-ins/common/warp.c:460 msgid "On edges:" msgstr "На краях:" -#: ../plug-ins/common/warp.c:470 +#: ../plug-ins/common/warp.c:471 msgid "Wrap" msgstr "Заворачивать" -#: ../plug-ins/common/warp.c:485 +#: ../plug-ins/common/warp.c:486 msgid "Smear" msgstr "Размазывать" -#: ../plug-ins/common/warp.c:500 ../plug-ins/file-fits/fits.c:1020 -#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1459 +#: ../plug-ins/common/warp.c:501 ../plug-ins/file-fits/fits.c:1020 +#: ../plug-ins/flame/flame.c:1174 ../plug-ins/gfig/gfig-dialog.c:1461 msgid "Black" msgstr "Черный" -#: ../plug-ins/common/warp.c:515 +#: ../plug-ins/common/warp.c:516 msgid "Foreground color" msgstr "Цвет переднего плана" #. -------------------------------------------------------------------- #. --------- The secondary table -------------------------- -#: ../plug-ins/common/warp.c:535 +#: ../plug-ins/common/warp.c:536 msgid "Advanced Options" msgstr "Дополнительные параметры" -#: ../plug-ins/common/warp.c:551 +#: ../plug-ins/common/warp.c:552 msgid "Dither size:" msgstr "Размер смешения:" -#: ../plug-ins/common/warp.c:564 +#: ../plug-ins/common/warp.c:565 msgid "Rotation angle:" msgstr "Угол поворота:" -#: ../plug-ins/common/warp.c:577 +#: ../plug-ins/common/warp.c:578 msgid "Substeps:" msgstr "Подшагов:" #. Magnitude map menu -#: ../plug-ins/common/warp.c:586 +#: ../plug-ins/common/warp.c:587 msgid "Magnitude map:" msgstr "Карта значений:" -#: ../plug-ins/common/warp.c:608 +#: ../plug-ins/common/warp.c:609 msgid "Use magnitude map" msgstr "Использовать карту значений:" #. -------------------------------------------------------------------- #. --------- The "other" table -------------------------- -#: ../plug-ins/common/warp.c:621 +#: ../plug-ins/common/warp.c:622 msgid "More Advanced Options" msgstr "Другие параметры" -#: ../plug-ins/common/warp.c:638 +#: ../plug-ins/common/warp.c:639 msgid "Gradient scale:" msgstr "Масштаб градиента:" -#: ../plug-ins/common/warp.c:657 +#: ../plug-ins/common/warp.c:658 msgid "Gradient map selection menu" msgstr "Меню выбора градиентной карты" -#: ../plug-ins/common/warp.c:667 +#: ../plug-ins/common/warp.c:668 msgid "Vector mag:" msgstr "Длина вектора:" #. Angle -#: ../plug-ins/common/warp.c:682 ../plug-ins/ifs-compose/ifs-compose.c:567 +#: ../plug-ins/common/warp.c:683 ../plug-ins/ifs-compose/ifs-compose.c:567 msgid "Angle:" msgstr "Угол:" -#: ../plug-ins/common/warp.c:701 +#: ../plug-ins/common/warp.c:702 msgid "Fixed-direction-vector map selection menu" msgstr "Меню выбора карты векторов с фикс.направлениями" #. make sure layer is visible -#: ../plug-ins/common/warp.c:1177 +#: ../plug-ins/common/warp.c:1178 msgid "Smoothing X gradient" msgstr "Сглаживание Х градиента..." -#: ../plug-ins/common/warp.c:1180 +#: ../plug-ins/common/warp.c:1181 msgid "Smoothing Y gradient" msgstr "Сглаживание Y градиента..." #. calculate new X,Y Displacement image maps -#: ../plug-ins/common/warp.c:1230 +#: ../plug-ins/common/warp.c:1231 msgid "Finding XY gradient" msgstr "Поиск XY градиента..." -#: ../plug-ins/common/warp.c:1255 +#: ../plug-ins/common/warp.c:1256 #, c-format msgid "Flow step %d" msgstr "Шаг %d" @@ -8200,23 +8205,23 @@ msgstr "Во_лны..." msgid "Waves" msgstr "Волны" -#: ../plug-ins/common/waves.c:294 +#: ../plug-ins/common/waves.c:295 msgid "_Reflective" msgstr "Отра_жающиеся волны" -#: ../plug-ins/common/waves.c:313 +#: ../plug-ins/common/waves.c:314 msgid "_Amplitude:" msgstr "_Амплитуда:" -#: ../plug-ins/common/waves.c:325 +#: ../plug-ins/common/waves.c:326 msgid "_Phase:" msgstr "_Фаза:" -#: ../plug-ins/common/waves.c:337 +#: ../plug-ins/common/waves.c:338 msgid "_Wavelength:" msgstr "_Длина волны:" -#: ../plug-ins/common/waves.c:448 +#: ../plug-ins/common/waves.c:449 msgid "Waving" msgstr "Создание волн" @@ -8268,11 +8273,11 @@ msgstr "Создание вихрей и щипков" msgid "Whirl and Pinch" msgstr "Вихрь и щипок" -#: ../plug-ins/common/whirl-pinch.c:564 +#: ../plug-ins/common/whirl-pinch.c:565 msgid "_Whirl angle:" msgstr "_Угол вихря:" -#: ../plug-ins/common/whirl-pinch.c:576 +#: ../plug-ins/common/whirl-pinch.c:577 msgid "_Pinch amount:" msgstr "_Величина щипка:" @@ -8299,54 +8304,54 @@ msgstr "Ветер" #. ******************************************************** #. radio buttons for choosing wind rendering algorithm #. ***************************************************** -#: ../plug-ins/common/wind.c:920 +#: ../plug-ins/common/wind.c:921 msgid "Style" msgstr "Стиль" -#: ../plug-ins/common/wind.c:924 +#: ../plug-ins/common/wind.c:925 msgid "_Wind" msgstr "_Ветер" -#: ../plug-ins/common/wind.c:925 +#: ../plug-ins/common/wind.c:926 msgid "_Blast" msgstr "_Порыв ветра" -#: ../plug-ins/common/wind.c:948 +#: ../plug-ins/common/wind.c:949 msgid "_Left" msgstr "С_лева" -#: ../plug-ins/common/wind.c:949 +#: ../plug-ins/common/wind.c:950 msgid "_Right" msgstr "_Справа" #. **************************************************** #. radio buttons for choosing BOTH, LEADING, TRAILING #. ************************************************** -#: ../plug-ins/common/wind.c:968 +#: ../plug-ins/common/wind.c:969 msgid "Edge Affected" msgstr "Захватываются края" -#: ../plug-ins/common/wind.c:972 +#: ../plug-ins/common/wind.c:973 msgid "L_eading" msgstr "Передний" -#: ../plug-ins/common/wind.c:973 +#: ../plug-ins/common/wind.c:974 msgid "Tr_ailing" msgstr "Замыкающий" -#: ../plug-ins/common/wind.c:974 +#: ../plug-ins/common/wind.c:975 msgid "Bot_h" msgstr "Оба" -#: ../plug-ins/common/wind.c:1011 +#: ../plug-ins/common/wind.c:1012 msgid "Higher values restrict the effect to fewer areas of the image" msgstr "Повышение значений ограничивает эффект меньшими областями изображения" -#: ../plug-ins/common/wind.c:1026 ../plug-ins/gimpressionist/orientmap.c:693 +#: ../plug-ins/common/wind.c:1027 ../plug-ins/gimpressionist/orientmap.c:693 msgid "_Strength:" msgstr "Сила:" -#: ../plug-ins/common/wind.c:1030 +#: ../plug-ins/common/wind.c:1031 msgid "Higher values increase the magnitude of the effect" msgstr "Повышение значений усиливает эффект" @@ -8399,23 +8404,23 @@ msgstr "Альфа-канал будет проигнорирован." msgid "Save as BMP" msgstr "Сохранить как BMP" -#: ../plug-ins/file-bmp/bmp-write.c:815 +#: ../plug-ins/file-bmp/bmp-write.c:816 msgid "_Run-Length Encoded" msgstr "_RLE-кодирование" -#: ../plug-ins/file-bmp/bmp-write.c:827 ../plug-ins/file-jpeg/jpeg-save.c:904 +#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:905 msgid "_Advanced Options" msgstr "_Дополнительные параметры" -#: ../plug-ins/file-bmp/bmp-write.c:842 +#: ../plug-ins/file-bmp/bmp-write.c:843 msgid "16 bits" msgstr "16 бит" -#: ../plug-ins/file-bmp/bmp-write.c:878 +#: ../plug-ins/file-bmp/bmp-write.c:879 msgid "24 bits" msgstr "24 бита" -#: ../plug-ins/file-bmp/bmp-write.c:895 +#: ../plug-ins/file-bmp/bmp-write.c:896 msgid "32 bits" msgstr "32 бита" @@ -8451,8 +8456,8 @@ msgstr "Загрузка файла в формате FITS" msgid "Replacement for undefined pixels" msgstr "Замещение для неопределенных пикселов" -#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1285 -#: ../plug-ins/gfig/gfig-dialog.c:1460 +#: ../plug-ins/file-fits/fits.c:1021 ../plug-ins/gfig/gfig-dialog.c:1286 +#: ../plug-ins/gfig/gfig-dialog.c:1462 msgid "White" msgstr "Белый" @@ -8574,7 +8579,7 @@ msgstr "Размер файла: %s" msgid "Calculating file size..." msgstr "Рассчитывается размер файла..." -#: ../plug-ins/file-jpeg/jpeg-save.c:778 ../plug-ins/file-jpeg/jpeg-save.c:880 +#: ../plug-ins/file-jpeg/jpeg-save.c:778 ../plug-ins/file-jpeg/jpeg-save.c:881 msgid "File size: unknown" msgstr "Размер: неизвестен" @@ -8582,59 +8587,59 @@ msgstr "Размер: неизвестен" msgid "Save as JPEG" msgstr "Сохранить как JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:866 +#: ../plug-ins/file-jpeg/jpeg-save.c:867 msgid "_Quality:" msgstr "_Качество:" -#: ../plug-ins/file-jpeg/jpeg-save.c:870 +#: ../plug-ins/file-jpeg/jpeg-save.c:871 msgid "JPEG quality parameter" msgstr "Качество изображения JPEG" -#: ../plug-ins/file-jpeg/jpeg-save.c:889 +#: ../plug-ins/file-jpeg/jpeg-save.c:890 msgid "Enable preview to obtain the file size." msgstr "Включите пред. просмотр, чтобы видеть размер файла." -#: ../plug-ins/file-jpeg/jpeg-save.c:892 +#: ../plug-ins/file-jpeg/jpeg-save.c:893 msgid "Sho_w preview in image window" msgstr "Просмотр _в окне изображения" -#: ../plug-ins/file-jpeg/jpeg-save.c:933 +#: ../plug-ins/file-jpeg/jpeg-save.c:934 msgid "S_moothing:" msgstr "Сг_лаживание:" -#: ../plug-ins/file-jpeg/jpeg-save.c:946 +#: ../plug-ins/file-jpeg/jpeg-save.c:947 msgid "Frequency (rows):" msgstr "Частота (строки):" -#: ../plug-ins/file-jpeg/jpeg-save.c:962 +#: ../plug-ins/file-jpeg/jpeg-save.c:963 msgid "Use _restart markers" msgstr "Использовать _маркеры перезапуска" -#: ../plug-ins/file-jpeg/jpeg-save.c:978 +#: ../plug-ins/file-jpeg/jpeg-save.c:979 msgid "_Optimize" msgstr "О_птимизировать" -#: ../plug-ins/file-jpeg/jpeg-save.c:992 +#: ../plug-ins/file-jpeg/jpeg-save.c:993 msgid "_Progressive" msgstr "Про_грессивная" -#: ../plug-ins/file-jpeg/jpeg-save.c:1008 +#: ../plug-ins/file-jpeg/jpeg-save.c:1009 msgid "Save _EXIF data" msgstr "Сохранить данные _Exif" -#: ../plug-ins/file-jpeg/jpeg-save.c:1025 +#: ../plug-ins/file-jpeg/jpeg-save.c:1026 msgid "Save _thumbnail" msgstr "Сохранить _эскиз" -#: ../plug-ins/file-jpeg/jpeg-save.c:1042 +#: ../plug-ins/file-jpeg/jpeg-save.c:1043 msgid "Save _XMP data" msgstr "Сохранить данные _XMP" -#: ../plug-ins/file-jpeg/jpeg-save.c:1057 +#: ../plug-ins/file-jpeg/jpeg-save.c:1058 msgid "_Use quality settings from original image" msgstr "Использовать _качественные характеристики исходного изображения" -#: ../plug-ins/file-jpeg/jpeg-save.c:1063 +#: ../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 " @@ -8645,48 +8650,48 @@ msgstr "" "параметр для получения максимально схожего качества и размера файла." #. Subsampling -#: ../plug-ins/file-jpeg/jpeg-save.c:1087 +#: ../plug-ins/file-jpeg/jpeg-save.c:1088 msgid "Su_bsampling:" msgstr "С_убвыборка:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1094 +#: ../plug-ins/file-jpeg/jpeg-save.c:1095 msgid "1x1,1x1,1x1 (best quality)" msgstr "1x1,1x1,1x1 (наилучшее качество)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1096 +#: ../plug-ins/file-jpeg/jpeg-save.c:1097 msgid "2x1,1x1,1x1 (4:2:2)" msgstr "2x1,1x1,1x1 (4:2:2)" -#: ../plug-ins/file-jpeg/jpeg-save.c:1098 +#: ../plug-ins/file-jpeg/jpeg-save.c:1099 msgid "1x2,1x1,1x1" msgstr "1x2,1x1,1x1" -#: ../plug-ins/file-jpeg/jpeg-save.c:1100 +#: ../plug-ins/file-jpeg/jpeg-save.c:1101 msgid "2x2,1x1,1x1 (smallest file)" msgstr "2x2,1x1,1x1 (наименьший размер файла)" #. DCT method -#: ../plug-ins/file-jpeg/jpeg-save.c:1130 +#: ../plug-ins/file-jpeg/jpeg-save.c:1131 msgid "_DCT method:" msgstr "_Метод DCT:" -#: ../plug-ins/file-jpeg/jpeg-save.c:1136 +#: ../plug-ins/file-jpeg/jpeg-save.c:1137 msgid "Fast Integer" msgstr "Быстрое целое" -#: ../plug-ins/file-jpeg/jpeg-save.c:1137 +#: ../plug-ins/file-jpeg/jpeg-save.c:1138 msgid "Integer" msgstr "Целое" -#: ../plug-ins/file-jpeg/jpeg-save.c:1138 +#: ../plug-ins/file-jpeg/jpeg-save.c:1139 msgid "Floating-Point" msgstr "С плавающей точкой" -#: ../plug-ins/file-jpeg/jpeg-save.c:1154 +#: ../plug-ins/file-jpeg/jpeg-save.c:1155 msgid "Comment" msgstr "Комментарий" -#: ../plug-ins/file-jpeg/jpeg-save.c:1199 +#: ../plug-ins/file-jpeg/jpeg-save.c:1201 msgid "Sa_ve Defaults" msgstr "_Запомнить эти параметры" @@ -8957,33 +8962,33 @@ msgstr "Внимание: в XJT сохранена единица неподд msgid "Save as XJT" msgstr "Сохранить как XJT" -#: ../plug-ins/file-xjt/xjt.c:888 +#: ../plug-ins/file-xjt/xjt.c:889 msgid "Optimize" msgstr "Оптимизировать" -#: ../plug-ins/file-xjt/xjt.c:898 +#: ../plug-ins/file-xjt/xjt.c:899 msgid "Clear transparent" msgstr "Очистить прозрачное" -#: ../plug-ins/file-xjt/xjt.c:910 +#: ../plug-ins/file-xjt/xjt.c:911 msgid "Quality:" msgstr "Качество:" -#: ../plug-ins/file-xjt/xjt.c:919 +#: ../plug-ins/file-xjt/xjt.c:920 msgid "Smoothing:" msgstr "Сглаживание:" -#: ../plug-ins/file-xjt/xjt.c:1716 ../plug-ins/file-xjt/xjt.c:3353 +#: ../plug-ins/file-xjt/xjt.c:1717 ../plug-ins/file-xjt/xjt.c:3354 #, c-format msgid "Could not create working folder '%s': %s" msgstr "Невозможно создать рабочий каталог '%s': %s" -#: ../plug-ins/file-xjt/xjt.c:3219 +#: ../plug-ins/file-xjt/xjt.c:3220 #, c-format msgid "Error: Could not read XJT property file '%s'." msgstr "Ошибка: невозможно прочитать файл свойств XJT '%s'" -#: ../plug-ins/file-xjt/xjt.c:3226 +#: ../plug-ins/file-xjt/xjt.c:3227 #, c-format msgid "Error: XJT property file '%s' is empty." msgstr "Ошибка: файл свойств XJT '%s' пуст" @@ -9046,7 +9051,7 @@ msgstr "Вихрь" msgid "Horseshoe" msgstr "Подкова" -#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1441 +#: ../plug-ins/flame/flame.c:752 ../plug-ins/gfig/gfig-dialog.c:1443 msgid "Polar" msgstr "Полярность" @@ -9712,34 +9717,34 @@ msgid "This tool has no options" msgstr "У этого инструмента нет параметров" #. Put buttons in -#: ../plug-ins/gfig/gfig-dialog.c:1227 +#: ../plug-ins/gfig/gfig-dialog.c:1228 msgid "Show position" msgstr "Показывать позицию" -#: ../plug-ins/gfig/gfig-dialog.c:1239 +#: ../plug-ins/gfig/gfig-dialog.c:1240 msgid "Show control points" msgstr "Показывать контрольные точки" -#: ../plug-ins/gfig/gfig-dialog.c:1273 +#: ../plug-ins/gfig/gfig-dialog.c:1274 msgid "Max undo:" msgstr "Макс. отмен:" -#: ../plug-ins/gfig/gfig-dialog.c:1282 +#: ../plug-ins/gfig/gfig-dialog.c:1283 #: ../plug-ins/gimpressionist/general.c:184 msgid "Transparent" msgstr "Прозрачный" -#: ../plug-ins/gfig/gfig-dialog.c:1284 +#: ../plug-ins/gfig/gfig-dialog.c:1285 msgid "Foreground" msgstr "Передний план" -#: ../plug-ins/gfig/gfig-dialog.c:1286 ../plug-ins/imagemap/imap_cmd_copy.c:53 +#: ../plug-ins/gfig/gfig-dialog.c:1287 ../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:1295 +#: ../plug-ins/gfig/gfig-dialog.c:1296 msgid "" "Layer background type. Copy causes the previous layer to be copied before " "the draw is performed." @@ -9747,80 +9752,80 @@ msgstr "" "Тип фона слоя. «Скопировать» будет вызывать копирование предыдущего слоя " "перед выполнением рисования." -#: ../plug-ins/gfig/gfig-dialog.c:1301 +#: ../plug-ins/gfig/gfig-dialog.c:1302 msgid "Background:" msgstr "Фон:" -#: ../plug-ins/gfig/gfig-dialog.c:1304 +#: ../plug-ins/gfig/gfig-dialog.c:1305 msgid "Feather" msgstr "Растушёвка" -#: ../plug-ins/gfig/gfig-dialog.c:1328 +#: ../plug-ins/gfig/gfig-dialog.c:1329 msgid "Radius:" msgstr "Радиус:" -#: ../plug-ins/gfig/gfig-dialog.c:1385 +#: ../plug-ins/gfig/gfig-dialog.c:1387 msgid "Grid spacing:" msgstr "Размер ячейки:" -#: ../plug-ins/gfig/gfig-dialog.c:1402 +#: ../plug-ins/gfig/gfig-dialog.c:1404 msgid "Polar grid sectors desired:" msgstr "Секторы полярной сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1424 +#: ../plug-ins/gfig/gfig-dialog.c:1426 msgid "Polar grid radius interval:" msgstr "Интервал радиусов пол. сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1440 ../plug-ins/imagemap/imap_menu.c:219 +#: ../plug-ins/gfig/gfig-dialog.c:1442 ../plug-ins/imagemap/imap_menu.c:219 msgid "Rectangle" msgstr "Прямоугольник" -#: ../plug-ins/gfig/gfig-dialog.c:1442 +#: ../plug-ins/gfig/gfig-dialog.c:1444 msgid "Isometric" msgstr "Изометрическая" -#: ../plug-ins/gfig/gfig-dialog.c:1451 +#: ../plug-ins/gfig/gfig-dialog.c:1453 msgid "Grid type:" msgstr "Тип сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1458 +#: ../plug-ins/gfig/gfig-dialog.c:1460 #: ../plug-ins/gradient-flare/gradient-flare.c:550 msgid "Normal" msgstr "Обычная" -#: ../plug-ins/gfig/gfig-dialog.c:1461 +#: ../plug-ins/gfig/gfig-dialog.c:1463 msgid "Grey" msgstr "Серый" -#: ../plug-ins/gfig/gfig-dialog.c:1462 +#: ../plug-ins/gfig/gfig-dialog.c:1464 msgid "Darker" msgstr "Темнее" -#: ../plug-ins/gfig/gfig-dialog.c:1463 +#: ../plug-ins/gfig/gfig-dialog.c:1465 msgid "Lighter" msgstr "Светлее" -#: ../plug-ins/gfig/gfig-dialog.c:1464 +#: ../plug-ins/gfig/gfig-dialog.c:1466 msgid "Very dark" msgstr "Очень тёмный" -#: ../plug-ins/gfig/gfig-dialog.c:1473 +#: ../plug-ins/gfig/gfig-dialog.c:1475 msgid "Grid color:" msgstr "Цвет сетки:" -#: ../plug-ins/gfig/gfig-dialog.c:1696 +#: ../plug-ins/gfig/gfig-dialog.c:1698 msgid "Sides:" msgstr "Стороны:" -#: ../plug-ins/gfig/gfig-dialog.c:1706 +#: ../plug-ins/gfig/gfig-dialog.c:1708 msgid "Right" msgstr "Справа" -#: ../plug-ins/gfig/gfig-dialog.c:1707 +#: ../plug-ins/gfig/gfig-dialog.c:1709 msgid "Left" msgstr "Слева" -#: ../plug-ins/gfig/gfig-dialog.c:1717 +#: ../plug-ins/gfig/gfig-dialog.c:1719 #: ../plug-ins/gimpressionist/orientation.c:147 msgid "Orientation:" msgstr "Ориентация:" @@ -10179,7 +10184,7 @@ msgstr "" "правой указывает вектор, щелчок средней — добавляет новый вектор." #: ../plug-ins/gimpressionist/orientmap.c:589 -#: ../plug-ins/gimpressionist/sizemap.c:458 +#: ../plug-ins/gimpressionist/sizemap.c:459 msgid "Adjust the preview's brightness" msgstr "Настроить яркость просмотра" @@ -10192,7 +10197,7 @@ msgid "Select next vector" msgstr "Выбрать следующий вектор" #: ../plug-ins/gimpressionist/orientmap.c:619 -#: ../plug-ins/gimpressionist/sizemap.c:489 +#: ../plug-ins/gimpressionist/sizemap.c:490 msgid "A_dd" msgstr "Добавить" @@ -10201,7 +10206,7 @@ msgid "Add new vector" msgstr "Добавить новый вектор" #: ../plug-ins/gimpressionist/orientmap.c:625 -#: ../plug-ins/gimpressionist/sizemap.c:496 +#: ../plug-ins/gimpressionist/sizemap.c:497 msgid "_Kill" msgstr "Удалить" @@ -10230,7 +10235,7 @@ msgid "Vortex_3" msgstr "Вихрь3" #: ../plug-ins/gimpressionist/orientmap.c:653 -#: ../plug-ins/gimpressionist/sizemap.c:541 +#: ../plug-ins/gimpressionist/sizemap.c:542 msgid "_Voronoi" msgstr "Вороной" @@ -10267,7 +10272,7 @@ msgid "S_trength exp.:" msgstr "Экспонента силы:" #: ../plug-ins/gimpressionist/orientmap.c:708 -#: ../plug-ins/gimpressionist/sizemap.c:536 +#: ../plug-ins/gimpressionist/sizemap.c:537 msgid "Change the exponent of the strength" msgstr "Изменить экспоненту силы:" @@ -10346,31 +10351,31 @@ msgstr "" msgid "Save Current" msgstr "Сохранить текущие" -#: ../plug-ins/gimpressionist/presets.c:893 +#: ../plug-ins/gimpressionist/presets.c:894 msgid "Gimpressionist Defaults" msgstr "Значения по умолчанию" -#: ../plug-ins/gimpressionist/presets.c:1014 +#: ../plug-ins/gimpressionist/presets.c:1015 msgid "_Presets" msgstr "Настройки" -#: ../plug-ins/gimpressionist/presets.c:1029 +#: ../plug-ins/gimpressionist/presets.c:1030 msgid "Save Current..." msgstr "Сохранить текущие..." -#: ../plug-ins/gimpressionist/presets.c:1037 +#: ../plug-ins/gimpressionist/presets.c:1038 msgid "Save the current settings to the specified file" msgstr "Сохранить текущие настройки в указанном файле" -#: ../plug-ins/gimpressionist/presets.c:1065 +#: ../plug-ins/gimpressionist/presets.c:1066 msgid "Reads the selected Preset into memory" msgstr "Считать выбранные настройки в память" -#: ../plug-ins/gimpressionist/presets.c:1071 +#: ../plug-ins/gimpressionist/presets.c:1072 msgid "Deletes the selected Preset" msgstr "Удалить выбранные настройки" -#: ../plug-ins/gimpressionist/presets.c:1077 +#: ../plug-ins/gimpressionist/presets.c:1078 msgid "Reread the folder of Presets" msgstr "Перечитать каталог настроек" @@ -10459,11 +10464,11 @@ msgstr "Открыть редактор карты размеров" msgid "Size Map Editor" msgstr "Редактор карты размеров" -#: ../plug-ins/gimpressionist/sizemap.c:428 +#: ../plug-ins/gimpressionist/sizemap.c:429 msgid "Smvectors" msgstr "Sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:438 +#: ../plug-ins/gimpressionist/sizemap.c:439 msgid "" "The smvector-field. Left-click to move selected smvector, Right-click to " "point it towards mouse, Middle-click to add a new smvector." @@ -10472,39 +10477,39 @@ msgstr "" "щелчок правой кнопкой - указание sm-вектора мышью, щелчок средней кнопкой - " "добавление нового sm-вектора." -#: ../plug-ins/gimpressionist/sizemap.c:480 +#: ../plug-ins/gimpressionist/sizemap.c:481 msgid "Select previous smvector" msgstr "Выбрать предыдущий sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:487 +#: ../plug-ins/gimpressionist/sizemap.c:488 msgid "Select next smvector" msgstr "Выбрать следующий sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:494 +#: ../plug-ins/gimpressionist/sizemap.c:495 msgid "Add new smvector" msgstr "Добавить новый sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:501 +#: ../plug-ins/gimpressionist/sizemap.c:502 msgid "Delete selected smvector" msgstr "Удалить выбранный sm-вектор" -#: ../plug-ins/gimpressionist/sizemap.c:514 +#: ../plug-ins/gimpressionist/sizemap.c:515 msgid "Change the angle of the selected smvector" msgstr "Изменить угол выбранного sm-вектора" -#: ../plug-ins/gimpressionist/sizemap.c:521 +#: ../plug-ins/gimpressionist/sizemap.c:522 msgid "S_trength:" msgstr "Сила:" -#: ../plug-ins/gimpressionist/sizemap.c:525 +#: ../plug-ins/gimpressionist/sizemap.c:526 msgid "Change the strength of the selected smvector" msgstr "Изменить длину выбранного sm-вектора" -#: ../plug-ins/gimpressionist/sizemap.c:532 +#: ../plug-ins/gimpressionist/sizemap.c:533 msgid "St_rength exp.:" msgstr "Экспонента силы:" -#: ../plug-ins/gimpressionist/sizemap.c:548 +#: ../plug-ins/gimpressionist/sizemap.c:549 msgid "" "Voronoi-mode makes only the smvector closest to the given point have any " "influence" @@ -12434,6 +12439,14 @@ msgstr "_Лабиринт..." msgid "Drawing maze" msgstr "Рисование лабиринта" +#: ../plug-ins/metadata/metadata.c:182 +msgid "View and edit metadata (EXIF, IPTC, XMP)" +msgstr "Просмотр и редактирование метаданных (EXIF, IPTC, XMP)" + +#: ../plug-ins/metadata/metadata.c:191 +msgid "Propert_ies" +msgstr "Сво_йства" + #: ../plug-ins/metadata/xmp-parse.c:238 #, c-format msgid "Error: No XMP packet found" @@ -12659,35 +12672,35 @@ msgstr "Получение данных со сканера/камеры" msgid "Grab" msgstr "Захватить" -#: ../plug-ins/win-snap/winsnap.c:880 +#: ../plug-ins/win-snap/winsnap.c:881 msgid "Grab a single window" msgstr "Захватить одно окно" -#: ../plug-ins/win-snap/winsnap.c:894 +#: ../plug-ins/win-snap/winsnap.c:895 msgid "Grab the whole screen" msgstr "Захватить весь экран" -#: ../plug-ins/win-snap/winsnap.c:910 +#: ../plug-ins/win-snap/winsnap.c:911 msgid "after" msgstr "через" -#: ../plug-ins/win-snap/winsnap.c:922 +#: ../plug-ins/win-snap/winsnap.c:923 msgid "Seconds delay" msgstr "Задержка в секундах" -#: ../plug-ins/win-snap/winsnap.c:929 +#: ../plug-ins/win-snap/winsnap.c:930 msgid "Include decorations" msgstr "Включая обрамление" -#: ../plug-ins/win-snap/winsnap.c:988 +#: ../plug-ins/win-snap/winsnap.c:989 msgid "Capture a window or desktop image" msgstr "Создать снимок экрана с рабочим столом или окнами" -#: ../plug-ins/win-snap/winsnap.c:993 +#: ../plug-ins/win-snap/winsnap.c:994 msgid "_Screen Shot..." msgstr "_Снимок экрана..." -#: ../plug-ins/win-snap/winsnap.c:1141 +#: ../plug-ins/win-snap/winsnap.c:1142 msgid "No data captured" msgstr "Данные не захвачены" From aa7c1d326761c99d7439df96fb97bbcf9c6c8182 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Thu, 16 Jul 2009 19:26:37 +0400 Subject: [PATCH 53/70] Updated Russian translation --- po/ru.po | 502 +++++++++++++++++++++++++++---------------------------- 1 file changed, 251 insertions(+), 251 deletions(-) diff --git a/po/ru.po b/po/ru.po index dd3ce17a5a..bf7cdb536d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: gimp trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-13 12:43+0400\n" -"PO-Revision-Date: 2009-07-13 13:33+0400\n" +"POT-Creation-Date: 2009-07-16 17:48+0400\n" +"PO-Revision-Date: 2009-07-16 19:26+0400\n" "Last-Translator: Alexandre Prokoudine \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -257,7 +257,7 @@ msgstr "Редактор кистей" #. initialize the list of gimp brushes #: ../app/actions/actions.c:108 ../app/core/gimp.c:855 -#: ../app/dialogs/dialogs.c:158 ../app/dialogs/preferences-dialog.c:2743 +#: ../app/dialogs/dialogs.c:158 ../app/dialogs/preferences-dialog.c:2744 msgid "Brushes" msgstr "Кисти" @@ -304,7 +304,7 @@ msgstr "Панель" #. Document History #: ../app/actions/actions.c:141 ../app/dialogs/dialogs.c:172 -#: ../app/dialogs/preferences-dialog.c:1594 +#: ../app/dialogs/preferences-dialog.c:1595 msgid "Document History" msgstr "Недавние изображения" @@ -325,7 +325,7 @@ msgid "File" msgstr "Файл" #: ../app/actions/actions.c:156 ../app/dialogs/dialogs.c:166 -#: ../app/dialogs/preferences-dialog.c:2759 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Fonts" msgstr "Шрифты" @@ -336,7 +336,7 @@ msgstr "Редактор градиентов" #. initialize the list of gimp gradients #: ../app/actions/actions.c:162 ../app/core/gimp.c:867 -#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:2755 +#: ../app/dialogs/dialogs.c:162 ../app/dialogs/preferences-dialog.c:2756 msgid "Gradients" msgstr "Градиенты" @@ -354,7 +354,7 @@ msgid "Images" msgstr "Изображения" #: ../app/actions/actions.c:174 ../app/dialogs/dialogs.c:179 -#: ../app/dialogs/resize-dialog.c:286 +#: ../app/dialogs/resize-dialog.c:287 msgid "Layers" msgstr "Слои" @@ -365,17 +365,17 @@ msgstr "Редактор палитры образцов" #. initialize the list of gimp palettes #: ../app/actions/actions.c:180 ../app/core/gimp.c:863 -#: ../app/dialogs/dialogs.c:164 ../app/dialogs/preferences-dialog.c:2751 +#: ../app/dialogs/dialogs.c:164 ../app/dialogs/preferences-dialog.c:2752 msgid "Palettes" msgstr "Палитры цветовых образцов" #. initialize the list of gimp patterns #: ../app/actions/actions.c:183 ../app/core/gimp.c:859 -#: ../app/dialogs/dialogs.c:160 ../app/dialogs/preferences-dialog.c:2747 +#: ../app/dialogs/dialogs.c:160 ../app/dialogs/preferences-dialog.c:2748 msgid "Patterns" msgstr "Текстуры" -#: ../app/actions/actions.c:186 ../app/dialogs/preferences-dialog.c:2763 +#: ../app/actions/actions.c:186 ../app/dialogs/preferences-dialog.c:2764 msgid "Plug-Ins" msgstr "Расширения" @@ -406,7 +406,7 @@ msgid "Text Editor" msgstr "Редактор текста" #: ../app/actions/actions.c:207 ../app/dialogs/dialogs.c:139 -#: ../app/dialogs/preferences-dialog.c:1879 ../app/gui/gui.c:428 +#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:429 msgid "Tool Options" msgstr "Параметры инструментов" @@ -2629,7 +2629,7 @@ msgstr "Сделать копию выделения градиента" msgid "Replicate" msgstr "Создать копию" -#: ../app/actions/gradient-editor-commands.c:491 +#: ../app/actions/gradient-editor-commands.c:492 msgid "" "Select the number of times\n" "to replicate the selected segment." @@ -2637,7 +2637,7 @@ msgstr "" "Укажите количество копий\n" "выделенного сегмента" -#: ../app/actions/gradient-editor-commands.c:494 +#: ../app/actions/gradient-editor-commands.c:495 msgid "" "Select the number of times\n" "to replicate the selection." @@ -2645,27 +2645,27 @@ msgstr "" "Выбор числа создаваемых\n" "копий выделения." -#: ../app/actions/gradient-editor-commands.c:553 +#: ../app/actions/gradient-editor-commands.c:554 msgid "Split Segment Uniformly" msgstr "Равномерно разделить сегмент" -#: ../app/actions/gradient-editor-commands.c:554 +#: ../app/actions/gradient-editor-commands.c:555 msgid "Split Gradient Segment Uniformly" msgstr "Равномерно разделить сегмент градиента" -#: ../app/actions/gradient-editor-commands.c:558 +#: ../app/actions/gradient-editor-commands.c:559 msgid "Split Segments Uniformly" msgstr "Равномерно разделить сегменты" -#: ../app/actions/gradient-editor-commands.c:559 +#: ../app/actions/gradient-editor-commands.c:560 msgid "Split Gradient Segments Uniformly" msgstr "Равномерно разделить сегменты градиента" -#: ../app/actions/gradient-editor-commands.c:572 +#: ../app/actions/gradient-editor-commands.c:573 msgid "Split" msgstr "Разделить" -#: ../app/actions/gradient-editor-commands.c:593 +#: ../app/actions/gradient-editor-commands.c:595 msgid "" "Select the number of uniform parts\n" "in which to split the selected segment." @@ -2673,7 +2673,7 @@ msgstr "" "Выберите число равных частей \n" "на которые надо разделить сегмент" -#: ../app/actions/gradient-editor-commands.c:596 +#: ../app/actions/gradient-editor-commands.c:598 msgid "" "Select the number of uniform parts\n" "in which to split the segments in the selection." @@ -3073,7 +3073,7 @@ msgstr "Смена размера изображения" #. Scaling #: ../app/actions/image-commands.c:660 ../app/actions/layers-commands.c:1100 -#: ../app/dialogs/preferences-dialog.c:1924 +#: ../app/dialogs/preferences-dialog.c:1925 #: ../app/pdb/drawable-transform-cmds.c:681 #: ../app/pdb/drawable-transform-cmds.c:757 ../app/pdb/image-cmds.c:404 #: ../app/pdb/image-cmds.c:440 ../app/pdb/layer-cmds.c:288 @@ -4290,7 +4290,7 @@ msgstr "_Прикреплять выделение к краям изображ #: ../app/actions/select-commands.c:332 ../app/actions/select-commands.c:365 #: ../app/actions/vectors-commands.c:383 ../app/actions/vectors-commands.c:417 -#: ../app/dialogs/stroke-dialog.c:288 +#: ../app/dialogs/stroke-dialog.c:289 msgid "There is no active layer or channel to stroke to." msgstr "Нет активного слоя или канала для обводки" @@ -6231,7 +6231,7 @@ msgstr "По Флойду-Стейнбергу (уменьшенное раст #: ../app/core/core-enums.c:57 msgctxt "convert-dither-type" msgid "Positioned" -msgstr "" +msgstr "Фиксированное" #: ../app/core/core-enums.c:87 msgctxt "convert-palette-type" @@ -7058,7 +7058,7 @@ msgid "Fonts (this may take a while)" msgstr "Шрифты (их загрузка может длиться долго)" #. initialize the module list -#: ../app/core/gimp.c:880 ../app/dialogs/preferences-dialog.c:2771 +#: ../app/core/gimp.c:880 ../app/dialogs/preferences-dialog.c:2772 msgid "Modules" msgstr "Модули" @@ -7820,7 +7820,7 @@ msgstr "Опускание контура" msgid "Lower Path to Bottom" msgstr "Сделать контур нижним" -#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1726 +#: ../app/core/gimpimagefile.c:534 ../app/dialogs/preferences-dialog.c:1727 msgid "Folder" msgstr "Каталог" @@ -7862,7 +7862,7 @@ msgstr[0] "%d x %d точку растра" msgstr[1] "%d x %d точки растра" msgstr[2] "%d x %d точек растра" -#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:316 +#: ../app/core/gimpimagefile.c:634 ../app/display/gimpdisplayshell-title.c:318 #, c-format msgid "%d layer" msgid_plural "%d layers" @@ -8225,7 +8225,7 @@ msgctxt "plural" msgid "percent" msgstr "проценты" -#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:478 +#: ../app/dialogs/about-dialog.c:113 ../app/gui/gui.c:479 msgid "About GIMP" msgstr "О GIMP" @@ -8249,11 +8249,11 @@ msgstr "GIMP создали для вас" msgid "This is an unstable development release." msgstr "Это нестабильная версия программы." -#: ../app/dialogs/channel-options-dialog.c:145 +#: ../app/dialogs/channel-options-dialog.c:146 msgid "Channel _name:" msgstr "_Имя канала:" -#: ../app/dialogs/channel-options-dialog.c:174 +#: ../app/dialogs/channel-options-dialog.c:175 msgid "Initialize from _selection" msgstr "Создать из _выделения" @@ -8372,11 +8372,11 @@ msgstr "Ослабить %s" msgid "_Fade" msgstr "_Ослабить" -#: ../app/dialogs/fade-dialog.c:157 +#: ../app/dialogs/fade-dialog.c:158 msgid "_Mode:" msgstr "_Режим:" -#: ../app/dialogs/fade-dialog.c:163 +#: ../app/dialogs/fade-dialog.c:164 msgid "_Opacity:" msgstr "Н_епрозрачность:" @@ -8477,23 +8477,23 @@ msgstr "Параметры объединения слоев" msgid "_Merge" msgstr "О_бъединить" -#: ../app/dialogs/image-merge-layers-dialog.c:91 +#: ../app/dialogs/image-merge-layers-dialog.c:92 msgid "Final, Merged Layer should be:" msgstr "Полученный слой должен быть:" -#: ../app/dialogs/image-merge-layers-dialog.c:95 +#: ../app/dialogs/image-merge-layers-dialog.c:96 msgid "Expanded as necessary" msgstr "Расширен при необходимости" -#: ../app/dialogs/image-merge-layers-dialog.c:98 +#: ../app/dialogs/image-merge-layers-dialog.c:99 msgid "Clipped to image" msgstr "Отсечен по изображению" -#: ../app/dialogs/image-merge-layers-dialog.c:101 +#: ../app/dialogs/image-merge-layers-dialog.c:102 msgid "Clipped to bottom layer" msgstr "Отсечен по нижнему слою" -#: ../app/dialogs/image-merge-layers-dialog.c:109 +#: ../app/dialogs/image-merge-layers-dialog.c:110 msgid "_Discard invisible layers" msgstr "От_казаться от невидимых слоев" @@ -8502,7 +8502,7 @@ msgid "Create a New Image" msgstr "Создать новое изображение" #: ../app/dialogs/image-new-dialog.c:144 -#: ../app/dialogs/preferences-dialog.c:2020 +#: ../app/dialogs/preferences-dialog.c:2021 msgid "_Template:" msgstr "_Шаблон:" @@ -8575,7 +8575,7 @@ msgstr "Вы действительно хотите это сделать?" msgid "Configure Keyboard Shortcuts" msgstr "Настройка комбинаций клавиш" -#: ../app/dialogs/keyboard-shortcuts-dialog.c:72 +#: ../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." @@ -8583,7 +8583,7 @@ msgstr "" "Укажите строку для редактирования, нажмите сочетание клавиш или Backspace " "для отмены" -#: ../app/dialogs/keyboard-shortcuts-dialog.c:80 +#: ../app/dialogs/keyboard-shortcuts-dialog.c:81 msgid "S_ave keyboard shortcuts on exit" msgstr "_Сохранять комбинации клавиш при выходе" @@ -8591,11 +8591,11 @@ msgstr "_Сохранять комбинации клавиш при выход msgid "Add a Mask to the Layer" msgstr "Добавить маску к слою" -#: ../app/dialogs/layer-add-mask-dialog.c:110 +#: ../app/dialogs/layer-add-mask-dialog.c:111 msgid "Initialize Layer Mask to:" msgstr "С чем инициализировать маску слоя:" -#: ../app/dialogs/layer-add-mask-dialog.c:139 +#: ../app/dialogs/layer-add-mask-dialog.c:140 msgid "In_vert mask" msgstr "Ин_вертировать маску" @@ -8605,12 +8605,12 @@ msgstr "_Имя слоя:" #. The size labels #: ../app/dialogs/layer-options-dialog.c:139 -#: ../app/tools/gimpmeasuretool.c:1069 +#: ../app/tools/gimpmeasuretool.c:1070 msgid "Width:" msgstr "Ширина:" #: ../app/dialogs/layer-options-dialog.c:145 -#: ../app/tools/gimpmeasuretool.c:1097 +#: ../app/tools/gimpmeasuretool.c:1098 msgid "Height:" msgstr "Высота:" @@ -8626,41 +8626,41 @@ msgstr "Взять имя из _текста" msgid "Module Manager" msgstr "Управление модулями" -#: ../app/dialogs/module-dialog.c:149 +#: ../app/dialogs/module-dialog.c:150 msgid "You will have to restart GIMP for the changes to take effect." msgstr "" "Необходимо перезапустить GIMP, чтобы\n" "подействовали внесенные изменения." -#: ../app/dialogs/module-dialog.c:190 +#: ../app/dialogs/module-dialog.c:191 msgid "Module" msgstr "Модуль" -#: ../app/dialogs/module-dialog.c:463 +#: ../app/dialogs/module-dialog.c:464 msgid "Only in memory" msgstr "Только в памяти" -#: ../app/dialogs/module-dialog.c:468 +#: ../app/dialogs/module-dialog.c:469 msgid "No longer available" msgstr "Больше не доступен" -#: ../app/dialogs/module-dialog.c:497 +#: ../app/dialogs/module-dialog.c:498 msgid "Author:" msgstr "Автор:" -#: ../app/dialogs/module-dialog.c:498 +#: ../app/dialogs/module-dialog.c:499 msgid "Version:" msgstr "Версия:" -#: ../app/dialogs/module-dialog.c:499 +#: ../app/dialogs/module-dialog.c:500 msgid "Date:" msgstr "Дата:" -#: ../app/dialogs/module-dialog.c:500 +#: ../app/dialogs/module-dialog.c:501 msgid "Copyright:" msgstr "Авторское право:" -#: ../app/dialogs/module-dialog.c:501 +#: ../app/dialogs/module-dialog.c:502 msgid "Location:" msgstr "Расположение:" @@ -8678,7 +8678,7 @@ msgstr "Смещение канала" #. The offset frame #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152 -#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:275 +#: ../app/dialogs/resize-dialog.c:198 ../app/widgets/gimpgrideditor.c:275 msgid "Offset" msgstr "Смещение" @@ -8687,11 +8687,11 @@ msgstr "Смещение" msgid "_Offset" msgstr "_Смещение" -#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:226 +#: ../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:227 +#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:228 msgid "_Y:" msgstr "_Y:" @@ -8730,7 +8730,7 @@ msgid "Select Source" msgstr "Выбрать источник" #: ../app/dialogs/palette-import-dialog.c:214 -#: ../app/dialogs/preferences-dialog.c:1945 +#: ../app/dialogs/preferences-dialog.c:1946 msgid "_Gradient" msgstr "_Градиент" @@ -8894,698 +8894,698 @@ msgstr "Установить свой цвет фона вокруг изобр msgid "Preferences" msgstr "Параметры" -#: ../app/dialogs/preferences-dialog.c:1528 -#: ../app/dialogs/preferences-dialog.c:2779 +#: ../app/dialogs/preferences-dialog.c:1529 +#: ../app/dialogs/preferences-dialog.c:2780 msgid "Environment" msgstr "Окружение" -#: ../app/dialogs/preferences-dialog.c:1542 +#: ../app/dialogs/preferences-dialog.c:1543 msgid "Resource Consumption" msgstr "Конфигурирование ресурсов" -#: ../app/dialogs/preferences-dialog.c:1552 +#: ../app/dialogs/preferences-dialog.c:1553 msgid "Minimal number of _undo levels:" msgstr "Минимальное число _уровней отмены:" -#: ../app/dialogs/preferences-dialog.c:1555 +#: ../app/dialogs/preferences-dialog.c:1556 msgid "Maximum undo _memory:" msgstr "Максимально памяти для _отмены:" -#: ../app/dialogs/preferences-dialog.c:1558 +#: ../app/dialogs/preferences-dialog.c:1559 msgid "Tile cache _size:" msgstr "Размер _кэша:" -#: ../app/dialogs/preferences-dialog.c:1561 +#: ../app/dialogs/preferences-dialog.c:1562 msgid "Maximum _new image size:" msgstr "Максимальный размер _нового изображения:" -#: ../app/dialogs/preferences-dialog.c:1566 +#: ../app/dialogs/preferences-dialog.c:1567 msgid "Number of _processors to use:" msgstr "Число используемых _процессоров:" #. Image Thumbnails -#: ../app/dialogs/preferences-dialog.c:1571 +#: ../app/dialogs/preferences-dialog.c:1572 msgid "Image Thumbnails" msgstr "Эскизы изображений" -#: ../app/dialogs/preferences-dialog.c:1576 +#: ../app/dialogs/preferences-dialog.c:1577 msgid "Size of _thumbnails:" msgstr "Размер файлов _эскизов:" -#: ../app/dialogs/preferences-dialog.c:1580 +#: ../app/dialogs/preferences-dialog.c:1581 msgid "Maximum _filesize for thumbnailing:" msgstr "Максимальный размер эскизных _файлов:" #. File Saving -#: ../app/dialogs/preferences-dialog.c:1584 +#: ../app/dialogs/preferences-dialog.c:1585 msgid "Saving Images" msgstr "Сохранение изображений" -#: ../app/dialogs/preferences-dialog.c:1587 +#: ../app/dialogs/preferences-dialog.c:1588 msgid "Confirm closing of unsa_ved images" msgstr "Требовать подтверждение при закрытии несохраненных _изображений" -#: ../app/dialogs/preferences-dialog.c:1597 +#: ../app/dialogs/preferences-dialog.c:1598 msgid "Keep record of used files in the Recent Documents list" msgstr "Хранить список недавно открывавшихся файлов" -#: ../app/dialogs/preferences-dialog.c:1606 +#: ../app/dialogs/preferences-dialog.c:1607 msgid "User Interface" msgstr "Пользовательский интерфейс" -#: ../app/dialogs/preferences-dialog.c:1609 +#: ../app/dialogs/preferences-dialog.c:1610 msgid "Interface" msgstr "Интерфейс" #. Previews -#: ../app/dialogs/preferences-dialog.c:1616 +#: ../app/dialogs/preferences-dialog.c:1617 msgid "Previews" msgstr "Предварительный просмотр" -#: ../app/dialogs/preferences-dialog.c:1619 +#: ../app/dialogs/preferences-dialog.c:1620 msgid "_Enable layer & channel previews" msgstr "Включить _предпросмотр слоев и каналов" -#: ../app/dialogs/preferences-dialog.c:1625 +#: ../app/dialogs/preferences-dialog.c:1626 msgid "_Default layer & channel preview size:" msgstr "_Размер эскизов слоев и каналов:" -#: ../app/dialogs/preferences-dialog.c:1628 +#: ../app/dialogs/preferences-dialog.c:1629 msgid "Na_vigation preview size:" msgstr "Ра_змер окна навигации:" #. Keyboard Shortcuts -#: ../app/dialogs/preferences-dialog.c:1632 +#: ../app/dialogs/preferences-dialog.c:1633 msgid "Keyboard Shortcuts" msgstr "Клавиатурные комбинации" -#: ../app/dialogs/preferences-dialog.c:1636 +#: ../app/dialogs/preferences-dialog.c:1637 msgid "Show menu _mnemonics (access keys)" msgstr "Показывать _мнемонические клавиши" -#: ../app/dialogs/preferences-dialog.c:1639 +#: ../app/dialogs/preferences-dialog.c:1640 msgid "_Use dynamic keyboard shortcuts" msgstr "_Использовать динамические комбинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1643 +#: ../app/dialogs/preferences-dialog.c:1644 msgid "Configure _Keyboard Shortcuts..." msgstr "Настроить _комбинации клавиш..." -#: ../app/dialogs/preferences-dialog.c:1650 +#: ../app/dialogs/preferences-dialog.c:1651 msgid "_Save keyboard shortcuts on exit" msgstr "_Сохранять комбинации клавиш при выходе" -#: ../app/dialogs/preferences-dialog.c:1654 +#: ../app/dialogs/preferences-dialog.c:1655 msgid "Save Keyboard Shortcuts _Now" msgstr "Сохранить комбинации клавиш _сейчас" -#: ../app/dialogs/preferences-dialog.c:1661 +#: ../app/dialogs/preferences-dialog.c:1662 msgid "_Reset Keyboard Shortcuts to Default Values" msgstr "_Восстановить исходные комбинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1670 +#: ../app/dialogs/preferences-dialog.c:1671 msgid "Remove _All Keyboard Shortcuts" msgstr "Удалить все ком_бинации клавиш" -#: ../app/dialogs/preferences-dialog.c:1682 -#: ../app/dialogs/preferences-dialog.c:1721 +#: ../app/dialogs/preferences-dialog.c:1683 +#: ../app/dialogs/preferences-dialog.c:1722 msgid "Theme" msgstr "Тема" -#: ../app/dialogs/preferences-dialog.c:1691 +#: ../app/dialogs/preferences-dialog.c:1692 msgid "Select Theme" msgstr "Выбрать тему" -#: ../app/dialogs/preferences-dialog.c:1773 +#: ../app/dialogs/preferences-dialog.c:1774 msgid "Reload C_urrent Theme" msgstr "_Обновить текущую тему" -#: ../app/dialogs/preferences-dialog.c:1785 +#: ../app/dialogs/preferences-dialog.c:1786 msgid "Help System" msgstr "Система помощи" #. General -#: ../app/dialogs/preferences-dialog.c:1797 -#: ../app/dialogs/preferences-dialog.c:1891 -#: ../app/dialogs/preferences-dialog.c:2078 +#: ../app/dialogs/preferences-dialog.c:1798 +#: ../app/dialogs/preferences-dialog.c:1892 +#: ../app/dialogs/preferences-dialog.c:2079 #: ../app/widgets/gimpcontrollereditor.c:188 msgid "General" msgstr "Общая" -#: ../app/dialogs/preferences-dialog.c:1800 +#: ../app/dialogs/preferences-dialog.c:1801 msgid "Show _tooltips" msgstr "Показывать всплывающие по_дсказки" -#: ../app/dialogs/preferences-dialog.c:1803 +#: ../app/dialogs/preferences-dialog.c:1804 msgid "Show help _buttons" msgstr "Показывать кнопку «_Справка»" -#: ../app/dialogs/preferences-dialog.c:1816 +#: ../app/dialogs/preferences-dialog.c:1817 msgid "Use the online version" msgstr "Использовать версию из Интернета" -#: ../app/dialogs/preferences-dialog.c:1817 +#: ../app/dialogs/preferences-dialog.c:1818 msgid "Use a locally installed copy" msgstr "Использовать локальную копию" -#: ../app/dialogs/preferences-dialog.c:1818 +#: ../app/dialogs/preferences-dialog.c:1819 msgid "User manual:" msgstr "Руководство пользователя:" -#: ../app/dialogs/preferences-dialog.c:1825 +#: ../app/dialogs/preferences-dialog.c:1826 msgid "There's a local installation of the user manual." msgstr "Руководство пользователя установлено локально" -#: ../app/dialogs/preferences-dialog.c:1830 +#: ../app/dialogs/preferences-dialog.c:1831 msgid "The user manual is not installed locally." msgstr "Руководство пользователя не установлено локально" #. Help Browser -#: ../app/dialogs/preferences-dialog.c:1853 +#: ../app/dialogs/preferences-dialog.c:1854 msgid "Help Browser" msgstr "Справочная система" -#: ../app/dialogs/preferences-dialog.c:1857 +#: ../app/dialogs/preferences-dialog.c:1858 msgid "H_elp browser to use:" msgstr "_Программа просмотра справки:" -#: ../app/dialogs/preferences-dialog.c:1862 +#: ../app/dialogs/preferences-dialog.c:1863 msgid "Web Browser" msgstr "Внешний просмотрщик" -#: ../app/dialogs/preferences-dialog.c:1866 +#: ../app/dialogs/preferences-dialog.c:1867 msgid "_Web browser to use:" msgstr "Используемый _браузер:" -#: ../app/dialogs/preferences-dialog.c:1894 +#: ../app/dialogs/preferences-dialog.c:1895 msgid "_Save tool options on exit" msgstr "_Сохранять параметры инструментов при выходе" -#: ../app/dialogs/preferences-dialog.c:1898 +#: ../app/dialogs/preferences-dialog.c:1899 msgid "Save Tool Options _Now" msgstr "Сохранить _параметры инструментов" -#: ../app/dialogs/preferences-dialog.c:1905 +#: ../app/dialogs/preferences-dialog.c:1906 msgid "_Reset Saved Tool Options to Default Values" msgstr "_Восстановить исходные параметры инструментов" #. Snapping Distance -#: ../app/dialogs/preferences-dialog.c:1915 +#: ../app/dialogs/preferences-dialog.c:1916 msgid "Guide & Grid Snapping" msgstr "Прилипание к направляющим и сетке" -#: ../app/dialogs/preferences-dialog.c:1920 +#: ../app/dialogs/preferences-dialog.c:1921 msgid "_Snap distance:" msgstr "_Дистанция прилипания:" -#: ../app/dialogs/preferences-dialog.c:1928 +#: ../app/dialogs/preferences-dialog.c:1929 msgid "Default _interpolation:" msgstr "_Интерполяция по умолчанию:" #. Global Brush, Pattern, ... -#: ../app/dialogs/preferences-dialog.c:1935 +#: ../app/dialogs/preferences-dialog.c:1936 msgid "Paint Options Shared Between Tools" msgstr "Параметры рисования разделены между инструментами" -#: ../app/dialogs/preferences-dialog.c:1939 +#: ../app/dialogs/preferences-dialog.c:1940 msgid "_Brush" msgstr "_Кисть" -#: ../app/dialogs/preferences-dialog.c:1942 +#: ../app/dialogs/preferences-dialog.c:1943 msgid "_Pattern" msgstr "_Текстура" -#: ../app/dialogs/preferences-dialog.c:1948 +#: ../app/dialogs/preferences-dialog.c:1949 msgid "Move Tool" msgstr "Инструмент перемещения" -#: ../app/dialogs/preferences-dialog.c:1952 +#: ../app/dialogs/preferences-dialog.c:1953 msgid "Set layer or path as active" msgstr "Делать слой или контур активным" -#: ../app/dialogs/preferences-dialog.c:1965 ../app/widgets/gimptoolbox.c:631 +#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:631 msgid "Toolbox" msgstr "Панель инструментов" #. Appearance -#: ../app/dialogs/preferences-dialog.c:1977 -#: ../app/dialogs/preferences-dialog.c:2151 +#: ../app/dialogs/preferences-dialog.c:1978 +#: ../app/dialogs/preferences-dialog.c:2152 #: ../app/widgets/gimpgrideditor.c:203 msgid "Appearance" msgstr "Внешний вид" -#: ../app/dialogs/preferences-dialog.c:1981 +#: ../app/dialogs/preferences-dialog.c:1982 msgid "Show _foreground & background color" msgstr "Показывать цвет _переднего плана и фона" -#: ../app/dialogs/preferences-dialog.c:1985 +#: ../app/dialogs/preferences-dialog.c:1986 msgid "Show active _brush, pattern & gradient" msgstr "Показывать активные _кисти, текстуры и градиенты" -#: ../app/dialogs/preferences-dialog.c:1989 +#: ../app/dialogs/preferences-dialog.c:1990 msgid "Show active _image" msgstr "Показывать активное _изображение" -#: ../app/dialogs/preferences-dialog.c:2002 +#: ../app/dialogs/preferences-dialog.c:2003 msgid "Default New Image" msgstr "Свойства нового изображения" -#: ../app/dialogs/preferences-dialog.c:2005 +#: ../app/dialogs/preferences-dialog.c:2006 msgid "Default Image" msgstr "Изображение по умолчанию" -#: ../app/dialogs/preferences-dialog.c:2042 +#: ../app/dialogs/preferences-dialog.c:2043 msgid "Default Image Grid" msgstr "Параметры сетки" -#: ../app/dialogs/preferences-dialog.c:2045 +#: ../app/dialogs/preferences-dialog.c:2046 msgid "Default Grid" msgstr "Параметры сетки" -#: ../app/dialogs/preferences-dialog.c:2066 +#: ../app/dialogs/preferences-dialog.c:2067 msgid "Image Windows" msgstr "Окно изображения" -#: ../app/dialogs/preferences-dialog.c:2081 +#: ../app/dialogs/preferences-dialog.c:2082 msgid "Use \"_Dot for dot\" by default" msgstr "Использовать «_Точка за точкой» по умолчанию" -#: ../app/dialogs/preferences-dialog.c:2087 +#: ../app/dialogs/preferences-dialog.c:2088 msgid "Marching _ants speed:" msgstr "Скорость _муравьиной дорожки:" #. Zoom & Resize Behavior -#: ../app/dialogs/preferences-dialog.c:2091 +#: ../app/dialogs/preferences-dialog.c:2092 msgid "Zoom & Resize Behavior" msgstr "Правила масштабирования и изменения размера" -#: ../app/dialogs/preferences-dialog.c:2095 +#: ../app/dialogs/preferences-dialog.c:2096 msgid "Resize window on _zoom" msgstr "Изменять размер окна при _масштабировании" -#: ../app/dialogs/preferences-dialog.c:2098 +#: ../app/dialogs/preferences-dialog.c:2099 msgid "Resize window on image _size change" msgstr "Изменять размер окна при _смене размера изображения" -#: ../app/dialogs/preferences-dialog.c:2104 +#: ../app/dialogs/preferences-dialog.c:2105 msgid "Fit to window" msgstr "К размеру окна" -#: ../app/dialogs/preferences-dialog.c:2106 +#: ../app/dialogs/preferences-dialog.c:2107 msgid "Initial zoom _ratio:" msgstr "_Исходные пропорции масштаба:" #. Space Bar -#: ../app/dialogs/preferences-dialog.c:2110 +#: ../app/dialogs/preferences-dialog.c:2111 msgid "Space Bar" msgstr "Пробел" -#: ../app/dialogs/preferences-dialog.c:2116 +#: ../app/dialogs/preferences-dialog.c:2117 msgid "_While space bar is pressed:" msgstr "_При нажатии пробела:" #. Mouse Pointers -#: ../app/dialogs/preferences-dialog.c:2120 +#: ../app/dialogs/preferences-dialog.c:2121 msgid "Mouse Pointers" msgstr "Курсоры мыши" -#: ../app/dialogs/preferences-dialog.c:2124 +#: ../app/dialogs/preferences-dialog.c:2125 msgid "Show _brush outline" msgstr "Показывать _контур кисти" -#: ../app/dialogs/preferences-dialog.c:2127 +#: ../app/dialogs/preferences-dialog.c:2128 msgid "Show pointer for paint _tools" msgstr "Показывать курсор мыши в режиме рисования" -#: ../app/dialogs/preferences-dialog.c:2133 +#: ../app/dialogs/preferences-dialog.c:2134 msgid "Pointer _mode:" msgstr "_Режим курсора:" -#: ../app/dialogs/preferences-dialog.c:2136 +#: ../app/dialogs/preferences-dialog.c:2137 msgid "Pointer re_ndering:" msgstr "Отображение к_урсора:" -#: ../app/dialogs/preferences-dialog.c:2148 +#: ../app/dialogs/preferences-dialog.c:2149 msgid "Image Window Appearance" msgstr "Внешний вид окна изображения" -#: ../app/dialogs/preferences-dialog.c:2159 +#: ../app/dialogs/preferences-dialog.c:2160 msgid "Default Appearance in Normal Mode" msgstr "Внешний вид по умолчанию в нормальном режиме" -#: ../app/dialogs/preferences-dialog.c:2164 +#: ../app/dialogs/preferences-dialog.c:2165 msgid "Default Appearance in Fullscreen Mode" msgstr "Внешний вид по умолчанию в полноэкранном режиме" -#: ../app/dialogs/preferences-dialog.c:2173 +#: ../app/dialogs/preferences-dialog.c:2174 msgid "Image Title & Statusbar Format" msgstr "Формат заголовка изображения и строки состояния" -#: ../app/dialogs/preferences-dialog.c:2176 +#: ../app/dialogs/preferences-dialog.c:2177 msgid "Title & Status" msgstr "Заголовок и состояние" -#: ../app/dialogs/preferences-dialog.c:2194 +#: ../app/dialogs/preferences-dialog.c:2195 msgid "Current format" msgstr "Текущий формат" -#: ../app/dialogs/preferences-dialog.c:2195 +#: ../app/dialogs/preferences-dialog.c:2196 msgid "Default format" msgstr "Исходный формат" -#: ../app/dialogs/preferences-dialog.c:2196 +#: ../app/dialogs/preferences-dialog.c:2197 msgid "Show zoom percentage" msgstr "Показывать масштаб в %" -#: ../app/dialogs/preferences-dialog.c:2197 +#: ../app/dialogs/preferences-dialog.c:2198 msgid "Show zoom ratio" msgstr "Показывать масштабный коэффициент" -#: ../app/dialogs/preferences-dialog.c:2198 +#: ../app/dialogs/preferences-dialog.c:2199 msgid "Show image size" msgstr "Показать размер изображения" -#: ../app/dialogs/preferences-dialog.c:2211 +#: ../app/dialogs/preferences-dialog.c:2212 msgid "Image Title Format" msgstr "Формат заголовка изображения" -#: ../app/dialogs/preferences-dialog.c:2213 +#: ../app/dialogs/preferences-dialog.c:2214 msgid "Image Statusbar Format" msgstr "Формат строки состояния" -#: ../app/dialogs/preferences-dialog.c:2298 +#: ../app/dialogs/preferences-dialog.c:2299 msgid "Display" msgstr "Дисплей" #. Transparency -#: ../app/dialogs/preferences-dialog.c:2310 +#: ../app/dialogs/preferences-dialog.c:2311 msgid "Transparency" msgstr "Прозрачный" -#: ../app/dialogs/preferences-dialog.c:2314 +#: ../app/dialogs/preferences-dialog.c:2315 msgid "_Check style:" msgstr "_Стиль клеток:" -#: ../app/dialogs/preferences-dialog.c:2317 +#: ../app/dialogs/preferences-dialog.c:2318 msgid "Check _size:" msgstr "Размер _клеток:" -#: ../app/dialogs/preferences-dialog.c:2320 +#: ../app/dialogs/preferences-dialog.c:2321 msgid "Monitor Resolution" msgstr "Разрешение монитора" #. Pixels -#: ../app/dialogs/preferences-dialog.c:2324 +#: ../app/dialogs/preferences-dialog.c:2325 #: ../app/display/gimpcursorview.c:202 ../app/widgets/gimpgrideditor.c:268 #: ../app/widgets/gimpgrideditor.c:300 msgid "Pixels" msgstr "px" -#: ../app/dialogs/preferences-dialog.c:2342 +#: ../app/dialogs/preferences-dialog.c:2343 msgid "Horizontal" msgstr "Горизонтальное" -#: ../app/dialogs/preferences-dialog.c:2344 +#: ../app/dialogs/preferences-dialog.c:2345 msgid "Vertical" msgstr "Вертикальное" -#: ../app/dialogs/preferences-dialog.c:2346 +#: ../app/dialogs/preferences-dialog.c:2347 #: ../app/widgets/gimpimagepropview.c:476 msgid "ppi" msgstr "ppi" -#: ../app/dialogs/preferences-dialog.c:2362 +#: ../app/dialogs/preferences-dialog.c:2363 #, c-format msgid "_Detect automatically (currently %d × %d ppi)" msgstr "О_пределить автоматически (сейчас %d × %d ppi)" -#: ../app/dialogs/preferences-dialog.c:2382 +#: ../app/dialogs/preferences-dialog.c:2383 msgid "_Enter manually" msgstr "_Вручную" -#: ../app/dialogs/preferences-dialog.c:2397 +#: ../app/dialogs/preferences-dialog.c:2398 msgid "C_alibrate..." msgstr "О_ткалибровать..." -#: ../app/dialogs/preferences-dialog.c:2420 +#: ../app/dialogs/preferences-dialog.c:2421 msgid "Color Management" msgstr "Управление цветом" -#: ../app/dialogs/preferences-dialog.c:2440 +#: ../app/dialogs/preferences-dialog.c:2441 msgid "_RGB profile:" msgstr "_RGB-профиль:" -#: ../app/dialogs/preferences-dialog.c:2441 +#: ../app/dialogs/preferences-dialog.c:2442 msgid "Select RGB Color Profile" msgstr "Выберите RGB-профиль" -#: ../app/dialogs/preferences-dialog.c:2442 +#: ../app/dialogs/preferences-dialog.c:2443 msgid "_CMYK profile:" msgstr "_CMYK-профиль:" -#: ../app/dialogs/preferences-dialog.c:2443 +#: ../app/dialogs/preferences-dialog.c:2444 msgid "Select CMYK Color Profile" msgstr "Выберите CMYK-профиль" -#: ../app/dialogs/preferences-dialog.c:2444 +#: ../app/dialogs/preferences-dialog.c:2445 msgid "_Monitor profile:" msgstr "Профиль _монитора:" -#: ../app/dialogs/preferences-dialog.c:2445 +#: ../app/dialogs/preferences-dialog.c:2446 msgid "Select Monitor Color Profile" msgstr "Выберите цветовой профиль монитора" -#: ../app/dialogs/preferences-dialog.c:2446 +#: ../app/dialogs/preferences-dialog.c:2447 msgid "_Print simulation profile:" msgstr "Профиль _имитации принтера:" -#: ../app/dialogs/preferences-dialog.c:2447 +#: ../app/dialogs/preferences-dialog.c:2448 msgid "Select Printer Color Profile" msgstr "Выбор цветового профиля принтера" -#: ../app/dialogs/preferences-dialog.c:2458 +#: ../app/dialogs/preferences-dialog.c:2459 msgid "_Mode of operation:" msgstr "_Вид управления:" -#: ../app/dialogs/preferences-dialog.c:2488 +#: ../app/dialogs/preferences-dialog.c:2489 msgid "_Try to use the system monitor profile" msgstr "_Использовать системный ICC-профиль монитора" -#: ../app/dialogs/preferences-dialog.c:2498 +#: ../app/dialogs/preferences-dialog.c:2499 msgid "_Display rendering intent:" msgstr "_Цветопередача монитора:" -#: ../app/dialogs/preferences-dialog.c:2507 +#: ../app/dialogs/preferences-dialog.c:2508 msgid "_Softproof rendering intent:" msgstr "Ц_ветопередача при цветопробе:" -#: ../app/dialogs/preferences-dialog.c:2520 +#: ../app/dialogs/preferences-dialog.c:2521 msgid "Mark out of gamut colors" msgstr "Пометить цвета вне цветового охвата" -#: ../app/dialogs/preferences-dialog.c:2525 +#: ../app/dialogs/preferences-dialog.c:2526 msgid "Select Warning Color" msgstr "Выберите цвет предупреждения" -#: ../app/dialogs/preferences-dialog.c:2538 +#: ../app/dialogs/preferences-dialog.c:2539 msgid "File Open behaviour:" msgstr "Поведение при открытии файла:" -#: ../app/dialogs/preferences-dialog.c:2550 +#: ../app/dialogs/preferences-dialog.c:2551 msgid "Input Devices" msgstr "Устройства ввода" #. Extended Input Devices -#: ../app/dialogs/preferences-dialog.c:2560 +#: ../app/dialogs/preferences-dialog.c:2561 msgid "Extended Input Devices" msgstr "Дополнительные устройства ввода" -#: ../app/dialogs/preferences-dialog.c:2564 +#: ../app/dialogs/preferences-dialog.c:2565 msgid "Configure E_xtended Input Devices..." msgstr "Настроить _дополнительные устройства ввода..." -#: ../app/dialogs/preferences-dialog.c:2571 +#: ../app/dialogs/preferences-dialog.c:2572 msgid "_Save input device settings on exit" msgstr "Сохранять параметры устройств ввода при выходе" -#: ../app/dialogs/preferences-dialog.c:2575 +#: ../app/dialogs/preferences-dialog.c:2576 msgid "Save Input Device Settings _Now" msgstr "Сохранить параметры устройств ввода _сейчас" -#: ../app/dialogs/preferences-dialog.c:2582 +#: ../app/dialogs/preferences-dialog.c:2583 msgid "_Reset Saved Input Device Settings to Default Values" msgstr "_Восстановить параметры устройств ввода по умолчанию" -#: ../app/dialogs/preferences-dialog.c:2597 +#: ../app/dialogs/preferences-dialog.c:2598 msgid "Additional Input Controllers" msgstr "Дополнительные способы управления" -#: ../app/dialogs/preferences-dialog.c:2600 +#: ../app/dialogs/preferences-dialog.c:2601 msgid "Input Controllers" msgstr "Способы управления" -#: ../app/dialogs/preferences-dialog.c:2616 +#: ../app/dialogs/preferences-dialog.c:2617 msgid "Window Management" msgstr "Поведение окон" -#: ../app/dialogs/preferences-dialog.c:2625 +#: ../app/dialogs/preferences-dialog.c:2626 msgid "Window Manager Hints" msgstr "Управление внешним видом окон" -#: ../app/dialogs/preferences-dialog.c:2631 +#: ../app/dialogs/preferences-dialog.c:2632 msgid "Hint for the _toolbox:" msgstr "Тип окна для панели _инструментов:" -#: ../app/dialogs/preferences-dialog.c:2635 +#: ../app/dialogs/preferences-dialog.c:2636 msgid "Hint for other _docks:" msgstr "Тип окна для _других панелей:" -#: ../app/dialogs/preferences-dialog.c:2640 +#: ../app/dialogs/preferences-dialog.c:2641 msgid "Toolbox and other docks are transient to the active image window" msgstr "Все панели сверху окна изображения" -#: ../app/dialogs/preferences-dialog.c:2645 +#: ../app/dialogs/preferences-dialog.c:2646 msgid "Focus" msgstr "Фокус" -#: ../app/dialogs/preferences-dialog.c:2649 +#: ../app/dialogs/preferences-dialog.c:2650 msgid "Activate the _focused image" msgstr "_Активировать изображение в фокусе" #. Window Positions -#: ../app/dialogs/preferences-dialog.c:2653 +#: ../app/dialogs/preferences-dialog.c:2654 msgid "Window Positions" msgstr "Расположение окон" -#: ../app/dialogs/preferences-dialog.c:2656 +#: ../app/dialogs/preferences-dialog.c:2657 msgid "_Save window positions on exit" msgstr "_Сохранять расположение окон при выходе" -#: ../app/dialogs/preferences-dialog.c:2660 +#: ../app/dialogs/preferences-dialog.c:2661 msgid "Save Window Positions _Now" msgstr "Сохранить расположение окон с_ейчас" -#: ../app/dialogs/preferences-dialog.c:2667 +#: ../app/dialogs/preferences-dialog.c:2668 msgid "_Reset Saved Window Positions to Default Values" msgstr "_Восстановить исходную позицию окон" -#: ../app/dialogs/preferences-dialog.c:2682 +#: ../app/dialogs/preferences-dialog.c:2683 msgid "Folders" msgstr "Каталоги" -#: ../app/dialogs/preferences-dialog.c:2702 +#: ../app/dialogs/preferences-dialog.c:2703 msgid "Temporary folder:" msgstr "Временный каталог:" -#: ../app/dialogs/preferences-dialog.c:2703 +#: ../app/dialogs/preferences-dialog.c:2704 msgid "Select Folder for Temporary Files" msgstr "Выберите каталог для временных файлов" -#: ../app/dialogs/preferences-dialog.c:2707 +#: ../app/dialogs/preferences-dialog.c:2708 msgid "Swap folder:" msgstr "Каталог подкачки:" -#: ../app/dialogs/preferences-dialog.c:2708 +#: ../app/dialogs/preferences-dialog.c:2709 msgid "Select Swap Folder" msgstr "Выбрать каталог подкачки" -#: ../app/dialogs/preferences-dialog.c:2743 +#: ../app/dialogs/preferences-dialog.c:2744 msgid "Brush Folders" msgstr "Каталоги кистей" -#: ../app/dialogs/preferences-dialog.c:2745 +#: ../app/dialogs/preferences-dialog.c:2746 msgid "Select Brush Folders" msgstr "Выбрать каталоги кистей" -#: ../app/dialogs/preferences-dialog.c:2747 +#: ../app/dialogs/preferences-dialog.c:2748 msgid "Pattern Folders" msgstr "Каталоги текстур" -#: ../app/dialogs/preferences-dialog.c:2749 +#: ../app/dialogs/preferences-dialog.c:2750 msgid "Select Pattern Folders" msgstr "Выбрать каталоги текстур" -#: ../app/dialogs/preferences-dialog.c:2751 +#: ../app/dialogs/preferences-dialog.c:2752 msgid "Palette Folders" msgstr "Каталоги палитр" -#: ../app/dialogs/preferences-dialog.c:2753 +#: ../app/dialogs/preferences-dialog.c:2754 msgid "Select Palette Folders" msgstr "Выбрать каталоги палитр" -#: ../app/dialogs/preferences-dialog.c:2755 +#: ../app/dialogs/preferences-dialog.c:2756 msgid "Gradient Folders" msgstr "Каталоги градиентов" -#: ../app/dialogs/preferences-dialog.c:2757 +#: ../app/dialogs/preferences-dialog.c:2758 msgid "Select Gradient Folders" msgstr "Выбрать каталоги градиентов" -#: ../app/dialogs/preferences-dialog.c:2759 +#: ../app/dialogs/preferences-dialog.c:2760 msgid "Font Folders" msgstr "Каталоги шрифтов" -#: ../app/dialogs/preferences-dialog.c:2761 +#: ../app/dialogs/preferences-dialog.c:2762 msgid "Select Font Folders" msgstr "Выбрать каталоги шрифтов" -#: ../app/dialogs/preferences-dialog.c:2763 +#: ../app/dialogs/preferences-dialog.c:2764 msgid "Plug-In Folders" msgstr "Каталоги расширений" -#: ../app/dialogs/preferences-dialog.c:2765 +#: ../app/dialogs/preferences-dialog.c:2766 msgid "Select Plug-In Folders" msgstr "Выбрать каталоги расширений" -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/dialogs/preferences-dialog.c:2768 msgid "Scripts" msgstr "Сценарии" -#: ../app/dialogs/preferences-dialog.c:2767 +#: ../app/dialogs/preferences-dialog.c:2768 msgid "Script-Fu Folders" msgstr "Каталоги Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2769 +#: ../app/dialogs/preferences-dialog.c:2770 msgid "Select Script-Fu Folders" msgstr "Выбрать каталоги Script-Fu" -#: ../app/dialogs/preferences-dialog.c:2771 +#: ../app/dialogs/preferences-dialog.c:2772 msgid "Module Folders" msgstr "Каталоги модулей" -#: ../app/dialogs/preferences-dialog.c:2773 +#: ../app/dialogs/preferences-dialog.c:2774 msgid "Select Module Folders" msgstr "Выбрать каталоги модулей" -#: ../app/dialogs/preferences-dialog.c:2775 +#: ../app/dialogs/preferences-dialog.c:2776 msgid "Interpreters" msgstr "Интерпретаторы" -#: ../app/dialogs/preferences-dialog.c:2775 +#: ../app/dialogs/preferences-dialog.c:2776 msgid "Interpreter Folders" msgstr "Каталоги интерпретаторов" -#: ../app/dialogs/preferences-dialog.c:2777 +#: ../app/dialogs/preferences-dialog.c:2778 msgid "Select Interpreter Folders" msgstr "Выбрать каталоги интерпретаторов" -#: ../app/dialogs/preferences-dialog.c:2779 +#: ../app/dialogs/preferences-dialog.c:2780 msgid "Environment Folders" msgstr "Каталоги окружения" -#: ../app/dialogs/preferences-dialog.c:2781 +#: ../app/dialogs/preferences-dialog.c:2782 msgid "Select Environment Folders" msgstr "Выбрать каталоги окружения" -#: ../app/dialogs/preferences-dialog.c:2783 +#: ../app/dialogs/preferences-dialog.c:2784 msgid "Themes" msgstr "Стили оформления" -#: ../app/dialogs/preferences-dialog.c:2783 +#: ../app/dialogs/preferences-dialog.c:2784 msgid "Theme Folders" msgstr "Каталоги стилей оформления" -#: ../app/dialogs/preferences-dialog.c:2785 +#: ../app/dialogs/preferences-dialog.c:2786 msgid "Select Theme Folders" msgstr "Выбрать каталоги стилей оформления" @@ -9658,7 +9658,7 @@ msgstr "Размер холста" msgid "Layer Size" msgstr "Размер слоя" -#: ../app/dialogs/resize-dialog.c:294 +#: ../app/dialogs/resize-dialog.c:295 msgid "Resize _layers:" msgstr "Изменить размер _слоев:" @@ -9666,15 +9666,15 @@ msgstr "Изменить размер _слоев:" msgid "Calibrate Monitor Resolution" msgstr "Откалибровать разрешение монитора" -#: ../app/dialogs/resolution-calibrate-dialog.c:127 +#: ../app/dialogs/resolution-calibrate-dialog.c:128 msgid "Measure the rulers and enter their lengths:" msgstr "Измерьте линейки и введите значение их длины:" -#: ../app/dialogs/resolution-calibrate-dialog.c:152 +#: ../app/dialogs/resolution-calibrate-dialog.c:153 msgid "_Horizontal:" msgstr "Горизонтальная:" -#: ../app/dialogs/resolution-calibrate-dialog.c:157 +#: ../app/dialogs/resolution-calibrate-dialog.c:158 msgid "_Vertical:" msgstr "Вертикальная:" @@ -9683,15 +9683,15 @@ msgstr "Вертикальная:" msgid "Image Size" msgstr "Размер изображения" -#: ../app/dialogs/scale-dialog.c:175 +#: ../app/dialogs/scale-dialog.c:176 msgid "Quality" msgstr "Качество" -#: ../app/dialogs/scale-dialog.c:187 +#: ../app/dialogs/scale-dialog.c:188 msgid "I_nterpolation:" msgstr "И_нтерполяция:" -#: ../app/dialogs/scale-dialog.c:206 +#: ../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." @@ -9703,11 +9703,11 @@ msgstr "" msgid "Choose Stroke Style" msgstr "Стиль обведения области" -#: ../app/dialogs/stroke-dialog.c:221 +#: ../app/dialogs/stroke-dialog.c:222 msgid "Paint tool:" msgstr "Инструмент:" -#: ../app/dialogs/stroke-dialog.c:235 +#: ../app/dialogs/stroke-dialog.c:236 msgid "_Emulate brush dynamics" msgstr "_Имитировать динамику кисти" @@ -9805,7 +9805,7 @@ msgstr "Объединить _импортированные контуры" msgid "_Scale imported paths to fit image" msgstr "_Масштабировать контуры до размера изображения" -#: ../app/dialogs/vectors-options-dialog.c:121 +#: ../app/dialogs/vectors-options-dialog.c:122 msgid "Path name:" msgstr "Имя контура:" @@ -10057,29 +10057,29 @@ msgstr "Пропорции:" msgid "Zoom:" msgstr "Масштаб:" -#: ../app/display/gimpdisplayshell-title.c:284 +#: ../app/display/gimpdisplayshell-title.c:286 msgid "(modified)" msgstr "(измененен)" -#: ../app/display/gimpdisplayshell-title.c:289 +#: ../app/display/gimpdisplayshell-title.c:291 msgid "(clean)" msgstr "(неизменен)" -#: ../app/display/gimpdisplayshell-title.c:337 -#: ../app/display/gimpdisplayshell-title.c:350 +#: ../app/display/gimpdisplayshell-title.c:339 +#: ../app/display/gimpdisplayshell-title.c:352 #: ../app/widgets/gimpactiongroup.c:888 msgid "(none)" msgstr "(Нет)" -#: ../app/display/gimpdisplayshell-title.c:483 +#: ../app/display/gimpdisplayshell-title.c:485 msgid " (exported)" msgstr " (экспортировано)" -#: ../app/display/gimpdisplayshell-title.c:485 +#: ../app/display/gimpdisplayshell-title.c:487 msgid " (overwritten)" msgstr " (перезаписано)" -#: ../app/display/gimpdisplayshell-title.c:491 +#: ../app/display/gimpdisplayshell-title.c:493 msgid " (imported)" msgstr " (импортировано)" @@ -10150,7 +10150,7 @@ msgid "not a GIMP Levels file" msgstr "не файл цветовых уровней GIMP" #. initialize the document history -#: ../app/gui/gui.c:425 +#: ../app/gui/gui.c:426 msgid "Documents" msgstr "Документы" @@ -11862,7 +11862,7 @@ msgstr "_Предустановки:" msgid "Settings saved to '%s'" msgstr "Настройки сохранены в '%s'" -#: ../app/tools/gimpimagemaptool.c:315 +#: ../app/tools/gimpimagemaptool.c:316 msgid "_Preview" msgstr "Пр_едварительный просмотр" @@ -11876,7 +11876,7 @@ msgstr "Коррекция" msgid "Size:" msgstr "Размер:" -#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1041 +#: ../app/tools/gimpinkoptions-gui.c:75 ../app/tools/gimpmeasuretool.c:1042 #: ../app/tools/gimppaintoptions-gui.c:168 #: ../app/widgets/gimpbrusheditor.c:207 msgid "Angle:" @@ -12087,8 +12087,8 @@ msgstr "Щелкните и потащите, чтобы добавить нов msgid "Click-Drag to move all points" msgstr "Щелкните и потащите, чтобы переместить все точки" -#: ../app/tools/gimpmeasuretool.c:881 ../app/tools/gimpmeasuretool.c:1024 -#: ../app/tools/gimpmeasuretool.c:1080 ../app/tools/gimpmeasuretool.c:1108 +#: ../app/tools/gimpmeasuretool.c:881 ../app/tools/gimpmeasuretool.c:1025 +#: ../app/tools/gimpmeasuretool.c:1081 ../app/tools/gimpmeasuretool.c:1109 #: ../app/tools/gimppainttool.c:580 msgid "pixels" msgstr "точки растра" @@ -12098,7 +12098,7 @@ msgstr "точки растра" msgid "Measure Distances and Angles" msgstr "Измерение расстояний и углов" -#: ../app/tools/gimpmeasuretool.c:1013 +#: ../app/tools/gimpmeasuretool.c:1014 msgid "Distance:" msgstr "Расстояние:" From 93f664f429ebc24236d7aeebd2ae0fa7bb1140f8 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Thu, 16 Jul 2009 19:14:44 +0200 Subject: [PATCH 54/70] data: Fix tags intltool-merge paths --- data/tags/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/tags/Makefile.am b/data/tags/Makefile.am index 2d4703c694..f40debf7a5 100644 --- a/data/tags/Makefile.am +++ b/data/tags/Makefile.am @@ -17,7 +17,7 @@ DISTCLEANFILES = $(tagsdata_data_files) gimp-tags-default.xml: gimp-tags-default.xml.in $(wildcard $(top_srcdir)/po-tags/*.po) - $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -x -u -c $(top_builddir)/po/.intltool-merge-cache + $(INTLTOOL_MERGE) $(top_srcdir)/po-tags $< $(@) -x -u -c $(top_builddir)/po-tags/.intltool-merge-cache validate: gimp-tags-default.xml From b604553bbe8df5d7ce94a19e4e49820c398aa62e Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Thu, 16 Jul 2009 19:15:41 +0200 Subject: [PATCH 55/70] data: Add translatable default tags on some brushes --- data/tags/gimp-tags-default.xml.in | 84 ++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/data/tags/gimp-tags-default.xml.in b/data/tags/gimp-tags-default.xml.in index b7722fa59a..5bb3b84232 100644 --- a/data/tags/gimp-tags-default.xml.in +++ b/data/tags/gimp-tags-default.xml.in @@ -26,60 +26,144 @@ + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + + + <_thetag>circle + + + <_thetag>fuzzy + From 7d7c053ae16085bb6294a4f7698ff3cf4b30602f Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Thu, 16 Jul 2009 19:39:06 +0200 Subject: [PATCH 56/70] po-tags: Add Swedish translation of default tags --- po-tags/.gitignore | 1 + po-tags/LINGUAS | 3 +++ po-tags/POTFILES.in | 6 ++++++ po-tags/sv.po | 23 +++++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 po-tags/.gitignore create mode 100644 po-tags/LINGUAS create mode 100644 po-tags/POTFILES.in create mode 100644 po-tags/sv.po diff --git a/po-tags/.gitignore b/po-tags/.gitignore new file mode 100644 index 0000000000..e973f08fb2 --- /dev/null +++ b/po-tags/.gitignore @@ -0,0 +1 @@ +/.intltool-merge-cache diff --git a/po-tags/LINGUAS b/po-tags/LINGUAS new file mode 100644 index 0000000000..ab6dc346c1 --- /dev/null +++ b/po-tags/LINGUAS @@ -0,0 +1,3 @@ +# please keep this list sorted alphabetically +# +sv diff --git a/po-tags/POTFILES.in b/po-tags/POTFILES.in new file mode 100644 index 0000000000..61a1c927c5 --- /dev/null +++ b/po-tags/POTFILES.in @@ -0,0 +1,6 @@ +# Files from the Gimp distribution which have already been +# marked to allow runtime translation of messages + +[encoding: UTF-8] + +data/tags/gimp-tags-default.xml.in diff --git a/po-tags/sv.po b/po-tags/sv.po new file mode 100644 index 0000000000..7a771488e4 --- /dev/null +++ b/po-tags/sv.po @@ -0,0 +1,23 @@ +# Swedish messages for gimp-tags. +# Copyright (C) 1998-2009 Free Software Foundation, Inc. +# Martin Nordholts , 2009 +# +msgid "" +msgstr "" +"Project-Id-Version: gimp-tags\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-07-16 19:05+0200\n" +"PO-Revision-Date: 2009-07-16 19:11+0200\n" +"Last-Translator: Martin Nordholts \n" +"Language-Team: Swedish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../data/tags/gimp-tags-default.xml.in.h:1 +msgid "circle" +msgstr "cirkel" + +#: ../data/tags/gimp-tags-default.xml.in.h:2 +msgid "fuzzy" +msgstr "luddig" From b6f574ab38e6ea80f3d7f3123bb2dd60e7af66db Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Thu, 16 Jul 2009 20:16:07 +0200 Subject: [PATCH 57/70] POTFILES.skip data/tags --- po-libgimp/POTFILES.skip | 1 + po-plug-ins/POTFILES.skip | 1 + po-python/POTFILES.skip | 1 + po-script-fu/POTFILES.skip | 1 + po-tips/POTFILES.skip | 1 + po/POTFILES.skip | 1 + 6 files changed, 6 insertions(+) diff --git a/po-libgimp/POTFILES.skip b/po-libgimp/POTFILES.skip index 569959ecdc..2d14b64b10 100644 --- a/po-libgimp/POTFILES.skip +++ b/po-libgimp/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-plug-ins/POTFILES.skip b/po-plug-ins/POTFILES.skip index db4fe48c3e..c2f26c06b5 100644 --- a/po-plug-ins/POTFILES.skip +++ b/po-plug-ins/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-python/POTFILES.skip b/po-python/POTFILES.skip index 183ffd25df..554cd375f3 100644 --- a/po-python/POTFILES.skip +++ b/po-python/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-script-fu/POTFILES.skip b/po-script-fu/POTFILES.skip index 60f84f31de..d004731936 100644 --- a/po-script-fu/POTFILES.skip +++ b/po-script-fu/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags data/tips desktop desktop/gimp.desktop.in diff --git a/po-tips/POTFILES.skip b/po-tips/POTFILES.skip index 66333ad8d3..f94378733b 100644 --- a/po-tips/POTFILES.skip +++ b/po-tips/POTFILES.skip @@ -1,4 +1,5 @@ app +data/tags desktop desktop/gimp.desktop.in libgimp diff --git a/po/POTFILES.skip b/po/POTFILES.skip index f6d7a4a9ae..28eb1abc1e 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,4 +1,5 @@ app/widgets/gtkscalebutton.c +data/tags/gimp-tags-default.xml.in data/tips/gimp-tips.xml.in desktop/gimp.desktop.in libgimp From fc66ca5169aea63c0f52ff799511c644c4661eba Mon Sep 17 00:00:00 2001 From: Mason Thomas Date: Wed, 15 Jul 2009 22:50:06 -0700 Subject: [PATCH 58/70] Clamp levels after input changes applied. --- app/base/levels.c | 8 ++++---- app/gegl/gimpoperationlevels.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/base/levels.c b/app/base/levels.c index 4be2da68aa..16fff75db1 100644 --- a/app/base/levels.c +++ b/app/base/levels.c @@ -90,12 +90,12 @@ levels_lut_func (Levels *levels, inten = (gdouble) (255.0 * inten - levels->low_input[j]); } + /* clamp to new black and white points */ + inten = CLAMP (inten, 0.0, 1.0); + if (levels->gamma[j] != 0.0) { - if (inten >= 0.0) - inten = pow ( inten, (1.0 / levels->gamma[j])); - else - inten = -pow (-inten, (1.0 / levels->gamma[j])); + inten = pow ( inten, (1.0 / levels->gamma[j])); } /* determine the output intensity */ diff --git a/app/gegl/gimpoperationlevels.c b/app/gegl/gimpoperationlevels.c index 01cc7b112e..d7a706a255 100644 --- a/app/gegl/gimpoperationlevels.c +++ b/app/gegl/gimpoperationlevels.c @@ -89,12 +89,12 @@ gimp_operation_levels_map (gdouble value, else value = (value - low_input); + /* clamp to new black and white points */ + value = CLAMP (value, 0.0, 1.0); + if (inv_gamma != 1.0) { - if (value >= 0.0) - value = pow ( value, inv_gamma); - else - value = -pow (-value, inv_gamma); + value = pow ( value, inv_gamma); } /* determine the output intensity */ From 48a6b0c59cbdfc07e904d7b000776b2ccc55504c Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Thu, 16 Jul 2009 22:21:40 +0200 Subject: [PATCH 59/70] =?UTF-8?q?Bug=20585665=20=E2=80=93=20Exporting=20to?= =?UTF-8?q?=20PSD=20with=20a=20blank=20text=20layer=20creates=20a=20corrup?= =?UTF-8?q?t=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use write_gchar() to write an empty string, not write_gint16(). --- plug-ins/file-psd/psd-save.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-save.c index f29de09a9b..a2dd761445 100644 --- a/plug-ins/file-psd/psd-save.c +++ b/plug-ins/file-psd/psd-save.c @@ -416,7 +416,7 @@ write_pascalstring (FILE *fd, } else { - write_gint16 (fd, 0, why); + write_gchar (fd, 0, why); } /* If total length (length byte + content) is not a multiple of PADDING, From 65c21b6bc3eb1455cbd7f890b568d3504f7250f4 Mon Sep 17 00:00:00 2001 From: Massimo Valentini Date: Thu, 16 Jul 2009 22:24:59 +0200 Subject: [PATCH 60/70] =?UTF-8?q?Bug=20567466=20=E2=80=93=20PNG=20comment?= =?UTF-8?q?=20not=20found=20if=20more=20than=201=20tEXt=20chunks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix an oversight: only the first tEXt chunk of a PNG was considered, though repeatedly, when looking for the comment. --- plug-ins/common/file-png.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index dad23335a8..f0706611e1 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -1031,7 +1031,7 @@ load_image (const gchar *filename, { gchar *comment = NULL; - for (i = 0; i < num_texts && !comment; i++) + for (i = 0; i < num_texts && !comment; i++, text++) { if (text->key == NULL || strcmp (text->key, "Comment")) continue; From cb4aec187f436f20fa348f6cd264c3b9701e1e96 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 16 Jul 2009 22:37:09 +0200 Subject: [PATCH 61/70] Update license to LGPL version 3 here as well. --- libgimpwidgets/test-eevl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libgimpwidgets/test-eevl.c b/libgimpwidgets/test-eevl.c index eb1bbda45e..a41eacc774 100644 --- a/libgimpwidgets/test-eevl.c +++ b/libgimpwidgets/test-eevl.c @@ -5,10 +5,10 @@ * Copyright (C) 2008 Fredrik Alstromer * Copyright (C) 2008 Martin Nordholts * - * This library is free software; you can redistribute it and/or + * 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. + * version 3 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 @@ -16,9 +16,8 @@ * Library 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. + * License along with this library. If not, see + * . */ /* A small regression test case for the evaluator */ From 99ce3bd8b27bd0b71f4c95d4eea4a2c69c090b37 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 18 Jul 2009 09:37:46 +0200 Subject: [PATCH 62/70] =?UTF-8?q?Bug=20120563=20=E2=80=93=20Add=20an=20eas?= =?UTF-8?q?y=20way=20to=20use=20the=20default=20comment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a 'Use default comment' button to the Comment tab in Image Properties that if clicked sets the image comment to the default comment set in Preferences. --- app/widgets/gimpimagecommenteditor.c | 53 +++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/app/widgets/gimpimagecommenteditor.c b/app/widgets/gimpimagecommenteditor.c index 5c3cde20a8..6cb00a03c5 100644 --- a/app/widgets/gimpimagecommenteditor.c +++ b/app/widgets/gimpimagecommenteditor.c @@ -30,18 +30,25 @@ #include "widgets-types.h" +#include "config/gimpcoreconfig.h" + +#include "core/gimp.h" #include "core/gimpimage.h" +#include "core/gimptemplate.h" #include "gimpimagecommenteditor.h" +#include "gimp-intl.h" #define GIMP_IMAGE_COMMENT_PARASITE "gimp-comment" -static void gimp_image_comment_editor_update (GimpImageParasiteView *view); +static void gimp_image_comment_editor_update (GimpImageParasiteView *view); -static void gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, - GimpImageCommentEditor *editor); +static void gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, + GimpImageCommentEditor *editor); +static void gimp_image_comment_editor_use_default_comment (GtkWidget *button, + GimpImageCommentEditor *editor); G_DEFINE_TYPE (GimpImageCommentEditor, @@ -60,20 +67,30 @@ gimp_image_comment_editor_class_init (GimpImageCommentEditorClass *klass) static void gimp_image_comment_editor_init (GimpImageCommentEditor *editor) { + GtkWidget *vbox; GtkWidget *scrolled_window; GtkWidget *text_view; + GtkWidget *button; + /* Init */ editor->recoursing = FALSE; + /* Vbox */ + vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (editor), vbox); + gtk_widget_show (vbox); + + /* Scrolled winow */ scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 2); - gtk_container_add (GTK_CONTAINER (editor), scrolled_window); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0); gtk_widget_show (scrolled_window); + /* Text view */ text_view = gtk_text_view_new (); gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), TRUE); @@ -86,6 +103,21 @@ gimp_image_comment_editor_init (GimpImageCommentEditor *editor) gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); gtk_widget_show (text_view); + /* Button */ + button = gtk_button_new_with_label (_("Use default comment")); + gimp_help_set_help_data (GTK_WIDGET (button), + _("Replace the current image comment with the " + "default comment set in " + "Edit→Preferences→Default Image."), + NULL); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, TRUE, 0); + gtk_widget_show (button); + + g_signal_connect (button, "clicked", + G_CALLBACK (gimp_image_comment_editor_use_default_comment), + editor); + + /* Buffer */ editor->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)); g_signal_connect (editor->buffer, "changed", @@ -192,3 +224,16 @@ gimp_image_comment_editor_buffer_changed (GtkTextBuffer *buffer, g_free (text); } + +static void +gimp_image_comment_editor_use_default_comment (GtkWidget *button, + GimpImageCommentEditor *editor) +{ + GimpImage *image = gimp_image_parasite_view_get_image (GIMP_IMAGE_PARASITE_VIEW (editor)); + const gchar *comment = image ? image->gimp->config->default_image->comment : NULL; + + if (comment) + gtk_text_buffer_set_text (editor->buffer, comment, -1); + else + gtk_text_buffer_set_text (editor->buffer, "", -1); +} From 0d81ce97177c10c8aee1f6b1d4addb1f5429eb2a Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 16:59:43 +0200 Subject: [PATCH 63/70] =?UTF-8?q?Bug=20446171=20=E2=80=93=20select=20conte?= =?UTF-8?q?nt=20by=20click=20on=20layer=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * app/widgets/gimplayertreeview.c (gimp_layer_tree_view_layer_clicked): when ALT is pressed, select the layer's alpha. SHIFT and CONTROL work as usual to add, subtract and intersect. * app/widgets/gimpchanneltreeview.c * app/widgets/gimpvectorstreeview.c: add "clicked" handlers here too and do the same select-on-alt-click thing. --- app/widgets/gimpchanneltreeview.c | 46 ++++++++++++++++++++ app/widgets/gimplayertreeview.c | 53 ++++++++++++++++------- app/widgets/gimpvectorstreeview.c | 71 ++++++++++++++++++++++++------- 3 files changed, 140 insertions(+), 30 deletions(-) diff --git a/app/widgets/gimpchanneltreeview.c b/app/widgets/gimpchanneltreeview.c index c0c3385872..89abfc52ed 100644 --- a/app/widgets/gimpchanneltreeview.c +++ b/app/widgets/gimpchanneltreeview.c @@ -36,12 +36,14 @@ #include "core/gimplayer.h" #include "core/gimplayermask.h" +#include "gimpactiongroup.h" #include "gimpchanneltreeview.h" #include "gimpcomponenteditor.h" #include "gimpcontainerview.h" #include "gimpdnd.h" #include "gimpdocked.h" #include "gimphelp-ids.h" +#include "gimpuimanager.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -77,6 +79,11 @@ static void gimp_channel_tree_view_set_context (GimpContainerView *view, GimpContext *context); static void gimp_channel_tree_view_set_view_size (GimpContainerView *view); +static void gimp_channel_tree_view_channel_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view); + G_DEFINE_TYPE_WITH_CODE (GimpChannelTreeView, gimp_channel_tree_view, GIMP_TYPE_DRAWABLE_TREE_VIEW, @@ -165,6 +172,10 @@ gimp_channel_tree_view_constructor (GType type, view = GIMP_CHANNEL_TREE_VIEW (object); tree_view = GIMP_CONTAINER_TREE_VIEW (object); + g_signal_connect (tree_view->renderer_cell, "clicked", + G_CALLBACK (gimp_channel_tree_view_channel_clicked), + view); + gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER, NULL, tree_view); gimp_dnd_viewable_dest_add (GTK_WIDGET (tree_view->view), GIMP_TYPE_LAYER_MASK, @@ -374,3 +385,38 @@ gimp_channel_tree_view_set_view_size (GimpContainerView *view) gimp_component_editor_set_view_size (GIMP_COMPONENT_EDITOR (channel_view->priv->component_editor), view_size); } + + +/* signal handlers */ + +static void +gimp_channel_tree_view_channel_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view) +{ + if (state & GDK_MOD1_MASK) + { + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; + const gchar *action = "channels-selection-replace"; + + group = gimp_ui_manager_get_action_group (ui_manager, "channels"); + + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "channels-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "channels-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "channels-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } +} + diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 451d740d0e..ac21a5324f 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -1319,25 +1319,48 @@ gimp_layer_tree_view_layer_clicked (GimpCellRendererViewable *cell, if (gtk_tree_model_get_iter (tree_view->model, &iter, path)) { - GimpViewRenderer *renderer; - GimpUIManager *ui_manager; - GimpActionGroup *group; + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; - ui_manager = GIMP_EDITOR (tree_view)->ui_manager; - group = gimp_ui_manager_get_action_group (ui_manager, "layers"); + group = gimp_ui_manager_get_action_group (ui_manager, "layers"); - gtk_tree_model_get (tree_view->model, &iter, - layer_view->priv->model_column_mask, &renderer, - -1); - - if (renderer) + if (state & GDK_MOD1_MASK) { - GimpLayerMask *mask = GIMP_LAYER_MASK (renderer->viewable); + const gchar *action = "layers-alpha-selection-replace"; - if (gimp_layer_mask_get_edit (mask)) - gimp_action_group_set_action_active (group, - "layers-mask-edit", FALSE); - g_object_unref (renderer); + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "layers-alpha-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "layers-alpha-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "layers-alpha-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } + else + { + GimpViewRenderer *renderer; + + gtk_tree_model_get (tree_view->model, &iter, + layer_view->priv->model_column_mask, &renderer, + -1); + + if (renderer) + { + GimpLayerMask *mask = GIMP_LAYER_MASK (renderer->viewable); + + if (gimp_layer_mask_get_edit (mask)) + gimp_action_group_set_action_active (group, + "layers-mask-edit", FALSE); + + g_object_unref (renderer); + } } } diff --git a/app/widgets/gimpvectorstreeview.c b/app/widgets/gimpvectorstreeview.c index ce933bba92..b240a6e749 100644 --- a/app/widgets/gimpvectorstreeview.c +++ b/app/widgets/gimpvectorstreeview.c @@ -38,9 +38,11 @@ #include "vectors/gimpvectors-export.h" #include "vectors/gimpvectors-import.h" +#include "gimpactiongroup.h" #include "gimpcontainerview.h" -#include "gimpvectorstreeview.h" #include "gimpdnd.h" +#include "gimpuimanager.h" +#include "gimpvectorstreeview.h" #include "gimpwidgets-utils.h" #include "gimp-intl.h" @@ -48,20 +50,24 @@ static void gimp_vectors_tree_view_view_iface_init (GimpContainerViewInterface *iface); -static GObject * gimp_vectors_tree_view_constructor (GType type, - guint n_params, - GObjectConstructParam *params); -static void gimp_vectors_tree_view_set_container (GimpContainerView *view, - GimpContainer *container); -static void gimp_vectors_tree_view_drop_svg (GimpContainerTreeView *tree_view, - const gchar *svg_data, - gsize svg_data_len, - GimpViewable *dest_viewable, - GtkTreeViewDropPosition drop_pos); -static GimpItem * gimp_vectors_tree_view_item_new (GimpImage *image); -static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, - gsize *svg_data_len, - gpointer data); +static GObject * gimp_vectors_tree_view_constructor (GType type, + guint n_params, + GObjectConstructParam *params); +static void gimp_vectors_tree_view_set_container (GimpContainerView *view, + GimpContainer *container); +static void gimp_vectors_tree_view_drop_svg (GimpContainerTreeView *tree_view, + const gchar *svg_data, + gsize svg_data_len, + GimpViewable *dest_viewable, + GtkTreeViewDropPosition drop_pos); +static GimpItem * gimp_vectors_tree_view_item_new (GimpImage *image); +static void gimp_vectors_tree_view_vectors_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view); +static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, + gsize *svg_data_len, + gpointer data); G_DEFINE_TYPE_WITH_CODE (GimpVectorsTreeView, gimp_vectors_tree_view, @@ -139,6 +145,10 @@ gimp_vectors_tree_view_constructor (GType type, tree_view = GIMP_CONTAINER_TREE_VIEW (object); view = GIMP_VECTORS_TREE_VIEW (object); + g_signal_connect (tree_view->renderer_cell, "clicked", + G_CALLBACK (gimp_vectors_tree_view_vectors_clicked), + view); + /* hide basically useless edit button */ gtk_widget_hide (gimp_item_tree_view_get_edit_button (GIMP_ITEM_TREE_VIEW (view))); @@ -258,6 +268,37 @@ gimp_vectors_tree_view_item_new (GimpImage *image) return GIMP_ITEM (new_vectors); } +static void +gimp_vectors_tree_view_vectors_clicked (GimpCellRendererViewable *cell, + const gchar *path_str, + GdkModifierType state, + GimpContainerTreeView *tree_view) +{ + if (state & GDK_MOD1_MASK) + { + GimpUIManager *ui_manager = GIMP_EDITOR (tree_view)->ui_manager; + GimpActionGroup *group; + const gchar *action = "vectors-selection-replace"; + + group = gimp_ui_manager_get_action_group (ui_manager, "vectors"); + + if ((state & GDK_SHIFT_MASK) && (state & GDK_CONTROL_MASK)) + { + action = "vectors-selection-intersect"; + } + else if (state & GDK_SHIFT_MASK) + { + action = "vectors-selection-add"; + } + else if (state & GDK_CONTROL_MASK) + { + action = "vectors-selection-subtract"; + } + + gimp_action_group_activate_action (group, action); + } +} + static guchar * gimp_vectors_tree_view_drag_svg (GtkWidget *widget, gsize *svg_data_len, From 6fd729cfb691cf2b0f6b9e1b9febea38711bfe41 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 17:51:04 +0200 Subject: [PATCH 64/70] Remove the possibility to disable mnemonics (bug #120034) There is GtkSettings:gtk-enable-mnemonics: now, so there is no reason to do the same in GIMP: * app/config/gimpguiconfig.[ch]: turn "menu-mnemonics" into a dummy. * app/dialogs/preferences-dialog.c: remove its GUI. * app/widgets/gimpactionfactory.[ch] * app/widgets/gimpactiongroup.[ch]: remove infrastructure for disabling menu mnemonics. * app/actions/actions.c: bye bye glue code. --- app/actions/actions.c | 10 +--- app/config/gimpguiconfig.c | 20 +++---- app/config/gimpguiconfig.h | 1 - app/dialogs/preferences-dialog.c | 3 -- app/widgets/gimpactionfactory.c | 7 +-- app/widgets/gimpactionfactory.h | 5 +- app/widgets/gimpactiongroup.c | 93 ++++++-------------------------- app/widgets/gimpactiongroup.h | 2 - 8 files changed, 28 insertions(+), 113 deletions(-) diff --git a/app/actions/actions.c b/app/actions/actions.c index f5b86b99af..f84b27c96d 100644 --- a/app/actions/actions.c +++ b/app/actions/actions.c @@ -24,8 +24,6 @@ #include "actions-types.h" -#include "config/gimpguiconfig.h" - #include "core/gimp.h" #include "core/gimpcontainer.h" #include "core/gimpcontext.h" @@ -227,16 +225,12 @@ static const GimpActionFactoryEntry action_groups[] = void actions_init (Gimp *gimp) { - GimpGuiConfig *gui_config; - gint i; + gint i; g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (global_action_factory == NULL); - gui_config = GIMP_GUI_CONFIG (gimp->config); - - global_action_factory = gimp_action_factory_new (gimp, - gui_config->menu_mnemonics); + global_action_factory = gimp_action_factory_new (gimp); for (i = 0; i < G_N_ELEMENTS (action_groups); i++) gimp_action_factory_group_register (global_action_factory, diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c index e84b6c870a..2af33b3491 100644 --- a/app/config/gimpguiconfig.c +++ b/app/config/gimpguiconfig.c @@ -64,7 +64,6 @@ enum PROP_CAN_CHANGE_ACCELS, PROP_SAVE_ACCELS, PROP_RESTORE_ACCELS, - PROP_MENU_MNEMONICS, PROP_LAST_OPENED_SIZE, PROP_MAX_NEW_IMAGE_SIZE, PROP_TOOLBOX_COLOR_AREA, @@ -87,6 +86,7 @@ enum /* ignored, only for backward compatibility: */ PROP_INFO_WINDOW_PER_DISPLAY, + PROP_MENU_MNEMONICS, PROP_SHOW_TOOL_TIPS, PROP_SHOW_TIPS }; @@ -177,11 +177,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) "restore-accels", RESTORE_ACCELS_BLURB, TRUE, GIMP_PARAM_STATIC_STRINGS); - GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MENU_MNEMONICS, - "menu-mnemonics", MENU_MNEMONICS_BLURB, - TRUE, - GIMP_PARAM_STATIC_STRINGS | - GIMP_CONFIG_PARAM_RESTART); GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_LAST_OPENED_SIZE, "last-opened-size", LAST_OPENED_SIZE_BLURB, 0, 1024, 10, @@ -286,6 +281,11 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass) FALSE, GIMP_PARAM_STATIC_STRINGS | GIMP_CONFIG_PARAM_IGNORE); + GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MENU_MNEMONICS, + "menu-mnemonics", MENU_MNEMONICS_BLURB, + TRUE, + GIMP_PARAM_STATIC_STRINGS | + GIMP_CONFIG_PARAM_IGNORE); GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_TOOL_TIPS, "show-tool-tips", NULL, FALSE, @@ -366,9 +366,6 @@ gimp_gui_config_set_property (GObject *object, case PROP_RESTORE_ACCELS: gui_config->restore_accels = g_value_get_boolean (value); break; - case PROP_MENU_MNEMONICS: - gui_config->menu_mnemonics = g_value_get_boolean (value); - break; case PROP_LAST_OPENED_SIZE: gui_config->last_opened_size = g_value_get_int (value); break; @@ -433,6 +430,7 @@ gimp_gui_config_set_property (GObject *object, break; case PROP_INFO_WINDOW_PER_DISPLAY: + case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: case PROP_SHOW_TIPS: /* ignored */ @@ -493,9 +491,6 @@ gimp_gui_config_get_property (GObject *object, case PROP_RESTORE_ACCELS: g_value_set_boolean (value, gui_config->restore_accels); break; - case PROP_MENU_MNEMONICS: - g_value_set_boolean (value, gui_config->menu_mnemonics); - break; case PROP_LAST_OPENED_SIZE: g_value_set_int (value, gui_config->last_opened_size); break; @@ -555,6 +550,7 @@ gimp_gui_config_get_property (GObject *object, break; case PROP_INFO_WINDOW_PER_DISPLAY: + case PROP_MENU_MNEMONICS: case PROP_SHOW_TOOL_TIPS: case PROP_SHOW_TIPS: /* ignored */ diff --git a/app/config/gimpguiconfig.h b/app/config/gimpguiconfig.h index 68c99816d7..63e05a829e 100644 --- a/app/config/gimpguiconfig.h +++ b/app/config/gimpguiconfig.h @@ -52,7 +52,6 @@ struct _GimpGuiConfig gboolean can_change_accels; gboolean save_accels; gboolean restore_accels; - gboolean menu_mnemonics; gint last_opened_size; guint64 max_new_image_size; gboolean toolbox_color_area; diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index 9b59ea01da..c2c146cf4b 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1633,9 +1633,6 @@ prefs_dialog_new (Gimp *gimp, vbox2 = prefs_frame_new (_("Keyboard Shortcuts"), GTK_CONTAINER (vbox), FALSE); - prefs_check_button_add (object, "menu-mnemonics", - _("Show menu _mnemonics (access keys)"), - GTK_BOX (vbox2)); prefs_check_button_add (object, "can-change-accels", _("_Use dynamic keyboard shortcuts"), GTK_BOX (vbox2)); diff --git a/app/widgets/gimpactionfactory.c b/app/widgets/gimpactionfactory.c index 0850ef4f46..755545635b 100644 --- a/app/widgets/gimpactionfactory.c +++ b/app/widgets/gimpactionfactory.c @@ -81,8 +81,7 @@ gimp_action_factory_finalize (GObject *object) } GimpActionFactory * -gimp_action_factory_new (Gimp *gimp, - gboolean mnemonics) +gimp_action_factory_new (Gimp *gimp) { GimpActionFactory *factory; @@ -90,8 +89,7 @@ gimp_action_factory_new (Gimp *gimp, factory = g_object_new (GIMP_TYPE_ACTION_FACTORY, NULL); - factory->gimp = gimp; - factory->mnemonics = mnemonics ? TRUE : FALSE; + factory->gimp = gimp; return factory; } @@ -146,7 +144,6 @@ gimp_action_factory_group_new (GimpActionFactory *factory, entry->identifier, entry->label, entry->stock_id, - factory->mnemonics, user_data, entry->update_func); diff --git a/app/widgets/gimpactionfactory.h b/app/widgets/gimpactionfactory.h index 1bff478d86..9f0e610d2d 100644 --- a/app/widgets/gimpactionfactory.h +++ b/app/widgets/gimpactionfactory.h @@ -53,8 +53,6 @@ struct _GimpActionFactory Gimp *gimp; GList *registered_groups; - - gboolean mnemonics; }; struct _GimpActionFactoryClass @@ -65,8 +63,7 @@ struct _GimpActionFactoryClass GType gimp_action_factory_get_type (void) G_GNUC_CONST; -GimpActionFactory * gimp_action_factory_new (Gimp *gimp, - gboolean mnemonics); +GimpActionFactory * gimp_action_factory_new (Gimp *gimp); void gimp_action_factory_group_register (GimpActionFactory *factory, const gchar *identifier, diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c index 7e6c70d6c7..34252561b3 100644 --- a/app/widgets/gimpactiongroup.c +++ b/app/widgets/gimpactiongroup.c @@ -46,8 +46,7 @@ enum PROP_0, PROP_GIMP, PROP_LABEL, - PROP_STOCK_ID, - PROP_MNEMONICS + PROP_STOCK_ID }; @@ -103,13 +102,6 @@ gimp_action_group_class_init (GimpActionGroupClass *klass) GIMP_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - g_object_class_install_property (object_class, PROP_MNEMONICS, - g_param_spec_boolean ("mnemonics", - NULL, NULL, - TRUE, - GIMP_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY)); - klass->groups = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); } @@ -223,9 +215,7 @@ gimp_action_group_set_property (GObject *object, case PROP_STOCK_ID: group->stock_id = g_value_dup_string (value); break; - case PROP_MNEMONICS: - group->mnemonics = g_value_get_boolean (value); - break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -251,9 +241,7 @@ gimp_action_group_get_property (GObject *object, case PROP_STOCK_ID: g_value_set_string (value, group->stock_id); break; - case PROP_MNEMONICS: - g_value_set_boolean (value, group->mnemonics); - break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -283,7 +271,6 @@ gimp_action_group_check_unique_action (GimpActionGroup *group, * @name: the name of the action group. * @label: the user visible label of the action group. * @stock_id: the icon of the action group. - * @mnemonics: whether or not to show mnemonics. * @user_data: the user_data for #GtkAction callbacks. * @update_func: the function that will be called on * gimp_action_group_update(). @@ -299,7 +286,6 @@ gimp_action_group_new (Gimp *gimp, const gchar *name, const gchar *label, const gchar *stock_id, - gboolean mnemonics, gpointer user_data, GimpActionGroupUpdateFunc update_func) { @@ -313,7 +299,6 @@ gimp_action_group_new (Gimp *gimp, "name", name, "label", label, "stock-id", stock_id, - "mnemonics", mnemonics, NULL); group->user_data = user_data; @@ -362,7 +347,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -370,7 +355,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -381,15 +366,9 @@ gimp_action_group_add_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_action_new (entries[i].name, label, tooltip, entries[i].stock_id); - if (! group->mnemonics) - g_free (label); - if (entries[i].callback) g_signal_connect (action, "activate", entries[i].callback, @@ -421,7 +400,7 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GtkToggleAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -429,7 +408,7 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -440,15 +419,9 @@ gimp_action_group_add_toggle_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_toggle_action_new (entries[i].name, label, tooltip, entries[i].stock_id); - if (! group->mnemonics) - g_free (label); - gtk_toggle_action_set_active (action, entries[i].is_active); if (entries[i].callback) @@ -486,7 +459,7 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GtkRadioAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -494,7 +467,7 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -505,16 +478,10 @@ gimp_action_group_add_radio_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_radio_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value); - if (! group->mnemonics) - g_free (label); - if (i == 0) first_action = action; @@ -558,7 +525,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpEnumAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -566,7 +533,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -577,17 +544,11 @@ gimp_action_group_add_enum_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_enum_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value, entries[i].value_variable); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -620,7 +581,7 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpStringAction *action; - gchar *label; + const gchar *label; const gchar *tooltip = NULL; if (! gimp_action_group_check_unique_action (group, entries[i].name)) @@ -628,7 +589,7 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, if (msg_context) { - label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label); + label = g_dpgettext2 (NULL, msg_context, entries[i].label); if (entries[i].tooltip) tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip); @@ -639,16 +600,10 @@ gimp_action_group_add_string_actions (GimpActionGroup *group, tooltip = gettext (entries[i].tooltip); } - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_string_action_new (entries[i].name, label, tooltip, entries[i].stock_id, entries[i].value); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -680,25 +635,16 @@ gimp_action_group_add_plug_in_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { GimpPlugInAction *action; - gchar *label; if (! gimp_action_group_check_unique_action (group, entries[i].name)) continue; - label = (gchar *) entries[i].label; - - if (! group->mnemonics) - label = gimp_strip_uline (label); - action = gimp_plug_in_action_new (entries[i].name, - label, + entries[i].label, entries[i].tooltip, entries[i].stock_id, entries[i].procedure); - if (! group->mnemonics) - g_free (label); - if (callback) g_signal_connect (action, "selected", callback, @@ -822,7 +768,6 @@ gimp_action_group_set_action_label (GimpActionGroup *group, const gchar *label) { GtkAction *action; - gchar *stripped; g_return_if_fail (GIMP_IS_ACTION_GROUP (group)); g_return_if_fail (action_name != NULL); @@ -837,15 +782,7 @@ gimp_action_group_set_action_label (GimpActionGroup *group, return; } - if (! group->mnemonics) - stripped = gimp_strip_uline (label); - else - stripped = (gchar *) label; - - gtk_action_set_label (action, stripped); - - if (! group->mnemonics) - g_free (stripped); + gtk_action_set_label (action, label); } void diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h index e604225924..4578bc5008 100644 --- a/app/widgets/gimpactiongroup.h +++ b/app/widgets/gimpactiongroup.h @@ -39,7 +39,6 @@ struct _GimpActionGroup Gimp *gimp; gchar *label; gchar *stock_id; - gboolean mnemonics; gpointer user_data; @@ -134,7 +133,6 @@ GimpActionGroup *gimp_action_group_new (Gimp *gimp, const gchar *name, const gchar *label, const gchar *stock_id, - gboolean mnemonics, gpointer user_data, GimpActionGroupUpdateFunc update_func); From 24209f7625e3e34ffc662e5b5c42678a18e153da Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 18:57:15 +0200 Subject: [PATCH 65/70] Use g_value_dup_object() inatead of g_value_get_object() and g_object_ref() --- app/core/gimpfilteredcontainer.c | 3 +-- app/widgets/gimptagpopup.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/core/gimpfilteredcontainer.c b/app/core/gimpfilteredcontainer.c index 703db03268..7e9747371a 100644 --- a/app/core/gimpfilteredcontainer.c +++ b/app/core/gimpfilteredcontainer.c @@ -213,8 +213,7 @@ gimp_filtered_container_set_property (GObject *object, switch (property_id) { case PROP_SRC_CONTAINER: - filtered_container->src_container = g_value_get_object (value); - g_object_ref (filtered_container->src_container); + filtered_container->src_container = g_value_dup_object (value); g_signal_connect (filtered_container->src_container, "add", G_CALLBACK (gimp_filtered_container_src_add), diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 443add722f..6465578010 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -409,8 +409,7 @@ gimp_tag_popup_set_property (GObject *object, switch (property_id) { case PROP_OWNER: - popup->combo_entry = g_value_get_object (value); - g_object_ref (popup->combo_entry); + popup->combo_entry = g_value_dup_object (value); break; default: From 5d76dd9bc50f21fad20496324e02eb6eea1f87e1 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 19:23:26 +0200 Subject: [PATCH 66/70] Fix unprelighting of the prelighted tag when there is no hit on any tag --- app/widgets/gimptagpopup.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 6465578010..b762546472 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -876,6 +876,7 @@ gimp_tag_popup_list_event (GtkWidget *widget, else if (event->type == GDK_MOTION_NOTIFY) { GdkEventMotion *motion_event = (GdkEventMotion *) event; + PopupTagData *prelight = NULL; gint x; gint y; gint i; @@ -889,15 +890,16 @@ gimp_tag_popup_list_event (GtkWidget *widget, if (gimp_tag_popup_is_in_tag (tag_data, x, y)) { - if (popup->prelight != tag_data) - { - popup->prelight = tag_data; - gtk_widget_queue_draw (widget); - } - + prelight = tag_data; break; } } + + if (prelight != popup->prelight) + { + popup->prelight = prelight; + gtk_widget_queue_draw (widget); + } } else if (event->type == GDK_BUTTON_RELEASE && ! popup->single_select_disabled) From 48a8b89bea825311d5fe82336c4b4f59ef299736 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 19:31:21 +0200 Subject: [PATCH 67/70] Only redraw the affected tags when prelight changes, not the entire widget --- app/widgets/gimptagpopup.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index b762546472..4a110d3c60 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -92,6 +92,8 @@ static gboolean gimp_tag_popup_list_event (GtkWidget *widg static gboolean gimp_tag_popup_is_in_tag (PopupTagData *tag_data, gint x, gint y); +static void gimp_tag_popup_queue_draw_tag (GimpTagPopup *widget, + PopupTagData *tag_data); static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data); static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged, @@ -897,8 +899,13 @@ gimp_tag_popup_list_event (GtkWidget *widget, if (prelight != popup->prelight) { + if (popup->prelight) + gimp_tag_popup_queue_draw_tag (popup, popup->prelight); + popup->prelight = prelight; - gtk_widget_queue_draw (widget); + + if (popup->prelight) + gimp_tag_popup_queue_draw_tag (popup, popup->prelight); } } else if (event->type == GDK_BUTTON_RELEASE && @@ -946,6 +953,17 @@ gimp_tag_popup_is_in_tag (PopupTagData *tag_data, return FALSE; } +static void +gimp_tag_popup_queue_draw_tag (GimpTagPopup *popup, + PopupTagData *tag_data) +{ + gtk_widget_queue_draw_area (popup->tag_area, + tag_data->bounds.x, + tag_data->bounds.y - popup->scroll_y, + tag_data->bounds.width, + tag_data->bounds.height); +} + static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup, PopupTagData *tag_data) From 84fd35d83232584256381850f5d65537a9b66094 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 19:34:42 +0200 Subject: [PATCH 68/70] Connect to widget signals in init() instead of constructor() --- app/widgets/gimptagpopup.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 4a110d3c60..2b7e4c6263 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -179,6 +179,20 @@ gimp_tag_popup_init (GimpTagPopup *popup) GDK_POINTER_MOTION_MASK); gtk_container_add (GTK_CONTAINER (popup->alignment), popup->tag_area); gtk_widget_show (popup->tag_area); + + g_signal_connect (popup->alignment, "expose-event", + G_CALLBACK (gimp_tag_popup_border_expose), + popup); + g_signal_connect (popup, "event", + G_CALLBACK (gimp_tag_popup_border_event), + NULL); + g_signal_connect (popup->tag_area, "expose-event", + G_CALLBACK (gimp_tag_popup_list_expose), + popup); + g_signal_connect (popup->tag_area, "event", + G_CALLBACK (gimp_tag_popup_list_event), + popup); + } static GObject * @@ -350,19 +364,6 @@ gimp_tag_popup_constructor (GType type, gtk_window_move (GTK_WINDOW (popup), popup_rect.x, popup_rect.y); gtk_window_resize (GTK_WINDOW (popup), popup_rect.width, popup_rect.height); - g_signal_connect (popup->alignment, "expose-event", - G_CALLBACK (gimp_tag_popup_border_expose), - popup); - g_signal_connect (popup, "event", - G_CALLBACK (gimp_tag_popup_border_event), - NULL); - g_signal_connect (popup->tag_area, "expose-event", - G_CALLBACK (gimp_tag_popup_list_expose), - popup); - g_signal_connect (popup->tag_area, "event", - G_CALLBACK (gimp_tag_popup_list_event), - popup); - return object; } From 20aa60ac8ca8cc688ebbb8d18203da0d27bbcf7b Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Sat, 18 Jul 2009 19:55:07 +0200 Subject: [PATCH 69/70] app: Fix a free cell renderer for GimpLanguageEntry We must set the text column with gtk_entry_completion_set_text_column() in order to get a free cell renderer. --- app/widgets/gimplanguageentry.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/widgets/gimplanguageentry.c b/app/widgets/gimplanguageentry.c index 4234e23179..a534703bba 100644 --- a/app/widgets/gimplanguageentry.c +++ b/app/widgets/gimplanguageentry.c @@ -94,10 +94,15 @@ gimp_language_entry_constructor (GType type, completion = g_object_new (GTK_TYPE_ENTRY_COMPLETION, "model", entry->store, - "text-column", GIMP_LANGUAGE_STORE_LANGUAGE, "inline-selection", TRUE, NULL); + /* Note that we must use this function to set the text column, + * otherwise we won't get a cell renderer for free + */ + gtk_entry_completion_set_text_column (completion, + GIMP_LANGUAGE_STORE_LANGUAGE); + gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_object_unref (completion); } From e564cc2e4e921b87251f1ccd162170e23d822a4b Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 18 Jul 2009 19:57:10 +0200 Subject: [PATCH 70/70] Fix motion event processing on the tag popup's scroll arrows Should work properly now wrt detecting the different speed areas and stopping scolling upon leaving the arrow. --- app/widgets/gimptagpopup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c index 2b7e4c6263..6911ede174 100644 --- a/app/widgets/gimptagpopup.c +++ b/app/widgets/gimptagpopup.c @@ -192,7 +192,6 @@ gimp_tag_popup_init (GimpTagPopup *popup) g_signal_connect (popup->tag_area, "event", G_CALLBACK (gimp_tag_popup_list_event), popup); - } static GObject * @@ -676,15 +675,13 @@ gimp_tag_popup_border_event (GtkWidget *widget, else if (event->type == GDK_MOTION_NOTIFY) { GdkEventMotion *motion_event = (GdkEventMotion *) event; + gint x, y; - if (motion_event->window == gtk_widget_get_window (widget)) - { - gint x = motion_event->x + widget->allocation.x; - gint y = motion_event->y + widget->allocation.y; + gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL); - gimp_tag_popup_handle_scrolling (popup, x, y, - popup->scroll_timeout_id == 0, TRUE); - } + gimp_tag_popup_handle_scrolling (popup, x, y, + motion_event->window == widget->window, + TRUE); } else if (event->type == GDK_BUTTON_RELEASE) {